Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2018-04-13 09:57:53 +0000
committerEike Stepper2018-04-13 09:57:53 +0000
commit8dea31c8f00d711893d352a912ad2907db8c57fe (patch)
treeb64cf41af456e1c711fc63dbb84478d9921e22c4 /plugins
parent4eca806562f7ea79b3133da21d0fda2392d81560 (diff)
downloadcdo-8dea31c8f00d711893d352a912ad2907db8c57fe.tar.gz
cdo-8dea31c8f00d711893d352a912ad2907db8c57fe.tar.xz
cdo-8dea31c8f00d711893d352a912ad2907db8c57fe.zip
[Releng] Add Ant task to migrate GenModels
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/.classpath1
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/.externalToolBuilders/org.eclipse.emf.cdo.migrator.build-ant-tasks.launch6
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF9
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/CDOImporter.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/actions/MigrateAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/tasks/org/eclipse/emf/cdo/migrator/tasks/MigrateModelTask.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/tasks/org/eclipse/emf/cdo/migrator/util/CDOMigratorUtil.java (renamed from plugins/org.eclipse.emf.cdo.migrator/tasks/org/eclipse/emf/cdo/migrator/tasks/util/CDOMigratorUtil.java)2
7 files changed, 17 insertions, 7 deletions
diff --git a/plugins/org.eclipse.emf.cdo.migrator/.classpath b/plugins/org.eclipse.emf.cdo.migrator/.classpath
index c72f04c2a0..c465fc1818 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/.classpath
+++ b/plugins/org.eclipse.emf.cdo.migrator/.classpath
@@ -1,5 +1,6 @@
<?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"/>
diff --git a/plugins/org.eclipse.emf.cdo.migrator/.externalToolBuilders/org.eclipse.emf.cdo.migrator.build-ant-tasks.launch b/plugins/org.eclipse.emf.cdo.migrator/.externalToolBuilders/org.eclipse.emf.cdo.migrator.build-ant-tasks.launch
index 5200a489cc..7e57bfad34 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/.externalToolBuilders/org.eclipse.emf.cdo.migrator.build-ant-tasks.launch
+++ b/plugins/org.eclipse.emf.cdo.migrator/.externalToolBuilders/org.eclipse.emf.cdo.migrator.build-ant-tasks.launch
@@ -4,6 +4,12 @@
<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.emf.cdo.migrator&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.emf.cdo.migrator"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
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 e48dcaeed8..75ca4ff0c4 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF
@@ -6,7 +6,8 @@ Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ClassPath: .
+Bundle-ClassPath: .,
+ ant_tasks/cdo.ant.tasks.jar
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)",
@@ -15,8 +16,10 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.net4j.util.ui;bundle-version="[3.6.0,4.0.0)",
org.eclipse.ant.core;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
org.apache.ant;bundle-version="[1.0.0,2.0.0)";resolution:=optional
-Export-Package: org.eclipse.emf.cdo.internal.messages;version="3.0.200";x-internal:=true,
+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.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
Automatic-Module-Name: org.eclipse.emf.cdo.migrator
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 9717619937..b2ff5bf2ea 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,7 @@
package org.eclipse.emf.cdo.internal.migrator;
import org.eclipse.emf.cdo.internal.messages.Messages;
-import org.eclipse.emf.cdo.migrator.tasks.util.CDOMigratorUtil;
+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/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 bb35e0fe01..e180159659 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.tasks.util.CDOMigratorUtil;
+import org.eclipse.emf.cdo.migrator.util.CDOMigratorUtil;
import org.eclipse.net4j.util.ui.UIUtil;
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/tasks/org/eclipse/emf/cdo/migrator/tasks/MigrateModelTask.java
index 909c7d72a2..919266ac8b 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/tasks/org/eclipse/emf/cdo/migrator/tasks/MigrateModelTask.java
+++ b/plugins/org.eclipse.emf.cdo.migrator/tasks/org/eclipse/emf/cdo/migrator/tasks/MigrateModelTask.java
@@ -10,7 +10,7 @@
*/
package org.eclipse.emf.cdo.migrator.tasks;
-import org.eclipse.emf.cdo.migrator.tasks.util.CDOMigratorUtil;
+import org.eclipse.emf.cdo.migrator.util.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/util/CDOMigratorUtil.java b/plugins/org.eclipse.emf.cdo.migrator/tasks/org/eclipse/emf/cdo/migrator/util/CDOMigratorUtil.java
index 0a626d6e51..43105501a8 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/tasks/org/eclipse/emf/cdo/migrator/tasks/util/CDOMigratorUtil.java
+++ b/plugins/org.eclipse.emf.cdo.migrator/tasks/org/eclipse/emf/cdo/migrator/util/CDOMigratorUtil.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
*/
-package org.eclipse.emf.cdo.migrator.tasks.util;
+package org.eclipse.emf.cdo.migrator.util;
import org.eclipse.emf.cdo.internal.messages.Messages;

Back to the top