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/08/12 03:40:45 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/bin catalina.sh
craigmcc 00/08/11 18:40:44
Modified: catalina/src/bin catalina.sh
Log:
Fix "minor script issues" in catalina.sh corresponding to changes in
catalina.bat.
Revision Changes Path
1.2 +8 -8 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- catalina.sh 2000/08/11 05:22:16 1.1
+++ catalina.sh 2000/08/12 01:40:44 1.2
@@ -12,7 +12,7 @@
#
# JAVA_HOME Must point at your Java Development Kit installation.
#
-# $Id: catalina.sh,v 1.1 2000/08/11 05:22:16 craigmcc Exp $
+# $Id: catalina.sh,v 1.2 2000/08/12 01:40:44 craigmcc Exp $
# -----------------------------------------------------------------------------
@@ -67,10 +67,10 @@
shift
pushd $CATALINA_HOME
jdb \
- -sourcepath ../../jakarta-tomcat/proposals/catalina:../../jakarta-tomcat \
+ -sourcepath ../../jakarta-tomcat-4.0/catalina/src/share \
-Xbootclasspath:$BP \
-classpath $CP -Dcatalina.home=$CATALINA_HOME \
- org.apache.tomcat.startup.Bootstrap "$@" start
+ org.apache.catalina.startup.Bootstrap "$@" start
popd
elif [ "$1" = "embedded" ] ; then
@@ -85,11 +85,11 @@
shift
java $CATALINA_OPTS -classpath $CP \
-Dcatalina.home=$CATALINA_HOME \
- org.apache.tomcat.startup.Embedded "$@"
+ org.apache.catalina.startup.Embedded "$@"
elif [ "$1" = "env" ] ; then
- export CATALINA_HOME CP
+ export BP CATALINA_HOME CP
exit 0
elif [ "$1" = "run" ] ; then
@@ -97,7 +97,7 @@
shift
java $CATALINA_OPTS -Xbootclasspath:$BP -classpath $CP \
-Dcatalina.home=$CATALINA_HOME \
- org.apache.tomcat.startup.Bootstrap "$@" start
+ org.apache.catalina.startup.Bootstrap "$@" start
elif [ "$1" = "start" ] ; then
@@ -105,7 +105,7 @@
touch $CATALINA_HOME/logs/catalina.out
java $CATALINA_OPTS -Xbootclasspath:$BP -classpath $CP \
-Dcatalina.home=$CATALINA_HOME \
- org.apache.tomcat.startup.Bootstrap "$@" start \
+ org.apache.catalina.startup.Bootstrap "$@" start \
>> $CATALINA_HOME/logs/catalina.out 2>&1 &
elif [ "$1" = "stop" ] ; then
@@ -113,7 +113,7 @@
shift
java $CATALINA_OPTS -Xbootclasspath:$BP -classpath $CP \
-Dcatalina.home=$CATALINA_HOME \
- org.apache.tomcat.startup.Bootstrap "$@" stop
+ org.apache.catalina.startup.Bootstrap "$@" stop
else