From 5b42c65383187bcbe34b314181fa6dff1dc0fb2e Mon Sep 17 00:00:00 2001
From: Andrew Overholt <overholt@fedoraproject.org>
Date: Mar 06 2006 21:47:41 +0000
Subject: s/tomcat-http11/tomcat-http/g


---

diff --git a/eclipse-tomcat55-build.patch b/eclipse-tomcat55-build.patch
index b48265c..086fec3 100644
--- a/eclipse-tomcat55-build.patch
+++ b/eclipse-tomcat55-build.patch
@@ -1,5 +1,5 @@
---- build.xml.orig	2005-05-13 14:34:52.000000000 -0400
-+++ build.xml	2005-06-14 15:56:51.000000000 -0400
+--- build.xml.orig	2006-03-06 16:45:16.000000000 -0500
++++ build.xml	2006-03-06 16:45:57.000000000 -0500
 @@ -45,7 +45,7 @@
  		<antcall target="gather.bin.parts">
  			<param name="destination.temp.folder" value="${temp.folder}/"/>
@@ -9,7 +9,7 @@
  		<delete dir="${temp.folder}"/>
  	</target>
  
-@@ -115,44 +115,64 @@
+@@ -115,48 +115,68 @@
  				<pathelement path="${build.result.folder}/../org.apache.ant/lib/ant-xalan1.jar"/>
  				<pathelement path="../org.apache.ant/lib/ant-xslp.jar"/>
  				<pathelement path="${build.result.folder}/../org.apache.ant/lib/ant-xslp.jar"/>
@@ -17,34 +17,20 @@
 -				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/catalina.jar"/>
  				<pathelement path="bootstrap.jar"/>
  				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/bootstrap.jar"/>
--				<pathelement path="commons-beanutils.jar"/>
--				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-beanutils.jar"/>
--				<pathelement path="commons-collections.jar"/>
--				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-collections.jar"/>
--				<pathelement path="commons-digester.jar"/>
--				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-digester.jar"/>
--				<pathelement path="commons-logging-api.jar"/>
--				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-logging-api.jar"/>
--				<pathelement path="commons-modeler.jar"/>
--				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-modeler.jar"/>
--				<pathelement path="jakarta-regexp-1.3.jar"/>
--				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-regexp-1.3.jar"/>
--				<pathelement path="jasper-compiler.jar"/>
--				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jasper-compiler.jar"/>
--				<pathelement path="jasper-runtime.jar"/>
--				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jasper-runtime.jar"/>
 +				<pathelement path="catalina.jar"/>
 +				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/catalina.jar"/>
 +				<pathelement path="catalina-optional.jar"/>
 +				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/catalina-optional.jar"/>
-+				<pathelement path="commons-beanutils.jar"/>
-+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-beanutils.jar"/>
-+				<pathelement path="commons-collections.jar"/>
-+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-collections.jar"/>
+ 				<pathelement path="commons-beanutils.jar"/>
+ 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-beanutils.jar"/>
+ 				<pathelement path="commons-collections.jar"/>
+ 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-collections.jar"/>
 +				<pathelement path="commons-dbcp.jar"/>
 +				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-dbcp.jar"/>
-+				<pathelement path="commons-digester.jar"/>
-+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-digester.jar"/>
+ 				<pathelement path="commons-digester.jar"/>
+ 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-digester.jar"/>
+-				<pathelement path="commons-logging-api.jar"/>
+-				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-logging-api.jar"/>
 +				<pathelement path="commons-digester-rss.jar"/>
 +				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-digester-rss.jar"/>
 +				<pathelement path="commons-el.jar"/>
@@ -55,8 +41,14 @@
 +				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-launcher.jar"/>
 +				<pathelement path="commons-logging.jar"/>
 +				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-logging.jar"/>
-+				<pathelement path="commons-modeler.jar"/>
-+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-modeler.jar"/>
+ 				<pathelement path="commons-modeler.jar"/>
+ 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-modeler.jar"/>
+-				<pathelement path="jakarta-regexp-1.3.jar"/>
+-				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-regexp-1.3.jar"/>
+-				<pathelement path="jasper-compiler.jar"/>
+-				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jasper-compiler.jar"/>
+-				<pathelement path="jasper-runtime.jar"/>
+-				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jasper-runtime.jar"/>
 +				<pathelement path="commons-pool.jar"/>
 +				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-pool.jar"/>
 +				<pathelement path="jasper5-compiler.jar"/>
@@ -95,7 +87,13 @@
 -				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-manager.jar"/>
  				<pathelement path="tomcat-coyote.jar"/>
  				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/tomcat-coyote.jar"/>
- 				<pathelement path="tomcat-http11.jar"/>
+-				<pathelement path="tomcat-http11.jar"/>
+-				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/tomcat-http11.jar"/>
++				<pathelement path="tomcat-http.jar"/>
++				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/tomcat-http.jar"/>
+ 				<pathelement path="tomcat-util.jar"/>
+ 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/tomcat-util.jar"/>
+ 			</classpath>
 @@ -189,11 +209,11 @@
  	</target>
  
@@ -150,3 +148,4 @@
 +		<zip destfile="${plugin.destination}/org.eclipse.tomcat_5.5.15.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
  		<delete dir="${temp.folder}"/>
  	</target>
+ 
diff --git a/eclipse.spec b/eclipse.spec
index 76c657e..9e476d8 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -914,7 +914,7 @@ ln -sf %{_javadir}/servletapi5.jar plugins/org.eclipse.tomcat_*/servletapi5.jar
 ln -sf %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat_*/servlets-default.jar
 ln -sf %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat_*/servlets-invoker.jar
 ln -sf %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat_*/tomcat-coyote.jar
-ln -sf %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat_*/tomcat-http.jar
+ln -sf %{tomcatlibdir}/server/lib/tomcat-http.jar plugins/org.eclipse.tomcat_*/tomcat-http.jar
 ln -sf %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat_*/tomcat-util.jar
 ## END TOMCAT ##
 ln -sf %{_javadir}/junit.jar plugins/org.junit_*/junit.jar