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/07/25 05:21:20 UTC
cvs commit: jakarta-tomcat/src/shell tomcat.bat tomcat.sh
craigmcc 00/07/24 20:21:20
Modified: src/shell tomcat.bat tomcat.sh
Log:
Add JAVA_HOME and TOMCAT_HOME values to the output when Tomcat is started
or stopped, for debugging purposes.
Submitted by: Juan Jose Pablos <jj...@bton.ac.uk> who also submitted
the previous patch to add tools.jar to the classpath in build.bat.
Revision Changes Path
1.26 +3 -1 jakarta-tomcat/src/shell/tomcat.bat
Index: tomcat.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- tomcat.bat 2000/07/18 06:00:09 1.25
+++ tomcat.bat 2000/07/25 03:21:19 1.26
@@ -17,7 +17,7 @@
rem
rem JAVA_HOME Must point at your Java Development Kit installation.
rem
-rem $Id: tomcat.bat,v 1.25 2000/07/18 06:00:09 craigmcc Exp $
+rem $Id: tomcat.bat,v 1.26 2000/07/25 03:21:19 craigmcc Exp $
rem -------------------------------------------------------------------------
@@ -48,6 +48,8 @@
:noClasspath
set CP=%CP%;%JAVA_HOME%\lib\tools.jar
echo Using CLASSPATH: %CP%
+echo Using JAVA_HOME: %JAVA_HOME%
+echo Using TOMCAT_HOME: %TOMCAT_HOME%
rem ----- Execute The Requested Command -------------------------------------
1.18 +7 -1 jakarta-tomcat/src/shell/tomcat.sh
Index: tomcat.sh
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.sh,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- tomcat.sh 2000/05/26 18:55:33 1.17
+++ tomcat.sh 2000/07/25 03:21:20 1.18
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: tomcat.sh,v 1.17 2000/05/26 18:55:33 costin Exp $
+# $Id: tomcat.sh,v 1.18 2000/07/25 03:21:20 craigmcc Exp $
# Shell script to start and stop the server
@@ -118,6 +118,8 @@
if [ "$1" = "start" ] ; then
shift
echo Using classpath: ${CLASSPATH}
+ echo Using JAVA_HOME: ${JAVA_HOME}
+ echo Using TOMCAT_HOME: ${TOMCAT_HOME}
if [ "$1" = "-security" ] ; then
echo Starting with a SecurityManager
$JAVACMD $TOMCAT_OPTS -Djava.security.manager -Djava.security.policy==${TOMCAT_HOME}/conf/tomcat.policy -Dtomcat.home=${TOMCAT_HOME} org.apache.tomcat.startup.Tomcat "$@" &
@@ -129,12 +131,16 @@
elif [ "$1" = "stop" ] ; then
shift
echo Using classpath: ${CLASSPATH}
+ echo Using JAVA_HOME: ${JAVA_HOME}
+ echo Using TOMCAT_HOME: ${TOMCAT_HOME}
$JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} org.apache.tomcat.startup.Tomcat -stop "$@"
# $JAVACMD org.apache.tomcat.shell.Shutdown "$@"
elif [ "$1" = "run" ] ; then
shift
echo Using classpath: ${CLASSPATH}
+ echo Using JAVA_HOME: ${JAVA_HOME}
+ echo Using TOMCAT_HOME: ${TOMCAT_HOME}
if [ "$1" = "-security" ] ; then
echo Starting with a SecurityManager
$JAVACMD $TOMCAT_OPTS -Djava.security.manager -Djava.security.policy==${TOMCAT_HOME}/conf/tomcat.policy -Dtomcat.home=${TOMCAT_HOME} org.apache.tomcat.startup.Tomcat "$@"