Attachment 208017 Details for Bug 362724 – patch to fix equinox build page

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch to fix equinox build page

362724d.txt (text/plain), 7.66 KB, created by Kim Moir

on 2011-12-06 14:16:05 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Kim Moir

Created: 2011-12-06 14:16:05 EST

Size: 7.66 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.releng.eclipsebuilder
>Index: equinox/helper.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/equinox/helper.xml,v
>retrieving revision 1.57
>diff -u -r1.57 helper.xml
>--- equinox/helper.xml	9 Nov 2011 17:34:53 -0000	1.57
>+++ equinox/helper.xml	6 Dec 2011 19:11:14 -0000
>@@ -190,43 +190,55 @@
> 		</antcall>
> 		<antcall target="updateTestManifest">
> 			<param name="bundle.id" value="javax.servlet" />
>+		</antcall>		
>+		<antcall target="updateTestManifest">
>+			<param name="bundle.id" value="javax.servlet.jsp" />
> 		</antcall>
> 		<antcall target="updateTestManifest">
>-			<param name="bundle.id" value="javax.servlet_2.4.0" />
>+			<param name="bundle.id" value="org.apache.commons.logging" />
> 		</antcall>
> 		<antcall target="updateTestManifest">
>-			<param name="bundle.id" value="javax.servlet_2.5.0" />
>+			<param name="bundle.id" value="org.apache.commons.el" />
> 		</antcall>
> 		<antcall target="updateTestManifest">
>-			<param name="bundle.id" value="javax.servlet.jsp" />
>+			<param name="bundle.id" value="org.mortbay.jetty" />
>+		</antcall>		
>+		<antcall target="updateTestManifest">
>+			<param name="bundle.id" value="org.eclipse.equinox.simpleconfigurator" />
> 		</antcall>
> 		<antcall target="updateTestManifest">
>-			<param name="bundle.id" value="org.apache.commons.logging" />
>+			<param name="bundle.id" value="org.eclipse.equinox.concurrent" />
> 		</antcall>
> 		<antcall target="updateTestManifest">
>-			<param name="bundle.id" value="org.apache.commons.el" />
>+			<param name="bundle.id" value="org.eclipse.equinox.coordinator" />
> 		</antcall>
> 		<antcall target="updateTestManifest">
>-			<param name="bundle.id" value="org.mortbay.jetty" />
>+			<param name="bundle.id" value="org.eclipse.equinox.region" />
> 		</antcall>
> 		<antcall target="updateTestManifest">
>-			<param name="bundle.id" value="org.mortbay.jetty.util" />
>+				<param name="bundle.id" value="org.eclipse.jetty.continuation" />
> 		</antcall>
> 		<antcall target="updateTestManifest">
>-			<param name="bundle.id" value="org.mortbay.jetty.server" />
>+				<param name="bundle.id" value="org.eclipse.jetty.security" />
> 		</antcall>
> 		<antcall target="updateTestManifest">
>-			<param name="bundle.id" value="org.eclipse.equinox.simpleconfigurator" />
>+				<param name="bundle.id" value="org.eclipse.jetty.util" />
> 		</antcall>
> 		<antcall target="updateTestManifest">
>-			<param name="bundle.id" value="org.eclipse.equinox.concurrent" />
>+				<param name="bundle.id" value="org.eclipse.jetty.http" />
> 		</antcall>
> 		<antcall target="updateTestManifest">
>-			<param name="bundle.id" value="org.eclipse.equinox.coordinator" />
>+				<param name="bundle.id" value="org.eclipse.jetty.http" />
> 		</antcall>
> 		<antcall target="updateTestManifest">
>-			<param name="bundle.id" value="org.eclipse.equinox.region" />
>+				<param name="bundle.id" value="org.eclipse.jetty.server" />
> 		</antcall>
>+		<antcall target="updateTestManifest">
>+				<param name="bundle.id" value="org.eclipse.jetty.io" />
>+		</antcall>
>+		<antcall target="updateTestManifest">
>+				<param name="bundle.id" value="org.eclipse.jetty.servlet" />
>+		</antcall>		
> 	</target>
> 
> 	
>Index: equinox/publishingFiles/testManifest.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/equinox/publishingFiles/testManifest.xml,v
>retrieving revision 1.107
>diff -u -r1.107 testManifest.xml
>--- equinox/publishingFiles/testManifest.xml	9 Nov 2011 17:34:53 -0000	1.107
>+++ equinox/publishingFiles/testManifest.xml	6 Dec 2011 19:11:14 -0000
>@@ -34,28 +34,29 @@
> 			<platform format="equinox" id="useradmin" name="All" fileName="@org.eclipse.equinox.useradmin@.jar" />
> 			<platform format="equinox" id="util" name="All" fileName="@org.eclipse.osgi.util@.jar" />
> 			<platform format="equinox" id="equinoxservletbridge" name="All" fileName="@org.eclipse.equinox.servletbridge@.jar" />
>-			<platform format="equinox" id="http" name="All" fileName="@org.eclipse.equinox.http@.jar" />
>-			<platform format="equinox" id="httpjetty" name="All" fileName="@org.eclipse.equinox.http.jetty_1.1.100@.jar" />
>-			<platform format="equinox" id="equinoxjetty" name="All" fileName="@org.eclipse.equinox.http.jetty_2.0.100@.jar" />
>+			<platform format="equinox" id="http" name="All" fileName="@org.eclipse.equinox.http@.jar" />			
>+			<platform format="equinox" id="equinoxjetty" name="All" fileName="@org.eclipse.equinox.http.jetty@.jar" />
> 			<platform format="equinox" id="httpjettyregistry" name="All" fileName="@org.eclipse.equinox.http.registry@.jar" />
> 			<platform format="equinox" id="httpservletbridge" name="All" fileName="@org.eclipse.equinox.http.servletbridge@.jar" />
>-			<platform format="equinox" id="httpservlet" name="All" fileName="@org.eclipse.equinox.http.servlet_1.1.200@.jar" />
>+			<platform format="equinox" id="httpservlet" name="All" fileName="@org.eclipse.equinox.http.servlet_1.1.300@.jar" />
> 			<platform format="equinox" id="wireadmin" name="All" fileName="@org.eclipse.equinox.wireadmin@.jar" />
> 			<platform format="equinox" id="simpleconfigurator" name="All" fileName="@org.eclipse.equinox.simpleconfigurator@.jar" />
> 			<platform format="equinox" id="concurrent" name="All" fileName="@org.eclipse.equinox.concurrent@.jar" />
> 			<platform format="equinox" id="coordinator" name="All" fileName="@org.eclipse.equinox.coordinator@.jar" />
>-			<platform format="equinox" id="region" name="All" fileName="@org.eclipse.equinox.region@.jar" />
>+			<platform format="equinox" id="region" name="All" fileName="@org.eclipse.equinox.region@.jar" />			
>+			<platform format="equinox" id="jettycontinuation" name="All" fileName="@org.eclipse.jetty.continuation@.jar" />
>+			<platform format="equinox" id="jettysecurity" name="All" fileName="@org.eclipse.jetty.security@.jar" />
>+			<platform format="equinox" id="jettyutil" name="All" fileName="@org.eclipse.jetty.util@.jar" />
>+			<platform format="equinox" id="jettyhttp" name="All" fileName="@org.eclipse.jetty.http@.jar" />
>+			<platform format="equinox" id="jettyserver" name="All" fileName="@org.eclipse.jetty.server@.jar" />
>+			<platform format="equinox" id="jettyio" name="All" fileName="@org.eclipse.jetty.io@.jar" />
>+		    <platform format="equinox" id="jettyservlet" name="All" fileName="@org.eclipse.jetty.servlet@.jar" />			
> 		</zipType>	
> 
> 		<zipType name="Other">
>-			<platform format="equinox" id="javaxservlet_2.4.0" name="All" fileName="@javax.servlet_2.4.0@.jar" />
>-			<platform format="equinox" id="javaxservlet_2.5.0" name="All" fileName="@javax.servlet_2.5.0@.jar" />
>+			<platform format="equinox" id="javaxservlet_2.4.0" name="All" fileName="@javax.servlet@.jar" />			
> 			<platform format="equinox" id="javaxservletjsp" name="All" fileName="@javax.servlet.jsp@.jar" />
>-			<platform format="equinox" id="apachecommonsel" name="All" fileName="@org.apache.commons.el@.jar" />
>-			<platform format="equinox" id="apachecomminglogging" name="All" fileName="@org.apache.commons.logging@.jar" />
>-			<platform format="equinox" id="mortbayjetty" name="All" fileName="@org.mortbay.jetty@.jar" />
>-			<platform format="equinox" id="mortbayjettyutil" name="All" fileName="@org.mortbay.jetty.util@.jar" />
>-			<platform format="equinox" id="mortbayjettyserver" name="All" fileName="@org.mortbay.jetty.server@.jar" />
>+			<platform format="equinox" id="apachecomminglogging" name="All" fileName="@org.apache.commons.logging@.jar" />			
> 		 </zipType>				
> 		   	   	    	    	
>     		<zipType name="Provisioning">

Actions: View | Diff

Attachments on bug 362724: 206706 | 206856 | 206957 | 208017