[223737] Cleanup
diff --git a/plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF
index 2db2d37..394f14f 100644
--- a/plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF
@@ -19,8 +19,8 @@
org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
- org.eclipse.wst.server.core;bundle-version="[1.0.102,1.2.0)",
- org.eclipse.jst.server.core;bundle-version="[1.0.102,1.2.0)",
+ org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
+ org.eclipse.jst.server.core;bundle-version="[1.0.102,2.0.0)",
org.eclipse.ant.ui;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
@@ -29,5 +29,5 @@
org.apache.ant;bundle-version="[1.6.5,2.0.0)",
org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
org.eclipse.core.variables;bundle-version="[3.1.0,4.0.0)"
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServer.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServer.java
index 9bcb433..0f8bcff 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServer.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServer.java
@@ -33,7 +33,6 @@
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IModuleType;
import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
import org.eclipse.wst.server.core.ServerPort;
import org.eclipse.wst.server.core.ServerUtil;
import org.eclipse.wst.server.core.model.IURLProvider;
diff --git a/plugins/org.eclipse.jst.server.generic.jboss/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.generic.jboss/META-INF/MANIFEST.MF
index d6f6b04..52eb89b 100644
--- a/plugins/org.eclipse.jst.server.generic.jboss/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.generic.jboss/META-INF/MANIFEST.MF
@@ -5,13 +5,13 @@
Bundle-Version: 1.5.105.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jst.server.core;bundle-version="[1.0.102,1.1.0)",
- org.eclipse.jst.server.generic.core;bundle-version="[1.0.102,1.2.0)",
- org.eclipse.jst.server.generic.ui;bundle-version="[1.0.102,1.2.0)",
- org.eclipse.jst.server.ui;bundle-version="[1.0.102,1.1.0)",
+Require-Bundle: org.eclipse.jst.server.core;bundle-version="[1.0.102,2.0.0)",
+ org.eclipse.jst.server.generic.core;bundle-version="[1.0.102,2.0.0)",
+ org.eclipse.jst.server.generic.ui;bundle-version="[1.0.102,2.0.0)",
+ org.eclipse.jst.server.ui;bundle-version="[1.0.102,2.0.0)",
org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,2.0.0)"
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
Bundle-ClassPath: genericjboss.jar
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.jst.server.generic.jonas/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.generic.jonas/META-INF/MANIFEST.MF
index 0fd7344..b826c26 100644
--- a/plugins/org.eclipse.jst.server.generic.jonas/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.generic.jonas/META-INF/MANIFEST.MF
@@ -5,13 +5,13 @@
Bundle-Version: 1.5.105.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jst.server.core;bundle-version="[1.0.102,1.1.0)",
- org.eclipse.jst.server.generic.core;bundle-version="[1.0.102,1.2.0)",
- org.eclipse.jst.server.generic.ui;bundle-version="[1.0.102,1.2.0)",
- org.eclipse.jst.server.ui;bundle-version="[1.0.102,1.1.0)",
+Require-Bundle: org.eclipse.jst.server.core;bundle-version="[1.0.102,2.0.0)",
+ org.eclipse.jst.server.generic.core;bundle-version="[1.0.102,2.0.0)",
+ org.eclipse.jst.server.generic.ui;bundle-version="[1.0.102,2.0.0)",
+ org.eclipse.jst.server.ui;bundle-version="[1.0.102,2.0.0)",
org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,2.0.0)"
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
Bundle-ClassPath: genericjonas.jar
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.generic.oc4j/META-INF/MANIFEST.MF
index 9e1f9a8..70fe549 100644
--- a/plugins/org.eclipse.jst.server.generic.oc4j/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/META-INF/MANIFEST.MF
@@ -5,13 +5,13 @@
Bundle-Version: 1.5.105.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jst.server.generic.core;bundle-version="[1.0.102,1.2.0)",
- org.eclipse.jst.server.generic.ui;bundle-version="[1.0.102,1.2.0)",
- org.eclipse.jst.server.core;bundle-version="[1.0.102,1.1.0)",
- org.eclipse.jst.server.ui;bundle-version="[1.0.102,1.1.0)",
+Require-Bundle: org.eclipse.jst.server.generic.core;bundle-version="[1.0.102,2.0.0)",
+ org.eclipse.jst.server.generic.ui;bundle-version="[1.0.102,2.0.0)",
+ org.eclipse.jst.server.core;bundle-version="[1.0.102,2.0.0)",
+ org.eclipse.jst.server.ui;bundle-version="[1.0.102,2.0.0)",
org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,2.0.0)"
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
Bundle-ClassPath: genericoc4j.jar
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.jst.server.generic.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.generic.ui/META-INF/MANIFEST.MF
index bc9a8ac..0236611 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.generic.ui/META-INF/MANIFEST.MF
@@ -10,15 +10,15 @@
org.eclipse.jst.server.generic.ui.internal.editor;x-internal:=true
Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.server.ui;bundle-version="[1.0.102,1.2.0)",
+ org.eclipse.wst.server.ui;bundle-version="[1.0.102,2.0.0)",
org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
org.eclipse.jdt.debug.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.server.core;bundle-version="[1.0.102,1.2.0)",
- org.eclipse.jst.server.generic.core;bundle-version="[1.0.1,1.2.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,1.2.0)",
+ org.eclipse.jst.server.core;bundle-version="[1.0.102,2.0.0)",
+ org.eclipse.jst.server.generic.core;bundle-version="[1.0.1,2.0.0)",
+ org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
org.eclipse.core.variables;bundle-version="[3.2.0,4.0.0)",
org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.jst.server.installable/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.installable/META-INF/MANIFEST.MF
index 14d903d..885dc29 100644
--- a/plugins/org.eclipse.jst.server.installable/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.installable/META-INF/MANIFEST.MF
@@ -6,4 +6,4 @@
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,1.1.0)"
+ org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)"
diff --git a/plugins/org.eclipse.jst.server.websphere.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.websphere.core/META-INF/MANIFEST.MF
index e2a0e5c..ce2ec0f 100644
--- a/plugins/org.eclipse.jst.server.websphere.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.websphere.core/META-INF/MANIFEST.MF
@@ -12,22 +12,22 @@
org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,1.2.0)",
- org.eclipse.jst.server.core;bundle-version="[1.0.102,1.2.0)",
- org.eclipse.jst.server.ui;bundle-version="[1.0.102,1.2.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.server.generic.core;bundle-version="[1.0.100,1.2.0)",
- org.eclipse.jst.server.generic.ui;bundle-version="[1.0.100,1.2.0)",
+ org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
+ org.eclipse.jst.server.core;bundle-version="[1.0.102,2.0.0)",
+ org.eclipse.jst.server.ui;bundle-version="[1.0.102,2.0.0)",
+ org.eclipse.jst.j2ee;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.jst.server.generic.core;bundle-version="[1.0.100,2.0.0)",
+ org.eclipse.jst.server.generic.ui;bundle-version="[1.0.100,2.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,2.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.wst.common.core;bundle-version="[1.0.0,1.2.0)",
+ org.eclipse.wst.common.core;bundle-version="[1.0.0,2.0.0)",
org.eclipse.wst.common.project.facet.core;bundle-version="[1.0.0,2.0.0)",
org.eclipse.jst.common.project.facet.core;bundle-version="[1.0.0,2.0.0)",
org.eclipse.wst.common.project.facet.ui;bundle-version="[1.0.0,2.0.0)"
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.jst.server.websphere.core
Bundle-RequiredExecutionEnvironment: J2SE-1.4