From 9847ebcb6af62d5a6977abfb6cd69875ee1fa63a Mon Sep 17 00:00:00 2001
From: Christophe Bouhier
Date: Thu, 2 Jan 2014 15:10:53 +0100
Subject: - enable tycho releng on CDO feature & plugin - clean-up feature
 projects.

---
 plugins/org.eclipse.emf.edapt.history.cdo/.classpath          |  4 ++--
 plugins/org.eclipse.emf.edapt.history.cdo/.project            |  6 ++++++
 plugins/org.eclipse.emf.edapt.history.cdo/build.properties    |  1 -
 plugins/org.eclipse.emf.edapt.history.cdo/pom.xml             | 11 +++++++++++
 .../edapt/cdo/migration/execution/EdaptCDOViewProvider.java   |  1 -
 plugins/org.eclipse.emf.edapt.migration/.classpath            |  2 +-
 plugins/org.eclipse.emf.edapt.migration/build.properties      |  1 -
 plugins/pom.xml                                               |  1 +
 8 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 plugins/org.eclipse.emf.edapt.history.cdo/pom.xml

(limited to 'plugins')

diff --git a/plugins/org.eclipse.emf.edapt.history.cdo/.classpath b/plugins/org.eclipse.emf.edapt.history.cdo/.classpath
index 64c5e31..00e032c 100644
--- a/plugins/org.eclipse.emf.edapt.history.cdo/.classpath
+++ b/plugins/org.eclipse.emf.edapt.history.cdo/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/plugins/org.eclipse.emf.edapt.history.cdo/.project b/plugins/org.eclipse.emf.edapt.history.cdo/.project
index c34de77..0992422 100644
--- a/plugins/org.eclipse.emf.edapt.history.cdo/.project
+++ b/plugins/org.eclipse.emf.edapt.history.cdo/.project
@@ -20,8 +20,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.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/org.eclipse.emf.edapt.history.cdo/build.properties b/plugins/org.eclipse.emf.edapt.history.cdo/build.properties
index da1e9aa..8d74fc6 100644
--- a/plugins/org.eclipse.emf.edapt.history.cdo/build.properties
+++ b/plugins/org.eclipse.emf.edapt.history.cdo/build.properties
@@ -1,5 +1,4 @@
 source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
                .,\
                OSGI-INF/l10n/bundle.properties,\
diff --git a/plugins/org.eclipse.emf.edapt.history.cdo/pom.xml b/plugins/org.eclipse.emf.edapt.history.cdo/pom.xml
new file mode 100644
index 0000000..a5d983f
--- /dev/null
+++ b/plugins/org.eclipse.emf.edapt.history.cdo/pom.xml
@@ -0,0 +1,11 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <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.history.cdo</artifactId>
+  <version>0.3.0-SNAPSHOT</version>
+</project>
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.edapt.history.cdo/src/org/eclipse/emf/edapt/cdo/migration/execution/EdaptCDOViewProvider.java b/plugins/org.eclipse.emf.edapt.history.cdo/src/org/eclipse/emf/edapt/cdo/migration/execution/EdaptCDOViewProvider.java
index 32ccde0..843a383 100644
--- a/plugins/org.eclipse.emf.edapt.history.cdo/src/org/eclipse/emf/edapt/cdo/migration/execution/EdaptCDOViewProvider.java
+++ b/plugins/org.eclipse.emf.edapt.history.cdo/src/org/eclipse/emf/edapt/cdo/migration/execution/EdaptCDOViewProvider.java
@@ -23,7 +23,6 @@ public class EdaptCDOViewProvider extends AbstractCDOViewProvider {
 	}
 
 
-	@Override
 	public CDOView getView(URI uri, ResourceSet resourceSet) {
 		if (container == null) {
 			container = new ManagedContainer();
diff --git a/plugins/org.eclipse.emf.edapt.migration/.classpath b/plugins/org.eclipse.emf.edapt.migration/.classpath
index 17ec6ee..3f94255 100644
--- a/plugins/org.eclipse.emf.edapt.migration/.classpath
+++ b/plugins/org.eclipse.emf.edapt.migration/.classpath
@@ -4,5 +4,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/plugins/org.eclipse.emf.edapt.migration/build.properties b/plugins/org.eclipse.emf.edapt.migration/build.properties
index f1eb143..b3e2a56 100644
--- a/plugins/org.eclipse.emf.edapt.migration/build.properties
+++ b/plugins/org.eclipse.emf.edapt.migration/build.properties
@@ -23,4 +23,3 @@ bin.includes = .,\
 jars.compile.order = .
 source.. = src/,\
            generated-src/
-output.. = bin/
diff --git a/plugins/pom.xml b/plugins/pom.xml
index cf58263..9d08a32 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -19,6 +19,7 @@
     <module>org.eclipse.emf.edapt.declaration.edit</module>
     <module>org.eclipse.emf.edapt.declaration.editor</module>
     <module>org.eclipse.emf.edapt.history</module>
+    <module>org.eclipse.emf.edapt.history.cdo</module>
     <module>org.eclipse.emf.edapt.history.edit</module>
     <module>org.eclipse.emf.edapt.history.editor</module>
     <module>org.eclipse.emf.edapt.migration</module>
-- 
cgit v1.2.3