Author: baggins Date: Mon Dec 6 23:14:25 2010 GMT
Module: packages Tag: DEVEL
---- Log message:
- merge from HEAD
---- Files affected:
packages/tomcat:
apache-tomcat.init (1.19 -> 1.19.2.1) , apache-tomcat.sysconfig (1.4 ->
1.4.2.1)
---- Diffs:
================================================================
Index: packages/tomcat/apache-tomcat.init
diff -u packages/tomcat/apache-tomcat.init:1.19
packages/tomcat/apache-tomcat.init:1.19.2.1
--- packages/tomcat/apache-tomcat.init:1.19 Wed May 19 22:00:40 2010
+++ packages/tomcat/apache-tomcat.init Tue Dec 7 00:14:19 2010
@@ -16,29 +16,49 @@
# 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"
+# Check that networking is up.
+if is_yes "${NETWORKING}"; then
+ if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ];
then
+ msg_network_down tomcat
+ exit 1
+ fi
+else
+ exit 0
+fi
+
set_jvm
+# Set default options
+CATALINA_OPTS="-Xmx384M -XX:MaxPermSize=192m -XX:PermSize=128m"
+
# 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
+unset TMPDIR
+unset TMP
+
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
- msg_network_down tomcat
- exit 1
+CATALINA_HOME=/usr/share/tomcat
+CATALINA_BASE=/var/lib/tomcat
+CATALINA_TMPDIR=/var/lib/tomcat/temp
+
+JSVC_OPTS="-classpath ${CLASSPATH} \
+ -home ${JAVA_HOME} \
+ -pidfile /var/run/tomcat.pid \
+ -outfile /var/log/tomcat/catalina.out \
+ -errfile /var/log/tomcat/catalina.err"
+
+if is_yes "${SECURITY_MANAGER}"; then
+ CATALINA_OPTS="$CATALINA_OPTS \
+ -Djava.security.manager \
+ -Djava.security.policy==${CATALINA_BASE}/conf/catalina.policy"
+ if [ -n "${SECURITY_MANAGER_DEBUG}" ]; then
+ CATALINA_OPTS="$CATALINA_OPTS \
+ -Djava.security.debug=${SECURITY_MANAGER_DEBUG}"
fi
-else
- exit 0
fi
start() {
@@ -47,13 +67,12 @@
msg_starting tomcat
busy
cd $CATALINA_BASE
- 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 \
+ jsvc -user tomcat -procname tomcat \
+ $JSVC_OPTS \
+ -Dcatalina.base=${CATALINA_BASE} \
+ -Dcatalina.home=${CATALINA_HOME} \
+ -Djava.io.tmpdir=${CATALINA_TMPDIR} \
+ -Djava.library.path=/usr/lib64:/usr/lib \
$CATALINA_OPTS \
org.apache.catalina.startup.Bootstrap
[ $? -ne 0 ] && RETVAL=1
@@ -73,12 +92,8 @@
# Stop daemons.
msg_stopping tomcat
busy
- jsvc -user tomcat \
- -stop \
- -cp $CLASSPATH \
- -pidfile /var/run/tomcat.pid \
- -outfile /var/log/tomcat/catalina.out \
- -errfile /var/log/tomcat/catalina.err \
+ jsvc -user tomcat -stop \
+ $JSVC_OPTS \
org.apache.catalina.startup.Bootstrap
[ $? -eq 0 ] && ok || fail
rm -f /var/lock/subsys/tomcat
================================================================
Index: packages/tomcat/apache-tomcat.sysconfig
diff -u packages/tomcat/apache-tomcat.sysconfig:1.4
packages/tomcat/apache-tomcat.sysconfig:1.4.2.1
--- packages/tomcat/apache-tomcat.sysconfig:1.4 Fri Dec 11 17:40:54 2009
+++ packages/tomcat/apache-tomcat.sysconfig Tue Dec 7 00:14:19 2010
@@ -1,6 +1,12 @@
-### Java runtime options used when the "start", or "run" command is executed.
-# CATALINA_OPTS="-Xmx384M -XX:MaxPermSize=192m -XX:PermSize=128m"
+# Java runtime options used when starting Tomcat
+#CATALINA_OPTS="-Xmx384M -XX:MaxPermSize=192m -XX:PermSize=128m"
-### Java runtime options used when the "start", "stop", or "run" command is
-### executed.
-# JAVA_HOME=""
+# Start Tomcat with SecurityManager
+#SECURITY_MANAGER="yes"
+
+# Enable SecurityManager debugging
+# WARNING - This will generate many megabytes of output!
+#SECURITY_MANAGER_DEBUG="all"
+
+# Java Development Kit installation
+#JAVA_HOME=""
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/apache-tomcat.init?r1=1.19&r2=1.19.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/apache-tomcat.sysconfig?r1=1.4&r2=1.4.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
