- utf8 URIEncoding; rel 2

[packages/tomcat.git] / apache-tomcat.init

diff --git a/apache-tomcat.init b/apache-tomcat.init
index ed8eccf668c43501e5edd1c085ab1088f8c6d8b7..5b8aaf911bf3334939cd72ff460bbef99abad44d 100644 (file)
--- a/apache-tomcat.init
+++ b/apache-tomcat.init
@@ -1,23 +1,36 @@
 #!/bin/sh
 #
-# tomcat       Jakarta Tomcat Servlet/JSP container
+# tomcat       Tomcat Servlet/JSP container
 #
 # chkconfig:    345  84 16
 #
-# description: Jakarta Tomcat Servlet/JSP container
+# description: Tomcat Servlet/JSP container
 #
 # $Id$
 
 
-# Source function library
+# Source function libraries
 . /etc/rc.d/init.d/functions
+. /usr/share/java-utils/java-functions
 
 # Get network config
 . /etc/sysconfig/network
 
+CATALINA_BASE=/var/lib/tomcat
+CATALINA_OPTS="-Xmx384M -XX:MaxPermSize=192m -XX:PermSize=128m -Djava.library.path=/usr/lib64:/usr/lib"
+set_jvm
+
 # Get service config - may override defaults
 [ -f /etc/sysconfig/tomcat ] && . /etc/sysconfig/tomcat
 
+export CATALINA_BASE
+export CATALINA_OPTS
+export JAVA_OPTS
+export JAVA_HOME
+COMMONSDAEMON=$(find-jar commons-daemon)
+TOMCATLIBS=/usr/share/tomcat/bin/bootstrap.jar:$(build-classpath-directory /usr/share/tomcat/lib)
+CLASSPATH=${CLASSPATH:+"$CLASSPATH:"}$COMMONSDAEMON:$TOMCATLIBS
+
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
        if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
@@ -33,7 +46,16 @@ start() {
        if [ ! -f /var/lock/subsys/tomcat ]; then
                msg_starting tomcat
                busy
-               su - http -s /bin/sh -c /usr/share/tomcat/bin/startup.sh >/dev/null 2>&1
+               cd $CATALINA_BASE
+               jsvc -user tomcat \
+                       -procname tomcat \
+                       -cp $CLASSPATH \
+                       -home $JAVA_HOME \
+                       -pidfile /var/run/tomcat.pid \
+                       -outfile /var/log/tomcat/catalina.out \
+                       -errfile /var/log/tomcat/catalina.err \
+                       $CATALINA_OPTS \
+                       org.apache.catalina.startup.Bootstrap
                [ $? -ne 0 ] && RETVAL=1
                if [ $RETVAL -eq 0 ]; then
                        ok
@@ -51,7 +73,13 @@ stop() {
                # Stop daemons.
                msg_stopping tomcat
                busy
-               su - http -s /bin/sh -c /usr/share/tomcat/bin/shutdown.sh >/dev/null 2>&1
+               jsvc -user tomcat \
+                       -stop \
+                       -cp $CLASSPATH \
+                       -pidfile /var/run/tomcat.pid \
+                       -outfile /var/log/tomcat/catalina.out \
+                       -errfile /var/log/tomcat/catalina.err \
+                       org.apache.catalina.startup.Bootstrap
                [ $? -eq 0 ] && ok || fail
                rm -f /var/lock/subsys/tomcat
        else
@@ -59,6 +87,16 @@ stop() {
        fi
 }
 
+condrestart() {
+       if [ -f /var/lock/subsys/tomcat ]; then
+               stop
+               start
+       else
+               msg_not_running tomcat
+               RETVAL=$1
+       fi
+}
+
 RETVAL=0
 # See how we were called.
 case "$1" in
@@ -68,16 +106,22 @@ case "$1" in
   stop)
        stop
        ;;
-  restart|force-reload)
+  restart)
        stop
        start
        ;;
+  try-restart)
+       condrestart 0
+       ;;
+  force-reload)
+       condrestart 7
+       ;;
   status)
-       echo "Not supported (yet?)"
+       status --pidfile /var/run/tomcat.pid tomcat tomcat
        RETVAL=0
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
        exit 3
 esac