rpms/eclipse/devel eclipse-tomcat55-build.2.patch, 1.3, 1.4 eclipse-tomcat55-build.3.patch, 1.3, 1.4 eclipse-tomcat55-build.patch, 1.8, 1.9 eclipse-tomcat55.patch, 1.5, 1.6 eclipse.spec, 1.293, 1.294
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jul 6 18:22:21 UTC 2006
- Previous message (by thread): rpms/samba/devel samba-3.0.23rc2-logfiles.patch, NONE, 1.1 samba-3.0.23rc3-passwd.patch, NONE, 1.1 .cvsignore, 1.29, 1.30 samba.spec, 1.65, 1.66 smb.init, 1.5, 1.6 sources, 1.31, 1.32 samba-3.0.20pre1-passwd.patch, 1.1, NONE samba-3.0.21b-logfiles.patch, 1.1, NONE samba-3.0.4-install.mount.smbfs.patch, 1.1, NONE
- Next message (by thread): rpms/tomcat5/devel tomcat5.spec,1.70,1.71
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: overholt
Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14436
Modified Files:
eclipse-tomcat55-build.2.patch eclipse-tomcat55-build.3.patch
eclipse-tomcat55-build.patch eclipse-tomcat55.patch
eclipse.spec
Log Message:
* Thu Jul 06 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
- Bump tomcat5 to 5.5.17 both in BR/R and in patches.
eclipse-tomcat55-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 +-
6 files changed, 6 insertions(+), 6 deletions(-)
Index: eclipse-tomcat55-build.2.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-tomcat55-build.2.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-tomcat55-build.2.patch 4 Jul 2006 21:27:47 -0000 1.3
+++ eclipse-tomcat55-build.2.patch 6 Jul 2006 18:22:19 -0000 1.4
@@ -6,7 +6,7 @@
<arg line="${pluginArchivePrefix}/org.eclipse.jface.databinding_1.0.0.I20060605-1400.jar"/>
<arg line="${pluginArchivePrefix}/org.eclipse.core.resources_3.2.0.v20060603.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.130.v20060601"/>
-+ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.15.v20060601"/>
++ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.17.v20060601"/>
<arg line="${pluginArchivePrefix}/org.eclipse.sdk_3.2.0.v20060605"/>
<arg line="${pluginArchivePrefix}/org.eclipse.ui.forms_3.2.0.v20060602.jar"/>
<arg line="${pluginArchivePrefix}/org.eclipse.help.base_3.2.0.v20060601.jar"/>
@@ -18,7 +18,7 @@
<zipfileset file="${eclipse.base}/plugins/org.eclipse.jface.databinding_1.0.0.I20060605-1400.jar" fullpath="${pluginArchivePrefix}/org.eclipse.jface.databinding_1.0.0.I20060605-1400.jar" />
<zipfileset file="${eclipse.base}/plugins/org.eclipse.core.resources_3.2.0.v20060603.jar" fullpath="${pluginArchivePrefix}/org.eclipse.core.resources_3.2.0.v20060603.jar" />
- <zipfileset dir="${eclipse.base}/plugins/org.eclipse.tomcat_4.1.130.v20060601" prefix="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.130.v20060601" />
-+ <zipfileset dir="${eclipse.base}/plugins/org.eclipse.tomcat_5.5.15.v20060601" prefix="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.15.v20060601" />
++ <zipfileset dir="${eclipse.base}/plugins/org.eclipse.tomcat_5.5.17.v20060601" prefix="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.17.v20060601" />
<zipfileset dir="${eclipse.base}/plugins/org.eclipse.sdk_3.2.0.v20060605" prefix="${pluginArchivePrefix}/org.eclipse.sdk_3.2.0.v20060605" />
<zipfileset file="${eclipse.base}/plugins/org.eclipse.ui.forms_3.2.0.v20060602.jar" fullpath="${pluginArchivePrefix}/org.eclipse.ui.forms_3.2.0.v20060602.jar" />
<zipfileset file="${eclipse.base}/plugins/org.eclipse.help.base_3.2.0.v20060601.jar" fullpath="${pluginArchivePrefix}/org.eclipse.help.base_3.2.0.v20060601.jar" />
@@ -30,7 +30,7 @@
<arg line="${pluginArchivePrefix}/org.eclipse.jface.databinding_1.0.0.I20060605-1400.jar"/>
<arg line="${pluginArchivePrefix}/org.eclipse.core.resources_3.2.0.v20060603.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.130.v20060601"/>
-+ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.15.v20060601"/>
++ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.17.v20060601"/>
<arg line="${pluginArchivePrefix}/org.eclipse.sdk_3.2.0.v20060605"/>
<arg line="${pluginArchivePrefix}/org.eclipse.ui.forms_3.2.0.v20060602.jar"/>
<arg line="${pluginArchivePrefix}/org.eclipse.help.base_3.2.0.v20060601.jar"/>
@@ -42,7 +42,7 @@
<arg line="${pluginArchivePrefix}/org.eclipse.jface.databinding_1.0.0.I20060605-1400.jar"/>
<arg line="${pluginArchivePrefix}/org.eclipse.core.resources_3.2.0.v20060603.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.130.v20060601"/>
-+ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.15.v20060601"/>
++ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.17.v20060601"/>
<arg line="${pluginArchivePrefix}/org.eclipse.sdk_3.2.0.v20060605"/>
<arg line="${pluginArchivePrefix}/org.eclipse.ui.forms_3.2.0.v20060602.jar"/>
<arg line="${pluginArchivePrefix}/org.eclipse.help.base_3.2.0.v20060601.jar"/>
@@ -54,7 +54,7 @@
<arg line="${pluginArchivePrefix}/org.eclipse.jface.databinding_1.0.0.I20060605-1400.jar"/>
<arg line="${pluginArchivePrefix}/org.eclipse.core.resources_3.2.0.v20060603.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.130.v20060601"/>
-+ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.15.v20060601"/>
++ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.17.v20060601"/>
<arg line="${pluginArchivePrefix}/org.eclipse.sdk_3.2.0.v20060605"/>
<arg line="${pluginArchivePrefix}/org.eclipse.ui.forms_3.2.0.v20060602.jar"/>
<arg line="${pluginArchivePrefix}/org.eclipse.help.base_3.2.0.v20060601.jar"/>
@@ -66,7 +66,7 @@
<arg line="${pluginArchivePrefix}/org.eclipse.jface.databinding_1.0.0.I20060605-1400.jar"/>
<arg line="${pluginArchivePrefix}/org.eclipse.core.resources_3.2.0.v20060603.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.130.v20060601"/>
-+ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.15.v20060601"/>
++ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.17.v20060601"/>
<arg line="${pluginArchivePrefix}/org.eclipse.sdk_3.2.0.v20060605"/>
<arg line="${pluginArchivePrefix}/org.eclipse.ui.forms_3.2.0.v20060602.jar"/>
<arg line="${pluginArchivePrefix}/org.eclipse.help.base_3.2.0.v20060601.jar"/>
eclipse-tomcat55-build.3.patch:
build.xml | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Index: eclipse-tomcat55-build.3.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-tomcat55-build.3.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-tomcat55-build.3.patch 4 Jul 2006 21:27:47 -0000 1.3
+++ eclipse-tomcat55-build.3.patch 6 Jul 2006 18:22:19 -0000 1.4
@@ -6,7 +6,7 @@
<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.2.0.v20060609m-BBt47n6hlEUsvBO/feature.xml" selfVersion="3.2.0.v20060609m-BBt47n6hlEUsvBO" featureIds="org.eclipse.rcp,3.2.0.v20060609m-Swbi2VrNoh-MeGG," pluginIds="com.jcraft.jsch,0.1.28,org.apache.ant,1.6.5,org.apache.lucene,1.4.103.v20060601,org.eclipse.ant.core,3.1.100.v20060531,org.eclipse.compare,3.2.0.v20060605,org.eclipse.core.boot,3.1.100.v20060603,org.eclipse.core.filebuffers,3.2.0.v20060605-1400,org.eclipse.core.filesystem,1.0.0.v20060603,org.eclipse.core.resources,3.2.0.v20060603,org.eclipse.core.resources.compatibility,3.2.0.v20060603,org.eclipse.core.runtime.compatibility,3.1.100.v20060603,org.eclipse.osgi.services,3.1.100.v20060601,org.eclipse.osgi.util,3.1.100.v20060601,org.eclipse.core.variables,3.1.100.v20060605,org.eclipse.debug.core,3.2.0.v20060605,org.eclipse.debug.ui,3.2.0.v20060605,org.eclipse.help.webapp,3.2.0.v20060602,org.eclipse.help.base,3.2.0.v20060601,org.e!
clipse.help.ui,3.2.0.v20060602,org.eclipse.help.appserver,3.1.100.v20060602,org.eclipse.ltk.core.refactoring,3.2.0.v20060605-1400,org.eclipse.ltk.ui.refactoring,3.2.0.v20060605-1400,org.eclipse.platform,3.2.0.v20060601,org.eclipse.platform.doc.user,3.2.0.v20060605,org.eclipse.search,3.2.0.v20060605-1400,org.eclipse.team.core,3.2.0.I200606051140,org.eclipse.team.cvs.core,3.2.0.M20060628,org.eclipse.team.cvs.ssh,3.2.0.I200606011710,org.eclipse.team.cvs.ssh2,3.2.0.I200606051140,org.eclipse.team.cvs.ui,3.2.0.I200606051140,org.eclipse.team.ui,3.2.0.I200606051140,org.eclipse.tomcat,4.1.130.v20060601,org.eclipse.text,3.2.0.v20060605-1400,org.eclipse.jface.text,3.2.0.v20060605-1400,org.eclipse.ui.console,3.1.100.v20060605,org.eclipse.ui.presentations.r21,3.2.0.I20060605-1400,org.eclipse.ui.intro,3.2.0.v20060601,org.eclipse.ui.intro.universal,3.2.0.v20060602,org.eclipse.ui.cheatsheets,3.2.0.v20060602,org.eclipse.ui.browser,3.2.0.v20060602,org.eclipse.ui.navigator,3.2.0.I20060605-140!
0,org.eclipse.ui.navigator.resources,3.2.0.I20060605-1400,org.!
eclipse.
ui.workbench.texteditor,3.2.0.v20060605-1400,org.eclipse.ui.views,3.2.0.I20060605-1400,org.eclipse.ui.editors,3.2.0.v20060605-1400,org.eclipse.ui.forms,3.2.0.v20060602,org.eclipse.ui.externaltools,3.1.100.v20060605,org.eclipse.ui.ide,3.2.0.I20060605-1400,org.eclipse.update.core,3.2.0.v20060605,org.eclipse.update.scheduler,3.2.0.v20060605,org.eclipse.update.ui,3.2.0.v20060605,org.eclipse.ui.workbench.compatibility,3.2.0.I20060605-1400,org.eclipse.core.filesystem.hpux.ia64_32,1.0.0.v20060603,org.eclipse.core.filesystem.hpux.PA_RISC,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86_64,1.0.0.v20060603,org.eclipse.core.filesystem.macosx,1.0.0.v20060603,org.eclipse.core.filesystem.qnx.x86,1.0.0.v20060603,org.eclipse.core.filesystem.win32.x86,1.0.0.v20060603,org.eclipse.core.resources.win32,3.2.0.v20060603,org.eclipse.ui.carbon,3.2.0.I20060605-1400,org.eclipse.ui.win32,3.2.0.I20060605-1400,org.eclipse.update.core.linux,3.2.0!
.v20060605,org.eclipse.update.core.win32,3.2.0.v20060605,org.eclipse.ui.views.properties.tabbed,3.2.0.I20060605-1400,org.eclipse.core.runtime.compatibility.registry,3.2.0.v20060603,"/>
-+ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.2.0.v20060609m-BBt47n6hlEUsvBO/feature.xml" selfVersion="3.2.0.v20060609m-BBt47n6hlEUsvBO" featureIds="org.eclipse.rcp,3.2.0.v20060609m-Swbi2VrNoh-MeGG," pluginIds="com.jcraft.jsch,0.1.28,org.apache.ant,1.6.5,org.apache.lucene,1.4.103.v20060601,org.eclipse.ant.core,3.1.100.v20060531,org.eclipse.compare,3.2.0.v20060605,org.eclipse.core.boot,3.1.100.v20060603,org.eclipse.core.filebuffers,3.2.0.v20060605-1400,org.eclipse.core.filesystem,1.0.0.v20060603,org.eclipse.core.resources,3.2.0.v20060603,org.eclipse.core.resources.compatibility,3.2.0.v20060603,org.eclipse.core.runtime.compatibility,3.1.100.v20060603,org.eclipse.osgi.services,3.1.100.v20060601,org.eclipse.osgi.util,3.1.100.v20060601,org.eclipse.core.variables,3.1.100.v20060605,org.eclipse.debug.core,3.2.0.v20060605,org.eclipse.debug.ui,3.2.0.v20060605,org.eclipse.help.webapp,3.2.0.v20060602,org.eclipse.help.base,3.2.0.v20060601,org.e!
clipse.help.ui,3.2.0.v20060602,org.eclipse.help.appserver,3.1.100.v20060602,org.eclipse.ltk.core.refactoring,3.2.0.v20060605-1400,org.eclipse.ltk.ui.refactoring,3.2.0.v20060605-1400,org.eclipse.platform,3.2.0.v20060601,org.eclipse.platform.doc.user,3.2.0.v20060605,org.eclipse.search,3.2.0.v20060605-1400,org.eclipse.team.core,3.2.0.I200606051140,org.eclipse.team.cvs.core,3.2.0.M20060628,org.eclipse.team.cvs.ssh,3.2.0.I200606011710,org.eclipse.team.cvs.ssh2,3.2.0.I200606051140,org.eclipse.team.cvs.ui,3.2.0.I200606051140,org.eclipse.team.ui,3.2.0.I200606051140,org.eclipse.tomcat,5.5.15.v20060601,org.eclipse.text,3.2.0.v20060605-1400,org.eclipse.jface.text,3.2.0.v20060605-1400,org.eclipse.ui.console,3.1.100.v20060605,org.eclipse.ui.presentations.r21,3.2.0.I20060605-1400,org.eclipse.ui.intro,3.2.0.v20060601,org.eclipse.ui.intro.universal,3.2.0.v20060602,org.eclipse.ui.cheatsheets,3.2.0.v20060602,org.eclipse.ui.browser,3.2.0.v20060602,org.eclipse.ui.navigator,3.2.0.I20060605-1400!
,org.eclipse.ui.navigator.resources,3.2.0.I20060605-1400,org.e!
clipse.u
i.workbench.texteditor,3.2.0.v20060605-1400,org.eclipse.ui.views,3.2.0.I20060605-1400,org.eclipse.ui.editors,3.2.0.v20060605-1400,org.eclipse.ui.forms,3.2.0.v20060602,org.eclipse.ui.externaltools,3.1.100.v20060605,org.eclipse.ui.ide,3.2.0.I20060605-1400,org.eclipse.update.core,3.2.0.v20060605,org.eclipse.update.scheduler,3.2.0.v20060605,org.eclipse.update.ui,3.2.0.v20060605,org.eclipse.ui.workbench.compatibility,3.2.0.I20060605-1400,org.eclipse.core.filesystem.hpux.ia64_32,1.0.0.v20060603,org.eclipse.core.filesystem.hpux.PA_RISC,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86_64,1.0.0.v20060603,org.eclipse.core.filesystem.macosx,1.0.0.v20060603,org.eclipse.core.filesystem.qnx.x86,1.0.0.v20060603,org.eclipse.core.filesystem.win32.x86,1.0.0.v20060603,org.eclipse.core.resources.win32,3.2.0.v20060603,org.eclipse.ui.carbon,3.2.0.I20060605-1400,org.eclipse.ui.win32,3.2.0.I20060605-1400,org.eclipse.update.core.linux,3.2.0.!
v20060605,org.eclipse.update.core.win32,3.2.0.v20060605,org.eclipse.ui.views.properties.tabbed,3.2.0.I20060605-1400,org.eclipse.core.runtime.compatibility.registry,3.2.0.v20060603,"/>
++ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.2.0.v20060609m-BBt47n6hlEUsvBO/feature.xml" selfVersion="3.2.0.v20060609m-BBt47n6hlEUsvBO" featureIds="org.eclipse.rcp,3.2.0.v20060609m-Swbi2VrNoh-MeGG," pluginIds="com.jcraft.jsch,0.1.28,org.apache.ant,1.6.5,org.apache.lucene,1.4.103.v20060601,org.eclipse.ant.core,3.1.100.v20060531,org.eclipse.compare,3.2.0.v20060605,org.eclipse.core.boot,3.1.100.v20060603,org.eclipse.core.filebuffers,3.2.0.v20060605-1400,org.eclipse.core.filesystem,1.0.0.v20060603,org.eclipse.core.resources,3.2.0.v20060603,org.eclipse.core.resources.compatibility,3.2.0.v20060603,org.eclipse.core.runtime.compatibility,3.1.100.v20060603,org.eclipse.osgi.services,3.1.100.v20060601,org.eclipse.osgi.util,3.1.100.v20060601,org.eclipse.core.variables,3.1.100.v20060605,org.eclipse.debug.core,3.2.0.v20060605,org.eclipse.debug.ui,3.2.0.v20060605,org.eclipse.help.webapp,3.2.0.v20060602,org.eclipse.help.base,3.2.0.v20060601,org.e!
clipse.help.ui,3.2.0.v20060602,org.eclipse.help.appserver,3.1.100.v20060602,org.eclipse.ltk.core.refactoring,3.2.0.v20060605-1400,org.eclipse.ltk.ui.refactoring,3.2.0.v20060605-1400,org.eclipse.platform,3.2.0.v20060601,org.eclipse.platform.doc.user,3.2.0.v20060605,org.eclipse.search,3.2.0.v20060605-1400,org.eclipse.team.core,3.2.0.I200606051140,org.eclipse.team.cvs.core,3.2.0.M20060628,org.eclipse.team.cvs.ssh,3.2.0.I200606011710,org.eclipse.team.cvs.ssh2,3.2.0.I200606051140,org.eclipse.team.cvs.ui,3.2.0.I200606051140,org.eclipse.team.ui,3.2.0.I200606051140,org.eclipse.tomcat,5.5.17.v20060601,org.eclipse.text,3.2.0.v20060605-1400,org.eclipse.jface.text,3.2.0.v20060605-1400,org.eclipse.ui.console,3.1.100.v20060605,org.eclipse.ui.presentations.r21,3.2.0.I20060605-1400,org.eclipse.ui.intro,3.2.0.v20060601,org.eclipse.ui.intro.universal,3.2.0.v20060602,org.eclipse.ui.cheatsheets,3.2.0.v20060602,org.eclipse.ui.browser,3.2.0.v20060602,org.eclipse.ui.navigator,3.2.0.I20060605-1400!
,org.eclipse.ui.navigator.resources,3.2.0.I20060605-1400,org.e!
clipse.u
i.workbench.texteditor,3.2.0.v20060605-1400,org.eclipse.ui.views,3.2.0.I20060605-1400,org.eclipse.ui.editors,3.2.0.v20060605-1400,org.eclipse.ui.forms,3.2.0.v20060602,org.eclipse.ui.externaltools,3.1.100.v20060605,org.eclipse.ui.ide,3.2.0.I20060605-1400,org.eclipse.update.core,3.2.0.v20060605,org.eclipse.update.scheduler,3.2.0.v20060605,org.eclipse.update.ui,3.2.0.v20060605,org.eclipse.ui.workbench.compatibility,3.2.0.I20060605-1400,org.eclipse.core.filesystem.hpux.ia64_32,1.0.0.v20060603,org.eclipse.core.filesystem.hpux.PA_RISC,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86_64,1.0.0.v20060603,org.eclipse.core.filesystem.macosx,1.0.0.v20060603,org.eclipse.core.filesystem.qnx.x86,1.0.0.v20060603,org.eclipse.core.filesystem.win32.x86,1.0.0.v20060603,org.eclipse.core.resources.win32,3.2.0.v20060603,org.eclipse.ui.carbon,3.2.0.I20060605-1400,org.eclipse.ui.win32,3.2.0.I20060605-1400,org.eclipse.update.core.linux,3.2.0.!
v20060605,org.eclipse.update.core.win32,3.2.0.v20060605,org.eclipse.ui.views.properties.tabbed,3.2.0.I20060605-1400,org.eclipse.core.runtime.compatibility.registry,3.2.0.v20060603,"/>
<antcall target="rootFiles${os}_${ws}_${arch}"/>
</target>
<target name="copybuiltlauncher" if="libsconfig">
eclipse-tomcat55-build.patch:
build.xml | 120 ++++++++++++++++++++++++++++++++------------------------------
1 files changed, 63 insertions(+), 57 deletions(-)
Index: eclipse-tomcat55-build.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-tomcat55-build.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- eclipse-tomcat55-build.patch 5 Jul 2006 17:11:24 -0000 1.8
+++ eclipse-tomcat55-build.patch 6 Jul 2006 18:22:19 -0000 1.9
@@ -5,7 +5,7 @@
<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.15.v20060601.jar" basedir="${temp.folder}/org.eclipse.tomcat_5.5.15.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>
@@ -116,16 +116,16 @@
<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.15.v20060601"/>
-+ <copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.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.15.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.15.v20060601" version="5.5.15.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">
@@ -135,9 +135,9 @@
- <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.15.v20060601"/>
-+ <copy file="${build.result.folder}/tomcatwrappersrc.zip" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601" failonerror="false" overwrite="false"/>
-+ <copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.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>
@@ -145,8 +145,8 @@
<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.15.v20060601"/>
-+ <copy file="${temp.folder}/tomcatwrapper.jar.bin${logExtension}" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.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.">
@@ -154,8 +154,8 @@
<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.15.v20060601.jar"/>
-+ <delete file="${plugin.destination}/org.eclipse.tomcat_5.5.15.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>
@@ -164,7 +164,7 @@
<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.15.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>
eclipse-tomcat55.patch:
.classpath | 43
META-INF/MANIFEST.MF | 116 -
build.properties | 2
src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java | 51
src/org/eclipse/tomcat/internal/TomcatAppServer.java | 1254 +++++------
src/org/eclipse/tomcat/internal/TomcatPlugin.java | 3
6 files changed, 797 insertions(+), 672 deletions(-)
Index: eclipse-tomcat55.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-tomcat55.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-tomcat55.patch 4 Jul 2006 21:27:47 -0000 1.5
+++ eclipse-tomcat55.patch 6 Jul 2006 18:22:19 -0000 1.6
@@ -1471,7 +1471,7 @@
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tomcat; singleton:=true
-Bundle-Version: 4.1.130.qualifier
-+Bundle-Version: 5.5.15.qualifier
++Bundle-Version: 5.5.17.qualifier
Bundle-ClassPath: tomcatwrapper.jar,
- catalina.jar,
- bootstrap.jar,
Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -r1.293 -r1.294
--- eclipse.spec 6 Jul 2006 12:54:28 -0000 1.293
+++ eclipse.spec 6 Jul 2006 18:22:19 -0000 1.294
@@ -165,9 +165,9 @@
%ifnarch ppc64 s390 s390x
BuildRequires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool
BuildRequires: mx4j >= 2.1
-BuildRequires: tomcat5 >= 5.5.15
-BuildRequires: tomcat5-jasper >= 5.5.15
-BuildRequires: tomcat5-servlet-2.4-api >= 5.5.15
+BuildRequires: tomcat5 >= 5.5.17
+BuildRequires: tomcat5-jasper >= 5.5.17
+BuildRequires: tomcat5-servlet-2.4-api >= 5.5.17
%endif
BuildRequires: lucene
BuildRequires: regexp
@@ -232,9 +232,9 @@
%ifnarch ppc64 s390 s390x
Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool
Requires: mx4j >= 2.1
-Requires: tomcat5 >= 5.5.15
-Requires: tomcat5-jasper >= 5.5.15
-Requires: tomcat5-servlet-2.4-api >= 5.5.15
+Requires: tomcat5 >= 5.5.17
+Requires: tomcat5-jasper >= 5.5.17
+Requires: tomcat5-servlet-2.4-api >= 5.5.17
%endif
Requires: lucene
Requires: regexp
@@ -1633,6 +1633,7 @@
%changelog
* Thu Jul 06 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
- Temporarily add webapp patch for ppc64, s390, and s390x.
+- Bump tomcat5 to 5.5.17 both in BR/R and in patches.
* Wed Jul 05 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
- Don't require tomcat on ppc64, s390, or s390x until we've got it there.
- Previous message (by thread): rpms/samba/devel samba-3.0.23rc2-logfiles.patch, NONE, 1.1 samba-3.0.23rc3-passwd.patch, NONE, 1.1 .cvsignore, 1.29, 1.30 samba.spec, 1.65, 1.66 smb.init, 1.5, 1.6 sources, 1.31, 1.32 samba-3.0.20pre1-passwd.patch, 1.1, NONE samba-3.0.21b-logfiles.patch, 1.1, NONE samba-3.0.4-install.mount.smbfs.patch, 1.1, NONE
- Next message (by thread): rpms/tomcat5/devel tomcat5.spec,1.70,1.71
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list