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/18 08:00:12 UTC
cvs commit: jakarta-tomcat/src/shell tomcat.bat
craigmcc 00/07/17 23:00:10
Modified: src/shell tomcat.bat
Log:
Surround the %CP% argument with double quotes everywhere it is used, so that
classpaths containing directories with spaces are still handled correctly.
Note that this patch, by itself, does not deal with the "command line too
long" problem.
Submitted by: Larry Isaacs <La...@sas.com>
Revision Changes Path
1.25 +8 -8 jakarta-tomcat/src/shell/tomcat.bat
Index: tomcat.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- tomcat.bat 2000/06/19 02:44:55 1.24
+++ tomcat.bat 2000/07/18 06:00:09 1.25
@@ -17,7 +17,7 @@
rem
rem JAVA_HOME Must point at your Java Development Kit installation.
rem
-rem $Id: tomcat.bat,v 1.24 2000/06/19 02:44:55 rubys Exp $
+rem $Id: tomcat.bat,v 1.25 2000/07/18 06:00:09 craigmcc Exp $
rem -------------------------------------------------------------------------
@@ -76,39 +76,39 @@
:startServer
echo Starting Tomcat in new window
if "%2" == "-security" goto startSecure
-start java %TOMCAT_OPTS% -classpath %CP% -Dtomcat.home="%TOMCAT_HOME%" org.apache.tomcat.startup.Tomcat %2 %3 %4 %5 %6 %7 %8 %9
+start java %TOMCAT_OPTS% -classpath "%CP%" -Dtomcat.home="%TOMCAT_HOME%" org.apache.tomcat.startup.Tomcat %2 %3 %4 %5 %6 %7 %8 %9
goto cleanup
:startSecure
echo Starting Tomcat with a SecurityManager
-start java %TOMCAT_OPTS% -classpath %CP% -Djava.security.manager -Djava.security.policy=="%TOMCAT_HOME%/conf/tomcat.policy" -Dtomcat.home="%TOMCAT_HOME%" org.apache.tomcat.startup.Tomcat %3 %4 %5 %6 %7 %8 %9
+start java %TOMCAT_OPTS% -classpath "%CP%" -Djava.security.manager -Djava.security.policy=="%TOMCAT_HOME%/conf/tomcat.policy" -Dtomcat.home="%TOMCAT_HOME%" org.apache.tomcat.startup.Tomcat %3 %4 %5 %6 %7 %8 %9
goto cleanup
:runServer
rem Running Tomcat in this window
if "%2" == "-security" goto runSecure
-java %TOMCAT_OPTS% -classpath %CP% -Dtomcat.home="%TOMCAT_HOME%" org.apache.tomcat.startup.Tomcat %2 %3 %4 %5 %6 %7 %8 %9
+java %TOMCAT_OPTS% -classpath "%CP%" -Dtomcat.home="%TOMCAT_HOME%" org.apache.tomcat.startup.Tomcat %2 %3 %4 %5 %6 %7 %8 %9
goto cleanup
:runSecure
rem Running Tomcat with a SecurityManager
-java %TOMCAT_OPTS% -classpath %CP% -Djava.security.manager -Djava.security.policy=="%TOMCAT_HOME%/conf/tomcat.policy" -Dtomcat.home="%TOMCAT_HOME%" org.apache.tomcat.startup.Tomcat %3 %4 %5 %6 %7 %8 %9
+java %TOMCAT_OPTS% -classpath "%CP%" -Djava.security.manager -Djava.security.policy=="%TOMCAT_HOME%/conf/tomcat.policy" -Dtomcat.home="%TOMCAT_HOME%" org.apache.tomcat.startup.Tomcat %3 %4 %5 %6 %7 %8 %9
goto cleanup
:stopServer
rem Stopping the Tomcat Server
-java %TOMCAT_OPTS% -classpath %CP% -Dtomcat.home="%TOMCAT_HOME%" org.apache.tomcat.startup.Tomcat -stop %2 %3 %4 %5 %6 %7 %8 %9
+java %TOMCAT_OPTS% -classpath "%CP%" -Dtomcat.home="%TOMCAT_HOME%" org.apache.tomcat.startup.Tomcat -stop %2 %3 %4 %5 %6 %7 %8 %9
goto cleanup
:runAnt
rem Run ANT in Tomcat's Environment
set CP=%CP%;%TOMCAT_HOME%\lib\ant.jar
-java %ANT_OPTS% -classpath %CP% -Dant.home="%TOMCAT_HOME%" -Dtomcat.home="%TOMCAT_HOME%" org.apache.tools.ant.Main %2 %3 %4 %5 %6 %7 %8 %9
+java %ANT_OPTS% -classpath "%CP%" -Dant.home="%TOMCAT_HOME%" -Dtomcat.home="%TOMCAT_HOME%" org.apache.tools.ant.Main %2 %3 %4 %5 %6 %7 %8 %9
goto cleanup
:runJspc
rem Run JSPC in Tomcat's Environment
-java %JSPC_OPTS% -classpath %CP% -Dtomcat.home="%TOMCAT_HOME%" org.apache.jasper.JspC %2 %3 %4 %5 %6 %7 %8 %9
+java %JSPC_OPTS% -classpath "%CP%" -Dtomcat.home="%TOMCAT_HOME%" org.apache.jasper.JspC %2 %3 %4 %5 %6 %7 %8 %9
goto cleanup