CVS eclipse/debian/patches

Stephan Michels tashiro-guest at haydn.debian.org
Fri Nov 11 07:47:16 UTC 2005 

Update of /cvsroot/pkg-java/eclipse/debian/patches
In directory haydn:/tmp/cvs-serv25118/debian/patches

Modified Files:
	eclipse-tomcat5.dpatch 
Log Message:
debian/patches/eclipse-tomcat5.dpatch: Changed version of the tomcat
plugin from 4.1.30.1 to 5.0.30 and all occurrences to fix dependency
problem of the sdk feature.


--- /cvsroot/pkg-java/eclipse/debian/patches/eclipse-tomcat5.dpatch	2005/10/24 19:47:46	1.2
+++ /cvsroot/pkg-java/eclipse/debian/patches/eclipse-tomcat5.dpatch	2005/11/11 07:47:16	1.3
@@ -23,9 +23,118 @@
 exit 0
 
 @DPATCH@
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' ../source-tree.orig/plugins/org.eclipse.help.webapp/build.xml source-tree/plugins/org.eclipse.help.webapp/build.xml
---- ../source-tree.orig/plugins/org.eclipse.help.webapp/build.xml	2005-10-20 11:16:01.000000000 +0200
-+++ source-tree/plugins/org.eclipse.help.webapp/build.xml	2005-10-20 11:17:57.000000000 +0200
+
+diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.aix.motif.ppc.xml source-tree/assemble.org.eclipse.sdk.aix.motif.ppc.xml
+--- source-tree.orig/assemble.org.eclipse.sdk.aix.motif.ppc.xml	2005-11-10 23:42:08.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.aix.motif.ppc.xml	2005-11-10 23:54:03.000000000 +0100
+@@ -584,7 +584,7 @@
+ 		<eclipse.brand root="${eclipse.base}/aix.motif.ppc/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}"		/>
+ 		<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"/>
+ 		</exec>
+ 		<exec executable="zip" dir="${assemblyTempDir}">
+ 			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.hpux.motif.ia64_32.xml source-tree/assemble.org.eclipse.sdk.hpux.motif.ia64_32.xml
+--- source-tree.orig/assemble.org.eclipse.sdk.hpux.motif.ia64_32.xml	2005-11-10 23:42:08.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.hpux.motif.ia64_32.xml	2005-11-10 23:54:38.000000000 +0100
+@@ -594,7 +594,7 @@
+ 		<eclipse.brand root="${eclipse.base}/hpux.motif.ia64_32/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}"		/>
+ 		<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"/>
+ 		</exec>
+ 		<exec executable="zip" dir="${assemblyTempDir}">
+ 			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.hpux.motif.ia64.xml source-tree/assemble.org.eclipse.sdk.hpux.motif.ia64.xml
+--- source-tree.orig/assemble.org.eclipse.sdk.hpux.motif.ia64.xml	2005-11-10 23:42:08.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.hpux.motif.ia64.xml	2005-11-10 23:55:29.000000000 +0100
+@@ -580,7 +580,7 @@
+ 		</antcall>
+ 		<eclipse.brand root="${eclipse.base}/hpux.motif.ia64/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}"		/>
+ 		<zip destfile="${archiveFullPath}" filesonly="false" whenempty="skip" update="true">
+-			<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 file="${eclipse.base}/plugins/org.eclipse.help.appserver_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.help.appserver_3.1.0.jar"			/>
+ 			<zipfileset file="${eclipse.base}/plugins/org.eclipse.ant.ui_3.1.1.jar" fullpath="${pluginArchivePrefix}/org.eclipse.ant.ui_3.1.1.jar"			/>
+ 			<zipfileset file="${eclipse.base}/plugins/org.eclipse.pde.runtime_3.1.1.jar" fullpath="${pluginArchivePrefix}/org.eclipse.pde.runtime_3.1.1.jar"			/>
+diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml source-tree/assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml
+--- source-tree.orig/assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml	2005-11-10 23:42:08.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml	2005-11-10 23:56:06.000000000 +0100
+@@ -594,7 +594,7 @@
+ 		<eclipse.brand root="${eclipse.base}/hpux.motif.PA_RISC/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}"		/>
+ 		<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"/>
+ 		</exec>
+ 		<exec executable="zip" dir="${assemblyTempDir}">
+ 			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.qnx.photon.x86.xml source-tree/assemble.org.eclipse.sdk.qnx.photon.x86.xml
+--- source-tree.orig/assemble.org.eclipse.sdk.qnx.photon.x86.xml	2005-11-10 23:42:08.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.qnx.photon.x86.xml	2005-11-10 23:56:27.000000000 +0100
+@@ -594,7 +594,7 @@
+ 		<eclipse.brand root="${eclipse.base}/qnx.photon.x86/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}"		/>
+ 		<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"/>
+ 		</exec>
+ 		<exec executable="zip" dir="${assemblyTempDir}">
+ 			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.solaris.gtk.sparc.xml source-tree/assemble.org.eclipse.sdk.solaris.gtk.sparc.xml
+--- source-tree.orig/assemble.org.eclipse.sdk.solaris.gtk.sparc.xml	2005-11-10 23:42:08.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.solaris.gtk.sparc.xml	2005-11-10 23:56:48.000000000 +0100
+@@ -584,7 +584,7 @@
+ 		<eclipse.brand root="${eclipse.base}/solaris.gtk.sparc/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}"		/>
+ 		<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"/>
+ 		</exec>
+ 		<exec executable="zip" dir="${assemblyTempDir}">
+ 			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.solaris.motif.sparc.xml source-tree/assemble.org.eclipse.sdk.solaris.motif.sparc.xml
+--- source-tree.orig/assemble.org.eclipse.sdk.solaris.motif.sparc.xml	2005-11-10 23:42:08.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.solaris.motif.sparc.xml	2005-11-10 23:57:03.000000000 +0100
+@@ -584,7 +584,7 @@
+ 		<eclipse.brand root="${eclipse.base}/solaris.motif.sparc/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}"		/>
+ 		<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"/>
+ 		</exec>
+ 		<exec executable="zip" dir="${assemblyTempDir}">
+ 			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/assemble.org.eclipse.sdk.win32.win32.x86.xml source-tree/assemble.org.eclipse.sdk.win32.win32.x86.xml
+--- source-tree.orig/assemble.org.eclipse.sdk.win32.win32.x86.xml	2005-11-10 23:42:08.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.win32.win32.x86.xml	2005-11-10 23:57:26.000000000 +0100
+@@ -608,7 +608,7 @@
+ 		<eclipse.brand root="${eclipse.base}/win32.win32.x86/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}"		/>
+ 		<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"/>
+ 		</exec>
+ 		<exec executable="zip" dir="${assemblyTempDir}">
+ 			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/features/org.eclipse.platform/build.xml source-tree/features/org.eclipse.platform/build.xml
+--- source-tree.orig/features/org.eclipse.platform/build.xml	2005-11-10 23:42:08.000000000 +0100
++++ source-tree/features/org.eclipse.platform/build.xml	2005-11-10 23:57:58.000000000 +0100
+@@ -331,7 +331,7 @@
+ 		<copy todir="${feature.base}/features/org.eclipse.platform_3.1.1" 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.1/feature.xml"  selfVersion="3.1.1" featureIds="org.eclipse.rcp,3.1.1," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,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.1,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.1,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.1,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.1,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.1,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.1,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.1,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,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.1,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.1/feature.xml"  selfVersion="3.1.1" featureIds="org.eclipse.rcp,3.1.1," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,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.1,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.1,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.1,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.1,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,5.0.30,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.1,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.1,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.1,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,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.1,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">
+diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.help.webapp/build.xml source-tree/plugins/org.eclipse.help.webapp/build.xml
+--- source-tree.orig/plugins/org.eclipse.help.webapp/build.xml	2005-11-10 23:42:05.000000000 +0100
++++ source-tree/plugins/org.eclipse.help.webapp/build.xml	2005-11-10 23:43:44.000000000 +0100
 @@ -74,7 +74,7 @@
  				<pathelement path="../org.eclipse.help"/>
  				<pathelement path="../org.eclipse.help.base"/>
