Had to rename the com.ibm. plugins because they would conflict with WSAD V60 plugins from J2EE.
diff --git a/features/org.eclipse.jem-feature/com.ibm.etools.emf.ecore.utilities/build.properties b/features/org.eclipse.jem-feature/com.ibm.etools.jem.emf.ecore.utilities/build.properties similarity index 100% rename from features/org.eclipse.jem-feature/com.ibm.etools.emf.ecore.utilities/build.properties rename to features/org.eclipse.jem-feature/com.ibm.etools.jem.emf.ecore.utilities/build.properties
diff --git a/features/org.eclipse.jem-feature/com.ibm.etools.emf.ecore.utilities/plugin.xml b/features/org.eclipse.jem-feature/com.ibm.etools.jem.emf.ecore.utilities/plugin.xml similarity index 96% rename from features/org.eclipse.jem-feature/com.ibm.etools.emf.ecore.utilities/plugin.xml rename to features/org.eclipse.jem-feature/com.ibm.etools.jem.emf.ecore.utilities/plugin.xml index c5d7b91..d0ce125 100644 --- a/features/org.eclipse.jem-feature/com.ibm.etools.emf.ecore.utilities/plugin.xml +++ b/features/org.eclipse.jem-feature/com.ibm.etools.jem.emf.ecore.utilities/plugin.xml
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <plugin - id="com.ibm.etools.emf.ecore.utilities" + id="com.ibm.etools.jem.emf.ecore.utilities" name="Ecore Utilities" version="5.1.1" provider-name="IBM"
diff --git a/features/org.eclipse.jem-feature/com.ibm.etools.emf.ecore.utilities/runtime/ecore.utilities.jar b/features/org.eclipse.jem-feature/com.ibm.etools.jem.emf.ecore.utilities/runtime/ecore.utilities.jar similarity index 100% rename from features/org.eclipse.jem-feature/com.ibm.etools.emf.ecore.utilities/runtime/ecore.utilities.jar rename to features/org.eclipse.jem-feature/com.ibm.etools.jem.emf.ecore.utilities/runtime/ecore.utilities.jar Binary files differ
diff --git a/features/org.eclipse.jem-feature/com.ibm.etools.emf.ecore.utilities/runtime/workbench.jar b/features/org.eclipse.jem-feature/com.ibm.etools.jem.emf.ecore.utilities/runtime/workbench.jar similarity index 100% rename from features/org.eclipse.jem-feature/com.ibm.etools.emf.ecore.utilities/runtime/workbench.jar rename to features/org.eclipse.jem-feature/com.ibm.etools.jem.emf.ecore.utilities/runtime/workbench.jar Binary files differ
diff --git a/features/org.eclipse.jem-feature/com.ibm.etools.emf.workbench/build.properties b/features/org.eclipse.jem-feature/com.ibm.etools.jem.emf.workbench/build.properties similarity index 100% rename from features/org.eclipse.jem-feature/com.ibm.etools.emf.workbench/build.properties rename to features/org.eclipse.jem-feature/com.ibm.etools.jem.emf.workbench/build.properties
diff --git a/features/org.eclipse.jem-feature/com.ibm.etools.emf.workbench/plugin.xml b/features/org.eclipse.jem-feature/com.ibm.etools.jem.emf.workbench/plugin.xml similarity index 85% rename from features/org.eclipse.jem-feature/com.ibm.etools.emf.workbench/plugin.xml rename to features/org.eclipse.jem-feature/com.ibm.etools.jem.emf.workbench/plugin.xml index 2a85f6e..aa92df8 100644 --- a/features/org.eclipse.jem-feature/com.ibm.etools.emf.workbench/plugin.xml +++ b/features/org.eclipse.jem-feature/com.ibm.etools.jem.emf.workbench/plugin.xml
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <plugin - id="com.ibm.etools.emf.workbench" + id="com.ibm.etools.jem.emf.workbench" name="EMF Workbench" version="5.1.1" provider-name="IBM" @@ -13,7 +13,7 @@ </library> </runtime> <requires> - <import plugin="com.ibm.etools.emf.ecore.utilities" export="true" version="5.1.1" match="equivalent"/> + <import plugin="com.ibm.etools.jem.emf.ecore.utilities" export="true" version="5.1.1" match="equivalent"/> <import plugin="org.apache.xerces" version="4.0.13" match="equivalent"/> <import plugin="org.eclipse.core.resources" /> <!--import plugin="com.ibm.etools.logging.util" version="5.1.1" match="equivalent"/-->
diff --git a/features/org.eclipse.jem-feature/com.ibm.etools.emf.workbench/runtime/emfworkbench.jar b/features/org.eclipse.jem-feature/com.ibm.etools.jem.emf.workbench/runtime/emfworkbench.jar similarity index 100% rename from features/org.eclipse.jem-feature/com.ibm.etools.emf.workbench/runtime/emfworkbench.jar rename to features/org.eclipse.jem-feature/com.ibm.etools.jem.emf.workbench/runtime/emfworkbench.jar Binary files differ
diff --git a/features/org.eclipse.jem-feature/feature.xml b/features/org.eclipse.jem-feature/feature.xml index 0a6c2a4..3baae5f 100644 --- a/features/org.eclipse.jem-feature/feature.xml +++ b/features/org.eclipse.jem-feature/feature.xml
@@ -54,7 +54,7 @@ version="0.5.0"/> <plugin - id="com.ibm.etools.emf.ecore.utilities" + id="com.ibm.etools.jem.emf.ecore.utilities" download-size="0" install-size="0" version="5.1.1"/> @@ -66,7 +66,7 @@ version="2.0.0.1"/> <plugin - id="com.ibm.etools.emf.workbench" + id="com.ibm.etools.jem.emf.workbench" download-size="0" install-size="0" version="5.1.1"/>
diff --git a/plugins/org.eclipse.jem.workbench/.project b/plugins/org.eclipse.jem.workbench/.project index a022215..a15e878 100644 --- a/plugins/org.eclipse.jem.workbench/.project +++ b/plugins/org.eclipse.jem.workbench/.project
@@ -3,7 +3,7 @@ <name>org.eclipse.jem.workbench</name> <comment></comment> <projects> - <project>com.ibm.etools.emf.workbench</project> + <project>com.ibm.etools.jem.emf.workbench</project> <project>org.eclipse.core.boot</project> <project>org.eclipse.core.resources</project> <project>org.eclipse.core.runtime</project>
diff --git a/plugins/org.eclipse.jem.workbench/plugin.xml b/plugins/org.eclipse.jem.workbench/plugin.xml index 4f9f5db..e53c8bd 100644 --- a/plugins/org.eclipse.jem.workbench/plugin.xml +++ b/plugins/org.eclipse.jem.workbench/plugin.xml
@@ -15,7 +15,7 @@ <import plugin="org.eclipse.jem" export="true"/> <import plugin="org.eclipse.jdt.core"/> <import plugin="org.eclipse.core.resources"/> - <import plugin="com.ibm.etools.emf.workbench" export="true"/> + <import plugin="com.ibm.etools.jem.emf.workbench" export="true"/> </requires>