- add CDO feature to repo.

- fix feature setup for maven/tycho. 

8 files changed, 30 insertions, 48 deletions

diff --git a/builds/org.eclipse.emf.edapt.releng.p2/category.xml b/builds/org.eclipse.emf.edapt.releng.p2/category.xml
index b26cdec..58ce675 100644
--- a/builds/org.eclipse.emf.edapt.releng.p2/category.xml
+++ b/builds/org.eclipse.emf.edapt.releng.p2/category.xml
@@ -6,5 +6,7 @@
    <feature url="features/org.eclipse.emf.edapt.recorder.feature_0.3.0.qualifier.jar" id="org.eclipse.emf.edapt.recorder.feature" version="0.3.0.qualifier">
       <category name="org.eclipse.emf.edapt.category.latest"/>
    </feature>
+   <feature url="features/org.eclipse.emf.edapt.cdo.runtime.feature_0.3.0.qualifier.jar" id="org.eclipse.emf.edapt.cdo.runtime.feature" version="0.3.0.qualifier"/>
    <category-def name="org.eclipse.emf.edapt.category.latest" label="Edapt Kepler"/>
+   <category-def name="org.eclipse.emf.edapt.category.optional" label="Edapt Optional"/>
 </site>
diff --git a/builds/org.eclipse.emf.edapt.releng/pom.xml b/builds/org.eclipse.emf.edapt.releng/pom.xml
index a9a1e9f..6118f04 100644
--- a/builds/org.eclipse.emf.edapt.releng/pom.xml
+++ b/builds/org.eclipse.emf.edapt.releng/pom.xml
@@ -8,11 +8,11 @@
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<properties>
-		<tycho-version>0.18.0</tycho-version>
+		<tycho-version>0.19.0</tycho-version>
 	</properties>
 	<build>
 		<plugins>
-		<plugin>
+			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>target-platform-configuration</artifactId>
 				<version>${tycho-version}</version>
diff --git a/features/org.eclipse.emf.edapt.recorder.feature/.classpath b/features/org.eclipse.emf.edapt.recorder.feature/.classpath
deleted file mode 100644
index 0a1dadd..0000000
--- a/features/org.eclipse.emf.edapt.recorder.feature/.classpath
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/features/org.eclipse.emf.edapt.recorder.feature/.project b/features/org.eclipse.emf.edapt.recorder.feature/.project
index 5259d3b..326564c 100644
--- a/features/org.eclipse.emf.edapt.recorder.feature/.project
+++ b/features/org.eclipse.emf.edapt.recorder.feature/.project
@@ -6,11 +6,6 @@
 	</projects>

 	<buildSpec>

 		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

 			<name>org.eclipse.pde.FeatureBuilder</name>

 			<arguments>

 			</arguments>

@@ -22,7 +17,6 @@
 		</buildCommand>

 	</buildSpec>

 	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

 		<nature>org.eclipse.m2e.core.maven2Nature</nature>

 		<nature>org.eclipse.pde.FeatureNature</nature>

 	</natures>

diff --git a/features/org.eclipse.emf.edapt.runtime.cdo.feature/.project b/features/org.eclipse.emf.edapt.runtime.cdo.feature/.project
index d76002f..131164f 100644
--- a/features/org.eclipse.emf.edapt.runtime.cdo.feature/.project
+++ b/features/org.eclipse.emf.edapt.runtime.cdo.feature/.project
@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.FeatureNature</nature>
 	</natures>
 </projectDescription>
diff --git a/features/org.eclipse.emf.edapt.runtime.cdo.feature/feature.xml b/features/org.eclipse.emf.edapt.runtime.cdo.feature/feature.xml
index 53b753b..45ba279 100644
--- a/features/org.eclipse.emf.edapt.runtime.cdo.feature/feature.xml
+++ b/features/org.eclipse.emf.edapt.runtime.cdo.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.edapt.cdo.runtime.feature"
       label="Feature"
-      version="1.0.0.qualifier"
+      version="0.3.0.qualifier"
       provider-name="Eclipse">
 
    <description url="http://www.eclipse.org/edapt">
diff --git a/features/org.eclipse.emf.edapt.runtime.feature/.project b/features/org.eclipse.emf.edapt.runtime.feature/.project
index 9888907..281b0ab 100644
--- a/features/org.eclipse.emf.edapt.runtime.feature/.project
+++ b/features/org.eclipse.emf.edapt.runtime.feature/.project
@@ -10,8 +10,14 @@
 			<arguments>

 			</arguments>

 		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.m2e.core.maven2Builder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

 	</buildSpec>

 	<natures>

+		<nature>org.eclipse.m2e.core.maven2Nature</nature>

 		<nature>org.eclipse.pde.FeatureNature</nature>

 	</natures>

 </projectDescription>

diff --git a/plugins/org.eclipse.emf.edapt.common/pom.xml b/plugins/org.eclipse.emf.edapt.common/pom.xml
index 28b91be..05396ed 100644
--- a/plugins/org.eclipse.emf.edapt.common/pom.xml
+++ b/plugins/org.eclipse.emf.edapt.common/pom.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project 
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>edapt</groupId>
-    <artifactId>plugins</artifactId>
-    <version>0.0.1-SNAPSHOT</version>  
-  </parent>
-  <groupId>edapt</groupId>
-  <artifactId>org.eclipse.emf.edapt.common</artifactId>
-  <version>0.3.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>edapt</groupId>
+		<artifactId>plugins</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<groupId>edapt</groupId>
+	<artifactId>org.eclipse.emf.edapt.common</artifactId>
+	<version>0.3.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>