From 5ae27f12c347ef79864d062585acfe9762311737 Mon Sep 17 00:00:00 2001
From: Andrew Overholt <overholt@fedoraproject.org>
Date: Mar 01 2006 14:49:15 +0000
Subject: Add webapp patch.


---

diff --git a/eclipse-webapp-tomcat55.patch b/eclipse-webapp-tomcat55.patch
new file mode 100644
index 0000000..d533b1b
--- /dev/null
+++ b/eclipse-webapp-tomcat55.patch
@@ -0,0 +1,67 @@
+Index: build.properties
+===================================================================
+RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/build.properties,v
+retrieving revision 1.32
+diff -u -r1.32 build.properties
+--- build.properties	18 Mar 2005 08:00:28 -0000	1.32
++++ build.properties	28 Feb 2006 22:52:35 -0000
+@@ -33,5 +33,5 @@
+                      ../org.eclipse.help.appserver/bin,\
+                      ../org.eclipse.help.appserver,\
+                      ../org.eclipse.help.appserver/@dot,\
+-                     ../org.eclipse.tomcat/servlet.jar,\
++                     ../org.eclipse.tomcat/servletapi5.jar,\
+                      ../org.eclipse.tomcat/jasper-runtime.jar
+Index: build.xml
+===================================================================
+RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/build.xml,v
+retrieving revision 1.65
+diff -u -r1.65 build.xml
+--- build.xml	18 Mar 2005 07:55:40 -0000	1.65
++++ build.xml	28 Feb 2006 22:52:35 -0000
+@@ -126,7 +126,7 @@
+ 				<pathelement path="../org.eclipse.help"/>
+ 				<pathelement path="../org.eclipse.help.base"/>
+ 				<pathelement path="../org.eclipse.help.appserver"/>
+-				<pathelement path="../org.eclipse.tomcat/servlet.jar"/>
++				<pathelement path="../org.eclipse.tomcat/servletapi5.jar"/>
+ 				<pathelement path="../org.eclipse.tomcat/jasper-runtime.jar"/>
+ 			</classpath>
+ 			<src path="src_servlets/"			/>
+@@ -154,11 +154,14 @@
+ 		<!-- generate java code from JSPs -->
+ 		<path id="jasper.classpath" > 
+ 			<pathelement location="../org.apache.ant/lib/ant.jar"/>
+-			<pathelement location="../org.apache.ant/lib/optional.jar"/>
++			<pathelement location="../org.apache.ant/lib/ant-launcher.jar"/>
+ 			<pathelement location="../org.eclipse.tomcat/jasper-compiler.jar" />
+ 			<pathelement location="../org.eclipse.tomcat/jasper-runtime.jar" />
+-			<pathelement location="../org.eclipse.tomcat/servlet.jar" />
+-			<pathelement location="../org.eclipse.tomcat/tomcat_util.jar" />  
++			<pathelement location="../org.eclipse.tomcat/servletapi5.jar" />
++			<pathelement location="../org.eclipse.tomcat/tomcat-util.jar" />  
++			<pathelement location="../org.eclipse.tomcat/jspapi.jar"/>
++			<pathelement location="../org.eclipse.tomcat/commons-el.jar"/>
++			<pathelement location="../org.eclipse.tomcat/commons-logging.jar"/>
+ 		</path>
+ 		<delete dir="${temp.folder}/jsp.jar.src"/>
+   		<mkdir dir="${temp.folder}/jsp.jar.src"/>
+@@ -168,7 +171,6 @@
+ 			failonerror="false"
+ 			classpathref="jasper.classpath"
+ 			output="${temp.folder}/WEB-INF/lib/jsp.jar.bin.log">
+-			<arg value="-v3" />
+ 			<arg value="-d" /><arg value="${temp.folder}/jsp.jar.src" />
+ 			<arg value="-die" />
+ 			<arg value="-p" /><arg value="org.eclipse.help.internal.webapp.jsp"/>
+@@ -202,8 +204,9 @@
+ 				<pathelement path="../org.eclipse.help"/>
+ 				<pathelement path="../org.eclipse.help.base"/>
+ 				<pathelement path="../org.eclipse.help.appserver"/>
+-				<pathelement path="../org.eclipse.tomcat/servlet.jar"/>
++				<pathelement path="../org.eclipse.tomcat/servletapi5.jar"/>
+ 				<pathelement path="../org.eclipse.tomcat/jasper-runtime.jar"/>
++				<pathelement path="../org.eclipse.tomcat/jspapi.jar"/>
+ 			</classpath>
+ 			<src path="${temp.folder}/jsp.jar.src/"			/>
+ <!-- custom begin -->