[124914] Remove added dependency on o.e.jst.j2ee. Set standard version range for org.eclipse.emf.common.
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF
index aea71e2..0729bd8 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF
@@ -21,7 +21,6 @@
org.eclipse.jst.server.core;bundle-version="[1.0.103,1.1.0)",
org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.emf.common
+ org.eclipse.emf.common;bundle-version="[2.2.0,2.4.0)"
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/wst/ModuleTraverser.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/wst/ModuleTraverser.java
index 02aa3f2..472ef11 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/wst/ModuleTraverser.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/wst/ModuleTraverser.java
@@ -24,7 +24,6 @@
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
import org.eclipse.jst.server.tomcat.core.internal.TomcatPlugin;
import org.eclipse.jst.server.tomcat.core.internal.Trace;
import org.eclipse.wst.common.componentcore.ComponentCore;
@@ -38,7 +37,6 @@
import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
import org.eclipse.wst.server.core.IModule;
/**
@@ -94,7 +92,8 @@
private static void traverseEarComponent(IVirtualComponent component,
IModuleVisitor visitor, IProgressMonitor monitor)
throws CoreException {
- EARArtifactEdit earEdit = EARArtifactEdit
+ // Currently the JST Server portion of WTP may not depend on the JST Enterprise portion of WTP
+/* EARArtifactEdit earEdit = EARArtifactEdit
.getEARArtifactEditForRead(component);
if (earEdit != null) {
IVirtualReference[] j2eeComponents = earEdit.getJ2EEModuleReferences();
@@ -117,7 +116,7 @@
visitor.visitEarResource(null, getOSPath(dependentProject,
project, cpe.getOutputLocation()));
}
- }
+ }*/
visitor.endVisitEarComponent(component);
}
