rpms/tomcat5/devel tomcat5-5.5-unversioned-commons-logging-jar.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 sources, 1.12, 1.13 tomcat5-5.5-catalina.sh.patch, 1.5, 1.6 tomcat5-5.5-connectors-util-build.patch, 1.2, 1.3 tomcat5-5.5-jasper.sh.patch, 1.3, 1.4 tomcat5-5.5-jk-build.patch, 1.4, 1.5 tomcat5-5.5-jspc-classpath.patch, 1.3, 1.4 tomcat5-5.5-jspc.sh.patch, 1.3, 1.4 tomcat5-5.5-util-build.patch, 1.3, 1.4 tomcat5-5.5.conf, 1.5, 1.6 tomcat5-5.5.init, 1.9, 1.10 tomcat5-5.5.relink, 1.6, 1.7 tomcat5.spec, 1.115, 1.116 tomcat5-5.5-acceptlangheader.patch, 1.2, NONE
David Walluck
dwalluck at fedoraproject.org
Mon Oct 13 20:58:53 UTC 2008
Author: dwalluck
Update of /cvs/pkgs/rpms/tomcat5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17806
Modified Files:
.cvsignore sources tomcat5-5.5-catalina.sh.patch
tomcat5-5.5-connectors-util-build.patch
tomcat5-5.5-jasper.sh.patch tomcat5-5.5-jk-build.patch
tomcat5-5.5-jspc-classpath.patch tomcat5-5.5-jspc.sh.patch
tomcat5-5.5-util-build.patch tomcat5-5.5.conf tomcat5-5.5.init
tomcat5-5.5.relink tomcat5.spec
Added Files:
tomcat5-5.5-unversioned-commons-logging-jar.patch
Removed Files:
tomcat5-5.5-acceptlangheader.patch
Log Message:
- sync with JPackage 0:5.5.27-4
tomcat5-5.5-unversioned-commons-logging-jar.patch:
--- NEW FILE tomcat5-5.5-unversioned-commons-logging-jar.patch ---
--- container/catalina/src/conf/catalina.policy.orig 2008-09-25 14:35:30.007073450 -0400
+++ container/catalina/src/conf/catalina.policy 2008-09-25 14:35:50.612075193 -0400
@@ -66,7 +66,7 @@
};
// These permissions apply to the commons-logging API
-grant codeBase "file:${catalina.home}/bin/commons-logging-api-1.1.1.jar" {
+grant codeBase "file:${catalina.home}/bin/commons-logging-api.jar" {
permission java.security.AllPermission;
};
--- container/catalina/etc/bootstrap.MF.orig 2008-09-25 14:37:52.602074218 -0400
+++ container/catalina/etc/bootstrap.MF 2008-09-25 14:38:01.479074247 -0400
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
Main-Class: org.apache.catalina.startup.Bootstrap
-Class-Path: jmx.jar commons-daemon.jar commons-logging-api-1.1.1.jar tomcat-juli.jar
+Class-Path: jmx.jar commons-daemon.jar commons-logging-api.jar tomcat-juli.jar
Specification-Title: Catalina
Specification-Version: 1.0
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 8 Feb 2008 22:06:50 -0000 1.14
+++ .cvsignore 13 Oct 2008 20:58:22 -0000 1.15
@@ -1 +1,2 @@
-apache-tomcat-5.5.26-src.tar.gz
+apache-tomcat-5.5.27-src.tar.gz
+tomcat5-poms-5.5.27.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 8 Feb 2008 22:06:50 -0000 1.12
+++ sources 13 Oct 2008 20:58:22 -0000 1.13
@@ -1 +1,2 @@
-642b6526354cb18c5b5d77ebef8109ae apache-tomcat-5.5.26-src.tar.gz
+eb3f196013550b9b1684e4ff18593a8e apache-tomcat-5.5.27-src.tar.gz
+c110d4d1a33321eec645f2e58214f25a tomcat5-poms-5.5.27.tar.bz2
tomcat5-5.5-catalina.sh.patch:
Index: tomcat5-5.5-catalina.sh.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-catalina.sh.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tomcat5-5.5-catalina.sh.patch 14 Jul 2008 14:57:09 -0000 1.5
+++ tomcat5-5.5-catalina.sh.patch 13 Oct 2008 20:58:23 -0000 1.6
@@ -1,6 +1,6 @@
---- container/catalina/src/bin/catalina.sh.sav 2008-07-14 10:48:13.000000000 -0400
-+++ container/catalina/src/bin/catalina.sh 2008-07-14 10:51:27.000000000 -0400
-@@ -64,6 +64,11 @@
+--- 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,11 @@
Darwin*) darwin=true;;
esac
@@ -12,7 +12,7 @@
# resolve links - $0 may be a softlink
PRG="$0"
-@@ -111,30 +116,73 @@
+@@ -97,30 +100,73 @@
export QIBM_MULTI_THREADED=Y
fi
@@ -35,14 +35,14 @@
- fi
+if [ -z "$CATALINA_HOME" ]; then
+ [ -r "$TOMCAT_CFG" ] && . "${TOMCAT_CFG}"
- fi
-
++fi
++
+### Set up defaults if they were omitted in TOMCAT_CFG
+### JVM lookup
+if [ -z "$JAVA_HOME" ]; then
+ # Search for java in PATH
+ JAVA=`which java`
-+ if [ -n "$JAVA" ] ; then
++ if [ -z "$JAVA" ] ; then
+ JAVA_BINDIR=`dirname ${JAVA}`
+ JAVA_HOME="${JAVA_BINDIR}/.."
+ fi
@@ -79,8 +79,8 @@
+ echo "Found JAVA_HOME: ${JAVA_HOME}"
+ echo "Please complete your ${TOMCAT_CFG} so we won't have to look for it next time"
+ fi
-+fi
-+
+ fi
+
+# Set standard commands for invoking Java.
+_RUNJAVA="$JAVA_HOME"/bin/java
+_RUNJAVAC="$JAVA_HOME"/bin/javac
@@ -104,7 +104,7 @@
if [ -z "$CATALINA_BASE" ] ; then
CATALINA_BASE="$CATALINA_HOME"
-@@ -145,6 +193,10 @@
+@@ -131,6 +179,10 @@
CATALINA_TMPDIR="$CATALINA_BASE"/temp
fi
@@ -112,10 +112,10 @@
+ export CATALINA_PID=/var/run/tomcat5.pid
+fi
+
- # Bugzilla 37848: When no TTY is available, don't output to console
- have_tty=0
- if [ "`tty`" != "not a tty" ]; then
-@@ -318,7 +370,7 @@
+ # For Cygwin, switch paths to Windows format before running java
+ if $cygwin; then
+ JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
+@@ -290,7 +342,7 @@
else
tomcat5-5.5-connectors-util-build.patch:
Index: tomcat5-5.5-connectors-util-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-connectors-util-build.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tomcat5-5.5-connectors-util-build.patch 14 Jul 2008 16:26:18 -0000 1.2
+++ tomcat5-5.5-connectors-util-build.patch 13 Oct 2008 20:58:23 -0000 1.3
@@ -4,7 +4,7 @@
<available property="commons-logging.present" file="${commons-logging.jar}"/>
<available property="modeler.present" file="${commons-modeler.jar}"/>
<available property="jdk1.4.present" classname="java.lang.CharSequence" />
-+ <condition property="build.javac.source" value="5.0" else="1.4">
++ <condition property="build.javac.source" value="1.5" else="1.4">
<available property="jdk1.5.present" classname="javax.net.ssl.CertPathTrustManagerParameters" />
+ </condition>
</target>
tomcat5-5.5-jasper.sh.patch:
Index: tomcat5-5.5-jasper.sh.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-jasper.sh.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tomcat5-5.5-jasper.sh.patch 16 May 2007 10:57:12 -0000 1.3
+++ tomcat5-5.5-jasper.sh.patch 13 Oct 2008 20:58:23 -0000 1.4
@@ -45,7 +45,7 @@
+ commons-daemon \
+ commons-el \
+ commons-logging \
-+ eclipse-ecj.jar \
++ ecj.jar \
+ jasper5-compiler \
+ jasper5-runtime \
+ jsp \
tomcat5-5.5-jk-build.patch:
Index: tomcat5-5.5-jk-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-jk-build.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tomcat5-5.5-jk-build.patch 14 Jul 2008 16:26:18 -0000 1.4
+++ tomcat5-5.5-jk-build.patch 13 Oct 2008 20:58:23 -0000 1.5
@@ -1,6 +1,6 @@
---- connectors/jk/build.xml.p14 2008-07-14 11:55:14.000000000 -0400
-+++ connectors/jk/build.xml 2008-07-14 11:58:29.000000000 -0400
-@@ -45,7 +45,7 @@
+--- 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" />
@@ -9,7 +9,7 @@
<!-- default locations, overrident by properties -->
<property name="base.path" location="/usr/share/java"/>
-@@ -230,6 +230,7 @@
+@@ -211,6 +211,7 @@
<exclude name="org/apache/jk/ant/**" />
<classpath>
<pathelement location="${tomcat-apr.jar}" />
@@ -17,7 +17,7 @@
<path refid="xml-apis.classpath"/>
<path refid="build-main.classpath"/>
</classpath>
-@@ -269,6 +270,7 @@
+@@ -252,6 +252,7 @@
<include name="org/apache/coyote/ajp/**"/>
<include name="org/apache/jk/config/**"/>
<classpath>
tomcat5-5.5-jspc-classpath.patch:
Index: tomcat5-5.5-jspc-classpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-jspc-classpath.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tomcat5-5.5-jspc-classpath.patch 14 Jul 2008 16:26:18 -0000 1.3
+++ tomcat5-5.5-jspc-classpath.patch 13 Oct 2008 20:58:23 -0000 1.4
@@ -4,7 +4,7 @@
<path id="jspc.classpath">
<pathelement location="${java.home}/../lib/tools.jar"/>
-+ <pathelement location="/usr/lib/jvm/java/jre/lib/rt.jar"/>
++ <pathelement location="@JAVA_HOME@/jre/lib/rt.jar"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${tomcat.build}/server/classes"/>
<fileset dir="${tomcat.build}/server/lib">
tomcat5-5.5-jspc.sh.patch:
Index: tomcat5-5.5-jspc.sh.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-jspc.sh.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tomcat5-5.5-jspc.sh.patch 14 Jul 2008 16:26:18 -0000 1.3
+++ tomcat5-5.5-jspc.sh.patch 13 Oct 2008 20:58:23 -0000 1.4
@@ -1,6 +1,6 @@
---- jasper/src/bin/jspc.sh.sav 2008-07-14 11:30:15.000000000 -0400
-+++ jasper/src/bin/jspc.sh 2008-07-14 11:31:25.000000000 -0400
-@@ -21,32 +21,9 @@
+--- 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-util-build.patch:
Index: tomcat5-5.5-util-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-util-build.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tomcat5-5.5-util-build.patch 14 Jul 2008 16:26:18 -0000 1.3
+++ tomcat5-5.5-util-build.patch 13 Oct 2008 20:58:23 -0000 1.4
@@ -1,6 +1,6 @@
---- connectors/util/build.xml.sav 2008-07-14 12:19:19.000000000 -0400
-+++ connectors/util/build.xml 2008-07-14 12:19:55.000000000 -0400
-@@ -40,7 +40,7 @@
+--- 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" />
@@ -9,7 +9,7 @@
<path id="compile.classpath">
<pathelement location="${jmx.jar}" />
-@@ -90,7 +90,10 @@
+@@ -73,7 +73,10 @@
optimize="off"
verbose="off"
excludes="**/CVS/**">
Index: tomcat5-5.5.conf
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tomcat5-5.5.conf 16 Nov 2007 20:44:14 -0000 1.5
+++ tomcat5-5.5.conf 13 Oct 2008 20:58:23 -0000 1.6
@@ -2,7 +2,7 @@
# you could also override JAVA_HOME here
# Where your java installation lives
-JAVA_HOME="/usr/lib/jvm/java"
+#JAVA_HOME="/usr/lib/jvm/java"
# Where your tomcat installation lives
# That change from previous RPM where TOMCAT_HOME
@@ -18,7 +18,7 @@
#JAVA_OPTS="-Xminf0.1 -Xmaxf0.3"
# Use JAVA_OPTS to set java.library.path for libtcnative.so
-#JAVA_OPTS="-Djava.library.path=@@@LIBDIR@@@
+#JAVA_OPTS="-Djava.library.path=@@@LIBDIR@@@"
# Bug 190:
# https://www.jpackage.org/bugzilla/show_bug.cgi?id=190
@@ -41,6 +41,9 @@
# Connector port is 8080 for this tomcat5 instance
#CONNECTOR_PORT=8080
+# Change to yes if you want the tomcat init script to run the relink script
+RELINK="no"
+
# If you wish to further customize your tomcat environment,
# put your own definitions here
# (i.e. LD_LIBRARY_PATH for some jdbc drivers)
Index: tomcat5-5.5.init
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tomcat5-5.5.init 5 Jan 2008 14:08:47 -0000 1.9
+++ tomcat5-5.5.init 13 Oct 2008 20:58:23 -0000 1.10
@@ -18,9 +18,10 @@
# - heavily rewritten by Deepak Bhole and Jason Corley
#
-# Source the function library
-if [ -r "/etc/rc.d/init.d/functions" ]; then
- . /etc/rc.d/init.d/functions
+if [ -r /lib/lsb/init-functions ]; then
+ . /lib/lsb/init-functions
+else
+ exit 1
fi
NAME="$(basename $0)"
@@ -48,6 +49,10 @@
. /etc/sysconfig/${NAME}
fi
+if [ -z "${CATALINA_BASE}" ]; then
+ CATALINA_BASE="${CATALINA_HOME}"
+fi
+
# Define which connector port to use
CONNECTOR_PORT="${CONNECTOR_PORT:-8080}"
@@ -63,17 +68,21 @@
# Define the tomcat username
TOMCAT_USER="${TOMCAT_USER:-tomcat}"
-# Define the tomcat group
-TOMCAT_GROUP="${TOMCAT_GROUP:-tomcat}"
-
# Define the tomcat log file
TOMCAT_LOG="${TOMCAT_LOG:-/var/log/tomcat5/catalina.out}"
-
-test -e $TOMCAT_LOG || touch $TOMCAT_LOG
-chown $TOMCAT_USER:$TOMCAT_GROUP $TOMCAT_LOG
RETVAL="0"
+function checkpid() {
+ local i
+ for i in $* ; do
+ if [ -d "/proc/${i}" ]; then
+ return 0
+ fi
+ done
+ return 1
+}
+
# Look for open ports, as the function name might imply
function findFreePorts() {
local isSet1="false"
@@ -107,13 +116,15 @@
}
function makeHomeDir() {
- if [ ! -d "$CATALINA_HOME" ]; then
- echo "$CATALINA_HOME does not exist, creating"
+ SAVE_UMASK=$(umask)
+ umask 022
+ if [ ! -d "${CATALINA_HOME}" ]; then
+ echo "${CATALINA_HOME} does not exist, creating"
if [ ! -d "/var/lib/${NAME}" ]; then
mkdir -p /var/lib/${NAME}
- cp -pLR /var/lib/tomcat5/* /var/lib/${NAME}
+ cp -pR /var/lib/tomcat5/* /var/lib/${NAME}
fi
- mkdir -p $CATALINA_HOME ${CATALINA_HOME}/conf /var/cache/${NAME}/temp \
+ mkdir -p ${CATALINA_HOME} ${CATALINA_HOME}/conf /var/cache/${NAME}/temp \
/var/cache/${NAME}/work /var/log/${NAME}
for i in temp work; do
ln -fs /var/cache/${NAME}/${i} ${CATALINA_HOME}/${i}
@@ -123,10 +134,11 @@
done
ln -fs /var/log/${NAME} ${CATALINA_HOME}/logs
cp -pLR /etc/tomcat5/* ${CATALINA_HOME}/conf/
- cp -pLR /usr/share/tomcat5/bin $CATALINA_HOME
+ cp -pLR /usr/share/tomcat5/bin ${CATALINA_HOME}
cp -pLR /var/cache/tomcat5/work/* ${CATALINA_HOME}/work/
chown ${TOMCAT_USER}:${TOMCAT_USER} /var/log/${NAME}
fi
+ umask ${SAVE_UMASK}
}
function parseOptions() {
@@ -153,7 +165,7 @@
read kpid < /var/run/${NAME}.pid
if checkpid $kpid 2>&1; then
echo "$NAME process already running"
- echo_success
+ return -1
else
echo "lock file found but no process running for"
echo "pid $kpid, continuing"
@@ -173,14 +185,18 @@
-e "s/8009/${randomPort2}/g" -e "s/8443/${randomPort3}/g" \
${CATALINA_HOME}/conf/server.xml
fi
- $TOMCAT_RELINK_SCRIPT
+ touch $TOMCAT_LOG
+ chown ${TOMCAT_USER}:${TOMCAT_USER} $TOMCAT_LOG
+ if [ "$RELINK" = "yes" ]; then
+ $TOMCAT_RELINK_SCRIPT
+ fi
$SU - $TOMCAT_USER -c "$TOMCAT_SCRIPT start" >> $TOMCAT_LOG 2>&1
RETVAL="$?"
if [ "$RETVAL" -eq 0 ]; then
- echo_success
+ log_success_msg
touch /var/lock/subsys/${NAME}
else
- echo_failure
+ log_failure_msg
fi
echo
return $RETVAL
@@ -193,12 +209,11 @@
if checkpid $kpid 2>&1; then
echo "$0 is already running (${kpid})"
RETVAL="0"
- echo_success
else
echo "lock file found but no process running for pid $kpid"
fi
else
- pid="$(pgrep -u tomcat java)"
+ pid="$(pgrep -u ${TOMCAT_USER} -G ${TOMCAT_USER} java)"
if [ -n "$pid" ]; then
echo "$0 running (${pid}) but no PID file exists"
RETVAL="0"
@@ -212,10 +227,6 @@
function stop() {
local STOP_VERBOSE="false"
echo -n "Stopping $TOMCAT_PROG: "
- if [ ! -f /var/run/${NAME}.pid ]; then
- echo "$NAME process already stopped"
- echo_success
- fi
if [ -f "/var/lock/subsys/${NAME}" ]; then
$SU - $TOMCAT_USER -c "$TOMCAT_SCRIPT stop" >> $TOMCAT_LOG 2>&1
RETVAL="$?"
@@ -239,14 +250,14 @@
fi
kill -9 $kpid
fi
- echo_success
+ log_success_msg
if [ "$count" -gt "0" ]; then
echo -n -e "\n"
fi
fi
rm -f /var/lock/subsys/$NAME /var/run/$NAME.pid
else
- echo_failure
+ log_failure_msg
fi
fi
}
@@ -268,26 +279,34 @@
sleep 2
start
;;
- condrestart)
+ condrestart|try-restart)
if [ -f "/var/run/${NAME}.pid" ]; then
parseOptions
stop
start
fi
;;
+ reload)
+ RETVAL="3"
+ ;;
+ force-reload)
+ if [ -f "/var/run/${NAME}.pid" ]; then
+ stop
+ start
+ fi
+ ;;
status)
status
;;
version)
parseOptions
"${JAVA_HOME}/bin/java" \
- -classpath "${CATALINA_HOME}/server/lib/catalina.jar" \
+ -classpath "${CATALINA_HOME}/server/lib/[tomcat5][catalina].jar" \
org.apache.catalina.util.ServerInfo
;;
*)
- echo "Usage: $TOMCAT_PROG {start|stop|restart|condrestart|status|version}"
+ echo "Usage: $TOMCAT_PROG {start|stop|restart|condrestart|try-restart|reload|force-reload|status|version}"
exit 1
esac
exit $RETVAL
-
Index: tomcat5-5.5.relink
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5.relink,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tomcat5-5.5.relink 16 May 2007 10:57:12 -0000 1.6
+++ tomcat5-5.5.relink 13 Oct 2008 20:58:23 -0000 1.7
@@ -7,6 +7,10 @@
. @@@TCCONF@@@/tomcat5.conf
fi
+if [ -z "$CATALINA_BASE" ]; then
+ CATALINA_BASE="$CATALINA_HOME"
+fi
+
# Load JAVA_HOME
[ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/lib/jvm/java
@@ -14,10 +18,10 @@
# Relink tomcat jar repositories
for repository in $CATALINA_HOME/common/lib $CATALINA_HOME/common/endorsed \
- $CATALINA_HOME/server/lib $CATALINA_HOME/shared/lib ; do
+ $CATALINA_HOME/server/lib $CATALINA_BASE/shared/lib ; do
rebuild-jar-repository $repository
done
-for webapp in $(find $CATALINA_HOME/webapps -mindepth 1 -maxdepth 2 -type d) ; do
+for webapp in $(find $CATALINA_BASE/webapps -mindepth 1 -maxdepth 2 -type d) ; do
[ -d "$webapp/WEB-INF/lib" ] && rebuild-jar-repository $webapp/WEB-INF/lib
done
Index: tomcat5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- tomcat5.spec 14 Jul 2008 16:26:18 -0000 1.115
+++ tomcat5.spec 13 Oct 2008 20:58:23 -0000 1.116
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2007, JPackage Project
+# Copyright (c) 2000-2008, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -27,7 +27,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define _with_gcj_support 1
+
%define section free
%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
@@ -45,6 +45,7 @@
%define full_jname jasper5
%define jname jasper
%define majversion 5.5
+%define minversion 27
%define servletspec 2.4
%define jspspec 2.0
@@ -65,11 +66,12 @@
%define serverdir %{_var}/lib/%{name}/server
%define commondir %{_var}/lib/%{name}/common
%define shareddir %{_var}/lib/%{name}/shared
+%define _initrddir %{_sysconfdir}/init.d
Name: tomcat5
Epoch: 0
-Version: 5.5.26
-Release: 1.5%{?dist}
+Version: %{majversion}.%{minversion}
+Release: 4.1%{dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
Group: Networking/Daemons
@@ -81,9 +83,10 @@
Source3: %{name}-%{majversion}.wrapper
Source4: %{name}-%{majversion}.logrotate
Source5: %{name}-%{majversion}.relink
-Source6: jasper-OSGi-MANIFEST.MF
-Source7: servlet-api-OSGi-MANIFEST.MF
-Source8: jsp-api-OSGi-MANIFEST.MF
+Source6: %{name}-poms-%{version}.tar.bz2
+Source7: jasper-OSGi-MANIFEST.MF
+Source8: servlet-api-OSGi-MANIFEST.MF
+Source9: jsp-api-OSGi-MANIFEST.MF
Patch0: %{name}-%{majversion}.link_admin_jar.patch
Patch1: %{name}-%{majversion}-skip-build-on-install.patch
Patch2: %{name}-%{majversion}-jt5-build.patch
@@ -97,6 +100,7 @@
Patch12: %{name}-%{majversion}-util-build.patch
Patch13: %{name}-%{majversion}-http11-build.patch
Patch14: %{name}-%{majversion}-jk-build.patch
+Patch15: %{name}-%{majversion}-unversioned-commons-logging-jar.patch
Patch16: %{name}-%{majversion}-jspc-classpath.patch
#FIXME Disable JSP pre-compilation on ppc64, x390x and alpha
Patch18: %{name}-%{majversion}-skip-jsp-precompile.patch
@@ -104,21 +108,18 @@
# Seems to be only needed when building with ECJ for java 1.5 since
# the default source type for ecj is still 1.4
Patch19: %{name}-%{majversion}-connectors-util-build.patch
-Patch21: %{name}-%{majversion}-acceptlangheader.patch
-BuildRoot: %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root
%if ! %{gcj_support}
BuildArch: noarch
%endif
-Buildrequires: jpackage-utils >= 0:1.6.0
-BuildRequires: ant >= 0:1.6.2
-%if %{without_apisonly}
-BuildRequires: java-devel >= 0:1.4.2
-%endif
+Buildrequires: jpackage-utils >= 0:1.7.4
+BuildRequires: java-devel >= 0:1.5.0
+BuildRequires: ant >= 0:1.6.5
%if %{without_apisonly}
%if %{with_ecj}
-BuildRequires: eclipse-ecj >= 0:3.1.1
+BuildRequires: ecj >= 0:3.3.1.1
%endif
BuildRequires: ant-trax
BuildRequires: xalan-j2
@@ -129,63 +130,60 @@
BuildRequires: jakarta-commons-digester >= 0:1.7
BuildRequires: jakarta-commons-logging >= 0:1.0.4
BuildRequires: jakarta-commons-fileupload >= 0:1.0
+BuildRequires: jakarta-commons-io >= 0:1.3
BuildRequires: jakarta-commons-modeler >= 2.0
BuildRequires: jakarta-commons-pool >= 0:1.2
BuildRequires: jakarta-commons-launcher >= 0:0.9
BuildRequires: jakarta-commons-el >= 0:1.0
-BuildRequires: jaas
-BuildRequires: jdbc-stdext >= 0:2.0
-BuildRequires: jndi >= 0:1.2.1
-BuildRequires: jndi-ldap
-BuildRequires: jsse >= 0:1.0.3
BuildRequires: junit >= 0:3.8.1
-BuildRequires: mx4j >= 0:3.0.1
BuildRequires: regexp >= 0:1.3
-BuildRequires: struts >= 0:1.2.7
+BuildRequires: struts >= 0:1.2.9
BuildRequires: xerces-j2 >= 0:2.7.1
+BuildRequires: zip
# xml-commons-apis is needed by Xerces-J2
-BuildRequires: xml-commons-apis >= 1.3
+BuildRequires: xml-commons-jaxp-1.3-apis
# FIXME taglibs-standard is not listed in the Tomcat build.properties.default
BuildRequires: jakarta-taglibs-standard >= 0:1.1.0
# formerly non-free stuff
-# geronimo-specs replaces non-free jta
-# FIXME: Use geronimo-jta-1.0.1B-api once maven is added
-#BuildRequires: geronimo-jta-1.0.1B-api
-BuildRequires: jta >= 0:1.0.1
+# jta can be provided by geronimo-jta-version-api
+BuildRequires: jta_1_0_1B_api
# jaf can be provided by classpathx-jaf
-BuildRequires: jaf >= 0:1.0.1
+BuildRequires: jaf_1_0_2_api
# javamail can be provided by classpathx-mail
-BuildRequires: javamail >= 0:1.3.1
-Requires(post): xml-commons-apis >= 1.3
+BuildRequires: javamail_1_3_1_api
+Requires(post): xml-commons-jaxp-1.3-apis
# libgcj aot-compiled native libraries
%if %{gcj_support}
-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
-Requires(post): jpackage-utils >= 0:1.6.0
-Requires(post): /bin/rm
-Requires(post): /sbin/chkconfig
-Requires(post): jakarta-commons-dbcp-tomcat5
-Requires(post): jakarta-commons-collections-tomcat5
-Requires(post): jakarta-commons-pool-tomcat5
-Requires(post): findutils
-Requires(preun): /bin/rm
-Requires(post): /sbin/chkconfig
-Requires(preun): findutils
-Requires(pre): %{_sbindir}/useradd
-Requires(pre): %{_sbindir}/groupadd
+BuildRequires: java-gcj-compat-devel
%endif
-Requires: jpackage-utils >= 0:1.6.0
+Requires(post): jpackage-utils >= 0:1.7.4
+Requires(post): /bin/rm
+Requires(preun): /bin/rm
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Requires: /lib/lsb/init-functions
+Requires(preun): /lib/lsb/init-functions
+Requires(post): findutils
+Requires(preun): findutils
+Requires(pre): %{_sbindir}/useradd
+Requires(pre): %{_sbindir}/groupadd
+Requires(post): jakarta-commons-dbcp-tomcat5
+Requires(post): jakarta-commons-collections-tomcat5
+Requires(post): jakarta-commons-pool-tomcat5
+%endif
+Requires: jpackage-utils >= 0:1.7.4
# xml parsing packages
Requires: xerces-j2 >= 0:2.7.1
-Requires: xml-commons-apis >= 1.3
+Requires: xml-commons-jaxp-1.3-apis
# jakarta-commons packages
Requires: jakarta-commons-daemon >= 1.0.1
Requires: jakarta-commons-launcher >= 0:0.9
# alternatives
-Requires: java-devel >= 0:1.4.2
-Requires: jndi-ldap
+Requires: java-devel >= 0:1.5.0
+%if %{with_ecj}
+Requires: ecj >= 0:3.3.1.1
+Requires(post): ecj >= 0:3.3.1.1
+%endif
# And it needs its own API subpackages for running
Requires: %{name}-common-lib = %{epoch}:%{version}-%{release}
Requires: %{name}-server-lib = %{epoch}:%{version}-%{release}
@@ -209,65 +207,48 @@
%package webapps
Group: System Environment/Applications
# Replace PreReq
-Requires(pre): %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires: jakarta-taglibs-standard >= 0:1.1.0
-Summary: Web applications for Apache Tomcat
-Requires(post): jpackage-utils >= 0:1.6.0
-Requires(preun): findutils
-# For /bin/rm
-Requires(preun): coreutils
-
-%if %{gcj_support}
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-%endif
+Requires(pre): %{name} = %{epoch}:%{version}-%{release}
+Requires(postun): %{name} = %{epoch}:%{version}-%{release}
+Requires: jakarta-taglibs-standard >= 0:1.1.0
+Summary: Web applications for Apache Tomcat
+Requires(post): jpackage-utils >= 0:1.7.4
+Requires(preun): findutils
+Requires(preun): /bin/rm
%description webapps
Web applications for Apache Tomcat
%package admin-webapps
Group: System Environment/Applications
-# Replace PreReq
-Requires(pre): %{name} = %{epoch}:%{version}-%{release}
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires: struts >= 0:1.1
-Summary: The administrative web applications for Apache Tomcat
-# for /bin/rm
-Requires(post): coreutils
-Requires(post): jpackage-utils >= 0:1.6.0
-Requires(post): findutils
-Requires(preun): findutils
-# for /bin/rm
-Requires(preun): coreutils
-
-%if %{gcj_support}
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-%endif
+Summary: Administrative web applications for Apache Tomcat
+Requires(pre): %{name} = %{epoch}:%{version}-%{release}
+Requires(postun): %{name} = %{epoch}:%{version}-%{release}
+Requires: struts >= 0:1.2.9
+Requires(post): /bin/rm
+Requires(post): jpackage-utils >= 0:1.7.4
+Requires(post): findutils
+Requires(post): jakarta-commons-beanutils
+Requires(post): jakarta-commons-collections
+Requires(post): jakarta-commons-digester
+Requires(post): jakarta-commons-io
+Requires(post): struts
+Requires(preun): findutils
+Requires(preun): /bin/rm
%description admin-webapps
-The administrative web applications (admin and manager) for Apache Tomcat
+The administrative web applications (admin and manager) for Apache Tomcat.
%endif
%package servlet-%{servletspec}-api
Group: Internet/WWW/Dynamic Content
-# for /usr/sbin/update-alternatives
-Requires: chkconfig
+Requires: %{_sbindir}/update-alternatives
Summary: Apache Tomcat Servlet implementation classes
Obsoletes: servletapi5
Provides: servlet
Provides: servlet5
Provides: servlet24
Provides: servletapi5
-Requires(post): chkconfig
-requires(postun): chkconfig
-
-%if %{gcj_support}
-# libgcj aot-compiled native libraries
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-%endif
+Provides: servlet_2_4_api
%description servlet-%{servletspec}-api
Contains the implementation classes
@@ -278,8 +259,8 @@
Summary: Javadoc generated documentation for %{name}-servlet-%{servletspec}-api
Obsoletes: servletapi5-javadoc
Provides: servletapi5-javadoc
-# for /bin/rm and /bin/ln
-Requires(post): coreutils
+Requires(post): /bin/rm
+Requires(post): /bin/ln
%description servlet-%{servletspec}-api-javadoc
Contains the javadoc generated documentation for the implementation classes
@@ -287,24 +268,16 @@
%package jsp-%{jspspec}-api
Group: Internet/WWW/Dynamic Content
-# for /usr/sbin/update-alternatives
-Requires: chkconfig
+Requires: %{_sbindir}/update-alternatives
Requires: servlet24
# We need this to indirectly get rid of legacy jsp included in old
# servlet packages (one day we will be able to remove this)
# Replace PreReq
-Requires(pre): %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
-Requires(postun): %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
+Requires(pre): %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
+Requires(postun): %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
Summary: Apache Tomcat Servlet and JSP implementation classes
Provides: jsp
-Requires(post): chkconfig
-Requires(postun): chkconfig
-
-%if %{gcj_support}
-# libgcj aot-compiled native libraries
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-%endif
+Provides: jsp_2_0_api
%description jsp-%{jspspec}-api
Contains the implementation classes
@@ -313,8 +286,8 @@
%package jsp-%{jspspec}-api-javadoc
Group: Development/Documentation
Summary: Javadoc generated documentation for %{name}-jsp-%{jspspec}-api
-# for /bin/rm and /bin/ln
-Requires(post): coreutils
+Requires(post): /bin/rm
+Requires(post): /bin/ln
%description jsp-%{jspspec}-api-javadoc
Contains the javadoc generated documentation for the implementation classes
@@ -324,8 +297,8 @@
%package common-lib
Group: Development/Compilers
Summary: Libraries needed to run the Tomcat Web container (part)
-Requires: java >= 0:1.4.2
-Requires(post): jpackage-utils >= 0:1.6.0
+Requires: java >= 0:1.5.0
+Requires(post): jpackage-utils >= 0:1.7.4
Requires: jakarta-commons-collections-tomcat5 >= 0:3.1
Requires(post): jakarta-commons-collections-tomcat5 >= 0:3.1
Requires: jakarta-commons-dbcp-tomcat5 >= 0:1.2.1
@@ -336,8 +309,8 @@
Requires: jakarta-commons-pool-tomcat5 >= 0:1.2
Requires(post): jakarta-commons-pool-tomcat5 >= 0:1.2
%if %{with_ecj}
-Requires: eclipse-ecj >= 0:3.1.1
-Requires(post): eclipse-ecj >= 0:3.1.1
+Requires: ecj >= 0:3.3.1.1
+Requires(post): ecj >= 0:3.3.1.1
%endif
# Other subpackages must go in first
Requires(post): %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
@@ -346,17 +319,10 @@
Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release}
Requires: %{name}-%{jname} = %{epoch}:%{version}-%{release}
-Requires(post): findutils
-Requires(preun): findutils
-# for /bin/rm
-Requires(post): coreutils
-Requires(preun): coreutils
-
-%if %{gcj_support}
-# libgcj aot-compiled native libraries
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-%endif
+Requires(post): findutils
+Requires(preun): findutils
+Requires(post): /bin/rm
+Requires(preun): /bin/rm
%description common-lib
Libraries needed to run the Tomcat Web container (part)
@@ -364,22 +330,16 @@
%package server-lib
Group: Development/Compilers
Summary: Libraries needed to run the Tomcat Web container (part)
-Requires(post): jpackage-utils >= 0:1.6.0
+Requires(post): jpackage-utils >= 0:1.7.4
Requires: jakarta-commons-modeler >= 2.0
Requires(post): jakarta-commons-modeler >= 2.0
# Other subpackages must go in first
Requires: %{name}-%{jname} = %{epoch}:%{version}-%{release}
Requires(post): %{name}-%{jname} = %{epoch}:%{version}-%{release}
-Requires(post): findutils
-Requires(preun): findutils
-# for /bin/rm
-Requires(post): coreutils
-Requires(preun): coreutils
-%if %{gcj_support}
-# libgcj aot-compiled native libraries
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-%endif
+Requires(post): findutils
+Requires(preun): findutils
+Requires(post): /bin/rm
+Requires(preun): /bin/rm
%description server-lib
Libraries needed to run the Tomcat Web container (part)
@@ -391,12 +351,6 @@
Obsoletes: jasper5
Provides: jasper5
-%if %{gcj_support}
-# libgcj aot-compiled native libraries
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-%endif
-
%description %{jname}
Compiler JARs and associated scripts for %{name}
@@ -413,51 +367,41 @@
%if %{with_ecj}
%package jasper-eclipse
Group: Text Editors/Integrated Development Environments (IDE)
-Summary: Jasper OSGi Eclipse plugin
-%if %{gcj_support}
-Requires(post): java-gcj-compat >= 1.0.64
-Requires(postun): java-gcj-compat >= 1.0.64
-%endif
+Summary: Jasper OSGi Eclipse plugin
%description jasper-eclipse
-Jasper OSGi Eclipse plugin that contains class files from jasper-compiler,
+Jasper OSGi Eclipse plugin that contains class files from jasper-compiler,
jasper-runtime and ECJ.
%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
+%setup -q -D -T -a 6
cd %{packdname}
-%patch0 -b .p0
-%patch1 -b .p1
-%patch2 -b .p2
-%patch3 -b .p3
-%patch4 -b .p4
-%patch5 -b .p5
-%patch7 -b .p7
-%patch8 -b .p8
-%patch9 -b .p9
-%patch10 -b .p10
-%patch12 -b .p12
-%patch13 -b .p13
-%patch14 -b .p14
-%patch16 -b .p16
+%patch0 -p0
+%patch1 -p0
+%patch2 -p0
+%patch3 -p0
+%patch4 -p0
+%patch5 -p0
+%patch7 -p0
+%patch8 -p0
+%patch9 -p0
+%patch10 -p0
+%patch12 -p0
+%patch13 -p0
+%patch14 -p0
+%patch15 -p0
+%patch16 -p0
+%{__sed} -i -e 's|\@JAVA_HOME\@|%{java_home}|' build/build.xml
%ifarch ppc64 s390x alpha
-%patch18 -b .p18
+%patch18 -p0
+%endif
+%if %{with_ecj}
+%patch19 -p0
%endif
-%patch19 -b .p19
-%patch21 -b .p21
%if %{without_ecj}
%{__rm} %{jname}/src/share/org/apache/jasper/compiler/JDTCompiler.java
@@ -470,7 +414,7 @@
done
# copy license for later doc files declaration
pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}
- %{__cp} build/LICENSE .
+ %{__cp} -p build/LICENSE .
popd
# build jspapi and servletapi as ant dist will require them later
pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi
@@ -495,13 +439,13 @@
tools.jar=%{java.home}/lib/tools.jar
xerces.jar=$(build-classpath xerces-j2)
xercesImpl.jar=$(build-classpath jaxp_parser_impl)
-xmlParserAPIs.jar=$(build-classpath xml-commons-apis)
+xmlParserAPIs.jar=$(build-classpath xml-commons-jaxp-1.3-apis)
commons-el.jar=$(build-classpath commons-el)
commons-collections.jar=$(build-classpath commons-collections)
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 eclipse-ecj)
+jasper-compiler-jdt.jar=$(build-classpath ecj)
EOBP
ant -Djava.home="%{java_home}" -Dbuild.compiler="modern" javadoc
popd
@@ -510,17 +454,19 @@
pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/build
%{__cat} >> build.properties << EOBP
version=%{version}
+version.build=%{minversion}
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}
commons-beanutils.jar=$(build-classpath commons-beanutils)
-commons-fileupload.jar=$(build-classpath commons-fileupload)
commons-collections.jar=$(build-classpath commons-collections)
commons-daemon.jar=$(build-classpath commons-daemon)
commons-dbcp.jar=$(build-classpath commons-dbcp)
commons-digester.jar=$(build-classpath commons-digester)
commons-el.jar=$(build-classpath commons-el)
+commons-fileupload.jar=$(build-classpath commons-fileupload)
+commons-io.jar=$(build-classpath commons-io)
commons-launcher.jar=$(build-classpath commons-launcher)
commons-logging.jar=$(build-classpath commons-logging)
commons-logging-api.jar=$(build-classpath commons-logging-api)
@@ -536,12 +482,12 @@
jsp-api.jar=${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar
servlet.doc=${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/docs/api
xercesImpl.jar=$(build-classpath jaxp_parser_impl)
-xml-apis.jar=$(build-classpath xml-commons-apis)
+xml-apis.jar=$(build-classpath xml-commons-jaxp-1.3-apis)
struts.jar=$(build-classpath struts)
struts.lib=%{_datadir}/struts
-activation.jar=$(build-classpath jaf)
-mail.jar=$(build-classpath javamail)
-jta.jar=$(build-classpath jta)
+activation.jar=$(build-classpath jaf_1_0_2_api)
+mail.jar=$(build-classpath javamail_1_3_1_api)
+jta.jar=$(build-classpath jta_1_0_1B_api)
jaas.jar=$(build-classpath jaas)
jndi.jar=$(build-classpath jndi)
jdbc20ext.jar=$(build-classpath jdbc-stdext)
@@ -569,17 +515,16 @@
commons-daemon.jar=$(build-classpath commons-daemon)
commons-digester.jar=$(build-classpath commons-digester)
commons-fileupload.jar=$(build-classpath commons-fileupload)
+commons-io.jar=$(build-classpath commons-io)
commons-logging.jar=$(build-classpath commons-logging)
commons-logging-api.jar=$(build-classpath commons-logging-api)
commons-modeler.jar=$(build-classpath commons-modeler)
commons-pool.jar=$(build-classpath commons-pool)
regexp.jar=$(build-classpath regexp)
jmx.jar=$(build-classpath mx4j/mx4j-jmx)
-activation.jar=$(build-classpath jaf)
-mail.jar=$(build-classpath javamail)
-#FIXME: Replace with geronimo-jta-1.0.1B-api when maven2 is added
-#jta.jar=$(build-classpath geronimo-jta-1.0.1B-api)
-jta.jar=$(build-classpath jta)
+activation.jar=$(build-classpath jaf_1_0_2_api)
+mail.jar=$(build-classpath javamail_1_3_1_api)
+jta.jar=$(build-classpath jta_1_0_1B_api)
jaas.jar=$(build-classpath jaas)
jndi.jar=$(build-classpath jndi)
jdbc20ext.jar=$(build-classpath jdbc-stdext)
@@ -594,41 +539,42 @@
# create jasper-eclipse jar
%if %{with_ecj}
-mkdir org.apache.jasper
+mkdir -p org.apache.jasper
pushd org.apache.jasper
-unzip -qq ../apache-tomcat-5.5.26-src/build/build/common/lib/jasper-compiler.jar
-unzip -qq ../apache-tomcat-5.5.26-src/build/build/common/lib/jasper-runtime.jar \
+unzip -qq ../apache-tomcat-%{version}-src/build/build/common/lib/jasper-compiler.jar
+unzip -qq ../apache-tomcat-%{version}-src/build/build/common/lib/jasper-runtime.jar \
-x META-INF/MANIFEST.MF org/apache/jasper/compiler/Localizer.class
unzip -qq %{_javadir}/jdtcore.jar -x META-INF/MANIFEST.MF
-cp %{SOURCE6} META-INF/MANIFEST.MF
-rm -f plugin.properties plugin.xml about.html jdtCompilerAdapter.jar META-INF/eclipse.inf
+cp -p %{SOURCE7} META-INF/MANIFEST.MF
+rm -f plugin.properties plugin.xml about.html jdtCompilerAdapter.jar META-INF/eclipse.inf
zip -qq -r ../org.apache.jasper_5.5.17.v200706111724.jar .
popd
%endif
# inject OSGi manifests
-mkdir META-INF
-cp %{SOURCE7} META-INF/MANIFEST.MF
+mkdir -p META-INF
+cp -p %{SOURCE8} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
zip -u %{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar META-INF/MANIFEST.MF
-cp %{SOURCE8} META-INF/MANIFEST.MF
+cp -p %{SOURCE9} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
zip -u %{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar META-INF/MANIFEST.MF
-
%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadir}
%if %{without_apisonly}
-export CLASSPATH="%(build-classpath xalan-j2 xml-commons-apis jakarta-taglibs-core jakarta-taglibs-standard):${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar"
+export CLASSPATH="$(build-classpath xalan-j2 xml-commons-jaxp-1.3-apis jakarta-taglibs-core jakarta-taglibs-standard):${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}}
-touch ${RPM_BUILD_ROOT}%{logdir}/catalina.out
%{__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}/logrotate.d
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_initrddir}
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_bindir}
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadir}/%{name}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms
%{__install} -m 755 %{SOURCE5} ${RPM_BUILD_ROOT}%{bindir}/relink
# SysV init and configuration
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
@@ -650,7 +596,6 @@
# Register the new service in the system as usual (see chkconfig and similars)
#
EOT
-%{__cat} %{SOURCE2} >> %{name}
%{__install} -m 0644 %{name} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
%{__rm} %{name}
%{__install} %{SOURCE1} \
@@ -709,7 +654,9 @@
${RPM_BUILD_ROOT}%{_initrddir}/%{name} \
${RPM_BUILD_ROOT}%{bindir}/relink \
${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}; do
- %{__sed} -i -e 's|\@\@\@TCCONF\@\@\@|%{confdir}|g' \
+ %{__sed} -i \
+ -e 's|\@\@\@LIBDIR\@\@\@|%{_libdir}|g' \
+ -e 's|\@\@\@TCCONF\@\@\@|%{confdir}|g' \
-e "s|\@\@\@TCCONF\@\@\@|%{confdir}|g" \
-e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
-e "s|\@\@\@TCBIN\@\@\@|%{bindir}|g" \
@@ -717,9 +664,29 @@
-e "s|\@\@\@TCSERVER\@\@\@|%{serverdir}|g" \
-e "s|\@\@\@TCSHARED\@\@\@|%{shareddir}|g" \
-e "s|\@\@\@TCAPP\@\@\@|%{appdir}|g" \
- -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" \
- -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" $i
+ -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" $i
done
+%add_to_maven_depmap tomcat tomcat-parent %{version} JPP/%{name} parent
+ %{__install} -m 644 \
+ ${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/tomcat-parent-%{version}.pom \
+ $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.%{name}-parent.pom
+# Process bin
+# Remove local JARs (to be replaced with jpp links in post)
+pushd ${RPM_BUILD_ROOT}%{bindir}
+ # tomcat-juli will be installed in a public repository
+ %{__mv} tomcat-juli.jar \
+ ${RPM_BUILD_ROOT}%{_javadir}/%{name}/tomcat-juli-%{version}.jar
+ pushd ${RPM_BUILD_ROOT}%{_javadir}/%{name}
+ %{__ln_s} -f tomcat-juli-%{version}.jar tomcat-juli.jar
+ popd
+ %add_to_maven_depmap tomcat tomcat-juli %{version} JPP/%{name} tomcat-juli
+ %{__install} -m 644 \
+ ${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/tomcat-juli-%{version}.pom \
+ $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.%{name}-tomcat-juli.pom
+
+ find . -name "*.jar" -not -name "*bootstrap*" \
+ -exec %{__rm} -f {} \;
+popd
# Process server/lib
# Remove local JARs (to be replaced with jpp links in post)
pushd ${RPM_BUILD_ROOT}%{serverdir}/lib
@@ -732,6 +699,11 @@
pushd ${RPM_BUILD_ROOT}%{_javadir}
%{__ln_s} -f catalina-ant-%{version}.jar catalina-ant5.jar
popd
+ %add_to_maven_depmap tomcat catalina-ant %{version} JPP catalina-ant5
+ %{__install} -m 644 \
+ ${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/catalina-ant-%{version}.pom \
+ $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-catalina-ant5.pom
+
# catalina* jars will be installed in a public repository
for i in catalina*.jar; do
j="`echo $i | %{__sed} -e 's|\.jar$||'`"
@@ -740,6 +712,10 @@
pushd ${RPM_BUILD_ROOT}%{_javadir}/%{name}
%{__ln_s} -f ${j}-%{version}.jar ${j}.jar
popd
+ %add_to_maven_depmap tomcat ${j} %{version} JPP/tomcat5 ${j}
+ %{__install} -m 644 \
+ ${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/${j}-%{version}.pom \
+ $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.tomcat5-${j}.pom
done
# servlets* jars will be installed in a public repository
for i in servlets-*.jar; do
@@ -749,6 +725,10 @@
pushd ${RPM_BUILD_ROOT}%{_javadir}/%{name}
%{__ln_s} -f ${j}-%{version}.jar ${j}.jar
popd
+ %add_to_maven_depmap tomcat ${j} %{version} JPP/tomcat5 ${j}
+ %{__install} -m 644 \
+ ${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/${j}-%{version}.pom \
+ $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.tomcat5-${j}.pom
done
# tomcat* jars will be installed in a public repository
for i in tomcat-*.jar; do
@@ -758,6 +738,10 @@
pushd ${RPM_BUILD_ROOT}%{_javadir}/%{name}
%{__ln_s} -f ${j}-%{version}.jar ${j}.jar
popd
+ %add_to_maven_depmap tomcat ${j} %{version} JPP/tomcat5 ${j}
+ %{__install} -m 644 \
+ ${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/${j}-%{version}.pom \
+ $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.tomcat5-${j}.pom
done
popd
# Process admin webapp server/webapps/admin
@@ -769,6 +753,10 @@
pushd ${RPM_BUILD_ROOT}%{_javadir}/%{name}
%{__ln_s} -f ${i}-%{version}.jar ${i}.jar
popd
+ %add_to_maven_depmap tomcat ${i} %{version} JPP/tomcat5 ${i}
+ %{__install} -m 644 \
+ ${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/${i}-%{version}.pom \
+ $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.tomcat5-${i}.pom
done
popd
# Process manager webapp server/webapps/manager
@@ -780,6 +768,10 @@
pushd ${RPM_BUILD_ROOT}%{_javadir}/%{name}
%{__ln_s} -f ${i}-%{version}.jar ${i}.jar
popd
+ %add_to_maven_depmap tomcat ${i} %{version} JPP/tomcat5 ${i}
+ %{__install} -m 644 \
+ ${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/${i}-%{version}.pom \
+ $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.tomcat5-${i}.pom
done
popd
# Process host-manager webapp server/webapps/host-manager
@@ -792,6 +784,10 @@
pushd ${RPM_BUILD_ROOT}%{_javadir}/%{name}
%{__ln_s} -f ${i}-%{version}.jar ${i}.jar
popd
+ %add_to_maven_depmap tomcat ${i} %{version} JPP/tomcat5 ${i}
+ %{__install} -m 644 \
+ ${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/${i}-%{version}.pom \
+ $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.tomcat5-${i}.pom
done
popd
# Process common/lib
@@ -805,6 +801,10 @@
pushd ${RPM_BUILD_ROOT}%{_javadir}
%{__ln_s} -f ${j}-%{version}.jar ${j}.jar
popd
+ %add_to_maven_depmap tomcat ${i} %{version} JPP ${j}
+ %{__install} -m 644 \
+ ${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/${i}-%{version}.pom \
+ $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-${j}.pom
done
# naming* jars will be installed in a public repository
for i in naming-*.jar; do
@@ -814,6 +814,10 @@
pushd ${RPM_BUILD_ROOT}%{_javadir}/%{name}
%{__ln_s} -f ${j}-%{version}.jar ${j}.jar
popd
+ %add_to_maven_depmap tomcat ${j} %{version} JPP/tomcat5 ${j}
+ %{__install} -m 644 \
+ ${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/${j}-%{version}.pom \
+ $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.tomcat5-${j}.pom
done
popd
# Process common/endorsed
@@ -822,6 +826,13 @@
popd
# avoid duplicate servlet.jar
%{__rm} -f ${RPM_BUILD_ROOT}%{commondir}/lib/servlet.jar
+# Add catalina-deployer
+%{__install} -m 644 %{packdname}/build/deployer/lib/catalina-deployer.jar \
+ ${RPM_BUILD_ROOT}%{_javadir}/%{name}/catalina-deployer-%{version}.jar
+ pushd ${RPM_BUILD_ROOT}%{_javadir}/%{name}
+ %{__ln_s} -f catalina-deployer-%{version}.jar catalina-deployer.jar
+ popd
+
# Perform FHS translation
# (final links)
pushd ${RPM_BUILD_ROOT}%{homedir}
@@ -847,11 +858,16 @@
%{__ln_s} -f %{name}-servlet-%{servletspec}-api-%{version}.jar \
servletapi5.jar
popd
+ # depmap frag for standard alternative
+ %add_to_maven_depmap javax.servlet servlet-api %{servletspec} JPP servlet_2_4_api
+ %add_to_maven_depmap tomcat servlet-api %{version} JPP %{name}-servlet-%{servletspec}-api
+ %{__install} -m 644 \
+ ${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/servlet-api-%{version}.pom \
+ $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}-servlet-%{servletspec}-api.pom
# javadoc servlet
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-servlet-%{servletspec}-api-%{version}
%{__cp} -pr jsr154/build/docs/api/* \
${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-servlet-%{servletspec}-api-%{version}
- # ghost symlink
%{__ln_s} -f %{name}-servlet-%{servletspec}-api-%{version} \
${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-servlet-%{servletspec}-api
popd
@@ -866,11 +882,15 @@
%{__ln_s} -f %{name}-jsp-%{jspspec}-api-%{version}.jar \
jspapi.jar
popd
+ %add_to_maven_depmap javax.servlet jsp-api %{jspspec} JPP jsp_2_0_api
+ %add_to_maven_depmap tomcat jsp-api %{version} JPP %{name}-jsp-%{jspspec}-api
+ %{__install} -m 644 \
+ ${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/jsp-api-%{version}.pom \
+ $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}-jsp-%{jspspec}-api.pom
# javadoc jsp
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-jsp-%{jspspec}-api-%{version}
%{__cp} -pr jsr152/build/docs/api/* \
${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-jsp-%{jspspec}-api-%{version}
- # ghost symlink
%{__ln_s} %{name}-jsp-%{jspspec}-api-%{version} \
${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-jsp-%{jspspec}-api
popd
@@ -891,19 +911,18 @@
pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/%{jname}
%{__cp} -pr build/javadoc/* \
${RPM_BUILD_ROOT}%{_javadocdir}/%{jname}-%{version}
- # ghost symlink
%{__ln_s} %{jname}-%{version} ${RPM_BUILD_ROOT}%{_javadocdir}/%{jname}
popd
-# disable the juli log manager until the classpath
-# java.util.logging.LogManager is fixed
-# XXX: Still not fixed - http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29869
-# rm -f $RPM_BUILD_ROOT%{bindir}/tomcat-juli.jar
+%endif
+%if %{with_ecj}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_datadir}/eclipse/plugins
+%{__cp} -p org.apache.jasper_5.5.17.v200706111724.jar ${RPM_BUILD_ROOT}%{_datadir}/eclipse/plugins
%endif
%if %{gcj_support}
# Remove non-standard jars from the list for aot compilation
-aot-compile-rpm \
+%{_bindir}/aot-compile-rpm \
--exclude var/lib/%{name}/webapps/tomcat-docs/appdev/sample/sample.war \
--exclude var/lib/%{name}/webapps/servlets-examples/WEB-INF/classes \
--exclude var/lib/%{name}/webapps/jsp-examples/WEB-INF/classes \
@@ -912,19 +931,18 @@
--exclude var/lib/%{name}/server/lib/servlets-ssi.renametojar
%endif
-%if %{with_ecj}
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_datadir}/eclipse/plugins
-%{__cp} org.apache.jasper_5.5.17.v200706111724.jar ${RPM_BUILD_ROOT}%{_datadir}/eclipse/plugins
-%endif
-
%clean
%{__rm} -rf $RPM_BUILD_ROOT
%if %{without_apisonly}
%post
+%update_maven_depmap
# install tomcat5 (but don't activate)
/sbin/chkconfig --add %{name}
# Remove old automated symlinks
+for repository in %{bindir} ; do
+ find $repository -name '*.jar' -type l | xargs %{__rm} -f
+done
for repository in %{commondir}/endorsed ; do
find $repository -name '\[*\]*.jar' -not -type d | xargs %{__rm} -f
done
@@ -936,14 +954,20 @@
done
# Create automated links - since all needed extensions may not have been
# installed for this jvm output is muted
+%{__rm} -f %{bindir}/commons-daemon.jar
+%{__ln_s} $(build-classpath commons-daemon) %{bindir} 2>&1
+%{__rm} -f %{bindir}/commons-logging-api.jar
+%{__ln_s} $(build-classpath commons-logging-api) %{bindir} 2>&1
+%{__rm} -f %{bindir}/tomcat-juli.jar
+%{__ln_s} $(build-classpath tomcat5/tomcat-juli) %{bindir} 2>&1
build-jar-repository %{commondir}/endorsed jaxp_parser_impl \
- xml-commons-apis 2>&1
+ xml-commons-jaxp-1.3-apis 2>&1
build-jar-repository %{commondir}/lib commons-collections-tomcat5 \
- commons-dbcp-tomcat5 commons-el commons-pool-tomcat5 javamail jsp \
+ commons-dbcp-tomcat5 commons-el commons-pool-tomcat5 jaf javamail jsp \
%{name}/naming-factory %{name}/naming-resources servlet \
%{jname}5-compiler %{jname}5-runtime 2>&1
%if %{with_ecj}
- build-jar-repository %{commondir}/lib eclipse-ecj 2>&1
+ build-jar-repository %{commondir}/lib ecj 2>&1
%endif
build-jar-repository %{serverdir}/lib catalina-ant5 commons-modeler \
%{name}/catalina-ant-jmx %{name}/catalina-cluster %{name}/catalina \
@@ -952,42 +976,33 @@
%{name}/tomcat-ajp %{name}/tomcat-apr %{name}/tomcat-coyote \
%{name}/tomcat-http %{name}/tomcat-jkstatus-ant %{name}/tomcat-util 2>&1
%if %{gcj_support}
- %{_bindir}/rebuild-gcj-db
+ if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
%endif
-%if %{gcj_support}
%postun
-%{_bindir}/rebuild-gcj-db
+%update_maven_depmap
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
%endif
%if %{gcj_support}
%post common-lib
-%{_bindir}/rebuild-gcj-db
+if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
%endif
%if %{gcj_support}
%postun common-lib
-%{_bindir}/rebuild-gcj-db
-%endif
-
-%if %{gcj_support}
-%post jasper-eclipse
-%{_bindir}/rebuild-gcj-db
-%endif
-
-%if %{gcj_support}
-%postun jasper-eclipse
-%{_bindir}/rebuild-gcj-db
+if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
%endif
%if %{gcj_support}
%post server-lib
-%{_bindir}/rebuild-gcj-db
+if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
%endif
%if %{gcj_support}
%postun server-lib
-%{_bindir}/rebuild-gcj-db
+if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
%endif
%post webapps
@@ -996,12 +1011,12 @@
build-jar-repository %{appdir}/jsp-examples/WEB-INF/lib \
jakarta-taglibs-core jakarta-taglibs-standard 2>&1
%if %{gcj_support}
- %{_bindir}/rebuild-gcj-db
+ if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
%endif
%if %{gcj_support}
%postun webapps
- %{_bindir}/rebuild-gcj-db
+ if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
%endif
%post admin-webapps
@@ -1011,65 +1026,66 @@
# Create automated links - since all needed extensions may not have been
# installed for this jvm output is muted
build-jar-repository %{serverdir}/webapps/admin/WEB-INF/lib \
- struts %{name}/catalina-admin 2>&1
+ commons-beanutils commons-collections commons-digester struts \
+ %{name}/catalina-admin 2>&1
build-jar-repository %{serverdir}/webapps/host-manager/WEB-INF/lib \
%{name}/catalina-host-manager 2>&1
build-jar-repository %{serverdir}/webapps/manager/WEB-INF/lib \
- commons-fileupload %{name}/catalina-manager 2>&1
+ commons-io commons-fileupload %{name}/catalina-manager 2>&1
%if %{gcj_support}
- %{_bindir}/rebuild-gcj-db
+ if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
%endif
%if %{gcj_support}
%postun admin-webapps
- %{_bindir}/rebuild-gcj-db
+ if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
%endif
%endif
%post servlet-%{servletspec}-api
-update-alternatives --install %{_javadir}/servlet.jar servlet \
+%{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \
+ %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20400
+%{_sbindir}/update-alternatives --install %{_javadir}/servlet_2_4_api.jar servlet_2_4_api \
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20400
%if %{gcj_support}
- %{_bindir}/rebuild-gcj-db
+ if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
%endif
%post servlet-%{servletspec}-api-javadoc
%{__rm} -f %{_javadocdir}/servletapi # legacy symlink
-%{__rm} -f %{_javadocdir}/%{name}-servlet-%{servletspec}-api
-%{__ln_s} %{name}-servlet-%{servletspec}-api-%{version} \
- %{_javadocdir}/%{name}-servlet-%{servletspec}-api
%postun servlet-%{servletspec}-api
if [ "$1" = "0" ]; then
- update-alternatives --remove servlet \
+ %{_sbindir}/update-alternatives --remove servlet \
+ %{_javadir}/%{name}-servlet-%{servletspec}-api.jar
+ %{_sbindir}/update-alternatives --remove servlet_2_4_api \
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar
fi
%if %{gcj_support}
- %{_bindir}/rebuild-gcj-db
+ if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
%endif
%post jsp-%{jspspec}-api
-update-alternatives --install %{_javadir}/jsp.jar jsp \
+%{_sbindir}/update-alternatives --install %{_javadir}/jsp.jar jsp \
+ %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20000
+%{_sbindir}/update-alternatives --install %{_javadir}/jsp_2_0_api.jar jsp_2_0_api \
%{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20000
-
%if %{gcj_support}
- %{_bindir}/rebuild-gcj-db
+ if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
%endif
-
%post jsp-%{jspspec}-api-javadoc
%{__rm} -f %{_javadocdir}/jsp-api # legacy symlink
-%{__rm} -f %{_javadocdir}/%{name}-jsp-%{jspspec}-api
-%{__ln_s} %{name}-jsp-%{jspspec}-api-%{version} \
- %{_javadocdir}/%{name}-jsp-%{jspspec}-api
%postun jsp-%{jspspec}-api
if [ "$1" = "0" ]; then
- update-alternatives --remove jsp \
+ %{_sbindir}/update-alternatives --remove jsp \
+ %{_javadir}/%{name}-jsp-%{jspspec}-api.jar
+ %{_sbindir}/update-alternatives --remove jsp_2_0_api \
%{_javadir}/%{name}-jsp-%{jspspec}-api.jar
fi
%if %{gcj_support}
- %{_bindir}/rebuild-gcj-db
+ if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
%endif
%if %{without_apisonly}
@@ -1114,7 +1130,7 @@
%if %{without_apisonly}
%files
-%defattr(644,root,root,755)
+%defattr(0644,root,root,0755)
%doc %{packdname}/build/{LICENSE,RELE*,RUNNING.txt,BENCHMARKS.txt}
# symlinks
%{_datadir}/%{name}/common
@@ -1143,23 +1159,22 @@
%dir %{shareddir}/classes
%dir %{shareddir}/lib
# Directories with special permissions
-%attr(775,root,tomcat) %dir %{appdir}
-%attr(775,root,tomcat) %dir %{confdir}
-%attr(770,root,tomcat) %dir %{tempdir}
-%attr(770,root,tomcat) %dir %{workdir}
-%attr(755,tomcat,tomcat) %dir %{logdir}
-%attr(644,tomcat,tomcat) %{logdir}/catalina.out
-%attr(775,root,tomcat) %dir %{confdir}/Catalina
-%attr(775,root,tomcat) %dir %{confdir}/Catalina/localhost
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{bindir}/relink
-%attr(644,root,root) %{bindir}/*.jar
-%attr(644,root,root) %{bindir}/*.xml
-%attr(755,root,root) %{_initrddir}/%{name}
-%attr(644,root,tomcat) %config(noreplace) %{confdir}/catalina.policy
-%attr(644,root,tomcat) %config(noreplace) %{confdir}/catalina.properties
-%attr(660,root,tomcat) %config(noreplace) %{confdir}/logging.properties
-%attr(660,root,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml
+%attr(0775,root,tomcat) %dir %{appdir}
+%attr(0775,root,tomcat) %dir %{confdir}
+%attr(0770,root,tomcat) %dir %{tempdir}
+%attr(0770,root,tomcat) %dir %{workdir}
+%attr(0755,tomcat,tomcat) %dir %{logdir}
+%attr(0775,root,tomcat) %dir %{confdir}/Catalina
+%attr(0775,root,tomcat) %dir %{confdir}/Catalina/localhost
+%attr(0755,root,root) %{_bindir}/*
+%attr(0755,root,root) %{bindir}/relink
+%attr(0644,root,root) %{bindir}/*.jar
+%attr(0644,root,root) %{bindir}/*.xml
+%attr(0755,root,root) %{_initrddir}/%{name}
+%attr(0644,root,tomcat) %config(noreplace) %{confdir}/catalina.policy
+%attr(0644,root,tomcat) %config(noreplace) %{confdir}/catalina.properties
+%attr(0660,root,tomcat) %config(noreplace) %{confdir}/logging.properties
+%attr(0660,root,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml
%config(noreplace) %{confdir}/%{name}.conf
%config(noreplace) %{confdir}/server-minimal.xml
%config(noreplace) %{confdir}/server.xml
@@ -1171,35 +1186,56 @@
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%{commondir}/i18n/*
+%{_mavendepmapfragdir}/*
+%{_datadir}/maven2/poms/JPP.tomcat5-parent.pom
%if %{gcj_support}
%dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/bootstrap*
%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-daemon*
%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-logging-api*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-juli*
+#%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-juli*
%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-jkstatus-ant*
%endif
%files common-lib
-%defattr(644,root,root,755)
+%defattr(0644,root,root,0755)
%dir %{_javadir}/%{name}
%{_javadir}/%{name}/naming*.jar
+%{_datadir}/maven2/poms/JPP.tomcat5-naming-factory.pom
+%{_datadir}/maven2/poms/JPP.tomcat5-naming-resources.pom
%if %{gcj_support}
%attr(-,root,root) %{_libdir}/gcj/%{name}/naming-*
%endif
%files server-lib
-%defattr(644,root,root,755)
+%defattr(0644,root,root,0755)
%{_javadir}/catalina*.jar
%dir %{_javadir}/%{name}
%{_javadir}/%{name}/catalina-ant-jmx*.jar
%{_javadir}/%{name}/catalina-cluster*.jar
+%{_javadir}/%{name}/catalina-deployer*.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
+%{_datadir}/maven2/poms/JPP-catalina-ant5.pom
+%{_datadir}/maven2/poms/JPP.tomcat5-catalina-ant-jmx.pom
+%{_datadir}/maven2/poms/JPP.tomcat5-catalina-cluster.pom
+%{_datadir}/maven2/poms/JPP.tomcat5-catalina.pom
+%{_datadir}/maven2/poms/JPP.tomcat5-catalina-optional.pom
+%{_datadir}/maven2/poms/JPP.tomcat5-catalina-storeconfig.pom
+%{_datadir}/maven2/poms/JPP.tomcat5-servlets-default.pom
+%{_datadir}/maven2/poms/JPP.tomcat5-servlets-invoker.pom
+%{_datadir}/maven2/poms/JPP.tomcat5-servlets-webdav.pom
+%{_datadir}/maven2/poms/JPP.tomcat5-tomcat-ajp.pom
+%{_datadir}/maven2/poms/JPP.tomcat5-tomcat-apr.pom
+%{_datadir}/maven2/poms/JPP.tomcat5-tomcat-coyote.pom
+%{_datadir}/maven2/poms/JPP.tomcat5-tomcat-http.pom
+%{_datadir}/maven2/poms/JPP.tomcat5-tomcat-jkstatus-ant.pom
+%{_datadir}/maven2/poms/JPP.tomcat5-tomcat-juli.pom
+%{_datadir}/maven2/poms/JPP.tomcat5-tomcat-util.pom
%if %{gcj_support}
%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-ant*
%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-cluster*
@@ -1217,7 +1253,7 @@
%endif
%files webapps
-%defattr(644,root,tomcat,775)
+%defattr(0644,root,tomcat,0775)
%dir %{appdir}/servlets-examples
%{appdir}/servlets-examples/*
%dir %{appdir}/jsp-examples
@@ -1229,23 +1265,26 @@
%dir %{appdir}/webdav
%{appdir}/webdav/*
%if %{gcj_support}
-%ifnarch ppc64 s390x alpha
+%ifnarch ppc64 s390x
%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-root*
%endif
%endif
%files admin-webapps
-%defattr(640,root,tomcat,750)
-%attr(660,root,tomcat) %{confdir}/Catalina/localhost/manager.xml
-%attr(660,root,tomcat) %{confdir}/Catalina/localhost/host-manager.xml
+%defattr(0640,root,tomcat,0750)
+%attr(0660,root,tomcat) %{confdir}/Catalina/localhost/manager.xml
+%attr(0660,root,tomcat) %{confdir}/Catalina/localhost/host-manager.xml
%{confdir}/Catalina/localhost/admin.xml
%dir %{appdir}/balancer
%{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(0644,root,root) %{_javadir}/%{name}/catalina-admin*.jar
+%attr(0644,root,root) %{_javadir}/%{name}/catalina-manager*.jar
+%attr(0644,root,root) %{_javadir}/%{name}/catalina-host-manager*.jar
+%{_datadir}/maven2/poms/JPP.tomcat5-catalina-admin.pom
+%{_datadir}/maven2/poms/JPP.tomcat5-catalina-host-manager.pom
+%{_datadir}/maven2/poms/JPP.tomcat5-catalina-manager.pom
%if %{gcj_support}
%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-admin*
%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-balancer*
@@ -1254,11 +1293,13 @@
%endif
%files %{jname}
-%defattr(644,root,root,755)
+%defattr(0644,root,root,0755)
%doc ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/%{jname}/doc/jspc.html
%{_javadir}/%{jname}5-*.jar
-%attr(755,root,root) %{_bindir}/%{jname}*.sh
-%attr(755,root,root) %{_bindir}/jspc*.sh
+%attr(0755,root,root) %{_bindir}/%{jname}*.sh
+%attr(0755,root,root) %{_bindir}/jspc*.sh
+%{_datadir}/maven2/poms/JPP-jasper5-compiler.pom
+%{_datadir}/maven2/poms/JPP-jasper5-runtime.pom
%if %{gcj_support}
%attr(-,root,root) %{_libdir}/gcj/%{name}/%{jname}5-*
%endif
@@ -1266,46 +1307,51 @@
%files %{jname}-javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{jname}-%{version}
-%ghost %doc %{_javadocdir}/%{jname}
+%{_javadocdir}/%{jname}
%endif
%files servlet-%{servletspec}-api
-%defattr(-,root,root)
+%defattr(0644,root,root,0755)
%doc %{packdname}/build/LICENSE
%{_javadir}/%{name}-servlet-%{servletspec}-api*.jar
%{_javadir}/servletapi5.jar
+%{_datadir}/maven2/poms/JPP-tomcat5-servlet-2.4-api.pom
%if %{gcj_support}
%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-servlet-%{servletspec}-api*
%endif
%files servlet-%{servletspec}-api-javadoc
-%defattr(-,root,root)
-%doc %{_javadocdir}/%{name}-servlet-%{servletspec}-api-%{version}
-%ghost %doc %{_javadocdir}/%{name}-servlet-%{servletspec}-api
+%defattr(0644,root,root,0755)
+%{_javadocdir}/%{name}-servlet-%{servletspec}-api-%{version}
+%{_javadocdir}/%{name}-servlet-%{servletspec}-api
%files jsp-%{jspspec}-api
-%defattr(-,root,root)
+%defattr(0644,root,root,0755)
%doc %{packdname}/build/LICENSE
%{_javadir}/%{name}-jsp-%{jspspec}-api*.jar
%{_javadir}/jspapi.jar
+%{_datadir}/maven2/poms/JPP-tomcat5-jsp-2.0-api.pom
%if %{gcj_support}
%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-jsp-%{jspspec}-api*
%endif
%files jsp-%{jspspec}-api-javadoc
-%defattr(-,root,root)
-%doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api-%{version}
-%ghost %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api
+%defattr(0644,root,root,0755)
+%{_javadocdir}/%{name}-jsp-%{jspspec}-api-%{version}
+%{_javadocdir}/%{name}-jsp-%{jspspec}-api
%if %{with_ecj}
%files jasper-eclipse
-%defattr(-,root,root)
+%defattr(0644,root,root,0755)
%dir %{_datadir}/eclipse
%dir %{_datadir}/eclipse/plugins
%{_datadir}/eclipse/plugins/org.apache.jasper_*
%endif
%changelog
+* Mon Oct 13 2008 David Walluck <dwalluck at redhat.com> 0:5.5.27-4.1
+- sync with JPackage 0:5.5.27-4
+
* Mon Jul 14 2008 Andrew Overholt <overholt at redhat.com> 0:5.5.26-1.5
- Bump OSGi version numbers to match Eclipse SDK 3.4.
- Update patches to apply with 0 fuzz.
@@ -1330,7 +1376,7 @@
* Sat Jan 5 2008 Devrim GUNDUZ <devrim at commandprompt.com> 0:5.5.25-2jpp.2
- Fix for bz #153187
- Fix for bz #426850
-- Fix for bz #312561
+- Fix for bz #312561
- Fix init script, per bz #247077
- Fix builds on alpha, per bz #253827.
- Fix init script for bz #380921
@@ -1344,7 +1390,7 @@
* CVE-2007-3382
* CVE-2007-2450, RH bugzilla #244808, #244810, #244812, #363081
* CVE-2007-2449, RH bugzilla #244810, #244812, #244804, #363081
-- Applied patch(20) for RH bugzilla #333791, CVE-2007-5461
+- Applied patch(20) for RH bugzilla #333791, CVE-2007-5461
- Applied patch(21) for RH bugzilla #244803, #244812, #363081, CVE-2007-1358
* Mon Aug 06 2007 Ben Konrath <bkonrath at redhat.com> 0:5.5.23-9jpp.4
@@ -1365,7 +1411,7 @@
- Fix formatting of spec
- Use eclipse-ecj in place of ecj
- Apply GCJ specific patches
-- Use generic jta for now instead of geronimo-jta-1.0.1B-api
+- Use generic jta for now instead of geronimo-jta-1.0.1B-api
- Add tomcat-juli.jar since gcc bug 29869 is fixed
* Fri May 11 2007 Jason Corley <jason.corley at gmail.com> 0:5.5.23-9jpp
--- tomcat5-5.5-acceptlangheader.patch DELETED ---
More information about the scm-commits
mailing list