@@ -81,9 +190,9 @@
  			</classpath>
  			<src path="${temp.folder}/jsp.jar.src/"			/>
  <!-- custom begin -->
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' ../source-tree.orig/plugins/org.eclipse.tomcat/about.html source-tree/plugins/org.eclipse.tomcat/about.html
---- ../source-tree.orig/plugins/org.eclipse.tomcat/about.html	2005-10-20 11:15:56.000000000 +0200
-+++ source-tree/plugins/org.eclipse.tomcat/about.html	2005-10-20 11:16:51.000000000 +0200
+diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.tomcat/about.html source-tree/plugins/org.eclipse.tomcat/about.html
+--- source-tree.orig/plugins/org.eclipse.tomcat/about.html	2005-11-10 23:42:04.000000000 +0100
++++ source-tree/plugins/org.eclipse.tomcat/about.html	2005-11-10 23:43:44.000000000 +0100
 @@ -8,7 +8,7 @@
  <body lang="EN-US">
  <h2>About This Content</h2>
@@ -174,9 +283,18 @@
  
  <p>Your use of the MX4J code is subject to the terms and conditions of the MX4J License, Version 1.0, a copy of which is included
  with the Content in the file <a href="mx4j.license">mx4j.license</a>.  More specifically: </p>
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' ../source-tree.orig/plugins/org.eclipse.tomcat/build.xml source-tree/plugins/org.eclipse.tomcat/build.xml
---- ../source-tree.orig/plugins/org.eclipse.tomcat/build.xml	2005-10-20 11:15:56.000000000 +0200
-+++ source-tree/plugins/org.eclipse.tomcat/build.xml	2005-10-20 11:16:51.000000000 +0200
+diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.tomcat/build.xml source-tree/plugins/org.eclipse.tomcat/build.xml
+--- source-tree.orig/plugins/org.eclipse.tomcat/build.xml	2005-11-10 23:42:04.000000000 +0100
++++ source-tree/plugins/org.eclipse.tomcat/build.xml	2005-11-10 23:50:52.000000000 +0100
+@@ -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>
+ 
 @@ -117,6 +117,8 @@
  				<pathelement path="${build.result.folder}/../org.apache.ant/lib/ant-xslp.jar"/>
  				<pathelement path="catalina.jar"/>
