--- build.xml.orig	2005-05-13 14:34:52.000000000 -0400
+++ build.xml	2005-06-14 15:56:51.000000000 -0400
@@ -45,7 +45,7 @@
 		<antcall target="gather.bin.parts">
 			<param name="destination.temp.folder" value="${temp.folder}/"/>
 		</antcall>
-		<zip destfile="${plugin.destination}/org.eclipse.tomcat_4.1.30.1.jar" basedir="${temp.folder}/org.eclipse.tomcat_4.1.30.1" filesonly="false" whenempty="skip" update="false"/>
+		<zip destfile="${plugin.destination}/org.eclipse.tomcat_5.5.15.jar" basedir="${temp.folder}/org.eclipse.tomcat_5.5.15" filesonly="false" whenempty="skip" update="false"/>
 		<delete dir="${temp.folder}"/>
 	</target>
 
@@ -115,44 +115,64 @@
 				<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"/>
-				<pathelement path="catalina.jar"/>
-				<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-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-rss.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-digester-rss.jar"/>
+				<pathelement path="commons-el.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-el.jar"/>
+				<pathelement path="commons-fileupload.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-fileupload.jar"/>
+				<pathelement path="commons-launcher.jar"/>
+				<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-pool.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-pool.jar"/>
+				<pathelement path="jasper5-compiler.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jasper5-compiler.jar"/>
+				<pathelement path="jasper5-runtime.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jasper5-runtime.jar"/>
+				<pathelement path="jspapi.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jspapi.jar"/>
+				<pathelement path="mx4j.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/mx4j.jar"/>
+				<pathelement path="mx4j-impl.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/mx4j-impl.jar"/>
 				<pathelement path="mx4j-jmx.jar"/>
 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/mx4j-jmx.jar"/>
 				<pathelement path="naming-common.jar"/>
 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/naming-common.jar"/>
 				<pathelement path="naming-factory.jar"/>
 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/naming-factory.jar"/>
+				<pathelement path="naming-java.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/naming-java.jar"/>
 				<pathelement path="naming-resources.jar"/>
 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/naming-resources.jar"/>
-				<pathelement path="servlet.jar"/>
-				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlet.jar"/>
+				<pathelement path="regexp.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/regexp.jar"/>
+				<pathelement path="servletapi5.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/servletapi5.jar"/>
 				<pathelement path="servlets-common.jar"/>
 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-common.jar"/>
 				<pathelement path="servlets-default.jar"/>
 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-default.jar"/>
 				<pathelement path="servlets-invoker.jar"/>
 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-invoker.jar"/>
-				<pathelement path="servlets-manager.jar"/>
-				<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"/>
@@ -189,11 +209,11 @@
 	</target>
 
 	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.30.1"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.30.1" failonerror="true" overwrite="false">
+		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15"/>
+		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15" failonerror="true" overwrite="false">
 			<fileset dir="${build.result.folder}" includes="tomcatwrapper.jar"			/>
 		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.30.1" failonerror="true" overwrite="false">
+		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15" failonerror="true" overwrite="false">
 			<fileset dir="${basedir}" includes="conf/,webapps/,plugin.xml,*.jar,plugin.properties,preferences.ini,about.html,*.license,META-INF/"			/>
 		</copy>
 	</target>
@@ -202,23 +222,23 @@
 	</target>
 
 	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.30.1"/>
-		<copy file="${build.result.folder}/tomcatwrappersrc.zip" todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.30.1" failonerror="false" overwrite="false"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.30.1" failonerror="false" overwrite="false">
+		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15"/>
+		<copy file="${build.result.folder}/tomcatwrappersrc.zip" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15" failonerror="false" overwrite="false"/>
+		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15" failonerror="false" overwrite="false">
 			<fileset dir="${basedir}" includes="about.html,*.license"			/>
 		</copy>
 	</target>
 
 	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.30.1"/>
-		<copy file="${temp.folder}/tomcatwrapper.jar.bin.log" todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.30.1" failonerror="false" overwrite="false"/>
+		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15"/>
+		<copy file="${temp.folder}/tomcatwrapper.jar.bin.log" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15" failonerror="false" overwrite="false"/>
 	</target>
 
 	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.tomcat of all the zips, jars and logs created.">
 		<delete file="${build.result.folder}/tomcatwrapper.jar"/>
 		<delete file="${build.result.folder}/tomcatwrappersrc.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.tomcat_4.1.30.1.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.tomcat_4.1.30.1.zip"/>
+		<delete file="${plugin.destination}/org.eclipse.tomcat_5.5.15.jar"/>
+		<delete file="${plugin.destination}/org.eclipse.tomcat_5.5.15.zip"/>
 		<delete dir="${temp.folder}"/>
 	</target>
 
@@ -241,7 +261,7 @@
 		<delete>
 			<fileset dir="${temp.folder}" includes="**/*.bin.log"			/>
 		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.tomcat_4.1.30.1.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+		<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>