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:27:09 UTC
cvs commit: jakarta-tomcat/proposals/catalina/src/bin catalina.bat cpappend.bat shutdown.bat startup.bat
larryi 00/09/04 14:27:09
Modified: proposals/catalina/src/bin Tag: tomcat_32 catalina.bat
cpappend.bat shutdown.bat startup.bat
Log:
Apply improvements made to Tomcat batch files
Revision Changes Path
No revision
No revision
1.12.2.3 +58 -8 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.2.2
retrieving revision 1.12.2.3
diff -u -r1.12.2.2 -r1.12.2.3
--- catalina.bat 2000/08/29 10:43:07 1.12.2.2
+++ catalina.bat 2000/09/04 21:27:08 1.12.2.3
@@ -19,7 +19,7 @@
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.2.2 2000/08/29 10:43:07 larryi Exp $
+rem $Id: catalina.bat,v 1.12.2.3 2000/09/04 21:27:08 larryi Exp $
rem ---------------------------------------------------------------------------
@@ -27,7 +27,6 @@
set _CATALINA_HOME=%CATALINA_HOME%
set _CP=%CP%
-set _PATH=%PATH%
set _CLASSPATH=%CLASSPATH%
@@ -41,19 +40,69 @@
if not "%CATALINA_HOME%" == "" goto gotCatalinaHome
set CATALINA_HOME=.
:gotCatalinaHome
+if exist "%CATALINA_HOME%\lib\webserver.jar" goto okCatalinaHome
+echo Unable to locate webserver.jar, check the value of CATALINA_HOME.
+goto cleanup
+:okCatalinaHome
+
+
+rem ----- Prepare Appropriate Java Execution Commands -----------------------
+
+if not "%OS%" == "Windows_NT" goto noTitle
+set _STARTJAVA=start "Catalina" "%JAVA_HOME%\bin\java"
+set _RUNJAVA="%JAVA_HOME%\bin\java"
+goto setClasspath
-set PATH="%JAVA_HOME%\bin";%PATH%
+:noTitle
+set _STARTJAVA=start "%JAVA_HOME%\bin\java"
+set _RUNJAVA="%JAVA_HOME%\bin\java"
rem ----- Set Up The Runtime Classpath ----------------------------------------
+:setClasspath
set CP=%CATALINA_HOME%\classes
+
+rem Try to determine if CATALINA_HOME contains spaces
+if exist %CATALINA_HOME%\lib\webserver.jar goto dynClasspath
+echo Your CATALINA_HOME appears to contain spaces.
+echo Unable to set CLASSPATH dynamically.
+goto staticClasspath
+
+:dynClasspath
+set _LIBJARS=
for %%i in (%CATALINA_HOME%\lib\*.jar) do call %CATALINA_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 CATALINA_HOME!
+goto staticClasspath
+
+:gotLibJars
+echo Including all jars in %CATALINA_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%;%CATALINA_HOME%\lib\ant.jar
+set CP=%CP%;%CATALINA_HOME%\lib\jasper.jar
+set CP=%CP%;%CATALINA_HOME%\lib\regexp.jar
+set CP=%CP%;%CATALINA_HOME%\lib\servlet.jar
+set CP=%CP%;%CATALINA_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%
@@ -77,16 +126,16 @@
goto finish
:doRun
-java %CATALINA_OPTS% -Dcatalina.home="%CATALINA_HOME%" org.apache.tomcat.startup.Catalina %2 %3 %4 %5 %6 %7 %8 %9 start
+%_RUNJAVA% %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% -Dcatalina.home="%CATALINA_HOME%" org.apache.tomcat.startup.Catalina %2 %3 %4 %5 %6 %7 %8 %9 start
+%_STARTJAVA% %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% -Dcatalina.home="%CATALINA_HOME%" org.apache.tomcat.startup.Catalina %2 %3 %4 %5 %6 %7 %8 %9 stop
+%_RUNJAVA% %CATALINA_OPTS% -Dcatalina.home="%CATALINA_HOME%" org.apache.tomcat.startup.Catalina %2 %3 %4 %5 %6 %7 %8 %9 stop
goto cleanup
@@ -94,12 +143,13 @@
rem ----- Restore Environment Variables ---------------------------------------
:cleanup
+set _LIBJARS=
+set _STARTJAVA=
+set _RUNJAVA=
set CATALINA_HOME=%_CATALINA_HOME%
set _CATALINA_HOME=
set CP=%_CP%
set _CP=
-set PATH=%_PATH%
-set _PATH=
set CLASSPATH=%_CLASSPATH%
set _CLASSPATH=
:finish
1.1.2.1 +1 -1 jakarta-tomcat/proposals/catalina/src/bin/cpappend.bat
Index: cpappend.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/bin/cpappend.bat,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- cpappend.bat 2000/06/11 01:16:37 1.1
+++ cpappend.bat 2000/09/04 21:27:08 1.1.2.1
@@ -1 +1 @@
-set CP=%CP%;%1
+set _LIBJARS=%_LIBJARS%;%1
1.2.2.1 +2 -2 jakarta-tomcat/proposals/catalina/src/bin/shutdown.bat
Index: shutdown.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/bin/shutdown.bat,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- shutdown.bat 2000/05/07 01:59:09 1.2
+++ shutdown.bat 2000/09/04 21:27:09 1.2.2.1
@@ -2,13 +2,13 @@
rem ---------------------------------------------------------------------------
rem shutdown.bat - Stop Script for the CATALINA Server
rem
-rem $Id: shutdown.bat,v 1.2 2000/05/07 01:59:09 craigmcc Exp $
+rem $Id: shutdown.bat,v 1.2.2.1 2000/09/04 21:27:09 larryi Exp $
rem ---------------------------------------------------------------------------
set _CATALINA_HOME=%CATALINA_HOME%
if not "%CATALINA_HOME%" == "" goto gotCatalinaHome
set CATALINA_HOME=.
:gotCatalinaHome
-%CATALINA_HOME%\bin\catalina stop %1 %2 %3 %4 %5 %6 %7 %8 %9
+"%CATALINA_HOME%\bin\catalina" stop %1 %2 %3 %4 %5 %6 %7 %8 %9
set CATALINA_HOME=%_CATALINA_HOME%
set _CATALINA_HOME=
1.2.2.1 +2 -2 jakarta-tomcat/proposals/catalina/src/bin/startup.bat
Index: startup.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/bin/startup.bat,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- startup.bat 2000/05/07 01:59:09 1.2
+++ startup.bat 2000/09/04 21:27:09 1.2.2.1
@@ -2,14 +2,14 @@
rem ---------------------------------------------------------------------------
rem startup.bat - Start Script for the CATALINA Server
rem
-rem $Id: startup.bat,v 1.2 2000/05/07 01:59:09 craigmcc Exp $
+rem $Id: startup.bat,v 1.2.2.1 2000/09/04 21:27:09 larryi Exp $
rem ---------------------------------------------------------------------------
set _CATALINA_HOME=%CATALINA_HOME%
if not "%CATALINA_HOME%" == "" goto gotCatalinaHome
set CATALINA_HOME=.
:gotCatalinaHome
-%CATALINA_HOME%\bin\catalina start %1 %2 %3 %4 %5 %6 %7 %8 %9
+"%CATALINA_HOME%\bin\catalina" start %1 %2 %3 %4 %5 %6 %7 %8 %9
set CATALINA_HOME=%_CATALINA_HOME%
set _CATALINA_HOME=