You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by la...@locus.apache.org on 2000/08/29 07:07:35 UTC
cvs commit: jakarta-tomcat/proposals/catalina/src/bin catalina.bat
larryi 00/08/28 22:07:35
Modified: proposals/catalina/src/bin Tag: tomcat_32 catalina.bat
Log:
Restore using CLASSPATH instead of -classpath to shorten the command
for Win9x systems.Update PATH to help find JDK.
Couldn't find a way to get "for" command to work with spaces in
CATALINA_HOME on Win9x.
Revision Changes Path
No revision
No revision
1.12.2.1 +21 -6 jakarta-tomcat/proposals/catalina/src/bin/catalina.bat
Index: catalina.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/bin/catalina.bat,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- catalina.bat 2000/06/14 23:54:04 1.12
+++ catalina.bat 2000/08/29 05:07:35 1.12.2.1
@@ -6,14 +6,20 @@
rem
rem CATALINA_HOME (Optional) May point at your Catalina "build" directory.
rem If not present, the current working directory is assumed.
+rem Note: This batch file does not function properly if
+rem CATALINA_HOME contains spaces.
rem CATALINA_OPTS (Optional) Java runtime options used when the "start",
rem "stop", or "run" command is executed.
rem CLASSPATH Must contain the "jaxp.jar" and "parser.jar" files from
-rem the JAXP Reference Implementation, version 1.0, or these
-rem files must be in your Java2 extensions directory.
+rem the JAXP Reference Implementation, version 1.0 or later,
+rem or these files must be in your Java2 extensions directory.
+rem This batch file will automatically add additional entries
+rem that Catalina needs to the CLASSPATH. This consists
+rem of CATALINA_HOME\classes, all the jar files in
+rem CATALINA_HOME\lib, and the "tools.jar" from the JDK.
rem JAVA_HOME Must point at your Java Development Kit installation.
rem
-rem $Id: catalina.bat,v 1.12 2000/06/14 23:54:04 craigmcc Exp $
+rem $Id: catalina.bat,v 1.12.2.1 2000/08/29 05:07:35 larryi Exp $
rem ---------------------------------------------------------------------------
@@ -21,6 +27,8 @@
set _CATALINA_HOME=%CATALINA_HOME%
set _CP=%CP%
+set _PATH=%PATH%
+set _CLASSPATH=%CLASSPATH%
rem ----- Verify and Set Required Environment Variables -----------------------
@@ -34,7 +42,9 @@
set CATALINA_HOME=.
:gotCatalinaHome
+set PATH=%JAVA_HOME%\bin;%PATH%
+
rem ----- Set Up The Runtime Classpath ----------------------------------------
set CP=%CATALINA_HOME%\classes
@@ -44,6 +54,7 @@
:noClasspath
set CP=%CP%;%JAVA_HOME%\lib\tools.jar
echo Using CLASSPATH: %CP%
+set CLASSPATH=%CP%
rem ----- Execute The Requested Command ---------------------------------------
@@ -66,16 +77,16 @@
goto finish
:doRun
-java %CATALINA_OPTS% -classpath %CP% -Dcatalina.home=%CATALINA_HOME% org.apache.tomcat.startup.Catalina %2 %3 %4 %5 %6 %7 %8 %9 start
+java %CATALINA_OPTS% -Dcatalina.home="%CATALINA_HOME%" org.apache.tomcat.startup.Catalina %2 %3 %4 %5 %6 %7 %8 %9 start
goto cleanup
:doStart
-start java %CATALINA_OPTS% -classpath %CP% -Dcatalina.home=%CATALINA_HOME% org.apache.tomcat.startup.Catalina %2 %3 %4 %5 %6 %7 %8 %9 start
+start java %CATALINA_OPTS% -Dcatalina.home="%CATALINA_HOME%" org.apache.tomcat.startup.Catalina %2 %3 %4 %5 %6 %7 %8 %9 start
goto cleanup
:doStop
-java %CATALINA_OPTS% -classpath %CP% -Dcatalina.home=%CATALINA_HOME% org.apache.tomcat.startup.Catalina %2 %3 %4 %5 %6 %7 %8 %9 stop
+java %CATALINA_OPTS% -Dcatalina.home="%CATALINA_HOME%" org.apache.tomcat.startup.Catalina %2 %3 %4 %5 %6 %7 %8 %9 stop
goto cleanup
@@ -87,4 +98,8 @@
set _CATALINA_HOME=
set CP=%_CP%
set _CP=
+set PATH=%_PATH%
+set _PATH=
+set CLASSPATH=%_CLASSPATH%
+set _CLASSPATH=
:finish