diff options
| author | Heinz Wiesinger <pprkut@liwjatan.at> | 2013-11-30 18:00:21 +0100 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2013-12-02 00:58:01 -0600 |
| commit | a8ead33a5fd0fb876d1813a75643552a8aad0862 (patch) | |
| tree | 1bc3d8b09f3878669c077cb7b2357bc79ff83c94 | |
| parent | bd786958d8723124ad839ce8e7ddea53ce8a710f (diff) | |
system/apache-tomcat: Updated for version 7.0.47.
Updated init script for commons-daemon changes
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
| -rw-r--r-- | system/apache-tomcat/apache-tomcat.SlackBuild | 6 | ||||
| -rw-r--r-- | system/apache-tomcat/apache-tomcat.info | 6 | ||||
| -rw-r--r-- | system/apache-tomcat/rc.tomcat | 19 |
3 files changed, 21 insertions, 10 deletions
diff --git a/system/apache-tomcat/apache-tomcat.SlackBuild b/system/apache-tomcat/apache-tomcat.SlackBuild index 83451907fd43a..137249cc30268 100644 --- a/system/apache-tomcat/apache-tomcat.SlackBuild +++ b/system/apache-tomcat/apache-tomcat.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for apache-tomcat -# Copyright 2008-2011 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2008-2013 Heinz Wiesinger, Amsterdam, The Netherlands # Copyright 2010 Vincent Batts, vbatts@hashbangbash.com, http://hashbangbash.com/ # All rights reserved. # @@ -24,9 +24,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=apache-tomcat -VERSION=7.0.22 +VERSION=7.0.47 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 75e26089ce3d0..c51d63a6ac01e 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.22" +VERSION="7.0.47" HOMEPAGE="http://tomcat.apache.org/" -DOWNLOAD="http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.22/bin/apache-tomcat-7.0.22.tar.gz" -MD5SUM="e649eb42e18905665846499ff39e72be" +DOWNLOAD="http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.47/bin/apache-tomcat-7.0.47.tar.gz" +MD5SUM="efbae77efad579b655ae175754cad3df" 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 83ca5ccc9b5b8..97966a68cefc2 100644 --- a/system/apache-tomcat/rc.tomcat +++ b/system/apache-tomcat/rc.tomcat @@ -1,18 +1,26 @@ #!/bin/sh # Start/stop/restart apache-tomcat. -# $Id: rc.apache-tomcat,v 1.1.4 2011/04/01 +# $Id: rc.apache-tomcat,v 1.2.0 2013/11/30 # Authors: Heinz Wiesinger <pprkut@liwjatan.at>, Vincent Batts <vbatts@hashbangbash.com> # --------------------------------------------------------------------------- # Load tomcat specific java vm options . /etc/tomcat/tomcat-java.conf +# Load environment variables +. /etc/profile.d/apache-tomcat.sh +if [ -e "/etc/profile.d/openjdk.sh" ]; then + . /etc/profile.d/openjdk.sh +else + . /etc/profile.d/jdk.sh +fi + PIDFILE="/var/spool/tomcat/tomcat.pid" LOGFILE="/var/log/tomcat/tomcat.log" -CLASSPATH="/usr/share/tomcat/bin/bootstrap.jar:/usr/share/java/commons-daemon.jar" -for i in /usr/share/tomcat/lib/*.jar; do - CLASSPATH=$CLASSPATH:$i +CLASSPATH="$CATALINA_BASE/bin/bootstrap.jar:/usr/share/java/commons-daemon.jar" +for i in $CATALINA_LIBDIR/*.jar; do + CLASSPATH=$CLASSPATH:$i done USER="tomcat" @@ -20,6 +28,9 @@ USER="tomcat" TOMCAT_CMD="/usr/bin/jsvc -user $USER -cp $CLASSPATH \ -pidfile $PIDFILE -outfile $LOGFILE -errfile $LOGFILE \ -Xms$MEMALLOC_MIN -Xmx$MEMALLOC_MAX -Xss$STACK -XX:MaxPermSize=$MAXPERMSIZE \ + -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 \ -Djava.awt.headless=true org.apache.catalina.startup.Bootstrap" tomcat_start() { |