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/09/04 23:18:11 UTC
cvs commit: jakarta-tomcat/src/shell cpappend.bat jspc.bat shutdown.bat startup.bat tomcat.bat tomcatEnv.bat
larryi 00/09/04 14:18:10
Modified: src/shell Tag: tomcat_32 cpappend.bat jspc.bat shutdown.bat
startup.bat tomcat.bat tomcatEnv.bat
Log:
Update to better support spaces in JAVA_HOME and TOMCAT_HOME.
Also, thanks to Hans Bergsten, it has improved support for setting
CLASSPATH dynamically.
Revision Changes Path
No revision
No revision
1.1.2.3 +1 -1 jakarta-tomcat/src/shell/cpappend.bat
Index: cpappend.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/shell/cpappend.bat,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- cpappend.bat 2000/09/02 13:03:49 1.1.2.2
+++ cpappend.bat 2000/09/04 21:18:04 1.1.2.3
@@ -1 +1 @@
-set CP=%CP%;%1
+set _LIBJARS=%_LIBJARS%;%1
1.4.4.1 +4 -4 jakarta-tomcat/src/shell/jspc.bat
Index: jspc.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/shell/jspc.bat,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- jspc.bat 2000/03/31 20:16:58 1.4
+++ jspc.bat 2000/09/04 21:18:04 1.4.4.1
@@ -1,5 +1,5 @@
@echo off
-rem $Id: jspc.bat,v 1.4 2000/03/31 20:16:58 craigmcc Exp $
+rem $Id: jspc.bat,v 1.4.4.1 2000/09/04 21:18:04 larryi Exp $
rem A batch file to run the JspC Compiler
rem This batch file written and tested under Windows NT
@@ -8,16 +8,16 @@
if not "%TOMCAT_HOME%" == "" goto start
SET TOMCAT_HOME=.
-if exist %TOMCAT_HOME%\bin\tomcat.bat goto start
+if exist "%TOMCAT_HOME%\bin\tomcat.bat" goto start
SET TOMCAT_HOME=..
-if exist %TOMCAT_HOME%\bin\tomcat.bat goto start
+if exist "%TOMCAT_HOME%\bin\tomcat.bat" goto start
SET TOMCAT_HOME=
echo Unable to determine the value of TOMCAT_HOME.
goto eof
:start
-call %TOMCAT_HOME%\bin\tomcat jspc %1 %2 %3 %4 %5 %6 %7 %8 %9
+call "%TOMCAT_HOME%\bin\tomcat" jspc %1 %2 %3 %4 %5 %6 %7 %8 %9
:eof
1.5.4.1 +4 -4 jakarta-tomcat/src/shell/shutdown.bat
Index: shutdown.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/shell/shutdown.bat,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -r1.5 -r1.5.4.1
--- shutdown.bat 2000/03/31 19:40:02 1.5
+++ shutdown.bat 2000/09/04 21:18:05 1.5.4.1
@@ -1,20 +1,20 @@
@echo off
-rem $Id: shutdown.bat,v 1.5 2000/03/31 19:40:02 craigmcc Exp $
+rem $Id: shutdown.bat,v 1.5.4.1 2000/09/04 21:18:05 larryi Exp $
rem Startup batch file for tomcat server.
if not "%TOMCAT_HOME%" == "" goto start
SET TOMCAT_HOME=.
-if exist %TOMCAT_HOME%\bin\tomcat.bat goto start
+if exist "%TOMCAT_HOME%\bin\tomcat.bat" goto start
SET TOMCAT_HOME=..
-if exist %TOMCAT_HOME%\bin\tomcat.bat goto start
+if exist "%TOMCAT_HOME%\bin\tomcat.bat" goto start
SET TOMCAT_HOME=
echo Unable to determine the value of TOMCAT_HOME.
goto eof
:start
-call %TOMCAT_HOME%\bin\tomcat stop %1 %2 %3 %4 %5 %6 %7 %8 %9
+call "%TOMCAT_HOME%\bin\tomcat" stop %1 %2 %3 %4 %5 %6 %7 %8 %9
:eof
1.7.4.1 +4 -4 jakarta-tomcat/src/shell/startup.bat
Index: startup.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/shell/startup.bat,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -u -r1.7 -r1.7.4.1
--- startup.bat 2000/03/31 19:40:02 1.7
+++ startup.bat 2000/09/04 21:18:05 1.7.4.1
@@ -1,5 +1,5 @@
@echo off
-rem $Id: startup.bat,v 1.7 2000/03/31 19:40:02 craigmcc Exp $
+rem $Id: startup.bat,v 1.7.4.1 2000/09/04 21:18:05 larryi Exp $
rem Startup batch file for tomcat servner.
rem This batch file written and tested under Windows NT
@@ -8,16 +8,16 @@
if not "%TOMCAT_HOME%" == "" goto start
SET TOMCAT_HOME=.
-if exist %TOMCAT_HOME%\bin\tomcat.bat goto start
+if exist "%TOMCAT_HOME%\bin\tomcat.bat" goto start
SET TOMCAT_HOME=..
-if exist %TOMCAT_HOME%\bin\tomcat.bat goto start
+if exist "%TOMCAT_HOME%\bin\tomcat.bat" goto start
SET TOMCAT_HOME=
echo Unable to determine the value of TOMCAT_HOME.
goto eof
:start
-call %TOMCAT_HOME%\bin\tomcat start %1 %2 %3 %4 %5 %6 %7 %8 %9
+call "%TOMCAT_HOME%\bin\tomcat" start %1 %2 %3 %4 %5 %6 %7 %8 %9
:eof
1.24.2.3 +67 -13 jakarta-tomcat/src/shell/tomcat.bat
Index: tomcat.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v
retrieving revision 1.24.2.2
retrieving revision 1.24.2.3
diff -u -r1.24.2.2 -r1.24.2.3
--- tomcat.bat 2000/08/29 10:42:25 1.24.2.2
+++ tomcat.bat 2000/09/04 21:18:06 1.24.2.3
@@ -22,7 +22,7 @@
rem
rem JAVA_HOME Must point at your Java Development Kit installation.
rem
-rem $Id: tomcat.bat,v 1.24.2.2 2000/08/29 10:42:25 larryi Exp $
+rem $Id: tomcat.bat,v 1.24.2.3 2000/09/04 21:18:06 larryi Exp $
rem -------------------------------------------------------------------------
@@ -30,33 +30,85 @@
set _CP=%CP%
set _TOMCAT_HOME=%TOMCAT_HOME%
-set _PATH=%PATH%
set _CLASSPATH=%CLASSPATH%
rem ----- Verify and Set Required Environment Variables ---------------------
if not "%JAVA_HOME%" == "" goto gotJavaHome
-echo You must have set JAVA_HOME to point at your Java Development Kit installation
+echo You must set JAVA_HOME to point at your Java Development Kit installation
goto cleanup
:gotJavaHome
if not "%TOMCAT_HOME%" == "" goto gotTomcatHome
set TOMCAT_HOME=.
:gotTomcatHome
+if exist "%TOMCAT_HOME%\lib\webserver.jar" goto okTomcatHome
+echo Unable to locate webserver.jar, check the value of TOMCAT_HOME.
+goto cleanup
+:okTomcatHome
+
+
+rem ----- Prepare Appropriate Java Execution Commands -----------------------
-set PATH="%JAVA_HOME%\bin";%PATH%
+if not "%OS%" == "Windows_NT" goto noTitle
+set _SECSTARTJAVA=start "Secure Tomcat 3.2" "%JAVA_HOME%\bin\java"
+set _STARTJAVA=start "Tomcat 3.2" "%JAVA_HOME%\bin\java"
+set _RUNJAVA="%JAVA_HOME%\bin\java"
+goto setClasspath
+:noTitle
+set _SECSTARTJAVA=start "%JAVA_HOME%\bin\java"
+set _STARTJAVA=start "%JAVA_HOME%\bin\java"
+set _RUNJAVA="%JAVA_HOME%\bin\java"
+
rem ----- Set Up The Runtime Classpath --------------------------------------
+:setClasspath
set CP=%TOMCAT_HOME%\classes
+
+rem Try to determine if TOMCAT_HOME contains spaces
+if exist %TOMCAT_HOME%\lib\webserver.jar goto dynClasspath
+echo Your TOMCAT_HOME appears to contain spaces.
+echo Unable to set CLASSPATH dynamically.
+goto staticClasspath
+
+:dynClasspath
+set _LIBJARS=
for %%i in (%TOMCAT_HOME%\lib\*.jar) do call %TOMCAT_HOME%\bin\cpappend.bat %%i
+if not "%_LIBJARS%" == "" goto gotLibJars
+echo Unable to set CLASSPATH dynamically.
+if "%OS%" == "Windows_NT" goto staticClasspath
+echo Note: To set the CLASSPATH dynamically on Win9x systems
+echo only DOS 8.3 names may be used in TOMCAT_HOME!
+goto staticClasspath
+
+:gotLibJars
+echo Including all jars in %TOMCAT_HOME%\lib in your CLASSPATH.
+rem Note: _LIBJARS already contains a leading semicolon
+set CP=%CP%%_LIBJARS%
+goto chkClasspath
+
+:staticClasspath
+echo Setting your CLASSPATH statically.
+set CP=%CP%;%TOMCAT_HOME%\lib\ant.jar
+set CP=%CP%;%TOMCAT_HOME%\lib\jasper.jar
+set CP=%CP%;%TOMCAT_HOME%\lib\jaxp.jar
+set CP=%CP%;%TOMCAT_HOME%\lib\parser.jar
+set CP=%CP%;%TOMCAT_HOME%\lib\servlet.jar
+set CP=%CP%;%TOMCAT_HOME%\lib\webserver.jar
+
+:chkClasspath
if "%CLASSPATH%" == "" goto noClasspath
set CP=%CP%;%CLASSPATH%
:noClasspath
+if not exist "%JAVA_HOME%\lib\tools.jar" goto installClasspath
set CP=%CP%;%JAVA_HOME%\lib\tools.jar
+:installClasspath
+echo.
echo Using CLASSPATH: %CP%
+echo.
set CLASSPATH=%CP%
@@ -86,49 +138,51 @@
:startServer
echo Starting Tomcat in new window
if "%2" == "-security" goto startSecure
-start java %TOMCAT_OPTS% -Dtomcat.home="%TOMCAT_HOME%" org.apache.tomcat.startup.Tomcat %2 %3 %4 %5 %6 %7 %8 %9
+%_STARTJAVA% %TOMCAT_OPTS% -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% -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
+%_SECSTARTJAVA% %TOMCAT_OPTS% -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% -Dtomcat.home="%TOMCAT_HOME%" org.apache.tomcat.startup.Tomcat %2 %3 %4 %5 %6 %7 %8 %9
+%_RUNJAVA% %TOMCAT_OPTS% -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% -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
+%_RUNJAVA% %TOMCAT_OPTS% -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% -Dtomcat.home="%TOMCAT_HOME%" org.apache.tomcat.startup.Tomcat -stop %2 %3 %4 %5 %6 %7 %8 %9
+%_RUNJAVA% %TOMCAT_OPTS% -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% -Dant.home="%TOMCAT_HOME%" -Dtomcat.home="%TOMCAT_HOME%" org.apache.tools.ant.Main %2 %3 %4 %5 %6 %7 %8 %9
+%_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
-java %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.jasper.JspC %2 %3 %4 %5 %6 %7 %8 %9
goto cleanup
rem ----- Restore Environment Variables ---------------------------------------
:cleanup
+set _LIBJARS=
+set _SECSTARTJAVA=
+set _STARTJAVA=
+set _RUNJAVA=
set CLASSPATH=%_CLASSPATH%
set _CLASSPATH=
-set PATH=%_PATH%
-set _PATH=
set TOMCAT_HOME=%_TOMCAT_HOME%
set _TOMCAT_HOME=
set CP=%_CP%
1.4.4.1 +3 -3 jakarta-tomcat/src/shell/tomcatEnv.bat
Index: tomcatEnv.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcatEnv.bat,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- tomcatEnv.bat 2000/02/26 19:41:47 1.4
+++ tomcatEnv.bat 2000/09/04 21:18:06 1.4.4.1
@@ -8,17 +8,17 @@
if not "%TOMCAT_HOME%" == "" goto start
SET TOMCAT_HOME=.
-if exist %TOMCAT_HOME%\bin\tomcat.bat goto start
+if exist "%TOMCAT_HOME%\bin\tomcat.bat" goto start
SET TOMCAT_HOME=..
-if exist %TOMCAT_HOME%\bin\tomcat.bat goto start
+if exist "%TOMCAT_HOME%\bin\tomcat.bat" goto start
SET TOMCAT_HOME=
echo Unable to determine the value of TOMCAT_HOME.
goto eof
:start
-call %TOMCAT_HOME%\bin\tomcat env %*
+call "%TOMCAT_HOME%\bin\tomcat" env %*
goto eof
:restore