diff options
| author | Benjamin Trigona-Harany <bosth@alumni.sfu.ca> | 2014-10-13 13:52:52 -0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2014-10-18 07:00:02 +0700 |
| commit | dda5202c94693a85fad829e008a90e3b362fc494 (patch) | |
| tree | a4c9c46b26f2cefe219cc1a2912584612d21cc4a /system/apache-tomcat/rc.tomcat | |
| parent | 71f6ae8518d067823f41d14820b3366a31208b67 (diff) | |
system/apache-tomcat: Updated for version 7.0.56 + fixed rc.tomcat.
Signed-off-by: Benjamin Trigona-Harany <bosth@alumni.sfu.ca>
Diffstat (limited to 'system/apache-tomcat/rc.tomcat')
| -rw-r--r-- | system/apache-tomcat/rc.tomcat | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/system/apache-tomcat/rc.tomcat b/system/apache-tomcat/rc.tomcat index 478528d1afca8..75c083b67952c 100644 --- a/system/apache-tomcat/rc.tomcat +++ b/system/apache-tomcat/rc.tomcat @@ -26,9 +26,11 @@ done USER="tomcat" -TOMCAT_CMD="/usr/bin/jsvc -user $USER -cp $CLASSPATH \ +JSVC="/usr/bin/jsvc" +TOMCAT_CMD="-user $USER -cp $CLASSPATH \ -pidfile $PIDFILE -outfile $LOGFILE -errfile $LOGFILE \ -Xms$MEMALLOC_MIN -Xmx$MEMALLOC_MAX -Xss$STACK -XX:MaxPermSize=$MAXPERMSIZE \ + -Djava.io.tmpdir="$CATALINA_TMPDIR" \ -Dcatalina.home=$CATALINA_HOME -Dcatalina.base=$CATALINA_BASE \ -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \ -Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties \ @@ -41,7 +43,7 @@ tomcat_start() { else unset DISPLAY cd /var/lib/tomcat - $TOMCAT_CMD + $JSVC $TOMCAT_CMD echo "done!" fi } @@ -49,9 +51,9 @@ tomcat_start() { tomcat_stop() { echo -n "Stopping Apache Tomcat ... " if [ -e "$PIDFILE" ]; then - kill -TERM $(cat $PIDFILE) > /dev/null 2>&1 + cd /var/lib/tomcat + $JSVC -stop $TOMCAT_CMD echo "done!" - rm -f "$PIDFILE" else echo "not running!" fi |