[Releng] Add Ant task to migrate GenModels

12 files changed, 23 insertions, 27 deletions

diff --git a/plugins/org.eclipse.emf.cdo.migrator/.classpath b/plugins/org.eclipse.emf.cdo.migrator/.classpath
index c465fc1818..64c5e31b7a 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/.classpath
+++ b/plugins/org.eclipse.emf.cdo.migrator/.classpath
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="ant_tasks/cdo.ant.tasks.jar"/>
 	<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="src" output="bin.tasks" path="tasks"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF
index 75ca4ff0c4..53f388ff58 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF
@@ -6,8 +6,7 @@ Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ClassPath: .,
- ant_tasks/cdo.ant.tasks.jar
+Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
@@ -19,7 +18,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
 Export-Package: org.eclipse.emf.cdo.internal.messages;version="3.0.800";x-internal:=true,
  org.eclipse.emf.cdo.internal.migrator;version="3.0.800";x-internal:=true,
  org.eclipse.emf.cdo.internal.migrator.actions;version="3.0.800";x-internal:=true,
- org.eclipse.emf.cdo.internal.migrator.wizards;version="3.0.800";x-internal:=true,
- org.eclipse.emf.cdo.migrator.tasks;version="3.0.800";x-internal:=true,
- org.eclipse.emf.cdo.migrator.util;version="3.0.800";x-internal:=true
+ org.eclipse.emf.cdo.internal.migrator.tasks;version="3.0.800";x-internal:=true,
+ org.eclipse.emf.cdo.internal.migrator.wizards;version="3.0.800";x-internal:=true
 Automatic-Module-Name: org.eclipse.emf.cdo.migrator
diff --git a/plugins/org.eclipse.emf.cdo.migrator/build-ant-tasks.ant b/plugins/org.eclipse.emf.cdo.migrator/build-ant-tasks.ant
index 434d9e7e34..0a88a491b0 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/build-ant-tasks.ant
+++ b/plugins/org.eclipse.emf.cdo.migrator/build-ant-tasks.ant
@@ -11,18 +11,21 @@
 -->
 <project name="build-ant-tasks" default="build-ant-tasks" basedir=".">
 
-	<property name="jar.name" value="cdo.ant.tasks"/>
+	<property name="jar.name" value="cdo.ant.tasks" />
 
 	<target name="build-ant-tasks">
 		<jar destfile="ant_tasks/${jar.name}.jar">
-			<fileset dir="bin.tasks">
-				<include name="**/*.class"/>
+			<fileset dir="bin">
+				<include name="**/*.class" />
+				<exclude name="**/actions/*.class" />
+				<exclude name="**/wizards/*.class" />
+				<exclude name="**/CDOImporter*.class" />
 			</fileset>
 		</jar>
 	</target>
 
 	<target name="clean.jars">
-		<delete file="ant_tasks/${jar.name}.jar" failonerror="false"/>
+		<delete file="ant_tasks/${jar.name}.jar" failonerror="false" />
 	</target>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.migrator/build.properties b/plugins/org.eclipse.emf.cdo.migrator/build.properties
index c2d9dac0a3..3dec1becac 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/build.properties
+++ b/plugins/org.eclipse.emf.cdo.migrator/build.properties
@@ -19,17 +19,15 @@ bin.includes = .,\
                about.mappings,\
                about.properties,\
                modeling32.png,\
-               ant_tasks/,\
-               ant_tasks/cdo.ant.tasks.jar
+               ant_tasks/
 src.includes = about.html,\
                pom.xml,\
                build-ant-tasks.ant
+bin.excludes = ant_tasks/.gitignore
 jars.compile.order = .,\
                      ant_tasks/cdo.ant.tasks.jar
 source.. = src/
 output.. = bin/
-source.ant_tasks/cdo.ant.tasks.jar = tasks/
-output.ant_tasks/cdo.ant.tasks.jar = bin.tasks/
+output.ant_tasks/cdo.ant.tasks.jar = bin/
 
 generateSourceReferences = true
-bin.excludes = ant_tasks/.gitignore
diff --git a/plugins/org.eclipse.emf.cdo.migrator/plugin.xml b/plugins/org.eclipse.emf.cdo.migrator/plugin.xml
index cced81cecb..db4bc62772 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.migrator/plugin.xml
@@ -59,9 +59,9 @@
   </extension>
 
   <extension point="org.eclipse.ant.core.antTasks">