@@ -197,9 +315,64 @@
  				<pathelement path="servlets-common.jar"/>
  				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-common.jar"/>
  				<pathelement path="servlets-default.jar"/>
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' ../source-tree.orig/plugins/org.eclipse.tomcat/.classpath source-tree/plugins/org.eclipse.tomcat/.classpath
---- ../source-tree.orig/plugins/org.eclipse.tomcat/.classpath	2005-10-20 11:15:56.000000000 +0200
-+++ source-tree/plugins/org.eclipse.tomcat/.classpath	2005-10-20 11:16:51.000000000 +0200
+@@ -189,11 +191,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 +204,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 +243,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>
+ 
+diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.tomcat/.classpath source-tree/plugins/org.eclipse.tomcat/.classpath
+--- source-tree.orig/plugins/org.eclipse.tomcat/.classpath	2005-11-10 23:42:04.000000000 +0100
++++ source-tree/plugins/org.eclipse.tomcat/.classpath	2005-11-10 23:43:44.000000000 +0100
 @@ -1,29 +1,39 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <classpath>
@@ -262,15 +435,15 @@
 +	<classpathentry kind="lib" path="regexp.jar"/>
  	<classpathentry kind="output" path="bin"/>
  </classpath>
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' ../source-tree.orig/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF source-tree/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF
---- ../source-tree.orig/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF	2005-10-20 11:15:56.000000000 +0200
-+++ source-tree/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF	2005-10-20 11:19:13.000000000 +0200
+diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF source-tree/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF
+--- source-tree.orig/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF	2005-11-10 23:42:04.000000000 +0100
++++ source-tree/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF	2005-11-10 23:46:13.000000000 +0100
 @@ -2,7 +2,7 @@
  Bundle-ManifestVersion: 2
  Bundle-Name: %pluginName
  Bundle-SymbolicName: org.eclipse.tomcat; singleton:=true
 -Bundle-Version: 4.1.30.1
-+Bundle-Version: 3.1.0
++Bundle-Version: 5.0.30
  Bundle-ClassPath: tomcatwrapper.jar,
   catalina.jar,
   bootstrap.jar,
@@ -383,9 +556,9 @@
 - org.eclipse.tomcat.internal;x-internal:=true,
 - org.eclipse.tomcat.internal.extensions;x-internal:=true
 + org.apache.tomcat.util.threads;x-internal:=true
-diff -P -r -u --exclude='*.rej' --exclude='*.orig' ../source-tree.orig/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java source-tree/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java
---- ../source-tree.orig/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java	2005-10-20 11:15:56.000000000 +0200
-+++ source-tree/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java	2005-10-20 11:19:00.000000000 +0200
+diff -P -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java source-tree/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java
+--- source-tree.orig/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java	2005-11-10 23:42:04.000000000 +0100
++++ source-tree/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java	2005-11-10 23:43:44.000000000 +0100
 @@ -30,8 +30,8 @@
  import org.apache.catalina.logger.FileLogger;
  import org.apache.catalina.realm.MemoryRealm;

More information about the pkg-java-commits mailing list