X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache-tomcat.init;h=32c9a78ff657eef9bff6ee9b0bb09870c995ddd7;hb=81f64e18ad388b0d2846561ea3e2392e1887b4d3;hp=f1111248febb285251b43e44c47ceb40424c23b5;hpb=761d5e69fed95eb00f9ca5ee18f5bb27a9834898;p=packages%2Ftomcat.git

diff --git a/apache-tomcat.init b/apache-tomcat.init
index f111124..32c9a78 100644
--- 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 tomcat -s /bin/sh -c '/usr/share/tomcat/bin/catalina.sh start' >/dev/null 2>&1
+		cd /usr/share/tomcat
+		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 tomcat -s /bin/sh -c '/usr/share/tomcat/bin/catalina.sh stop' >/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
@@ -89,7 +117,7 @@ case "$1" in
 	condrestart 7
 	;;
   status)
-	echo "Not supported (yet?)"
+	status --pidfile /var/run/tomcat.pid tomcat tomcat
 	RETVAL=0
 	;;
   *)