Bug 527813 - ensure that org.eclipse.wst.server.preview.adapter, org.eclipse.jst.server.preview.adapter, and org.eclipse.wst.server.preview all require the same list of jetty bundles (add continuation, security, and xml where missing) Signed-off-by: nickboldt <nboldt@redhat.com>
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.preview.adapter/META-INF/MANIFEST.MF index 8719bbe..978ac7a 100644 --- a/plugins/org.eclipse.jst.server.preview.adapter/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.server.preview.adapter/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jst.server.preview.adapter;singleton:=true -Bundle-Version: 1.1.300.qualifier +Bundle-Version: 1.1.400.qualifier Bundle-Activator: org.eclipse.jst.server.preview.adapter.internal.PreviewPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/pom.xml b/plugins/org.eclipse.jst.server.preview.adapter/pom.xml index f9e4a91..0ac53cd 100644 --- a/plugins/org.eclipse.jst.server.preview.adapter/pom.xml +++ b/plugins/org.eclipse.jst.server.preview.adapter/pom.xml
@@ -22,6 +22,6 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.jst.server.preview.adapter</artifactId> - <version>1.1.300-SNAPSHOT</version> + <version>1.1.400-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java index 86c4bce..280f91f 100644 --- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java +++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java
@@ -46,13 +46,13 @@ "org.apache.commons.logging", "javax.servlet", "javax.servlet.jsp", - "org.eclipse.jetty.server", - "org.eclipse.jetty.util", "org.eclipse.jetty.continuation", "org.eclipse.jetty.http", "org.eclipse.jetty.io", "org.eclipse.jetty.security", + "org.eclipse.jetty.server", "org.eclipse.jetty.servlet", + "org.eclipse.jetty.util", "org.eclipse.jetty.webapp", "org.eclipse.jetty.xml", "javax.el",
diff --git a/plugins/org.eclipse.wst.server.preview.adapter/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.server.preview.adapter/META-INF/MANIFEST.MF index e866f03..d86c1b3 100644 --- a/plugins/org.eclipse.wst.server.preview.adapter/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.wst.server.preview.adapter/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.server.preview.adapter;singleton:=true -Bundle-Version: 1.1.300.qualifier +Bundle-Version: 1.1.400.qualifier Bundle-Activator: org.eclipse.wst.server.preview.adapter.internal.core.PreviewPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.wst.server.preview.adapter/pom.xml b/plugins/org.eclipse.wst.server.preview.adapter/pom.xml index 1d8f830..30d259f 100644 --- a/plugins/org.eclipse.wst.server.preview.adapter/pom.xml +++ b/plugins/org.eclipse.wst.server.preview.adapter/pom.xml
@@ -22,6 +22,6 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.wst.server.preview.adapter</artifactId> - <version>1.1.300-SNAPSHOT</version> + <version>1.1.400-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java index 310e2e5..cf87c8b 100644 --- a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java +++ b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java
@@ -47,13 +47,15 @@ // corresponds to CLASSPATH_BIN_INDEX_PREVIEW_SERVER private static final String[] REQUIRED_BUNDLE_IDS = new String[] { "javax.servlet", - "org.eclipse.jetty.server", - "org.eclipse.jetty.util", "org.eclipse.jetty.continuation", "org.eclipse.jetty.http", "org.eclipse.jetty.io", - "org.eclipse.jetty.webapp", + "org.eclipse.jetty.security", + "org.eclipse.jetty.server", "org.eclipse.jetty.servlet", + "org.eclipse.jetty.util", + "org.eclipse.jetty.webapp", + "org.eclipse.jetty.xml", "org.eclipse.wst.server.preview" };
diff --git a/plugins/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF index 5219439..a7036ff 100644 --- a/plugins/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF
@@ -9,8 +9,10 @@ Export-Package: org.eclipse.wst.server.preview.internal;x-internal:=true Require-Bundle: org.apache.commons.logging;bundle-version="[1.0.4,2.0.0)", org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", + org.eclipse.jetty.continuation;bundle-version="[9.4.7,10.0.0)", org.eclipse.jetty.http;bundle-version="[9.4.7,10.0.0)", org.eclipse.jetty.io;bundle-version="[9.4.7,10.0.0)", + org.eclipse.jetty.security;bundle-version="[9.4.7,10.0.0)", org.eclipse.jetty.server;bundle-version="[9.4.7,10.0.0)", org.eclipse.jetty.servlet;bundle-version="[9.4.7,10.0.0)", org.eclipse.jetty.util;bundle-version="[9.4.7,10.0.0)",