[RPM (6.0)] [DIST generic] tomcat7-7.0.39-2.jpp6

Name        : tomcat7                      Relocations: (not relocatable)
Version     : 7.0.39                            Vendor: JPackage Project
Release     : 2.jpp6                        Build Date: Sun 14 Apr 2013 01:29:24 PM CEST
Install Date: (not installed)               Build Host: linux.fritz.box
Group       : Networking/Daemons            Source RPM: (none)
Size        : 6320060                          License: ASL 2.0
Signature   : (none)
Packager    : Ralph Apel <[email protected]>
URL         : http://tomcat.apache.org/
Summary     : Apache Servlet/JSP Engine, RI for Servlet 3.0/JSP 2.2 API
Description :
Tomcat is the servlet container that is used in the official Reference
Implementation for the Java Servlet and JavaServer Pages technologies.
The Java Servlet and JavaServer Pages specifications are developed by
Sun under the Java Community Process.

Tomcat is developed in an open and participatory environment and
released under the Apache Software License version 2.0. Tomcat is intended
to be a collaboration of the best-of-breed developers from around the world.

---------------
Ralph Apel <[email protected]> 0:7.0.39-2
- Fix bug analogous to 356 for tomcat6
---------------
tomcat7.src:191: W: unversioned-explicit-provides jsp22
tomcat7.src:219: W: unversioned-explicit-provides servlet7
tomcat7.src:220: W: unversioned-explicit-provides servlet30
tomcat7.src: W: strange-permission tomcat7-7.0.starter 0775
tomcat7.src: W: strange-permission commons-dbcp-1.4-src.tar.gz 0675
tomcat7.src: W: strange-permission commons-logging-1.1.1-src.tar.gz 0675
tomcat7.src: W: source-or-patch-not-bzipped tomcat7-build.patch
tomcat7.src: W: source-or-patch-not-bzipped tomcat7-JDTCompiler.patch
tomcat7.src: W: non-standard-group Networking/Daemons
tomcat7.src: W: no-signature
tomcat7.src: W: mixed-use-of-spaces-and-tabs (spaces: line 140, tab: line 283)
tomcat7.src: W: lib-package-without-%mklibname
tomcat7.src: W: invalid-license ASL 2.0
tomcat7.src:138: W: hardcoded-library-path in /lib/lsb/init-functions
tomcat7.src:139: W: hardcoded-library-path in /lib/lsb/init-functions
1 packages and 0 specfiles checked; 0 errors, 15 warnings.

---------------
Index: tomcat7-7.0.conf
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/tomcat7/tomcat7-7.0.conf,v
retrieving revision 1.1
diff -u -r1.1 tomcat7-7.0.conf
--- tomcat7-7.0.conf	7 Jan 2012 23:48:20 -0000	1.1
+++ tomcat7-7.0.conf	14 Apr 2013 11:37:57 -0000
@@ -41,6 +41,9 @@
 # Set the TOMCAT_PID location
 CATALINA_PID="/var/run/tomcat7.pid"
 
+# Set the TOMCAT_LOG location
+TOMCAT_LOG="${CATALINA_BASE}/logs/catalina.out"
+
 # Connector port is 8080 for this tomcat7 instance
 #CONNECTOR_PORT="8080"
 
Index: tomcat7-7.0.init
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/tomcat7/tomcat7-7.0.init,v
retrieving revision 1.2
diff -u -r1.2 tomcat7-7.0.init
--- tomcat7-7.0.init	13 Apr 2013 09:26:07 -0000	1.2
+++ tomcat7-7.0.init	14 Apr 2013 11:37:57 -0000
@@ -44,7 +44,7 @@
 fi
 
 # Get the tomcat config (use this for environment specific settings)
-TOMCAT_CFG="/etc/tomcat7/tomcat7.conf"
+export TOMCAT_CFG="/etc/tomcat7/tomcat7.conf"
 if [ -r "$TOMCAT_CFG" ]; then
     . $TOMCAT_CFG
 fi
@@ -52,6 +52,7 @@
 # Get instance specific config file
 if [ -r "/etc/sysconfig/${NAME}" ]; then
     . /etc/sysconfig/${NAME}
+    TOMCAT_CFG=/etc/sysconfig/${NAME}
 fi
 
 # Define which connector port to use
