Accepting request 146513 from home:archie172:branches:Java:packages

What these changes do:

1. Fix this tomcat warning:

    SEVERE: An incompatible version 1.1.23 of the APR based Apache Tomcat Native library is installed, while Tomcat requires version 1.1.24

2. Fix this tomcat warning:

    WARNING: Problem with JAR file [/usr/share/java/tomcat/log4j.jar], exists: [false], canRead: [false]

3. Ensure tomcat stdout/stderr output ends up in catalina.out

4. Fix several issues in the init script

Thanks.

OBS-URL: https://build.opensuse.org/request/show/146513
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=15

tomcat-7.0-tomcat-sysd

@@ -77,7 +77,8 @@ function start() {
         -Djava.io.tmpdir="$CATALINA_TMPDIR" ${DSECURITY_MANAGER} \
         -Djava.util.logging.config.file="${CATALINA_BASE}/conf/logging.properties" \
         -Djava.util.logging.manager="org.apache.juli.ClassLoaderLogManager" \
-        org.apache.catalina.startup.Bootstrap start
+        org.apache.catalina.startup.Bootstrap start \
+        >> ${CATALINA_BASE}/logs/catalina.out 2>&1
     ret=${?}
 
     return $ret

tomcat-7.0.init

@@ -27,7 +27,7 @@
 ### END INIT INFO
  
 # set a minimalist PATH
-PATH="/bin:/sbin"
+PATH="/bin:/sbin:/usr/bin:/usr/sbin"
  
 # Source LSB function library.
 if [ -r /lib/lsb/init-functions ]; then
@@ -304,11 +304,9 @@ function stop() {
             rm -f /var/run/rc${NAME} /var/run/${NAME}.pid
             if [ "${CLEAR_WORK}" = "true" ]; then
                 echo -n "Cleaning work directory: "
-                #rm -rf ${CATALINA_HOME}/work/*
-                find ${CATALINA_HOME}/work/ -maxdepth 1 -type 'd' \! -name 'Catalina' \! -name 'temp' -print0 | xargs -0 rm -rf
-                find ${CATALINA_HOME}/work/Catalina/ ${CATALINA_HOME}/work/temp/ -print0 | xargs -0 rm -rf
+                find ${CATALINA_HOME}/work/{Catalina,temp} -mindepth 2 -type d -print0 | xargs -0 rm -rf
                 if [ "$?" -eq "0" ]; then
-                        echo_success
+                        log_success_msg
                         echo -n -e "\n"
                 fi
              fi
@@ -349,7 +347,7 @@ case "$1" in
     ## do this on signal 1 (SIGHUP).
     ## If it does not support it, restart.
  
-    echo -n "Reload service Tomcat $($CATALINA_BASE)"
+    echo -n "Reload service Tomcat ($CATALINA_BASE)"
     ## if it supports it:
     #killproc -HUP $TOMCAT_BIN
     #touch /var/run/FOO.pid

tomcat.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Dec 27 17:14:55 UTC 2012 - archie@dellroad.org
+
+- Ensure tomcat stdout/stderr output ends up in catalina.out
+
+-------------------------------------------------------------------
+Thu Dec 20 22:45:19 UTC 2012 - archie@dellroad.org
+
+- Recommend libtcnative-1-0 >= 1.1.24
+- /etc/init.d/tomcate init script fixes:
+  * Include /usr/bin and /usr/sbin in the PATH
+  * Fix logic for cleaning the work directories
+  * Fix typo (log_success_msg lsb function name)
+  * Fix typo (reload message)
+- Require log4j
+
 -------------------------------------------------------------------
 Tue Dec 18 09:34:29 UTC 2012 - mvyskocil@suse.com
 

tomcat.spec

@@ -112,7 +112,7 @@ BuildRequires:  wsdl4j
 BuildRequires:  systemd
 %endif
 
-Recommends:     libtcnative-1-0
+Recommends:     libtcnative-1-0 >= 1.1.24
 Recommends:     logrotate
 
 Requires(pre): %{_sbindir}/groupadd
@@ -122,6 +122,7 @@ Requires:       jakarta-commons-daemon
 Requires:       jakarta-commons-dbcp
 Requires:       jakarta-commons-logging
 Requires:       jakarta-commons-pool
+Requires:       log4j
 %{?systemd_requires}
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig