Author: mturk
Date: Mon Jun 6 14:54:15 2011
New Revision: 1132663
URL: http://svn.apache.org/viewvc?rev=1132663&view=rev
Log:
DAEMON-202 Allow having JSVC_OPTS environment variable
Modified:
commons/proper/daemon/trunk/RELEASE-NOTES.txt
commons/proper/daemon/trunk/src/samples/Tomcat5.sh
commons/proper/daemon/trunk/src/samples/Tomcat7.sh
Modified: commons/proper/daemon/trunk/RELEASE-NOTES.txt
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/RELEASE-NOTES.txt?rev=1132663&r1=1132662&r2=1132663&view=diff
==============================================================================
--- commons/proper/daemon/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/trunk/RELEASE-NOTES.txt Mon Jun 6 14:54:15 2011
@@ -34,6 +34,8 @@ NEW FEATURES:
* DAEMON-205: Add support for building on ARM processors (1.0.6)
* DAEMON-204: Add DaemonSignal interface that allows catching SIGUSR2
signals and creating custom callbacks (1.0.6)
+* DAEMON-202: Allow JSVC_OPTS environment variable to be used in
+ the example Tomcat scripts (1.0.6)
* DAEMON-180: Add DaemonWrapper to allow running standard applications
as daemons. (1.0.4)
* DAEMON-179: Allow procrun to use java/lang/System as --ShutdownClass. (1.0.4)
Modified: commons/proper/daemon/trunk/src/samples/Tomcat5.sh
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/samples/Tomcat5.sh?rev=1132663&r1=1132662&r2=1132663&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/samples/Tomcat5.sh (original)
+++ commons/proper/daemon/trunk/src/samples/Tomcat5.sh Mon Jun 6 14:54:15 2011
@@ -51,7 +51,7 @@ case "$1" in
#
# Start Tomcat
#
- $DAEMON_HOME/src/native/unix/jsvc \
+ $DAEMON_HOME/src/native/unix/jsvc $JSVC_OPTS \
-user $TOMCAT_USER \
-home $JAVA_HOME \
-Dcatalina.home=$CATALINA_HOME \
@@ -76,7 +76,7 @@ case "$1" in
#
# Stop Tomcat
#
- $DAEMON_HOME/src/native/unix/jsvc \
+ $DAEMON_HOME/src/native/unix/jsvc $JSVC_OPTS \
-stop \
-pidfile $PID_FILE \
org.apache.catalina.startup.Bootstrap
Modified: commons/proper/daemon/trunk/src/samples/Tomcat7.sh
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/samples/Tomcat7.sh?rev=1132663&r1=1132662&r2=1132663&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/samples/Tomcat7.sh (original)
+++ commons/proper/daemon/trunk/src/samples/Tomcat7.sh Mon Jun 6 14:54:15 2011
@@ -160,6 +160,7 @@ case "$1" in
run )
shift
"$JSVC" $* \
+ $JSVC_OPTS \
-java-home "$JAVA_HOME" \
-pidfile "$CATALINA_PID" \
-wait 10 \
@@ -176,7 +177,7 @@ case "$1" in
exit $?
;;
start )
- "$JSVC" \
+ "$JSVC" $JSVC_OPTS \
-java-home "$JAVA_HOME" \
-user $TOMCAT_USER \
-pidfile "$CATALINA_PID" \
@@ -193,7 +194,7 @@ case "$1" in
exit $?
;;
stop )
- "$JSVC" \
+ "$JSVC" $JSVC_OPTS \
-stop \
-pidfile "$CATALINA_PID" \
-classpath "$CLASSPATH" \
