--- build.xml.orig	2006-07-05 12:47:26.000000000 -0400
+++ build.xml	2006-07-05 12:50:49.000000000 -0400
@@ -58,7 +58,7 @@
 		<antcall target="gather.bin.parts">
 			<param name="destination.temp.folder" value="${temp.folder}/"/>
 		</antcall>
-		<zip destfile="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.jar" basedir="${temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" filesonly="false" whenempty="skip" update="false"/>
+		<zip destfile="${plugin.destination}/org.eclipse.tomcat_5.5.17.v20060601.jar" basedir="${temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" filesonly="false" whenempty="skip" update="false"/>
 		<delete dir="${temp.folder}"/>
 	</target>
 
@@ -144,50 +144,56 @@
 			<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="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-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="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"/>
-			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/tomcat-http11.jar"/>
-			<pathelement path="tomcat-util.jar"/>
-			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/tomcat-util.jar"/>
+			<pathelement path="lib/catalina.jar"/>
+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/catalina.jar"/>
+			<pathelement path="lib/catalina-optional.jar"/>
+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/catalina-optional.jar"/>
+			<pathelement path="lib/commons-beanutils.jar"/>
+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-beanutils.jar"/>
+			<pathelement path="lib/commons-collections.jar"/>
+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-collections.jar"/>
+			<pathelement path="lib/commons-digester.jar"/>
+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-digester.jar"/>
+			<pathelement path="lib/commons-digester-rss.jar"/>
+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-digester-rss.jar"/>
+			<pathelement path="lib/commons-el.jar"/>
+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-el.jar"/>
+			<pathelement path="lib/commons-logging-api.jar"/>
+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-logging-api.jar"/>
+			<pathelement path="lib/commons-modeler.jar"/>
+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-modeler.jar"/>
+			<pathelement path="lib/jasper-compiler.jar"/>
+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/jasper-compiler.jar"/>
+			<pathelement path="lib/jasper-runtime.jar"/>
+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/jasper-runtime.jar"/>
+			<pathelement path="lib/jmx.jar"/>
+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/jmx.jar"/>
+			<pathelement path="lib/mx4j.jar"/>
+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/mx4j.jar"/>
+			<pathelement path="lib/mx4j-impl.jar"/>
+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/mx4j-impl.jar"/>
+			<pathelement path="lib/mx4j-jmx.jar"/>
+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/mx4j-jmx.jar"/>
+			<pathelement path="lib/jspapi.jar"/>
+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/jspapi.jar"/>
+			<pathelement path="lib/naming-factory.jar"/>
+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/naming-factory.jar"/>
+			<pathelement path="lib/naming-resources.jar"/>
+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/naming-resources.jar"/>
+			<pathelement path="lib/regexp.jar"/>
+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/regexp.jar"/>
+			<pathelement path="lib/servletapi5.jar"/>
+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/servletapi5.jar"/>
+			<pathelement path="lib/servlets-default.jar"/>
+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/servlets-default.jar"/>
+			<pathelement path="lib/tomcat-coyote.jar"/>
+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/tomcat-coyote.jar"/>
+			<pathelement path="lib/tomcat-http.jar"/>
+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/tomcat-http.jar"/>
+			<pathelement path="lib/tomcat-util.jar"/>
+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/tomcat-util.jar"/>
+			<pathelement path="lib/servlets-invoker.jar"/>
+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/servlets-invoker.jar"/>
 		</path>
 		<!-- compile the source code -->
 		<javac destdir="${temp.folder}/tomcatwrapper.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}"		>
@@ -224,37 +230,37 @@
 	</target>
 
 	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="true" overwrite="false">
+		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601"/>
+		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" failonerror="true" overwrite="false">
 			<fileset dir="${build.result.folder}" includes="tomcatwrapper.jar"			/>
 		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="true" overwrite="false">
+		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" failonerror="true" overwrite="false">
 			<fileset dir="${basedir}" includes="conf/,webapps/,plugin.xml,*.jar,plugin.properties,preferences.ini,about.html,META-INF/,about_files/"			/>
 		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" version="4.1.130.v20060601"/>
+		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" version="5.5.17.v20060601"/>
 	</target>
 
 	<target name="build.zips" depends="init">
 	</target>
 
 	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"/>
-		<copy file="${build.result.folder}/tomcatwrappersrc.zip" todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="false" overwrite="false"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="false" overwrite="false">
+		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601"/>
+		<copy file="${build.result.folder}/tomcatwrappersrc.zip" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" failonerror="false" overwrite="false"/>
+		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" 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.130.v20060601"/>
-		<copy file="${temp.folder}/tomcatwrapper.jar.bin${logExtension}" todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="false" overwrite="false"/>
+		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601"/>
+		<copy file="${temp.folder}/tomcatwrapper.jar.bin${logExtension}" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" 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.130.v20060601.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.zip"/>
+		<delete file="${plugin.destination}/org.eclipse.tomcat_5.5.17.v20060601.jar"/>
+		<delete file="${plugin.destination}/org.eclipse.tomcat_5.5.17.v20060601.zip"/>
 		<delete dir="${temp.folder}"/>
 	</target>
 
@@ -277,7 +283,7 @@
 		<delete>
 			<fileset dir="${temp.folder}" includes="**/*.bin${logExtension}"			/>
 		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+		<zip destfile="${plugin.destination}/org.eclipse.tomcat_5.5.17.v20060601.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
 		<delete dir="${temp.folder}"/>
 	</target>