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 | |
| 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')
| -rw-r--r-- | system/apache-tomcat/apache-tomcat.SlackBuild | 4 | ||||
| -rw-r--r-- | system/apache-tomcat/apache-tomcat.info | 6 | ||||
| -rw-r--r-- | system/apache-tomcat/rc.tomcat | 10 | ||||
| -rw-r--r-- | system/apache-tomcat/tomcat-java.conf | 8 |
4 files changed, 15 insertions, 13 deletions
diff --git a/system/apache-tomcat/apache-tomcat.SlackBuild b/system/apache-tomcat/apache-tomcat.SlackBuild index 9c1545de36e31..7e44293ebcf8b 100644 --- a/system/apache-tomcat/apache-tomcat.SlackBuild +++ b/system/apache-tomcat/apache-tomcat.SlackBuild @@ -24,9 +24,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=apache-tomcat -VERSION=7.0.47 +VERSION=${VERSION:-7.0.56} ARCH=noarch -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} CWD=$(pwd) diff --git a/system/apache-tomcat/apache-tomcat.info b/system/apache-tomcat/apache-tomcat.info index c51d63a6ac01e..68a6541775339 100644 --- a/system/apache-tomcat/apache-tomcat.info +++ b/system/apache-tomcat/apache-tomcat.info @@ -1,8 +1,8 @@ PRGNAM="apache-tomcat" -VERSION="7.0.47" +VERSION="7.0.56" HOMEPAGE="http://tomcat.apache.org/" -DOWNLOAD="http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.47/bin/apache-tomcat-7.0.47.tar.gz" -MD5SUM="efbae77efad579b655ae175754cad3df" +DOWNLOAD="http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.56/bin/apache-tomcat-7.0.56.tar.gz" +MD5SUM="2887d0e3ca18bdca63004a0388c99775" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="jdk commons-daemon" 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 diff --git a/system/apache-tomcat/tomcat-java.conf b/system/apache-tomcat/tomcat-java.conf index 053db27e9937c..71a927242f12c 100644 --- a/system/apache-tomcat/tomcat-java.conf +++ b/system/apache-tomcat/tomcat-java.conf @@ -2,15 +2,15 @@ # used by apache tomcat. It does not affect any other java # applications -# Initial size of memory allocation pool +# Initial heap memory size MEMALLOC_MIN="512m" -# Maximum size of memory allocation pool +# Maximum heap memory size MEMALLOC_MAX="1024m" # Thread stack size STACK="256k" -# Maximum amount of heap used for permanent generation -MAXPERMSIZE="512m" +# Permanent generation memory size +MAXPERMSIZE="128m" |