Fix for bug 293020: War-deployment fails with equinox bridgeservlet from HEAD

https://bugs.eclipse.org/bugs/show_bug.cgi?id=293020

5 files changed, 36 insertions, 11 deletions

diff --git a/releng/org.eclipse.rap.releng/maps/rap.map b/releng/org.eclipse.rap.releng/maps/rap.map
index a3b883bc53..7d505fc36e 100644
--- a/releng/org.eclipse.rap.releng/maps/rap.map
+++ b/releng/org.eclipse.rap.releng/maps/rap.map
@@ -75,6 +75,8 @@ plugin@org.eclipse.rap.maildemo.ext=HEAD,:pserver:anonymous@dev.eclipse.org:/cvs
 feature@org.eclipse.rap.releng.warbuild.demo=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/rt,,org.eclipse.rap/releng/org.eclipse.rap.releng/warbuild/demo-feature
 
 plugin@org.eclipse.equinox.servletbridge=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.servletbridge
+plugin@org.eclipse.equinox.servletbridge.template=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.servletbridge.template
+fragment@org.eclipse.equinox.servletbridge.extensionbundle=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.servletbridge.extensionbundle
 plugin@org.eclipse.equinox.http.servletbridge=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.http.servletbridge
 
 # rms
diff --git a/releng/org.eclipse.rap.releng/warbuild/customTargets.xml b/releng/org.eclipse.rap.releng/warbuild/customTargets.xml
index 2e557c633a..1a5339c774 100644
--- a/releng/org.eclipse.rap.releng/warbuild/customTargets.xml
+++ b/releng/org.eclipse.rap.releng/warbuild/customTargets.xml
@@ -74,7 +74,8 @@
     </copy>
     <mkdir dir="${warDirectory}/WEB-INF/lib" />
     <copy todir="${warDirectory}/WEB-INF/lib">
-      <fileset file="${buildDirectory}/plugins/org.eclipse.equinox.servletbridge/servletbridge.jar" />
+      <fileset
+          file="${buildDirectory}/org.eclipse.equinox.servletbridge.template/templates/rootfiles/lib/org.eclipse.equinox.servletbridge_*.jar" />
     </copy>
 
     <property name="featureDir" value="${buildDirectory}/${buildLabel}/" />
diff --git a/releng/org.eclipse.rap.releng/warbuild/demo-feature/feature.xml b/releng/org.eclipse.rap.releng/warbuild/demo-feature/feature.xml
index ba4e05ecff..b8d04c9299 100644
--- a/releng/org.eclipse.rap.releng/warbuild/demo-feature/feature.xml
+++ b/releng/org.eclipse.rap.releng/warbuild/demo-feature/feature.xml
@@ -17,13 +17,6 @@
    </license>
 
    <plugin
-         id="org.eclipse.equinox.servletbridge"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.core.commands"
          download-size="0"
          install-size="0"
@@ -354,4 +347,19 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.equinox.servletbridge.template"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.servletbridge.extensionbundle"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
 </feature>
diff --git a/releng/org.eclipse.rap.releng/warbuild/templates/WEB-INF/eclipse/configuration/config.ini b/releng/org.eclipse.rap.releng/warbuild/templates/WEB-INF/eclipse/configuration/config.ini
index 1b32585448..fb4a881ee5 100644
--- a/releng/org.eclipse.rap.releng/warbuild/templates/WEB-INF/eclipse/configuration/config.ini
+++ b/releng/org.eclipse.rap.releng/warbuild/templates/WEB-INF/eclipse/configuration/config.ini
@@ -17,7 +17,7 @@ osgi.bundles=com.ibm.icu.base@start,\
   org.eclipse.equinox.http.servlet@start,\
   org.eclipse.equinox.preferences@start,\
   org.eclipse.equinox.registry@start,\
-  org.eclipse.equinox.servletbridge@start,\
+  org.eclipse.equinox.servletbridge.extensionbundle,\
   org.eclipse.osgi.services@start,\
   org.eclipse.help@start,\
   org.eclipse.rap.custom.viewers@start,\
@@ -46,6 +46,5 @@ osgi.bundles=com.ibm.icu.base@start,\
   org.eclipse.rap.ui.views.nl1@start,\
   org.eclipse.rap.ui.views@start,\
   org.eclipse.rap.ui.workbench.nl1@start,\
-  org.eclipse.rap.ui.workbench@start,\
-  org.eclipse.equinox.servletbridge.extensionbundle
+  org.eclipse.rap.ui.workbench@start
 osgi.bundles.defaultStartLevel=4
diff --git a/releng/org.eclipse.rap.releng/warbuild/templates/WEB-INF/web.xml b/releng/org.eclipse.rap.releng/warbuild/templates/WEB-INF/web.xml
index ab7ea3ea65..be87cae804 100644
--- a/releng/org.eclipse.rap.releng/warbuild/templates/WEB-INF/web.xml
+++ b/releng/org.eclipse.rap.releng/warbuild/templates/WEB-INF/web.xml
@@ -42,6 +42,21 @@
 			<param-value>org.eclipse.equinox.servletbridge.FrameworkLauncher</param-value>
 		</init-param>	
 		-->		
+		<!-- 
+		  When the framework is deployed, an extension bundle must be present to allow the Servlet API to 
+		  be exported by the container.  Typically, this extension bundle is created at deploy time by the
+		  FrameworkLauncher.  If, however, an extension bundle (with id 'org.eclipse.equinox.servletbridge.extensionbundle') is
+		  already present in the 'plugins' area, then preference is given to the existing bundle.
+		  If this param is set to 'true', then the existing extension bundle with be *overridden* and
+		  the one created by the FrameworkLauncher will replace any existing one.  The default is 'false' 
+		  (giving preference to the existing extension bundle if present).
+		  
+		  default: false
+		 -->
+		<init-param>
+			<param-name>overrideAndReplaceExtensionBundle</param-name>
+			<param-value>true</param-value>
+		</init-param>	
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet-mapping>