costin 01/08/20 22:52:12
Modified: src/shell tomcat.bat
Log:
Update for the new Main.java.
Also removed "tomcat ant" option, ant is no longer bundled ( it was there in 3.0
because
we didn't had a separate release, if I remember corectly ).
For sandbox use, don't specify -Djava.security.manager - PolicyLoader will set one
based on user options.
Revision Changes Path
1.37 +8 -16 jakarta-tomcat/src/shell/tomcat.bat
Index: tomcat.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- tomcat.bat 2001/08/19 22:52:51 1.36
+++ tomcat.bat 2001/08/21 05:52:12 1.37
@@ -29,7 +29,7 @@
rem Tomcat, refer to the Tomcat Users Guide (tomcat_ug.html found
rem in the "doc" directory.
rem
-rem $Id: tomcat.bat,v 1.36 2001/08/19 22:52:51 larryi Exp $
+rem $Id: tomcat.bat,v 1.37 2001/08/21 05:52:12 costin Exp $
rem -------------------------------------------------------------------------
@@ -99,14 +99,12 @@
if "%1" == "start" goto startServer
if "%1" == "stop" goto stopServer
if "%1" == "run" goto runServer
-if "%1" == "ant" goto runAnt
if "%1" == "env" goto doEnv
if "%1" == "jspc" goto runJspc
:doUsage
-echo Usage: tomcat ( ant ^| env ^| jspc ^| run ^| start ^| stop )
+echo Usage: tomcat ( env ^| jspc ^| run ^| start ^| stop )
echo Commands:
-echo ant - Run Ant in Tomcat's environment
echo env - Set up environment variables that Tomcat would use
echo jspc - Run JSPC in Tomcat's environment
echo run - Start Tomcat in the current window
@@ -117,39 +115,33 @@
:startServer
echo Starting Tomcat in new window
if "%2" == "-security" goto startSecure
-%_STARTJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME%
org.apache.tomcat.startup.Main %2 %3 %4 %5 %6 %7 %8 %9
+%_STARTJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME%
org.apache.tomcat.startup.Main start %2 %3 %4 %5 %6 %7 %8 %9
goto cleanup
:startSecure
echo Starting Tomcat with a SecurityManager
-%_SECSTARTJAVA% %TOMCAT_OPTS% -Djava.security.manager
-Djava.security.policy=="%TOMCAT_HOME%/conf/tomcat.policy" -Dtomcat.home=%TOMCAT_HOME%
org.apache.tomcat.startup.Main %3 %4 %5 %6 %7 %8 %9
+%_SECSTARTJAVA% %TOMCAT_OPTS%
-Djava.security.policy=="%TOMCAT_HOME%/conf/tomcat.policy" -Dtomcat.home=%TOMCAT_HOME%
org.apache.tomcat.startup.Main start -sandbox %3 %4 %5 %6 %7 %8 %9
goto cleanup
:runServer
rem Running Tomcat in this window
if "%2" == "-security" goto runSecure
-%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main
%2 %3 %4 %5 %6 %7 %8 %9
+%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main
start %2 %3 %4 %5 %6 %7 %8 %9
goto cleanup
:runSecure
rem Running Tomcat with a SecurityManager
-%_RUNJAVA% %TOMCAT_OPTS% -Djava.security.manager
-Djava.security.policy=="%TOMCAT_HOME%/conf/tomcat.policy" -Dtomcat.home=%TOMCAT_HOME%
org.apache.tomcat.startup.Main %3 %4 %5 %6 %7 %8 %9
+%_RUNJAVA% %TOMCAT_OPTS% -Djava.security.policy=="%TOMCAT_HOME%/conf/tomcat.policy"
-Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main start -sandbox %3 %4 %5 %6
%7 %8 %9
goto cleanup
:stopServer
rem Stopping the Tomcat Server
-%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main
-stop %2 %3 %4 %5 %6 %7 %8 %9
+%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main
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
-%_RUNJAVA% %ANT_OPTS% -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
-%_RUNJAVA% %JSPC_OPTS% -Dtomcat.home=%TOMCAT_HOME% org.apache.jasper.JspC %2 %3 %4
%5 %6 %7 %8 %9
+%_RUNJAVA% %JSPC_OPTS% -Dtomcat.home=%TOMCAT_HOME% org.apache.tomcat.startup.Main
jspc %2 %3 %4 %5 %6 %7 %8 %9
goto cleanup
rem ----- Set CLASSPATH to Tomcat's Runtime Environment -----------------------
