rpms/eclipse/devel eclipse-tomcat5-build.2.patch, NONE, 1.1 eclipse-tomcat5-build.patch, NONE, 1.1

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Jun 21 13:25:36 UTC 2005


Author: overholt

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7427

Added Files:
	eclipse-tomcat5-build.2.patch eclipse-tomcat5-build.patch 
Log Message:
Add uncommitted tomcat5 patches.

eclipse-tomcat5-build.2.patch:
 assemble.org.eclipse.sdk.aix.motif.ppc.xml       |    2 +-
 assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml  |    2 +-
 assemble.org.eclipse.sdk.hpux.motif.ia64.xml     |    2 +-
 assemble.org.eclipse.sdk.solaris.gtk.sparc.xml   |    2 +-
 assemble.org.eclipse.sdk.solaris.motif.sparc.xml |    2 +-
 assemble.org.eclipse.sdk.win32.win32.x86.xml     |    2 +-
 features/org.eclipse.platform/build.xml          |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE eclipse-tomcat5-build.2.patch ---
diff -uNr assemble.org.eclipse.sdk.aix.motif.ppc.xml assemble.org.eclipse.sdk.aix.motif.ppc.xml
--- assemble.org.eclipse.sdk.aix.motif.ppc.xml	2005-06-20 09:15:48.000000000 -0400
+++ assemble.org.eclipse.sdk.aix.motif.ppc.xml	2005-06-20 09:16:17.000000000 -0400
@@ -654,7 +654,7 @@
 			<arg line="${pluginArchivePrefix}/org.eclipse.help.webapp_3.1.0"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.core.boot_3.1.0.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.ui.browser_3.1.0.jar"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.help.ui_3.1.0.jar"/>
 		</exec>
diff -uNr assemble.org.eclipse.sdk.hpux.motif.ia64.xml assemble.org.eclipse.sdk.hpux.motif.ia64.xml
--- assemble.org.eclipse.sdk.hpux.motif.ia64.xml	2005-06-20 09:15:48.000000000 -0400
+++ assemble.org.eclipse.sdk.hpux.motif.ia64.xml	2005-06-20 09:16:21.000000000 -0400
@@ -639,7 +639,7 @@
 			<zipfileset file="${eclipse.base}/plugins/org.eclipse.core.boot_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.core.boot_3.1.0.jar"			/>
 			<zipfileset file="${eclipse.base}/plugins/org.eclipse.ui.browser_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.ui.browser_3.1.0.jar"			/>
 			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.platform.source.hpux.motif.ia64_3.1.0" prefix="${pluginArchivePrefix}/org.eclipse.platform.source.hpux.motif.ia64_3.1.0"			/>
-			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.tomcat_4.1.30.1" prefix="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"			/>
+			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.tomcat_5.0.30" prefix="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"			/>
 			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.team.cvs.ssh2_3.1.0" prefix="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"			/>
 			<zipfileset file="${eclipse.base}/plugins/org.eclipse.help.ui_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.help.ui_3.1.0.jar"			/>
 			<zipfileset file="${eclipse.base}/plugins/org.eclipse.pde_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.pde_3.1.0.jar"			/>
diff -uNr assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml
--- assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml	2005-06-20 09:15:48.000000000 -0400
+++ assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml	2005-06-20 09:16:23.000000000 -0400
@@ -666,7 +666,7 @@
 			<arg line="${pluginArchivePrefix}/org.eclipse.help.webapp_3.1.0"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.core.boot_3.1.0.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.ui.browser_3.1.0.jar"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
 		</exec>
 		<exec executable="zip" dir="${assemblyTempDir}">
 			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
diff -uNr assemble.org.eclipse.sdk.solaris.gtk.sparc.xml assemble.org.eclipse.sdk.solaris.gtk.sparc.xml
--- assemble.org.eclipse.sdk.solaris.gtk.sparc.xml	2005-06-20 09:15:48.000000000 -0400
+++ assemble.org.eclipse.sdk.solaris.gtk.sparc.xml	2005-06-20 09:16:25.000000000 -0400
@@ -654,7 +654,7 @@
 			<arg line="${pluginArchivePrefix}/org.eclipse.help.webapp_3.1.0"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.core.boot_3.1.0.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.ui.browser_3.1.0.jar"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.help.ui_3.1.0.jar"/>
 		</exec>
diff -uNr assemble.org.eclipse.sdk.solaris.motif.sparc.xml assemble.org.eclipse.sdk.solaris.motif.sparc.xml
--- assemble.org.eclipse.sdk.solaris.motif.sparc.xml	2005-06-20 09:15:48.000000000 -0400
+++ assemble.org.eclipse.sdk.solaris.motif.sparc.xml	2005-06-20 09:16:29.000000000 -0400
@@ -655,7 +655,7 @@
 			<arg line="${pluginArchivePrefix}/org.eclipse.help.webapp_3.1.0"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.core.boot_3.1.0.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.ui.browser_3.1.0.jar"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
 		</exec>
 		<exec executable="zip" dir="${assemblyTempDir}">
