commit 77ff004e015cc3c59ca26fceb5f5b3f031cad0ab
author hstaudacher <hstaudacher@eclipsesource.com> Mon Apr 22 08:44:09 2013 +0200
committer hstaudacher <hstaudacher@eclipsesource.com> Mon Apr 22 08:44:09 2013 +0200
tree 3a05e285b96f2df61b9230f736892267da296b40
parent 391bde886d0a7e0169c0b5ea9d564a46e31a44cb

Fixes https://bugs.eclipse.org/bugs/show_bug.cgi?id=398780
Remove dependency to servletbridge.extensionbundle

plugins/org.eclipse.libra.warproducts.core/src/org/eclipse/libra/warproducts/core/validation/Validator.java

diff --git a/plugins/org.eclipse.libra.warproducts.core/src/org/eclipse/libra/warproducts/core/validation/Validator.java b/plugins/org.eclipse.libra.warproducts.core/src/org/eclipse/libra/warproducts/core/validation/Validator.java
index edc1188..2ab1459 100644
--- a/plugins/org.eclipse.libra.warproducts.core/src/org/eclipse/libra/warproducts/core/validation/Validator.java
+++ b/plugins/org.eclipse.libra.warproducts.core/src/org/eclipse/libra/warproducts/core/validation/Validator.java
@@ -23,6 +23,14 @@
 
   public static final String[] BANNED_BUNDLES = new String[] { 
     "javax.servlet", //$NON-NLS-1$
+    "org.eclipse.jetty.continuation", //$NON-NLS-1$
+    "org.eclipse.jetty.http", //$NON-NLS-1$
+    "org.eclipse.jetty.io", //$NON-NLS-1$
+    "org.eclipse.jetty.jmx", //$NON-NLS-1$
+    "org.eclipse.jetty.security", //$NON-NLS-1$
+    "org.eclipse.jetty.server", //$NON-NLS-1$
+    "org.eclipse.jetty.servlet", //$NON-NLS-1$
+    "org.eclipse.jetty.util", //$NON-NLS-1$
     "org.eclipse.update.configurator",  //$NON-NLS-1$
     "org.eclipse.equinox.http.jetty",  //$NON-NLS-1$
     "org.mortbay.jetty.server",  //$NON-NLS-1$
@@ -30,7 +38,6 @@
   };
 
   public static final String[] REQUIRED_BUNDLES = new String[] { 
-    "org.eclipse.equinox.servletbridge.extensionbundle", //$NON-NLS-1$
     "org.eclipse.equinox.http.registry", //$NON-NLS-1$
     "org.eclipse.equinox.registry", //$NON-NLS-1$
     "org.eclipse.equinox.http.servlet", //$NON-NLS-1$

plugins/org.eclipse.libra.warproducts.ui/.settings/Libra WAR Products.launch

diff --git a/plugins/org.eclipse.libra.warproducts.ui/.settings/RAP Releng WAR.launch b/plugins/org.eclipse.libra.warproducts.ui/.settings/Libra WAR Products.launch
similarity index 96%
rename from plugins/org.eclipse.libra.warproducts.ui/.settings/RAP Releng WAR.launch
rename to plugins/org.eclipse.libra.warproducts.ui/.settings/Libra WAR Products.launch
index 7eab50a..60dd8ec 100644
--- a/plugins/org.eclipse.libra.warproducts.ui/.settings/RAP Releng WAR.launch
+++ b/plugins/org.eclipse.libra.warproducts.ui/.settings/Libra WAR Products.launch
@@ -10,10 +10,10 @@
 <booleanAttribute key="clearConfig" value="false"/>
 <booleanAttribute key="clearws" value="false"/>
 <booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/RAP Releng WAR"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Libra WAR Products"/>
 <booleanAttribute key="default" value="true"/>
 <booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-New_war"/>
+<stringAttribute key="location" value="${workspace_loc}/../runtime-war-products"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}&#13;&#10;-buildfile &quot;${eclipse_home}/plugins/org.eclipse.pde.build_3.4.0.v20080604/scripts/build.xml&quot;"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>