@@ -104,22 +105,28 @@
 }
 
 function makeHomeDir() {
-    if [ ! -d "$CATALINA_HOME" ]; then
-        echo "$CATALINA_HOME does not exist, creating"
+    if [ ! -d "$CATALINA_BASE" ]; then
+        echo "$CATALINA_BASE does not exist, creating"
         if [ ! -d "/usr/share/${NAME}" ]; then
             mkdir /usr/share/${NAME}
             cp -pLR /usr/share/tomcat7/* /usr/share/${NAME}
         fi
-        mkdir -p /var/log/${NAME} \
+        mkdir -p /var/lib/${NAME}/webapps \
+                 /var/log/${NAME} \
                  /var/cache/${NAME} \
                  /var/tmp/${NAME}
-        ln -fs /var/cache/${NAME} ${CATALINA_HOME}/work
-        ln -fs /var/tmp/${NAME} ${CATALINA_HOME}/temp
-        cp -pLR /usr/share/${NAME}/bin $CATALINA_HOME
-        cp -pLR /usr/share/${NAME}/conf $CATALINA_HOME
-        ln -fs /usr/share/java/tomcat7 ${CATALINA_HOME}/lib
-        ln -fs /usr/share/tomcat7/webapps ${CATALINA_HOME}/webapps
+        rm -rf ${CATALINA_BASE}/work
+        ln -fs /var/cache/${NAME} ${CATALINA_BASE}/work
+        rm -rf ${CATALINA_BASE}/temp
+        ln -fs /var/tmp/${NAME} ${CATALINA_BASE}/temp
+        rm -rf ${CATALINA_BASE}/logs
+        ln -fs /var/log/${NAME} ${CATALINA_BASE}/logs
+        ln -fs /usr/share/java/tomcat7 ${CATALINA_BASE}/lib
+        ln -fs /var/lib/${name}/webapps ${CATALINA_BASE}/webapps
+        chown ${TOMCAT_USER}:${TOMCAT_USER} /var/lib/${NAME}
         chown ${TOMCAT_USER}:${TOMCAT_USER} /var/log/${NAME}
+        chown ${TOMCAT_USER}:${TOMCAT_USER} /var/cache/${NAME}
+        chown ${TOMCAT_USER}:${TOMCAT_USER} /var/tmp/${NAME}
     fi
 }
 
@@ -159,18 +166,18 @@
     export CATALINA_PID="/var/run/${NAME}.pid"
     touch $CATALINA_PID
     chown ${TOMCAT_USER}:${TOMCAT_USER} $CATALINA_PID
-    touch $TOMCAT_LOG
-    chown ${TOMCAT_USER}:${TOMCAT_USER} $TOMCAT_LOG
-    if [ "$CATALINA_HOME" != "/usr/share/tomcat7" ]; then
+    if [ "$CATALINA_BASE" != "/usr/share/tomcat7" ]; then
         # Create a tomcat directory if it doesn't exist
         makeHomeDir
-        # If CATALINA_HOME doesn't exist modify port number so that
+        # If CATALINA_BASE doesn't exist modify port number so that
         # multiple instances don't interfere with each other
         findFreePorts
         sed -i -e "s/8005/${randomPort1}/g" -e "s/8080/${CONNECTOR_PORT}/g" \
             -e "s/8009/${randomPort2}/g" -e "s/8443/${randomPort3}/g" \
-            ${CATALINA_HOME}/conf/server.xml
+            ${CATALINA_BASE}/conf/server.xml
     fi
+    touch $TOMCAT_LOG
+    chown ${TOMCAT_USER}:${TOMCAT_USER} $TOMCAT_LOG
     parseOptions
     if [ "$SECURITY_MANAGER" = "true" ]; then
         $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start-security" \
Index: tomcat7-7.0.sysconfig
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/tomcat7/tomcat7-7.0.sysconfig,v
retrieving revision 1.1
diff -u -r1.1 tomcat7-7.0.sysconfig
--- tomcat7-7.0.sysconfig	7 Jan 2012 23:48:20 -0000	1.1
+++ tomcat7-7.0.sysconfig	14 Apr 2013 11:37:57 -0000
@@ -18,10 +18,10 @@
 #JAVA_HOME="/usr/lib/jvm/java"
 
 # Where your tomcat installation lives
-#CATALINA_BASE="@@@TCHOME@@@"
-#CATALINA_HOME="@@@TCHOME@@@"
-#JASPER_HOME="@@@TCHOME@@@"
-#CATALINA_TMPDIR="@@@TCTEMP@@@"
+CATALINA_BASE="@@@TCHOME@@@"
+CATALINA_HOME="@@@TCHOME@@@"
+JASPER_HOME="@@@TCHOME@@@"
+CATALINA_TMPDIR="@@@TCTEMP@@@"
 
 # You can pass some parameters to java here if you wish to
 #JAVA_OPTS="-Xminf0.1 -Xmaxf0.3"
@@ -45,7 +45,10 @@
 #SHUTDOWN_VERBOSE="false"
 
 # Set the TOMCAT_PID location
-#CATALINA_PID="/var/run/tomcat7.pid"
+CATALINA_PID="/var/run/tomcat7.pid"
+
+# Set the TOMCAT_LOG location
+TOMCAT_LOG="${CATALINA_BASE}/logs/catalina.out"
 
 # Connector port is 8080 for this tomcat7 instance
 #CONNECTOR_PORT="8080"
Index: tomcat7.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/tomcat7/tomcat7.spec,v
retrieving revision 1.5
diff -u -r1.5 tomcat7.spec
--- tomcat7.spec	13 Apr 2013 09:26:07 -0000	1.5
+++ tomcat7.spec	14 Apr 2013 11:37:57 -0000
@@ -59,7 +59,7 @@
 Name: tomcat7
 Epoch: 0
 Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group: Networking/Daemons
@@ -702,6 +702,9 @@
 %{appdir}/sample
 
 %changelog
+* Sun Apr 14 2013 Ralph Apel <[email protected]> 0:7.0.39-2
+- Fix bug analogous to 356 for tomcat6
+
 * Sat Apr 13 2013 Ralph Apel <[email protected]> 0:7.0.39-1
 - 7.0.39
 - Apply patches/changes supplied by jayen, THX a lot