diff -uNr assemble.org.eclipse.sdk.win32.win32.x86.xml assemble.org.eclipse.sdk.win32.win32.x86.xml
--- assemble.org.eclipse.sdk.win32.win32.x86.xml	2005-06-20 09:15:48.000000000 -0400
+++ assemble.org.eclipse.sdk.win32.win32.x86.xml	2005-06-20 09:16:33.000000000 -0400
@@ -684,7 +684,7 @@
 		</exec>
 		<exec executable="zip" dir="${assemblyTempDir}">
 			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.help.ui_3.1.0.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.pde_3.1.0.jar"/>
diff -uNr features/org.eclipse.platform/build.xml features/org.eclipse.platform/build.xml
--- features/org.eclipse.platform/build.xml	2005-06-20 09:16:03.000000000 -0400
+++ features/org.eclipse.platform/build.xml	2005-06-20 09:19:24.000000000 -0400
@@ -346,7 +346,7 @@
 		<copy todir="${feature.base}/features/org.eclipse.platform_3.1.0" failonerror="true" overwrite="false">
 			<fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html"			/>
 		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.0/feature.xml"  selfVersion="3.1.0" featureIds="org.eclipse.rcp,3.1.0," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.0,org.eclipse.compare,3.1.0,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.0,org.eclipse.core.resources,3.1.0,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.0,org.eclipse.osgi.util,3.1.0,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.0,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.0,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.0,org.eclipse.platform,3.1.0,org.eclipse.platform.doc.user,3.1.0,org.eclipse.search,3.1.0,org.eclipse.team.core,3.1.0,org.eclipse.team.cvs.core,3.1.0,org.eclipse.team.cvs.ssh,3.1.0,org.eclip!
se.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.0,org.eclipse.team.ui,3.1.0,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.0,org.eclipse.jface.text,3.1.0,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.0,org.eclipse.ui.cheatsheets,3.1.0,org.eclipse.ui.browser,3.1.0,org.eclipse.ui.workbench.texteditor,3.1.0,org.eclipse.ui.views,3.1.0,org.eclipse.ui.editors,3.1.0,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.0,org.eclipse.ui.ide,3.1.0,org.eclipse.update.core,3.1.0,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.0,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.0,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.0/feature.xml"  selfVersion="3.1.0" featureIds="org.eclipse.rcp,3.1.0," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.0,org.eclipse.compare,3.1.0,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.0,org.eclipse.core.resources,3.1.0,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.0,org.eclipse.osgi.util,3.1.0,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.0,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.0,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.0,org.eclipse.platform,3.1.0,org.eclipse.platform.doc.user,3.1.0,org.eclipse.search,3.1.0,org.eclipse.team.core,3.1.0,org.eclipse.team.cvs.core,3.1.0,org.eclipse.team.cvs.ssh,3.1.0,org.eclip!
se.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.0,org.eclipse.team.ui,3.1.0,org.eclipse.tomcat,5.0.30,org.eclipse.text,3.1.0,org.eclipse.jface.text,3.1.0,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.0,org.eclipse.ui.cheatsheets,3.1.0,org.eclipse.ui.browser,3.1.0,org.eclipse.ui.workbench.texteditor,3.1.0,org.eclipse.ui.views,3.1.0,org.eclipse.ui.editors,3.1.0,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.0,org.eclipse.ui.ide,3.1.0,org.eclipse.update.core,3.1.0,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.0,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.0,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
 		<antcall target="rootFiles${os}_${ws}_${arch}"/>
 	</target>
 	<target name="rootFileswin32_win32_x86">

eclipse-tomcat5-build.patch:
 build.xml |   88 ++++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 54 insertions(+), 34 deletions(-)

--- NEW FILE eclipse-tomcat5-build.patch ---
--- 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.0.30.jar" basedir="${temp.folder}/org.eclipse.tomcat_5.0.30" 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="jakarta-commons-beanutils.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-commons-beanutils.jar"/>
+				<pathelement path="jakarta-commons-collections.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-commons-collections.jar"/>
+				<pathelement path="jakarta-commons-dbcp.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-commons-dbcp.jar"/>
+				<pathelement path="jakarta-commons-digester.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-commons-digester.jar"/>
+				<pathelement path="jakarta-commons-digester-rss.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-commons-digester-rss.jar"/>
+				<pathelement path="jakarta-commons-el.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-commons-el.jar"/>
+				<pathelement path="jakarta-commons-fileupload.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-commons-fileupload.jar"/>
+				<pathelement path="jakarta-commons-launcher.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-commons-launcher.jar"/>
+				<pathelement path="jakarta-commons-logging.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-commons-logging.jar"/>
+				<pathelement path="jakarta-commons-modeler.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-commons-modeler.jar"/>
+				<pathelement path="jakarta-commons-pool.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-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.0.30"/>
+		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.0.30" 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.0.30" 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.0.30"/>
+		<copy file="${build.result.folder}/tomcatwrappersrc.zip" todir="${destination.temp.folder}/org.eclipse.tomcat_5.0.30" failonerror="false" overwrite="false"/>
+		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.0.30" 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.0.30"/>
+		<copy file="${temp.folder}/tomcatwrapper.jar.bin.log" todir="${destination.temp.folder}/org.eclipse.tomcat_5.0.30" 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.0.30.jar"/>
+		<delete file="${plugin.destination}/org.eclipse.tomcat_5.0.30.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.0.30.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
 		<delete dir="${temp.folder}"/>
 	</target>




More information about the fedora-cvs-commits mailing list