packages: tomcat/apache-tomcat.init - use jsvc to start tomcat
pawelz
pawelz at pld-linux.org
Wed May 19 01:49:28 CEST 2010
Author: pawelz Date: Tue May 18 23:49:28 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- use jsvc to start tomcat
---- Files affected:
packages/tomcat:
apache-tomcat.init (1.17 -> 1.18)
---- Diffs:
================================================================
Index: packages/tomcat/apache-tomcat.init
diff -u packages/tomcat/apache-tomcat.init:1.17 packages/tomcat/apache-tomcat.init:1.18
--- packages/tomcat/apache-tomcat.init:1.17 Fri Dec 11 17:40:14 2009
+++ packages/tomcat/apache-tomcat.init Wed May 19 01:49:23 2010
@@ -1,23 +1,24 @@
#!/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"
-JAVA_HOME=$(. /usr/share/java-utils/java-functions; set_jvm >&2; echo "$JAVA_HOME")
+set_jvm
# Get service config - may override defaults
[ -f /etc/sysconfig/tomcat ] && . /etc/sysconfig/tomcat
@@ -26,6 +27,9 @@
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
@@ -42,7 +46,16 @@
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
@@ -60,7 +73,13 @@
# Stop daemons.
msg_stopping tomcat
busy
- su tomcat -s /bin/sh -c '/usr/share/tomcat/bin/catalina.sh stop -force' >/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
@@ -98,7 +117,7 @@
condrestart 7
;;
status)
- status tomcat java
+ status --pidfile /var/run/tomcat.pid tomcat tomcat
RETVAL=0
;;
*)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/apache-tomcat.init?r1=1.17&r2=1.18&f=u
More information about the pld-cvs-commit
mailing list