[206066] Java EE tools need to adjust to the EMF 2.4 post M2 changes
diff --git a/plugins/org.eclipse.jem/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem/META-INF/MANIFEST.MF index c383ca7..ba31304 100644 --- a/plugins/org.eclipse.jem/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jem/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@ org.eclipse.jem.java.impl, org.eclipse.jem.java.internal.impl;x-friends:="org.eclipse.jem.beaninfo,org.eclipse.jem.workbench", org.eclipse.jem.java.util -Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.3.0,2.4.0)", +Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.3.0,3.0.0)", org.eclipse.jem.proxy;bundle-version="[2.0.0,3.0.0)";resolution:=optional, org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)"
diff --git a/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF index 6dc914b..4eb2cc3 100644 --- a/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF
@@ -97,9 +97,9 @@ org.eclipse.jst.jee.archive.internal;x-internal:=true, org.eclipse.jst.jee.util.internal;x-internal:=true Require-Bundle: org.eclipse.jem;bundle-version="[2.0.0,3.0.0)", - org.eclipse.emf.common;bundle-version="[2.2.0,2.4.0)", + org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)", org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)", - org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.4.0)", + org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)", org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)", org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveURIConverterImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveURIConverterImpl.java index 77ce387..3ba16d2 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveURIConverterImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveURIConverterImpl.java
@@ -99,7 +99,7 @@ } public URI normalize(URI uri) { - return getInternalURIMap().getURI(uri); + return ((URIConverterImpl.URIMap)getURIMap()).getURI(uri); } /**
diff --git a/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF index af7903d..5a4450a 100644 --- a/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF
@@ -24,10 +24,10 @@ org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)", org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)", org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)", - org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.4.0)", + org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)", org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)", org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)", - org.eclipse.emf.edit;bundle-version="[2.2.0,2.4.0)", + org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)", org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)", org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF index bee490a..1455ddb 100644 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF
@@ -14,8 +14,8 @@ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)", org.eclipse.jst.j2ee.ui;bundle-version="[1.1.0,1.2.0)", - org.eclipse.emf.edit;bundle-version="[2.2.0,2.4.0)", - org.eclipse.emf.edit.ui;bundle-version="[2.2.0,2.4.0)", + org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)", + org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)", org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)", org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)", org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
diff --git a/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF index a283195..871c935 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF
@@ -33,7 +33,7 @@ org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)", org.eclipse.jst.j2ee.jca;bundle-version="[1.1.0,1.2.0)", org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)", - org.eclipse.emf.edit.ui;bundle-version="[2.2.0,2.4.0)", + org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)", org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)", org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)", org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)", @@ -46,7 +46,7 @@ org.eclipse.wst.server.core;bundle-version="[1.0.102,1.1.0)", org.eclipse.wst.server.ui;bundle-version="[1.0.102,1.1.0)", org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)", - org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.4.0)", + org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)", org.eclipse.ltk.core.refactoring;bundle-version="[3.2.0,4.0.0)", org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)", org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)",
diff --git a/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF index af02011..ebfbbf0 100644 --- a/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF
@@ -28,13 +28,13 @@ org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)", org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)", org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)", - org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.4.0)", - org.eclipse.emf.edit;bundle-version="[2.2.0,2.4.0)", + org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)", + org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)", org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)", org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)", - org.eclipse.emf.codegen;bundle-version="[2.2.0,2.4.0)", + org.eclipse.emf.codegen;bundle-version="[2.2.0,3.0.0)", org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)", org.eclipse.jface;bundle-version="[3.2.0,4.0.0)", org.eclipse.jst.common.annotations.controller;bundle-version="[1.1.0,1.2.0)",
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF index 62f38ad..9171f45 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF
@@ -16,11 +16,11 @@ org.eclipse.jst.j2ee.ui;bundle-version="[1.1.0,1.2.0)", org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)", org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)", - org.eclipse.emf.edit;bundle-version="[2.2.0,2.4.0)", + org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)", org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)", org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)", - org.eclipse.emf.edit.ui;bundle-version="[2.2.0,2.4.0)", - org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.4.0)", + org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)", + org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)", org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)", org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)", org.eclipse.jst.j2ee.webservice;bundle-version="[1.1.0,1.2.0)",
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF index 04128ea..4868329 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF
@@ -19,8 +19,8 @@ org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)", org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)", org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)", - org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.4.0)", - org.eclipse.emf.edit;bundle-version="[2.2.0,2.4.0)", + org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)", + org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)", org.eclipse.jem;bundle-version="[2.0.0,3.0.0)", org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
diff --git a/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF index cf5808b..7895462 100644 --- a/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF
@@ -48,7 +48,7 @@ org.eclipse.jst.j2ee.refactor, org.eclipse.jst.j2ee.refactor.listeners, org.eclipse.jst.j2ee.refactor.operations -Require-Bundle: org.eclipse.emf.edit;bundle-version="[2.2.0,2.4.0)", +Require-Bundle: org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)", org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)", org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)", org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)", @@ -57,7 +57,7 @@ org.eclipse.wst.server.core;bundle-version="[1.0.102,1.1.0)", org.eclipse.jst.server.core;bundle-version="[1.0.102,1.1.0)", org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)", - org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.4.0)", + org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)", org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)", org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)", org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEEMFArchiveAdapterHelper.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEEMFArchiveAdapterHelper.java index 06a3905..5127cd7 100644 --- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEEMFArchiveAdapterHelper.java +++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEEMFArchiveAdapterHelper.java
@@ -23,6 +23,7 @@ import org.eclipse.core.runtime.content.IContentDescription; import org.eclipse.emf.common.notify.impl.AdapterImpl; import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.ContentHandler; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; @@ -165,6 +166,10 @@ } public Resource createResource(URI uri) { + return createResource(uri, ContentHandler.UNSPECIFIED_CONTENT_TYPE); + } + + public Resource createResource(URI uri, String contentType) { IContentDescription description = getContentDescription(uri); Resource.Factory resourceFactory = null;
diff --git a/plugins/org.eclipse.jst.jee.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.jee.web/META-INF/MANIFEST.MF index 0dbcaaa..c3e58fc 100644 --- a/plugins/org.eclipse.jst.jee.web/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.jee.web/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ org.eclipse.jst.jee;bundle-version="[1.0.0,1.1.0)", org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)", com.ibm.icu;bundle-version="[3.6.0,4.0.0)", - org.eclipse.emf.common;bundle-version="[2.2.0,2.4.0)", + org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)", org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)", org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)", org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",