You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@locus.apache.org on 2000/11/04 17:08:57 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/bin catalina.sh
craigmcc 00/11/04 08:08:55
Modified: catalina/src/bin catalina.sh
Log:
Use "$JAVA_HOME/bin/java" instead of "java" to execute the JVM, to ensure
that the correct runtime (based on the setting of JAVA_HOME) is selected,
no matter what is on the user's path. This functionality already exists
in the Windows version of the startup script.
PR: BugRat Bug Reports #341, 342
Submitted by: Juan Jose Pablos (juan.pablos@uk.sun.com)
Revision Changes Path
1.9 +7 -7 jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
Index: catalina.sh
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- catalina.sh 2000/11/02 06:14:08 1.8
+++ catalina.sh 2000/11/04 16:08:54 1.9
@@ -12,7 +12,7 @@
#
# JAVA_HOME Must point at your Java Development Kit installation.
#
-# $Id: catalina.sh,v 1.8 2000/11/02 06:14:08 remm Exp $
+# $Id: catalina.sh,v 1.9 2000/11/04 16:08:54 craigmcc Exp $
# -----------------------------------------------------------------------------
@@ -71,7 +71,7 @@
CP=$i:${CP}
done
echo Embedded Classpath: $CP
- java $CATALINA_OPTS -classpath $CP \
+ $JAVA_HOME/bin/java $CATALINA_OPTS -classpath $CP \
-Dcatalina.home=$CATALINA_HOME \
org.apache.catalina.startup.Embedded "$@"
@@ -86,13 +86,13 @@
if [ "$1" = "-security" ] ; then
echo Using Security Manager
shift
- java $CATALINA_OPTS -classpath $CP \
+ $JAVA_HOME/bin/java $CATALINA_OPTS -classpath $CP \
-Djava.security.manager \
-Djava.security.policy==$CATALINA_HOME/conf/catalina.policy \
-Dcatalina.home=$CATALINA_HOME \
org.apache.catalina.startup.Bootstrap "$@" start
else
- java $CATALINA_OPTS -classpath $CP \
+ $JAVA_HOME/bin/java $CATALINA_OPTS -classpath $CP \
-Dcatalina.home=$CATALINA_HOME \
org.apache.catalina.startup.Bootstrap "$@" start
fi
@@ -104,14 +104,14 @@
if [ "$1" = "-security" ] ; then
echo Using Security Manager
shift
- java $CATALINA_OPTS -classpath $CP \
+ $JAVA_HOME/bin/java $CATALINA_OPTS -classpath $CP \
-Djava.security.manager \
-Djava.security.policy==$CATALINA_HOME/conf/catalina.policy \
-Dcatalina.home=$CATALINA_HOME \
org.apache.catalina.startup.Bootstrap "$@" start \
>> $CATALINA_HOME/logs/catalina.out 2>&1 &
else
- java $CATALINA_OPTS -classpath $CP \
+ $JAVA_HOME/bin/java $CATALINA_OPTS -classpath $CP \
-Dcatalina.home=$CATALINA_HOME \
org.apache.catalina.startup.Bootstrap "$@" start \
>> $CATALINA_HOME/logs/catalina.out 2>&1 &
@@ -120,7 +120,7 @@
elif [ "$1" = "stop" ] ; then
shift
- java $CATALINA_OPTS -classpath $CP \
+ $JAVA_HOME/bin/java $CATALINA_OPTS -classpath $CP \
-Dcatalina.home=$CATALINA_HOME \
org.apache.catalina.startup.Bootstrap "$@" stop