-    <antTask library="ant_tasks/cdo.ant.tasks.jar" name="cdo.ProjectImport" headless="true" class="org.eclipse.emf.cdo.migrator.tasks.ProjectImportTask" />
-    <antTask library="ant_tasks/cdo.ant.tasks.jar" name="cdo.ProjectDelete" headless="true" class="org.eclipse.emf.cdo.migrator.tasks.ProjectDeleteTask" />
-    <antTask library="ant_tasks/cdo.ant.tasks.jar" name="cdo.MigrateModel" headless="true" class="org.eclipse.emf.cdo.migrator.tasks.MigrateModelTask" />
+    <antTask library="ant_tasks/cdo.ant.tasks.jar" name="cdo.ProjectImport" headless="true" class="org.eclipse.emf.cdo.internal.migrator.tasks.ProjectImportTask" />
+    <antTask library="ant_tasks/cdo.ant.tasks.jar" name="cdo.ProjectDelete" headless="true" class="org.eclipse.emf.cdo.internal.migrator.tasks.ProjectDeleteTask" />
+    <antTask library="ant_tasks/cdo.ant.tasks.jar" name="cdo.MigrateModel" headless="true" class="org.eclipse.emf.cdo.internal.migrator.tasks.MigrateModelTask" />
   </extension>
 
 </plugin>
diff --git a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/CDOImporter.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/CDOImporter.java
index b2ff5bf2ea..30144c7be0 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/CDOImporter.java
+++ b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/CDOImporter.java
@@ -11,7 +11,6 @@
 package org.eclipse.emf.cdo.internal.migrator;
 
 import org.eclipse.emf.cdo.internal.messages.Messages;
-import org.eclipse.emf.cdo.migrator.util.CDOMigratorUtil;
 
 import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
 import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
diff --git a/plugins/org.eclipse.emf.cdo.migrator/tasks/org/eclipse/emf/cdo/migrator/util/CDOMigratorUtil.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/CDOMigratorUtil.java
index 43105501a8..dc072fb32c 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/tasks/org/eclipse/emf/cdo/migrator/util/CDOMigratorUtil.java
+++ b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/CDOMigratorUtil.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.migrator.util;
+package org.eclipse.emf.cdo.internal.migrator;
 
 import org.eclipse.emf.cdo.internal.messages.Messages;
 
diff --git a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/actions/MigrateAction.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/actions/MigrateAction.java
index e180159659..1938fed5f0 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/actions/MigrateAction.java
+++ b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/actions/MigrateAction.java
@@ -11,7 +11,7 @@
 package org.eclipse.emf.cdo.internal.migrator.actions;
 
 import org.eclipse.emf.cdo.internal.messages.Messages;
-import org.eclipse.emf.cdo.migrator.util.CDOMigratorUtil;
+import org.eclipse.emf.cdo.internal.migrator.CDOMigratorUtil;
 
 import org.eclipse.net4j.util.ui.UIUtil;
 
diff --git a/plugins/org.eclipse.emf.cdo.migrator/tasks/org/eclipse/emf/cdo/migrator/tasks/CDOTask.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/tasks/CDOTask.java
index 3eccd7943e..559ca5ffe5 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/tasks/org/eclipse/emf/cdo/migrator/tasks/CDOTask.java
+++ b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/tasks/CDOTask.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.migrator.tasks;
+package org.eclipse.emf.cdo.internal.migrator.tasks;
 
 import org.eclipse.ant.core.AntCorePlugin;
 import org.eclipse.core.resources.IWorkspace;
diff --git a/plugins/org.eclipse.emf.cdo.migrator/tasks/org/eclipse/emf/cdo/migrator/tasks/MigrateModelTask.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/tasks/MigrateModelTask.java
index 919266ac8b..a30ab1662a 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/tasks/org/eclipse/emf/cdo/migrator/tasks/MigrateModelTask.java
+++ b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/tasks/MigrateModelTask.java
@@ -8,9 +8,9 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.migrator.tasks;
+package org.eclipse.emf.cdo.internal.migrator.tasks;
 
-import org.eclipse.emf.cdo.migrator.util.CDOMigratorUtil;
+import org.eclipse.emf.cdo.internal.migrator.CDOMigratorUtil;
 
 import org.eclipse.emf.codegen.ecore.genmodel.GenDelegationKind;
 import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
diff --git a/plugins/org.eclipse.emf.cdo.migrator/tasks/org/eclipse/emf/cdo/migrator/tasks/ProjectDeleteTask.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/tasks/ProjectDeleteTask.java
index b58e82fb47..cce0df56a8 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/tasks/org/eclipse/emf/cdo/migrator/tasks/ProjectDeleteTask.java
+++ b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/tasks/ProjectDeleteTask.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.migrator.tasks;
+package org.eclipse.emf.cdo.internal.migrator.tasks;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.NullProgressMonitor;
diff --git a/plugins/org.eclipse.emf.cdo.migrator/tasks/org/eclipse/emf/cdo/migrator/tasks/ProjectImportTask.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/tasks/ProjectImportTask.java
index 36c57f25ea..1546aed0cd 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/tasks/org/eclipse/emf/cdo/migrator/tasks/ProjectImportTask.java
+++ b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/tasks/ProjectImportTask.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.migrator.tasks;
+package org.eclipse.emf.cdo.internal.migrator.tasks;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;