rpms/tomcat5/devel tomcat5-5.5.23-http11-build.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 sources, 1.9, 1.10 tomcat5-5.5-jasper.sh.patch, 1.2, 1.3 tomcat5-5.5-jk-build.patch, 1.2, 1.3 tomcat5-5.5.init, 1.4, 1.5 tomcat5-5.5.relink, 1.5, 1.6 tomcat5-5.5-http11-build.patch, 1.2, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed May 16 01:05:06 UTC 2007
- Previous message (by thread): rpms/tomcat5/FC-6 tomcat5-5.5.23-WebappClassLoader-commons-modeler.patch, NONE, 1.1 tomcat5-5.5.23-http11-build.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 sources, 1.8, 1.9 tomcat5-5.5-jdtcompiler.patch, 1.1, 1.2 tomcat5-5.5-jk-build.patch, 1.2, 1.3 tomcat5-5.5.conf, 1.3, 1.4 tomcat5-5.5.init, 1.3, 1.4 tomcat5.spec, 1.94, 1.95 tomcat5-5.5-http11-build.patch, 1.2, NONE
- Next message (by thread): rpms/tomcat5/devel tomcat5.spec,1.96,1.97
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: vivekl
Update of /cvs/dist/rpms/tomcat5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17463
Modified Files:
.cvsignore sources tomcat5-5.5-jasper.sh.patch
tomcat5-5.5-jk-build.patch tomcat5-5.5.init tomcat5-5.5.relink
Added Files:
tomcat5-5.5.23-http11-build.patch
Removed Files:
tomcat5-5.5-http11-build.patch
Log Message:
- Merge with latest from JPP
- Replace references to geronimo JTA with a generic one available in Fedora
- Use Fedora compliant build root specification
- Enabling juli still kills tomcat5 on startup, disabled
- Add patch to force -source to 5.0 when 1.5 support enabled since
ecj seems to use 1.4 as default still
tomcat5-5.5.23-http11-build.patch:
build.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
--- NEW FILE tomcat5-5.5.23-http11-build.patch ---
--- connectors/http11/build.xml.orig 2007-02-26 10:27:04.000000000 -0500
+++ connectors/http11/build.xml 2007-02-26 10:28:11.000000000 -0500
@@ -31,7 +31,7 @@
<!-- The locations of necessary jar files -->
<property name="tomcat-util.jar" value="${util.home}/build/lib/tomcat-util.jar"/>
- <property name="tomcat-jni.jar" value="../jni/dist/tomcat-native-1.0.0.jar" />
+ <property name="tomcat-jni.jar" value="../../build/build/server/lib/tomcat-apr.jar" />
<property name="tomcat-coyote.jar" value="${coyote.home}/build/lib/tomcat-coyote.jar"/>
<property name="tomcat33-coyote.jar"
value="${coyote.home}/build/lib/tomcat33-coyote.jar"/>
@@ -169,7 +169,10 @@
deprecation="${compile.deprecation}"
optimize="${compile.optimize}">
<exclude name="org\apache\coyote\http11\*Apr*" unless="jdk.1.4.present" />
- <classpath refid="compile.classpath"/>
+ <classpath>
+ <path refid="compile.classpath"/>
+ <pathelement location="${build.home}/../../jakarta-tomcat-5/build/classes"/>
+ </classpath>
</javac>
<copy todir="${build.home}/classes" filtering="on">
<fileset dir="${source.home}" excludes="**/*.java"/>
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 19 Feb 2007 18:52:28 -0000 1.11
+++ .cvsignore 16 May 2007 01:05:04 -0000 1.12
@@ -1 +1 @@
-apache-tomcat-5.5.20-src.tar.gz
+apache-tomcat-5.5.23-src.tar.gz
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 19 Feb 2007 18:52:28 -0000 1.9
+++ sources 16 May 2007 01:05:04 -0000 1.10
@@ -1 +1 @@
-5775bae8fac16a0e3a2c913c4768bb37 apache-tomcat-5.5.20-src.tar.gz
+362d1d8b15dc09882440dcab8c592dd7 apache-tomcat-5.5.23-src.tar.gz
tomcat5-5.5-jasper.sh.patch:
jasper.sh | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
Index: tomcat5-5.5-jasper.sh.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-jasper.sh.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tomcat5-5.5-jasper.sh.patch 5 Jul 2006 22:50:50 -0000 1.2
+++ tomcat5-5.5-jasper.sh.patch 16 May 2007 01:05:04 -0000 1.3
@@ -1,6 +1,6 @@
--- jasper/src/bin/jasper.sh.sav 2006-03-23 17:14:58.000000000 +0100
+++ jasper/src/bin/jasper.sh 2006-03-23 17:24:56.000000000 +0100
-@@ -45,34 +45,38 @@
+@@ -45,34 +45,37 @@
. "$JASPER_HOME"/bin/setenv.sh
fi
@@ -42,15 +42,14 @@
+CLASSPATH=$CLASSPATH:$(build-classpath \
+ ant \
+ commons-collections \
-+ commons-el \
+ commons-daemon \
++ commons-el \
+ commons-logging \
-+ jasper-compiler \
-+ jasper-runtime \
-+ jdtcore.jar \
-+ \
-+ jsp-2.0-api \
-+ servlet-2.4-api \
++ eclipse-ecj.jar \
++ jasper5-compiler \
++ jasper5-runtime \
++ jsp \
++ servlet \
+ xerces-j2 \
+ xml-commons-apis \
+)
tomcat5-5.5-jk-build.patch:
build.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletion(-)
Index: tomcat5-5.5-jk-build.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-jk-build.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tomcat5-5.5-jk-build.patch 5 Jul 2006 22:50:50 -0000 1.2
+++ tomcat5-5.5-jk-build.patch 16 May 2007 01:05:04 -0000 1.3
@@ -13,7 +13,15 @@
<exclude name="org/apache/jk/ant/**" />
<classpath>
<pathelement location="${tomcat-apr.jar}" />
-+ <pathelement location="${jk.build}/../../jakarta-tomcat-5/build/classes"/>
++ <pathelement location="${jk.build}/../../build/build/classes"/>
<path refid="xml-apis.classpath"/>
<path refid="build-main.classpath"/>
</classpath>
+@@ -252,6 +252,7 @@
+ <include name="org/apache/coyote/ajp/**"/>
+ <include name="org/apache/jk/config/**"/>
+ <classpath>
++ <pathelement location="${jk.build}/../../build/build/classes"/>
+ <path refid="xml-apis.classpath"/>
+ <path refid="build-main.classpath"/>
+ <path refid="build-tc5.classpath"/>
Index: tomcat5-5.5.init
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tomcat5-5.5.init 19 Feb 2007 18:52:28 -0000 1.4
+++ tomcat5-5.5.init 16 May 2007 01:05:04 -0000 1.5
@@ -2,17 +2,16 @@
#
# tomcat5 This shell script takes care of starting and stopping Tomcat
#
-### BEGIN INIT INFO
# chkconfig: - 80 20
+#
+### BEGIN INIT INFO
# Provides: tomcat5
# Required-Start: $network $syslog
# Required-Stop: $network $syslog
-# Default-Start: -
-# Default-Stop: -
-# description: Tomcat 5.5 is the Servlet Engine RI for Servlet 2.4/JSP 2.0
-# processname: tomcat
-# pidfile: /var/run/tomcat5.pid
-# config: /etc/tomcat5/tomcat5.conf
+# Default-Start:
+# Default-Stop:
+# Description: Release implementation for Servlet 2.4 and JSP 2.0
+# Short-Description: start and stop tomcat
### END INIT INFO
#
# - originally written by Henri Gomez, Keith Irwin, and Nicolas Mailhot
@@ -144,7 +143,7 @@
cp -pLR /var/lib/tomcat5/* /var/lib/${NAME}
fi
mkdir -p $CATALINA_HOME ${CATALINA_HOME}/conf /var/cache/${NAME}/temp \
- /var/cache/${NAME}/work /var/log/${NAME}
+ /var/cache/${NAME}/work /var/log/${NAME}
for i in temp work; do
ln -fs /var/cache/${NAME}/${i} ${CATALINA_HOME}/${i}
done
--- tomcat5-5.5-http11-build.patch DELETED ---
- Previous message (by thread): rpms/tomcat5/FC-6 tomcat5-5.5.23-WebappClassLoader-commons-modeler.patch, NONE, 1.1 tomcat5-5.5.23-http11-build.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 sources, 1.8, 1.9 tomcat5-5.5-jdtcompiler.patch, 1.1, 1.2 tomcat5-5.5-jk-build.patch, 1.2, 1.3 tomcat5-5.5.conf, 1.3, 1.4 tomcat5-5.5.init, 1.3, 1.4 tomcat5.spec, 1.94, 1.95 tomcat5-5.5-http11-build.patch, 1.2, NONE
- Next message (by thread): rpms/tomcat5/devel tomcat5.spec,1.96,1.97
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list