rpms/tomcat5/devel .cvsignore, 1.9, 1.10 sources, 1.7, 1.8 tomcat5-5.5-catalina.sh.patch, 1.1, 1.2 tomcat5-5.5-http11-build.patch, 1.1, 1.2 tomcat5-5.5-jasper.sh.patch, 1.1, 1.2 tomcat5-5.5-javaxssl.patch, 1.1, 1.2 tomcat5-5.5-jk-build.patch, 1.1, 1.2 tomcat5-5.5-jspc.sh.patch, 1.1, 1.2 tomcat5-5.5-jt5-build.patch, 1.1, 1.2 tomcat5-5.5-jtc-build.patch, 1.1, 1.2 tomcat5-5.5-jtj-build.patch, 1.1, 1.2 tomcat5-5.5-setclasspath.sh.patch, 1.1, 1.2 tomcat5-5.5-skip-build-on-install.patch, 1.1, 1.2 tomcat5-5.5-skip-native.patch, 1.1, 1.2 tomcat5-5.5-util-build.patch, 1.1, 1.2 tomcat5-5.5.conf, 1.1, 1.2 tomcat5-5.5.init, 1.1, 1.2 tomcat5-5.5.link_admin_jar.patch, 1.1, 1.2 tomcat5-5.5.relink, 1.1, 1.2 tomcat5.spec, 1.65, 1.66
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jul 5 22:50:53 UTC 2006
Author: fnasser
Update of /cvs/dist/rpms/tomcat5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20939
Modified Files:
.cvsignore sources tomcat5-5.5-catalina.sh.patch
tomcat5-5.5-http11-build.patch tomcat5-5.5-jasper.sh.patch
tomcat5-5.5-javaxssl.patch tomcat5-5.5-jk-build.patch
tomcat5-5.5-jspc.sh.patch tomcat5-5.5-jt5-build.patch
tomcat5-5.5-jtc-build.patch tomcat5-5.5-jtj-build.patch
tomcat5-5.5-setclasspath.sh.patch
tomcat5-5.5-skip-build-on-install.patch
tomcat5-5.5-skip-native.patch tomcat5-5.5-util-build.patch
tomcat5-5.5.conf tomcat5-5.5.init
tomcat5-5.5.link_admin_jar.patch tomcat5-5.5.relink
tomcat5.spec
Log Message:
Upgrade
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 23 Feb 2006 00:26:54 -0000 1.9
+++ .cvsignore 5 Jul 2006 22:50:50 -0000 1.10
@@ -1 +1 @@
-apache-tomcat-5.5.15-src.tar.gz
+apache-tomcat-5.5.17-src.tar.gz
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 23 Feb 2006 00:26:54 -0000 1.7
+++ sources 5 Jul 2006 22:50:50 -0000 1.8
@@ -1 +1 @@
-08c7cf1d42971ef893daa4bf4519a537 apache-tomcat-5.5.15-src.tar.gz
+afedf090888029b19a1bebc471264105 apache-tomcat-5.5.17-src.tar.gz
tomcat5-5.5-catalina.sh.patch:
catalina.sh | 86 ++++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 67 insertions(+), 19 deletions(-)
Index: tomcat5-5.5-catalina.sh.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-catalina.sh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-catalina.sh.patch 23 Feb 2006 00:26:54 -0000 1.1
+++ tomcat5-5.5-catalina.sh.patch 5 Jul 2006 22:50:50 -0000 1.2
@@ -1,5 +1,5 @@
---- tomcat5-5.5.15/apache-tomcat-5.5.15-src/container/catalina/src/bin/catalina.sh.sav 2006-01-03 10:15:07.000000000 -0500
-+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/container/catalina/src/bin/catalina.sh 2006-02-21 13:16:25.143371000 -0500
+--- container/catalina/src/bin/catalina.sh.sav 2006-03-23 17:04:08.000000000 +0100
++++ container/catalina/src/bin/catalina.sh 2006-03-23 17:12:52.000000000 +0100
@@ -52,6 +52,9 @@
Darwin*) darwin=true;;
esac
tomcat5-5.5-http11-build.patch:
build.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
Index: tomcat5-5.5-http11-build.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-http11-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-http11-build.patch 23 Feb 2006 00:26:54 -0000 1.1
+++ tomcat5-5.5-http11-build.patch 5 Jul 2006 22:50:50 -0000 1.2
@@ -1,13 +1,22 @@
---- tomcat5-5.5.15/apache-tomcat-5.5.15-src/connectors/http11/build.xml.sav 2006-02-21 13:40:40.880179000 -0500
-+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/connectors/http11/build.xml 2006-02-21 13:40:52.563483000 -0500
+--- connectors/http11/build.xml.p13 2006-03-05 02:25:21.000000000 +0100
++++ connectors/http11/build.xml 2006-03-23 19:22:04.000000000 +0100
+@@ -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"/>
@@ -167,7 +167,10 @@
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}">
- <classpath refid="compile.classpath"/>
+ <classpath>
-+ <path refid="compile.classpath"/>
-+ <pathelement location="${build.home}/../../build/build/classes"/>
++ <path refid="compile.classpath"/>
++ <pathelement location="${build.home}/../../jakarta-tomcat-5/build/classes"/>
+ </classpath>
</javac>
<copy todir="${build.home}/classes" filtering="on">
tomcat5-5.5-jasper.sh.patch:
jasper.sh | 44 ++++++++++++++++++++++++--------------------
1 files changed, 24 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-jasper.sh.patch 23 Feb 2006 00:26:54 -0000 1.1
+++ tomcat5-5.5-jasper.sh.patch 5 Jul 2006 22:50:50 -0000 1.2
@@ -1,6 +1,6 @@
---- tomcat5-5.5.15/apache-tomcat-5.5.15-src/jasper/jasper2/src/bin/jasper.sh.sav 2006-01-03 10:15:14.000000000 -0500
-+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/jasper/jasper2/src/bin/jasper.sh 2006-02-21 13:21:55.764421000 -0500
-@@ -45,34 +45,36 @@
+--- 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 @@
. "$JASPER_HOME"/bin/setenv.sh
fi
@@ -47,16 +47,18 @@
+ commons-logging \
+ jasper-compiler \
+ jasper-runtime \
-+ eclipse-ecj.jar \
++ jdtcore.jar \
++ \
+ jsp-2.0-api \
+ servlet-2.4-api \
+ xerces-j2 \
+ xml-commons-apis \
+)
++
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
-@@ -103,7 +105,7 @@
+@@ -103,7 +107,7 @@
else
tomcat5-5.5-javaxssl.patch:
jk/java/org/apache/jk/server/JkMain.java | 2
util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java | 26 +++++-----
2 files changed, 14 insertions(+), 14 deletions(-)
Index: tomcat5-5.5-javaxssl.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-javaxssl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-javaxssl.patch 23 Feb 2006 00:26:54 -0000 1.1
+++ tomcat5-5.5-javaxssl.patch 5 Jul 2006 22:50:50 -0000 1.2
@@ -1,5 +1,5 @@
---- tomcat5-5.5.15/apache-tomcat-5.5.15-src/connectors/jk/java/org/apache/jk/server/JkMain.java.sav 2006-02-21 13:03:55.678587000 -0500
-+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/connectors/jk/java/org/apache/jk/server/JkMain.java 2006-02-21 13:04:09.811441000 -0500
+--- connectors/jk/java/org/apache/jk/server/JkMain.java.sav 2006-03-23 16:56:20.000000000 +0100
++++ connectors/jk/java/org/apache/jk/server/JkMain.java 2006-03-23 16:57:27.000000000 +0100
@@ -101,7 +101,7 @@
return jkMain;
}
@@ -9,8 +9,8 @@
private void initHTTPSUrls() {
try {
// 11657: if only ajp is used, https: redirects need to work ( at least for 1.3+)
---- tomcat5-5.5.15/apache-tomcat-5.5.15-src/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java.sav 2006-02-21 13:06:56.537546000 -0500
-+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java 2006-02-21 13:08:32.272715000 -0500
+--- connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java.sav 2006-03-23 16:58:48.000000000 +0100
++++ connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java 2006-03-23 17:01:34.000000000 +0100
@@ -67,13 +67,13 @@
*/
void init() throws IOException {
tomcat5-5.5-jk-build.patch:
build.xml | 3 ++-
1 files changed, 2 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-jk-build.patch 23 Feb 2006 00:26:54 -0000 1.1
+++ tomcat5-5.5-jk-build.patch 5 Jul 2006 22:50:50 -0000 1.2
@@ -1,10 +1,19 @@
---- tomcat5-5.5.15/apache-tomcat-5.5.15-src/connectors/jk/build.xml.sav 2006-02-21 13:42:53.241685000 -0500
-+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/connectors/jk/build.xml 2006-02-21 13:42:59.481438000 -0500
+--- connectors/jk/build.xml.p14 2006-03-05 02:25:22.000000000 +0100
++++ connectors/jk/build.xml 2006-03-23 19:25:51.000000000 +0100
+@@ -28,7 +28,7 @@
+ <property name="tomcat-jkshm.jar" value="${jk.build}/lib/jkshm.jar" />
+ <property name="tomcat-jk2.jar" value="${jk.build}/lib/tomcat-jk2.jar" />
+ <property name="tomcat-jni.jar" value="${jk.build}/lib/tomcat-jni.jar" />
+- <property name="tomcat-apr.jar" value="../jni/dist/tomcat-native-1.0.0.jar" />
++ <property name="tomcat-apr.jar" value="../../build/build/server/lib/tomcat-apr.jar" />
+
+ <!-- default locations, overrident by properties -->
+ <property name="base.path" location="/usr/share/java"/>
@@ -211,6 +211,7 @@
<exclude name="org/apache/jk/ant/**" />
<classpath>
<pathelement location="${tomcat-apr.jar}" />
-+ <pathelement location="${jk.build}/../../build/build/classes"/>
++ <pathelement location="${jk.build}/../../jakarta-tomcat-5/build/classes"/>
<path refid="xml-apis.classpath"/>
<path refid="build-main.classpath"/>
</classpath>
tomcat5-5.5-jspc.sh.patch:
jspc.sh | 27 ++-------------------------
1 files changed, 2 insertions(+), 25 deletions(-)
Index: tomcat5-5.5-jspc.sh.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-jspc.sh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-jspc.sh.patch 23 Feb 2006 00:26:54 -0000 1.1
+++ tomcat5-5.5-jspc.sh.patch 5 Jul 2006 22:50:50 -0000 1.2
@@ -1,5 +1,5 @@
---- tomcat5-5.5.15/apache-tomcat-5.5.15-src/jasper/jasper2/src/bin/jspc.sh.sav 2006-01-03 10:15:14.000000000 -0500
-+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/jasper/jasper2/src/bin/jspc.sh 2006-02-21 13:27:02.125753000 -0500
+--- jasper/src/bin/jspc.sh.sav 2006-03-23 17:33:40.000000000 +0100
++++ jasper/src/bin/jspc.sh 2006-03-23 17:35:26.000000000 +0100
@@ -5,32 +5,9 @@
# $Id$
# -----------------------------------------------------------------------------
tomcat5-5.5-jt5-build.patch:
build.xml | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
Index: tomcat5-5.5-jt5-build.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-jt5-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-jt5-build.patch 23 Feb 2006 00:26:54 -0000 1.1
+++ tomcat5-5.5-jt5-build.patch 5 Jul 2006 22:50:50 -0000 1.2
@@ -1,5 +1,5 @@
---- tomcat5-5.5.15/apache-tomcat-5.5.15-src/build/build.xml.sav 2006-02-21 12:05:21.945271000 -0500
-+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/build/build.xml 2006-02-21 12:09:52.329616000 -0500
+--- build/build.xml.p2 2006-03-23 19:51:48.000000000 +0100
++++ build/build.xml 2006-03-24 10:18:41.000000000 +0100
@@ -58,12 +58,14 @@
<property name="tomcat.release" value="${basedir}/release"/>
<property name="webapps.build" value="${catalina.home}/webapps/build"/>
@@ -9,47 +9,41 @@
<property name="tomcat-dbcp.jar"
- value="${tomcat-dbcp.home}/naming-factory-dbcp.jar"/>
+ value="${tomcat-dbcp.home}/commons-dbcp.jar"/>
-+ <!--
++<!--
<property name="jasper-compiler-jdt.home" value="${base.path}/tomcat-deps" />
<property name="jasper-compiler-jdt.jar"
value="${jasper-compiler-jdt.home}/jasper-compiler-jdt.jar"/>
-+ -->
++-->
<!-- Some compilers will disable debugging if true. And it doesn't do anything
in most cases -->
-@@ -160,7 +162,11 @@
+@@ -159,11 +161,17 @@
+ failonerror="false" />
+
+ <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
+- file="${tomcat-native.tar.gz}" />
++ file="${tomcat-native.tar.gz}"
++ failonerror="false" />
<!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
<copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> -->
-+ <!--
++<!--
<copy todir="${tomcat.build}/common/lib" file="${jasper-compiler-jdt.jar}"/>
-+ -->
-+ <!-- these should be links -->
-+ <copy todir="${tomcat.build}/common/lib" file="${base.path}/eclipse-ecj.jar"/>
++-->
++<!-- these should be links -->
++ <copy todir="${tomcat.build}/common/lib" file="${base.path}/jdtcore.jar" failonerror="false"/>
++
</target>
<!-- ====================== Build all components =================== -->
-@@ -953,7 +959,7 @@
+@@ -957,7 +965,9 @@
<copy todir="embed/lib">
<fileset dir="build/common/lib">
<include name="jasper-compiler.jar"/>
- <include name="jasper-compiler-jdt.jar"/>
-+ <include name="eclipse-ecj.jar"/>
++ <!-- <include name="jasper-compiler-jdt.jar"/> -->
++ <include name="jdtcore.jar"/>
++
</fileset>
</copy>
---- tomcat5-5.5.15/apache-tomcat-5.5.15-src/build/build.properties.default.sav 2006-02-21 12:10:09.197726000 -0500
-+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/build/build.properties.default 2006-02-21 12:10:26.608298000 -0500
-@@ -12,10 +12,10 @@
- # ----- Vesion Control Flags -----
- version.major=5
- version.minor=5
--version.build=0
-+version.build=15
- version.patch=0
- #Set the pretty version name
--version=5.5.0-dev
-+version=5.5.15
-
- # ----- Compile Control Flags -----
- compile.debug=on
tomcat5-5.5-jtc-build.patch:
catalina/build.xml | 2 +-
modules/cluster/build.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: tomcat5-5.5-jtc-build.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-jtc-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-jtc-build.patch 23 Feb 2006 00:26:54 -0000 1.1
+++ tomcat5-5.5-jtc-build.patch 5 Jul 2006 22:50:50 -0000 1.2
@@ -1,16 +1,16 @@
---- tomcat5-5.5.15/apache-tomcat-5.5.15-src/container/catalina/build.xml.sav 2006-02-21 12:14:44.437212000 -0500
-+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/container/catalina/build.xml 2006-02-21 12:14:59.603032000 -0500
+--- container/catalina/build.xml.sav 2006-03-23 16:46:37.000000000 +0100
++++ container/catalina/build.xml 2006-03-23 16:47:44.000000000 +0100
@@ -42,7 +42,7 @@
<property name="tomcat-http11.jar"
value="${tomcat-http11.home}/build/lib/tomcat-http11.jar"/>
<property name="tomcat-dbcp.jar"
- value="${base.path}/tomcat-deps/naming-factory-dbcp.jar"/>
-+ value="${base.path}/tomcat-deps/commons-dbcp.jar"/>
++ value="${base.path}/commons-dbcp.jar"/>
<!-- Construct Catalina classpath -->
<path id="catalina.classpath">
<pathelement location="${activation.jar}"/>
---- tomcat5-5.5.15/apache-tomcat-5.5.15-src/container/modules/cluster/build.xml.sav 2006-02-21 12:15:15.518099000 -0500
-+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/container/modules/cluster/build.xml 2006-02-21 12:15:49.952629000 -0500
+--- container/modules/cluster/build.xml.sav 2006-03-23 16:49:04.000000000 +0100
++++ container/modules/cluster/build.xml 2006-03-23 16:49:54.000000000 +0100
@@ -20,7 +20,7 @@
<pathelement location="${commons-modeler.jar}"/>
<pathelement location="${commons-logging.jar}"/>
tomcat5-5.5-jtj-build.patch:
build.xml | 4 ++++
1 files changed, 4 insertions(+)
Index: tomcat5-5.5-jtj-build.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-jtj-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-jtj-build.patch 23 Feb 2006 00:26:54 -0000 1.1
+++ tomcat5-5.5-jtj-build.patch 5 Jul 2006 22:50:50 -0000 1.2
@@ -1,18 +1,20 @@
---- tomcat5-5.5.15/apache-tomcat-5.5.15-src/jasper/jasper2/build.xml.sav 2006-02-21 13:00:06.484260000 -0500
-+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/jasper/jasper2/build.xml 2006-02-21 13:00:38.568893000 -0500
-@@ -38,6 +38,7 @@
+--- jasper/build.xml.sav 2006-03-23 16:52:01.000000000 +0100
++++ jasper/build.xml 2006-03-23 16:53:17.000000000 +0100
+@@ -38,6 +38,8 @@
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-daemon-launcher.jar}"/>
<pathelement location="${jasper.build}/shared/classes"/>
-+ <pathelement location="${base.path}/eclipse-ecj.jar"/>
++ <pathelement location="${base.path}/jdtcore.jar"/>
++
</path>
<!-- Construct unit tests classpath -->
-@@ -54,6 +55,7 @@
+@@ -54,6 +56,8 @@
<pathelement location="${commons-launcher.jar}"/>
<pathelement location="${jasper.build}/shared/classes"/>
<pathelement location="${jasper.build}/tests"/>
-+ <pathelement location="${base.path}/eclipse-ecj.jar"/>
++ <pathelement location="${base.path}/jdtcore.jar"/>
++
</path>
tomcat5-5.5-setclasspath.sh.patch:
setclasspath.sh | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Index: tomcat5-5.5-setclasspath.sh.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-setclasspath.sh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-setclasspath.sh.patch 23 Feb 2006 00:26:54 -0000 1.1
+++ tomcat5-5.5-setclasspath.sh.patch 5 Jul 2006 22:50:50 -0000 1.2
@@ -1,5 +1,5 @@
---- tomcat5-5.5.15/apache-tomcat-5.5.15-src/container/catalina/src/bin/setclasspath.sh.sav 2006-01-03 10:15:07.000000000 -0500
-+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/container/catalina/src/bin/setclasspath.sh 2006-02-21 13:29:23.285450000 -0500
+--- container/catalina/src/bin/setclasspath.sh.sav 2006-03-23 17:37:23.000000000 +0100
++++ container/catalina/src/bin/setclasspath.sh 2006-03-23 17:38:35.000000000 +0100
@@ -50,7 +50,7 @@
echo "This environment variable is needed to run this program"
exit 1
tomcat5-5.5-skip-build-on-install.patch:
build.xml | 2 ++
1 files changed, 2 insertions(+)
Index: tomcat5-5.5-skip-build-on-install.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-skip-build-on-install.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-skip-build-on-install.patch 23 Feb 2006 00:26:54 -0000 1.1
+++ tomcat5-5.5-skip-build-on-install.patch 5 Jul 2006 22:50:50 -0000 1.2
@@ -1,10 +1,9 @@
---- tomcat5-5.5.15/apache-tomcat-5.5.15-src/build/build.xml.sav 2006-02-21 11:53:11.829543000 -0500
-+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/build/build.xml 2006-02-21 11:53:30.700650000 -0500
-@@ -759,11 +759,12 @@
- <mkdir dir="${tomcat.build}/webapps" />
+--- build/build.xml.sav 2006-03-23 16:22:33.000000000 +0100
++++ build/build.xml 2006-03-23 16:23:40.000000000 +0100
+@@ -763,10 +763,12 @@
<mkdir dir="${tomcat.build}/server/webapps" />
-- <!-- The build files are far too difficult to hack - just build it and copy -->
+ <!-- The build files are far too difficult to hack - just build it and copy -->
+ <!--
<ant dir="${api.home}/jsr154" target="dist">
</ant>
tomcat5-5.5-skip-native.patch:
build.xml | 3 +++
1 files changed, 3 insertions(+)
Index: tomcat5-5.5-skip-native.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-skip-native.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-skip-native.patch 23 Feb 2006 00:26:54 -0000 1.1
+++ tomcat5-5.5-skip-native.patch 5 Jul 2006 22:50:50 -0000 1.2
@@ -1,13 +1,10 @@
---- tomcat5-5.5.15/apache-tomcat-5.5.15-src/build/build.xml.sav 2006-02-21 13:45:24.220555000 -0500
-+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/build/build.xml 2006-02-21 13:45:57.627114000 -0500
-@@ -157,8 +157,14 @@
+--- build/build.xml.sav 2006-03-23 17:54:40.000000000 +0100
++++ build/build.xml 2006-03-23 17:55:58.000000000 +0100
+@@ -160,8 +160,11 @@
<copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}"
failonerror="false" />
-+<!-- tomcat-native.tar.gz was added in 5.5.11
-+ see jakarta-tomcat-catalina/webapps/docs/changelog.xml
-+ commenting it out for now -\- vadimn at redhat.com
-+-->
++<!-- build native separately -->
+<!--
<copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
file="${tomcat-native.tar.gz}" />
tomcat5-5.5-util-build.patch:
build.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
Index: tomcat5-5.5-util-build.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-util-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-util-build.patch 23 Feb 2006 00:26:54 -0000 1.1
+++ tomcat5-5.5-util-build.patch 5 Jul 2006 22:50:50 -0000 1.2
@@ -1,13 +1,22 @@
---- tomcat5-5.5.15/apache-tomcat-5.5.15-src/connectors/util/build.xml.sav 2006-02-21 13:32:48.390140000 -0500
-+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/connectors/util/build.xml 2006-02-21 13:33:03.280235000 -0500
+--- connectors/util/build.xml.sav 2006-03-23 19:16:02.000000000 +0100
++++ connectors/util/build.xml 2006-03-23 19:17:46.000000000 +0100
+@@ -23,7 +23,7 @@
+ <property name="tomcat-util.lib" value="${tomcat-util.build}/lib" />
+ <property name="tomcat-util.jar" value="${tomcat-util.lib}/tomcat-util.jar" />
+ <property name="tomcat-loader.jar" value="${tomcat-util.lib}/tomcat-loader.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" />
+
+ <path id="compile.classpath">
+ <pathelement location="${jmx.jar}" />
@@ -73,7 +73,10 @@
optimize="off"
verbose="off"
excludes="**/CVS/**">
- <classpath refid="compile.classpath"/>
+ <classpath>
-+ <path refid="compile.classpath"/>
-+ <pathelement location="${tomcat-util.build}/../../build/build/classes"/>
++ <path refid="compile.classpath"/>
++ <pathelement location="${tomcat-util.build}/../../jakarta-tomcat-5/build/classes"/>
+ </classpath>
<exclude name="**/util/net/jsse/*" unless="jsse.present"/>
<exclude name="**/util/log/CommonLogHandler.java" unless="commons-logging.present"/>
Index: tomcat5-5.5.conf
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5.conf 23 Feb 2006 00:26:54 -0000 1.1
+++ tomcat5-5.5.conf 5 Jul 2006 22:50:50 -0000 1.2
@@ -8,6 +8,9 @@
# here if you wish to
#JAVA_OPTS="-Xminf0.1 -Xmaxf0.3"
+# Use JAVA_OPTS to set java.library.path for libtcnative.so
+#JAVA_OPTS="-Djava.library.path=/usr/lib
+
# Where your tomcat installation lives
# That change from previous RPM where TOMCAT_HOME
# used to be /var/tomcat.
Index: tomcat5-5.5.init
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5.init 23 Feb 2006 00:26:54 -0000 1.1
+++ tomcat5-5.5.init 5 Jul 2006 22:50:50 -0000 1.2
@@ -131,15 +131,19 @@
until [ `ps --pid $kpid | grep -c $kpid` = '0' ] || [ $count -gt $kwait ]
do
- echo "waiting for processes to exit";
+ echo -n -e "\nwaiting for processes to exit";
sleep 1
let count=$count+1;
done
if [ $count -gt $kwait ]; then
- echo "killing processes which didn't stop after $SHUTDOWN_WAIT seconds"
+ echo -n -e "\nkilling processes which didn't stop after $SHUTDOWN_WAIT seconds"
kill -9 $kpid
fi
+
+ if [ $count -gt 0 ]; then
+ echo -n -e "\n"
+ fi
fi
rm -f /var/lock/subsys/tomcat5 /var/run/tomcat5.pid
tomcat5-5.5.link_admin_jar.patch:
admin.xml | 5 +++++
1 files changed, 5 insertions(+)
Index: tomcat5-5.5.link_admin_jar.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5.link_admin_jar.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5.link_admin_jar.patch 23 Feb 2006 00:26:54 -0000 1.1
+++ tomcat5-5.5.link_admin_jar.patch 5 Jul 2006 22:50:50 -0000 1.2
@@ -1,10 +1,11 @@
---- tomcat5-5.5.15/apache-tomcat-5.5.15-src/container/webapps/admin/admin.xml.sav 2006-02-21 12:00:06.366407000 -0500
-+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/container/webapps/admin/admin.xml 2006-02-21 12:00:29.877116000 -0500
-@@ -17,4 +17,8 @@
+--- container/webapps/admin/admin.xml.sav 2006-03-23 16:16:51.000000000 +0100
++++ container/webapps/admin/admin.xml 2006-03-23 16:17:49.000000000 +0100
+@@ -17,4 +17,9 @@
allow="127.0.0.1"/>
-->
+ <!-- Allow linking since JPackage do not install jar as copies -->
++
+ <Resources className="org.apache.naming.resources.FileDirContext"
+ allowLinking="true"/>
+
Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- tomcat5.spec 19 Jun 2006 19:03:03 -0000 1.65
+++ tomcat5.spec 5 Jul 2006 22:50:50 -0000 1.66
@@ -1,3 +1,46 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+# If you want only apis to be built,
+# give rpmbuild option '--with apisonly'
+
+%define with_apisonly %{?_with_apisonly:1}%{!?_with_apisonly:0}
+%define without_apisonly %{!?_with_apisonly:1}%{?_with_apisonly:0}
+
+# If you don't want direct ecj support to be built in,
+# while eclipse-ecj isn't available,
+# give rpmbuild option '--without ecj'
+
+%define without_ecj %{?_without_ecj:1}%{!?_without_ecj:0}
+%define with_ecj %{!?_without_ecj:1}%{?_without_ecj:0}
+
%define full_name jakarta-%{name}
%define full_jname jasper5
%define jname jasper
@@ -25,15 +68,15 @@
Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
Name: tomcat5
-Version: 5.5.15
-Release: 1jpp_7fc
+Version: 5.5.17
+Release: 3jpp_1fc
Epoch: 0
License: Apache Software License
#Vendor: JPackage Project
#Distribution: JPackage
Group: Networking/Daemons
-URL: http://jakarta.apache.org/tomcat/
-Source0: http://jakarta.apache.org/builds/jakarta-tomcat-5.5/release/v%{version}/src/%{packdname}.tar.gz
+URL: http://tomcat.apache.org/
+Source0: http://www.apache.org/dist/tomcat/tomcat-5/v%{version}/src/%{packdname}.tar.gz
Source1: %{name}-%{majversion}.init
Source2: %{name}-%{majversion}.conf
Source3: %{name}-%{majversion}.wrapper
@@ -50,7 +93,6 @@
Patch8: %{name}-%{majversion}-jasper.sh.patch
Patch9: %{name}-%{majversion}-jspc.sh.patch
Patch10: %{name}-%{majversion}-setclasspath.sh.patch
-#Patch11: %{name}-%{majversion}-jdtcompiler.patch
Patch12: %{name}-%{majversion}-util-build.patch
Patch13: %{name}-%{majversion}-http11-build.patch
Patch14: %{name}-%{majversion}-jk-build.patch
@@ -72,14 +114,21 @@
# alternatives
Requires: jndi-ldap
# And it needs its own API subpackages for running
+Requires: %{name}-common-lib = %{epoch}:%{version}-%{release}
+Requires: %{name}-server-lib = %{epoch}:%{version}-%{release}
# And it needs its own API subpackages before being installed
-PreReq: %{name}-common-lib = %{epoch}:%{version}-%{release}
-PreReq: %{name}-server-lib = %{epoch}:%{version}-%{release}
+Requires(post): %{name}-common-lib = %{epoch}:%{version}-%{release}
+Requires(post): %{name}-server-lib = %{epoch}:%{version}-%{release}
Buildrequires: jpackage-utils >= 0:1.6.0
BuildRequires: ant >= 0:1.6.2
-#BuildRequires: java-devel >= 0:1.4.2
-BuildRequires: eclipse-ecj >= 0:3.0.2
+%if %{with_apisonly}
+BuildRequires: java-devel >= 0:1.4.2
+%endif
+%if %{without_apisonly}
+%if %{with_ecj}
+BuildRequires: eclipse-ecj >= 0:3.1.1
+%endif
BuildRequires: ant-trax
BuildRequires: xalan-j2
BuildRequires: jakarta-commons-beanutils >= 1.7
@@ -110,7 +159,7 @@
BuildRequires: jakarta-taglibs-standard >= 0:1.1.0
# formerly non-free stuff
# geronimo-specs replaces non-free jta
-BuildRequires: jta >= 0:1.0.1
+BuildRequires: geronimo-jta-1.0.1B-api
# jaf can be provided by classpathx-jaf
#BuildRequires: jaf >= 0:1.0.2
BuildRequires: jaf >= 0:1.0.1
@@ -121,6 +170,7 @@
BuildRequires: java-gcj-compat-devel >= 1.0.43
Requires(post): java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
+%endif
%description
Tomcat is the servlet container that is used in the official Reference
@@ -134,6 +184,7 @@
We invite you to participate in this open development project. To
learn more about getting involved, click here.
+%if %{without_apisonly}
%package webapps
Group: System Environment/Applications
PreReq: %{name} = %{epoch}:%{version}-%{release}
@@ -151,6 +202,7 @@
%description admin-webapps
The administrative web applications (admin and manager) for Jakarta Tomcat
+%endif
%package servlet-%{servletspec}-api
Group: Internet/WWW/Dynamic Content
@@ -214,32 +266,51 @@
Contains the javadoc generated documentation for the implementation classes
of the Jakarta Tomcat JSP API (packages javax.servlet.jsp).
+%if %{without_apisonly}
%package common-lib
Group: Development/Compilers
Summary: Libraries needed to run the Tomcat Web container (part)
-PreReq: ant >= 0:1.6.2
-PreReq: java >= 0:1.4.2
-PreReq: eclipse-ecj >= 0:3.0.2
-PreReq: jakarta-commons-collections >= 0:3.1
-PreReq: jakarta-commons-dbcp >= 0:1.2.1
-PreReq: jakarta-commons-el >= 0:1.0
-PreReq: jakarta-commons-logging >= 0:1.0.4
+Requires: java >= 0:1.4.2
+Requires(post): jpackage-utils >= 0:1.6.0
+Requires: ant >= 0:1.6
+Requires(post): ant >= 0:1.6
+Requires: jakarta-commons-collections >= 0:3.1
+Requires(post): jakarta-commons-collections >= 0:3.1
+Requires: jakarta-commons-dbcp >= 0:1.2.1
+Requires(post): jakarta-commons-dbcp >= 0:1.2.1
+Requires: jakarta-commons-el >= 0:1.0
+Requires(post): jakarta-commons-el >= 0:1.0
+Requires: jakarta-commons-logging >= 0:1.0.4
+Requires(post): jakarta-commons-logging >= 0:1.0.4
# FIXME commons-pool is not listed in the Tomcat build.properties.default
-PreReq: jakarta-commons-pool >= 0:1.2
-# formerly non-free stuff
-# geronimo-specs replaces non-free jta
-PreReq: jta >= 0:1.0.1
+Requires: jakarta-commons-pool >= 0:1.2
+Requires(post): jakarta-commons-pool >= 0:1.2
# jaf can be provided by classpathx-jaf
-PreReq: jaf >= 0:1.0.1
+Requires: jaf >= 0:1.0.1
+Requires(post): jaf >= 0:1.0.1
# javamail can be provided by classpathx-mail
-PreReq: javamail >= 0:1.3.1
-PreReq: jdbc-stdext
-PreReq: jndi
-PreReq: mx4j >= 0:3.0.1
+Requires: javamail >= 0:1.3.1
+Requires(post): javamail >= 0:1.3.1
+Requires: jdbc-stdext
+Requires(post): jdbc-stdext
+Requires: jndi
+Requires(post): jndi
+# geronimo-specs replaces non-free jta
+Requires: geronimo-jta-1.0.1B-api
+Requires(post): geronimo-jta-1.0.1B-api
+Requires: mx4j >= 0:3.0.1
+Requires(post): mx4j >= 0:3.0.1
+%if %{with_ecj}
+Requires: eclipse-ecj >= 0:3.1.1
+Requires(post): eclipse-ecj >= 0:3.1.1
+%endif
# Other subpackages must go in first
-PreReq: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
-PreReq: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release}
-PreReq: %{name}-%{jname} = %{epoch}:%{version}-%{release}
+Requires(post): %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
+Requires(post): %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release}
+Requires(post): %{name}-%{jname} = %{epoch}:%{version}-%{release}
+Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
+Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release}
+Requires: %{name}-%{jname} = %{epoch}:%{version}-%{release}
# libgcj aot-compiled native libraries
Requires(post): java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
@@ -250,17 +321,28 @@
%package server-lib
Group: Development/Compilers
Summary: Libraries needed to run the Tomcat Web container (part)
-PreReq: jakarta-commons-beanutils >= 0:1.7.0
-PreReq: jakarta-commons-digester >= 0:1.6
-PreReq: jakarta-commons-el >= 0:1.0
-PreReq: jakarta-commons-fileupload >= 0:1.0-1jpp
-PreReq: jakarta-commons-logging >= 0:1.0.4
-PreReq: jakarta-commons-modeler >= 1.1
-PreReq: jaas
-PreReq: mx4j >= 0:3.0.1
-PreReq: regexp >= 0:1.3
+Requires(post): jpackage-utils >= 0:1.6.0
+Requires: jakarta-commons-beanutils >= 0:1.7.0
+Requires(post): jakarta-commons-beanutils >= 0:1.7.0
+Requires: jakarta-commons-digester >= 0:1.6
+Requires(post): jakarta-commons-digester >= 0:1.6
+Requires: jakarta-commons-el >= 0:1.0
+Requires(post): jakarta-commons-el >= 0:1.0
+Requires: jakarta-commons-fileupload >= 0:1.0-1jpp
+Requires(post): jakarta-commons-fileupload >= 0:1.0-1jpp
+Requires: jakarta-commons-logging >= 0:1.0.4
+Requires(post): jakarta-commons-logging >= 0:1.0.4
+Requires: jakarta-commons-modeler >= 1.1
+Requires(post): jakarta-commons-modeler >= 1.1
+Requires: jaas
+Requires(post): jaas
+Requires: mx4j >= 0:3.0.1
+Requires(post): mx4j >= 0:3.0.1
+Requires: regexp >= 0:1.3
+Requires(post): regexp >= 0:1.3
# Other subpackages must go in first
-PreReq: %{name}-%{jname} = %{epoch}:%{version}-%{release}
+Requires: %{name}-%{jname} = %{epoch}:%{version}-%{release}
+Requires(post): %{name}-%{jname} = %{epoch}:%{version}-%{release}
# libgcj aot-compiled native libraries
Requires(post): java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
@@ -289,34 +371,50 @@
%description %{jname}-javadoc
Javadoc for generated documentation %{name}-%{jname}
+%endif
%prep
+cat <<EOT
+
+ If you want only apis to be built,
+ give rpmbuild option '--with apisonly'
+
+ If you don''t want direct ecj support to be built in,
+ while eclipse-ecj isn''t available,
+ give rpmbuild option '--without ecj'
+
+
+EOT
+
rm -rf $RPM_BUILD_DIR/%{name}-%{version}
%setup -q -c -T -a 0
cd %{packdname}
-%patch0 -p2
-%patch1 -p2
-%patch2 -p2
-%patch3 -p2
-%patch4 -p2
-%patch5 -p2
+%patch0 -b .p0
+%patch1 -b .p1
+%patch2 -b .p2
+%patch3 -b .p3
+%patch4 -b .p4
+%patch5 -b .p5
#%patch6 -p1
-%patch7 -p2
-%patch8 -p2
-%patch9 -p2
-%patch10 -p2
-##%patch11 -p1
-%patch12 -p2
-%patch13 -p2
-%patch14 -p2
-%patch15 -p2
-%patch16 -p2
-%patch17 -p2
+%patch7 -b .p7
+%patch8 -b .p8
+%patch9 -b .p9
+%patch10 -b .p10
+# omit jdtcompilerpatch for eclipse-ecj >= 3.1
+#%patch11 -b .p11
+%patch12 -b .p12
+%patch13 -b .p13
+%patch14 -b .p14
+#%patch15 -b .p15
+
+%if %{without_ecj}
+rm %{jname}/src/share/org/apache/jasper/compiler/JDTCompiler.java
+%endif
%build
-export CLASSPATH=%(build-classpath xml-commons-apis xalan-j2)
+#clp#export CLASSPATH=%(build-classpath xml-commons-apis xalan-j2)
# Remove pre-built jars
for dir in $RPM_BUILD_DIR/%{name}-%{version}/%{packdname} ; do
@@ -346,10 +444,11 @@
popd
popd
+%if %{without_apisonly}
# build jasper subpackage
-CLASSPATH=%(build-classpath xml-commons-apis xalan-j2)
-export CLASSPATH=$CLASSPATH:$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar
-pushd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/%{jname}/jasper2
+#clp#CLASSPATH=%(build-classpath xml-commons-apis xalan-j2)
+#clp#export CLASSPATH=$CLASSPATH:$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/jakarta-servletapi-5/jsr154/dist/lib/servlet-api.jar
+pushd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/%{jname}
cat > build.properties <<EOBP
ant.jar=$(build-classpath ant)
servlet-api.jar=$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar
@@ -363,6 +462,7 @@
commons-logging.jar=$(build-classpath commons-logging)
commons-daemon.jar=$(build-classpath commons-daemon)
junit.jar=$(build-classpath junit)
+jasper-compiler-jdt.jar=$(build-classpath jdtcore)
EOBP
# can't use jikes to build tomcat4 (strange)
ant -Djava.home=%{java_home} -Dbuild.compiler=modern javadoc
@@ -374,7 +474,7 @@
ant.jar=%{_javadir}/ant.jar
ant-launcher.jar=%{_javadir}/ant.jar
jtc.home=$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/connectors/
-%{jname}.home=$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/%{jname}/jasper2
+%{jname}.home=$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/%{jname}
commons-beanutils.jar=$(build-classpath commons-beanutils)
commons-fileupload.jar=$(build-classpath commons-fileupload)
commons-collections.jar=$(build-classpath commons-collections)
@@ -402,7 +502,7 @@
struts.lib=%{_datadir}/struts
activation.jar=$(build-classpath jaf)
mail.jar=$(build-classpath javamail/mailapi)
-jta.jar=$(build-classpath jta)
+jta.jar=$(build-classpath geronimo-jta-1.0.1B-api)
jaas.jar=$(build-classpath jaas)
jndi.jar=$(build-classpath jndi)
jdbc20ext.jar=$(build-classpath jdbc-stdext)
@@ -419,7 +519,7 @@
# build the connectors
pushd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/connectors
# use the JARs created above to build
- export CLASSPATH=$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar:$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/build/build/server/lib/catalina.jar
+export CLASSPATH=$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar:$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/jakarta-tomcat-5/build/server/lib/catalina.jar
cat > build.properties << EOBP
activation.jar=$(build-classpath jaf)
ant.jar=%{_javadir}/ant.jar
@@ -437,34 +537,40 @@
jmx.jar=$(build-classpath mx4j/mx4j-jmx)
activation.jar=$(build-classpath jaf)
mail.jar=$(build-classpath javamail/mailapi)
-jta.jar=$(build-classpath jta)
+jta.jar=$(build-classpath geronimo-jta-1.0.1B-api)
jaas.jar=$(build-classpath jaas)
jndi.jar=$(build-classpath jndi)
jdbc20ext.jar=$(build-classpath jdbc-stdext)
jcert.jar=$(build-classpath jsse/jcert)
jnet.jar=$(build-classpath jsse/jnet)
jsse.jar=$(build-classpath jsse/jsse)
+tomcat5.home=../../build/build
EOBP
ant -Dbuild.compiler=modern -Djava.home=%{java_home} build
popd
+%endif
%install
rm -rf $RPM_BUILD_ROOT
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+%if %{without_apisonly}
CLASSPATH=%(build-classpath xalan-j2 xml-commons-apis jakarta-taglibs-core jakarta-taglibs-standard)
export CLASSPATH=$CLASSPATH:$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar
# build initial path structure
-install -d -m 755 $RPM_BUILD_ROOT/{%{confdir},%{logdir},%{homedir},%{bindir}}
-install -d -m 755 $RPM_BUILD_ROOT/{%{serverdir},%{tempdir},%{workdir}}
-install -d -m 755 $RPM_BUILD_ROOT/{%{appdir},%{commondir},%{shareddir}}
-install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/{init.d,logrotate.d}
-install -d -m 755 $RPM_BUILD_ROOT/{%{_bindir},%{_javadir}}
+install -d -m 755 $RPM_BUILD_ROOT{%{confdir},%{logdir},%{homedir},%{bindir}}
+install -d -m 755 $RPM_BUILD_ROOT{%{serverdir},%{tempdir},%{workdir}}
+install -d -m 755 $RPM_BUILD_ROOT{%{appdir},%{commondir},%{shareddir}}
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/{init.d,logrotate.d}
+install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -m 755 %{SOURCE5} $RPM_BUILD_ROOT/%{bindir}/relink
# SysV init and configuration
install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
-install %{SOURCE2} $RPM_BUILD_ROOT/%{confdir}/%{name}.conf
+install %{SOURCE2} $RPM_BUILD_ROOT%{confdir}/%{name}.conf
pushd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/build
export usejikes=false
+ export OPT_JAR_LIST="ant/ant-trax xalan-j2-serializer"
ant -Dbuild.compiler=modern -Djava.home=%{java_home} dist
pushd dist
mv bin/* $RPM_BUILD_ROOT%{bindir}
@@ -530,22 +636,73 @@
perl -pi -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g;" $i
done
# Remove local JARs (to be replaced with jpp links in post)
-pushd $RPM_BUILD_ROOT/%{serverdir}/lib
+pushd $RPM_BUILD_ROOT%{serverdir}/lib
find . -name "*.jar" -not -name "catalina*" \
-not -name "servlets-*" \
-not -name "tomcat-*" | xargs -t rm -f
# catalina-ant will be installed in a public repository
- mv catalina-ant.jar $RPM_BUILD_ROOT/%{_javadir}/catalina-ant-%{version}.jar
- pushd $RPM_BUILD_ROOT/%{_javadir}
+ mv catalina-ant.jar $RPM_BUILD_ROOT%{_javadir}/catalina-ant-%{version}.jar
+ pushd $RPM_BUILD_ROOT%{_javadir}
ln -fs catalina-ant-%{version}.jar catalina-ant5.jar
popd
+ # catalina* jars will be installed in a public repository
+ for i in catalina*.jar; do
+ j=`echo $i | sed 's:\.jar$::'`
+ mv $j.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$j-%{version}.jar
+ pushd $RPM_BUILD_ROOT%{_javadir}/%{name}
+ ln -sf $j-%{version}.jar $j.jar
+ popd
+ ln -sf %{_javadir}/%{name}/$j.jar $j.jar
+ done
+ # servlets* jars will be installed in a public repository
+ for i in servlets-*.jar; do
+ j=`echo $i | sed 's:\.jar$::'`
+ mv $j.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$j-%{version}.jar
+ pushd $RPM_BUILD_ROOT%{_javadir}/%{name}
+ ln -sf $j-%{version}.jar $j.jar
+ popd
+ ln -sf %{_javadir}/%{name}/$j.jar $j.jar
+ done
+ # tomcat* jars will be installed in a public repository
+ for i in tomcat-*.jar; do
+ j=`echo $i | sed 's:\.jar$::'`
+ mv $j.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$j-%{version}.jar
+ pushd $RPM_BUILD_ROOT%{_javadir}/%{name}
+ ln -sf $j-%{version}.jar $j.jar
+ popd
+ ln -sf %{_javadir}/%{name}/$j.jar $j.jar
+ done
popd
# Process admin webapp server/webapps/admin
-pushd $RPM_BUILD_ROOT/%{serverdir}/webapps/admin/WEB-INF/lib
+pushd $RPM_BUILD_ROOT%{serverdir}/webapps/admin/WEB-INF/lib
find . -name "*.jar" -not -name 'catalina-admin*' | xargs -t rm -f
+ for i in catalina-admin; do
+ cp $i.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$i-%{version}.jar
+ pushd $RPM_BUILD_ROOT%{_javadir}/%{name}
+ ln -sf $i-%{version}.jar $i.jar
+ popd
+ done
+popd
+# Process manager webapp server/webapps/manager
+pushd $RPM_BUILD_ROOT%{serverdir}/webapps/manager/WEB-INF/lib
+ for i in catalina-manager; do
+ cp $i.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$i-%{version}.jar
+ pushd $RPM_BUILD_ROOT%{_javadir}/%{name}
+ ln -sf $i-%{version}.jar $i.jar
+ popd
+ done
+popd
+# Process host-manager webapp server/webapps/host-manager
+pushd $RPM_BUILD_ROOT%{serverdir}/webapps/host-manager/WEB-INF/lib
+ for i in catalina-host-manager; do
+ cp $i.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$i-%{version}.jar
+ pushd $RPM_BUILD_ROOT%{_javadir}/%{name}
+ ln -sf $i-%{version}.jar $i.jar
+ popd
+ done
popd
# Process common/lib
-pushd $RPM_BUILD_ROOT/%{commondir}/lib
+pushd $RPM_BUILD_ROOT%{commondir}/lib
find . -name "*.jar" -not -name "%{jname}*" \
-not -name "naming*" | xargs -t rm -f
# jasper's jars will be installed in a public repository
@@ -554,12 +711,20 @@
mv $i.jar $RPM_BUILD_ROOT%{_javadir}/$j-%{version}.jar
pushd $RPM_BUILD_ROOT%{_javadir}
ln -sf $j-%{version}.jar $j.jar
- ln -sf $j-%{version}.jar $i.jar
popd
done
+ # naming* jars will be installed in a public repository
+ for i in naming-*.jar; do
+ j=`echo $i | sed 's:\.jar$::'`
+ mv $j.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$j-%{version}.jar
+ pushd $RPM_BUILD_ROOT%{_javadir}/%{name}
+ ln -sf $j-%{version}.jar $j.jar
+ popd
+ ln -sf %{_javadir}/%{name}/$j.jar $j.jar
+ done
popd
# Process common/endorsed
-pushd $RPM_BUILD_ROOT/%{commondir}/endorsed
+pushd $RPM_BUILD_ROOT%{commondir}/endorsed
find . -name "*.jar" | xargs -t rm -f
popd
# avoid duplicate servlet.jar
@@ -580,6 +745,7 @@
cd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}
find $RPM_BUILD_ROOT%{homedir} -type l -maxdepth 1 | \
sed s+$RPM_BUILD_ROOT++g > homelinks
+%endif
# begin servlet api subpackage install
pushd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/servletapi
install -m 644 jsr154/dist/lib/servlet-api.jar \
@@ -618,11 +784,12 @@
ln -s %{name}-jsp-%{jspspec}-api-%{version} \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-jsp-%{jspspec}-api
popd
+%if %{without_apisonly}
# begin jasper subpackage install
pushd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/%{jname}
- install -m755 jasper2/src/bin/jspc.sh \
+ install -m755 src/bin/jspc.sh \
$RPM_BUILD_ROOT%{_bindir}/jspc5.sh
- install -m755 jasper2/src/bin/%{jname}.sh \
+ install -m755 src/bin/%{jname}.sh \
$RPM_BUILD_ROOT%{_bindir}/%{full_jname}.sh
popd
pushd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/container
@@ -632,7 +799,7 @@
# javadoc
install -d -m755 $RPM_BUILD_ROOT%{_javadocdir}/%{jname}-%{version}
pushd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/%{jname}
- cp -pr jasper2/build/javadoc/* \
+ cp -pr build/javadoc/* \
$RPM_BUILD_ROOT%{_javadocdir}/%{jname}-%{version}
# ghost symlink
ln -s %{jname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{jname}
@@ -645,10 +812,12 @@
# sample.war is a malformed zip file
aot-compile-rpm --exclude /var/lib/tomcat5/webapps/tomcat-docs/appdev/sample/sample.war
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
+%if %{without_apisonly}
%post
# install tomcat5 (but don't activate)
/sbin/chkconfig --add %{name}
@@ -688,11 +857,15 @@
build-jar-repository %{commondir}/lib ant commons-collections commons-dbcp \
commons-el commons-logging-api \
commons-pool jaf javamail jdbc-stdext \
- jndi jsp jta \
+ jndi jsp geronimo-jta-1.0.1B-api \
mx4j/mx4j \
servlet %{jname}5-compiler \
- eclipse-ecj \
%{jname}5-runtime 2>&1
+%if %{with_ecj}
+pushd %{commondir}/lib
+ln -sf %{_javadir}/jdtcore.jar .
+popd
+%endif
%{_bindir}/rebuild-gcj-db
%postun common-lib
@@ -715,8 +888,12 @@
commons-digester commons-el \
commons-fileupload commons-logging \
commons-modeler jaas mx4j/mx4j \
- eclipse-ecj \
regexp 2>&1
+%if %{with_ecj}
+pushd %{serverdir}/lib
+ln -sf %{_javadir}/jdtcore.jar .
+popd
+%endif
%{_bindir}/rebuild-gcj-db
%postun server-lib
@@ -755,6 +932,7 @@
%postun admin-webapps
%{_bindir}/rebuild-gcj-db
+%endif
%post servlet-%{servletspec}-api
update-alternatives --install %{_javadir}/servlet.jar servlet \
@@ -793,6 +971,7 @@
fi
%{_bindir}/rebuild-gcj-db
+%if %{without_apisonly}
%preun
# Always clean up workdir and tempdir on upgrade/removal
rm -fr %{workdir}/* %{tempdir}/*
@@ -841,7 +1020,9 @@
%{_sbindir}/groupadd -g %{tcuid} -r tomcat 2> /dev/null || :
%{_sbindir}/useradd -c "Tomcat" -u %{tcuid} -g tomcat \
-s /bin/sh -r -d %{homedir} tomcat 2> /dev/null || :
+%endif
+%if %{without_apisonly}
%files -f %{packdname}/homelinks
%defattr(644,root,root,755)
%doc %{packdname}/build/{LICENSE,RELE*,RUNNING.txt,BENCHMARKS.txt}
@@ -902,12 +1083,23 @@
%files common-lib
%defattr(644,root,root,755)
+%dir %{_javadir}/%{name}
+%{_javadir}/%{name}/naming*.jar
%{commondir}/lib/*
%attr(-,root,root) %{_libdir}/gcj/%{name}/naming-*
%files server-lib
%defattr(644,root,root,755)
%{_javadir}/catalina*.jar
+%dir %{_javadir}/%{name}
+%{_javadir}/%{name}/catalina-ant-jmx*.jar
+%{_javadir}/%{name}/catalina-cluster*.jar
+%{_javadir}/%{name}/catalina.jar
+%{_javadir}/%{name}/catalina-%{version}.jar
+%{_javadir}/%{name}/catalina-optional*.jar
+%{_javadir}/%{name}/catalina-storeconfig*.jar
+%{_javadir}/%{name}/servlets*.jar
+%{_javadir}/%{name}/tomcat*.jar
%{serverdir}/lib/*
%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-ant*
%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-cluster*
@@ -951,6 +1143,9 @@
%{appdir}/balancer/*
%dir %{serverdir}/webapps
%{serverdir}/webapps/*
+%attr(644,root,root) %{_javadir}/%{name}/catalina-admin*.jar
+%attr(644,root,root) %{_javadir}/%{name}/catalina-manager*.jar
+%attr(644,root,root) %{_javadir}/%{name}/catalina-host-manager*.jar
%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-admin*
%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-balancer*
%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-host-manager*
@@ -959,9 +1154,8 @@
%files %{jname}
%defattr(644,root,root,755)
-%doc $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/%{jname}/jasper2/doc/jspc.html
+%doc $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/%{jname}/doc/jspc.html
%{_javadir}/%{jname}5-*.jar
-%{_javadir}/%{jname}-*.jar
%attr(755,root,root) %{_bindir}/%{jname}*.sh
%attr(755,root,root) %{_bindir}/jspc*.sh
%attr(-,root,root) %{_libdir}/gcj/%{name}/%{jname}5-*
@@ -970,6 +1164,7 @@
%defattr(0644,root,root,0755)
%{_javadocdir}/%{jname}-%{version}
%ghost %doc %{_javadocdir}/%{jname}
+%endif
%files servlet-%{servletspec}-api
%defattr(-,root,root)
@@ -996,9 +1191,52 @@
%ghost %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api
%changelog
+* Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_1fc
+- Upgrade
+
+* Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_1rh
+- Merge with upstream
+
+* Fri Jun 30 2006 Ralph Apel <r.apel at r-apel.de> 0:5.5.17-3jpp
+- Create option --with apisonly to build just tomcat5-servlet-2.4-api,
+ tomcat5-jsp-2.0-api and its -javadoc subpackages
+- Create option --without ecj to build even when eclipse-ecj not available
+- Drop several unnecessary export CLASSPATH=
+
* Sat Jun 17 2006 Deepak Bhole <dbhole at redhat.com> - 0:5.5.15-1jpp_7fc
- Re-enable ppc64, s390 and s390x architectures now that eclipse is built there
+* Mon May 15 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-2jpp_1rh
+- Merge with upstream for upgrade to 5.5.17
+
+* Mon May 15 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-2jpp
+- Requires on post things that are linked to at post
+ Merge changes from downstream:
+- Fix line breaks in the tomcat5 init script
+- Split preun section among main package and the two new subpackages
+- Move catalina-ant*.jar to the server-lib subpackage to avoid circular
+ dependency with the main package
+- Remove leading zero from alternative priorities
+- Rebuild with new classpath-mail as javamail alternative
+- Update versions of dependencies and move them to library subpackages
+- Use only jta from geronimo-specs
+
+* Mon May 15 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-1jpp
+- Upgrade to 5.5.17
+- Remove jasper2 subdirectory of jasper from patches and this spec file
+
+* Wed Apr 19 2006 Ralph Apel <r.apel at r-apel.de> 0:5.5.16-3jpp
+- Drop jdtCompilerAdapter from build-jar-repository
+- Use ant-trax in static webapp build
+- Duplicate admin-webapps jars in _javadir and make them world readable
+- Direct install of common-lib and server-lib to _javadir and symlink for TC5
+
+* Tue Apr 04 2006 Ralph Apel <r.apel at r-apel.de> 0:5.5.16-2jpp
+- Require eclipse-ecj >= 3.1.1 and adapt to it
+
+* Fri Mar 24 2006 Ralph Apel <r.apel at r-apel.de> 0:5.5.16-1jpp
+- Upgrade to 5.5.16
+
* Mon Mar 6 2006 Jeremy Katz <katzj at redhat.com> - 0:5.5.15-1jpp_6fc
- stop scriptlet spew
@@ -1021,64 +1259,28 @@
* Wed Feb 22 2006 Rafael Schloming <rafaels at redhat.com> - 0:5.5.15-1jpp_1fc
- Updated to 5.5.15
-* Thu Dec 02 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp_11rh
-- Split preun section among main package and the two new subpackages
-
-* Tue Nov 29 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp_10rh
-- Move catalina-ant*.jar to the server-lib subpackage to avoid circular
- dependency with the main package
-
-* Tue Nov 15 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp_9rh
-- Remove leading zero from alternative priorities
-
-* Mon Nov 14 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp_8rh
-- Rebuild with new classpath-mail as javamail alternative
-
-* Mon Nov 14 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp_7rh
-- Update versions of dependencies and move them to library subpackages
-
-* Fri Nov 11 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp_6rh
-- Fix typo that caused links to be missing
-
-* Fri Nov 11 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp_5rh
-- Use only jta from geronimo-specs
-
-* Fri Nov 11 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp_4rh
- From Deepak Bhole <dbhole at redhat.com>
-- Fix init script so it works with SELinux
+* Tue Feb 14 2006 Ralph Apel <r.apel at r-apel.de> 0:5.5.12-2jpp
+- Fix jta.jar location
-* Fri Nov 11 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp_3rh
+* Fri Nov 11 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp
- Place jsp in its own subpackage
+- Fix alternative links to jsp and servlet
- Fix alternative priorities to jsp and servlet
- Create library subpackages: common-lib and server-lib
-
-* Tue Oct 25 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp_2rh
-- Fix versions in patch
-
-* Sat Oct 22 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp_1rh
-- Merge with upstream
-- Fix alternative links to jsp and servlet
-
-* Sat Oct 22 2005 Vadim Nasardinov <vadimn at redhat.com> 0:5.5.12-1jpp
+ From Vadim Nasardinov <vadimn at redhat.com> 0:5.5.12-1jpp
- Upgrade to 5.5.12
+ From Deepak Bhole <dbhole at redhat.com>
+- Fix init script so it works with SELinux
-* Wed Jul 06 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.9-1jpp_5rh
-- Reinstate ssl code changes so that tomcat can be built with other SDKs
- and not only with Sun's or BEA's.
-
-* Fri Jun 24 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.9-1jpp_4rh
-- Make sure the main package installs first so user tomcat is created
-
-* Fri Jun 17 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.9-1jpp_3rh
-- Remove spurious dependency on tyrex (only needed for tomcat4)
-
-* Fri Jun 10 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.9-1jpp_2rh
-- Remove spurious links to log4j.jar from common and server/lib
-
-* Wed Jun 08 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.9-1jpp_1rh
+* Wed Jun 08 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.9-1jpp
- Merge for upgrade
- Change the user to tomcat from tomcat4
- Relax permissions on appdir directory so jonas package can build
+- Remove spurious links to log4j.jar from common and server/lib
+- Remove spurious dependency on tyrex (only needed for tomcat4)
+- Make sure the main package installs first so user tomcat is created
+- Reinstate ssl code changes so that tomcat can be built with other SDKs
+ and not only with Sun's or BEA's.
* Mon May 09 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.9-1jpp
- Upgrade to 5.5.9
More information about the fedora-cvs-commits
mailing list