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/09/05 03:04:54 UTC
cvs commit: jakarta-tomcat-4.0/jasper/src/bin jpappend.bat jasper.bat cpappend.bat
craigmcc 00/09/04 18:04:54
Modified: catalina/src/bin catalina.bat cpappend.bat shutdown.bat
startup.bat
jasper/src/bin jasper.bat
Added: jasper/src/bin jpappend.bat
Removed: jasper/src/bin cpappend.bat
Log:
Port the revised Tomcat batch files to Tomcat 4.0.
Submitted by: Larry Isaacs
Revision Changes Path
1.4 +58 -7 jakarta-tomcat-4.0/catalina/src/bin/catalina.bat
Index: catalina.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- catalina.bat 2000/09/02 00:06:18 1.3
+++ catalina.bat 2000/09/05 01:04:52 1.4
@@ -12,7 +12,7 @@
rem
rem JAVA_HOME Must point at your Java Development Kit installation.
rem
-rem $Id: catalina.bat,v 1.3 2000/09/02 00:06:18 craigmcc Exp $
+rem $Id: catalina.bat,v 1.4 2000/09/05 01:04:52 craigmcc Exp $
rem ---------------------------------------------------------------------------
@@ -21,6 +21,7 @@
set _BP=%BP%
set _CATALINA_HOME=%CATALINA_HOME%
set _CLASSPATH=%CLASSPATH%
+set _CP=%CP%
rem ----- Verify and Set Required Environment Variables -----------------------
@@ -33,19 +34,65 @@
if not "%CATALINA_HOME%" == "" goto gotCatalinaHome
set CATALINA_HOME=.
:gotCatalinaHome
+if exist "%CATALINA_HOME%\server\catalina.jar" goto okCatalinaHome
+echo Unable to locate catalina.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 setBootpath
+:noTitle
+set _STARTJAVA=start "%JAVA_HOME%\bin\java"
+set _RUNJAVA="%JAVA_HOME%\bin\java"
+
rem ----- Set Up The Bootstrap Classpath --------------------------------------
+:setBootpath
set BP=%CATALINA_HOME%\bin\bootstrap.jar;%JAVA_HOME%\jre\lib\i18n.jar;%JAVA_HOME%\jre\lib\rt.jar;%JAVA_HOME%\lib\tools.jar
echo Using BOOT PATH: %BP%
rem ----- Set Up The Runtime Classpath ----------------------------------------
+
+set CP=%CATALINA_HOME%\dummy
+rem Try to determine if CATALINA_HOME contains spaces
+if exist %CATALINA_HOME%\server\catalina.jar goto dynClasspath
+echo Your CATALINA_HOME appears to contain spaces.
+echo Unable to set CLASSPATH dynamically.
+goto staticClasspath
-set CLASSPATH=%CATALINA_HOME%\dummy
+: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 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 installClasspath
+
+:staticClasspath
+echo Setting your CLASSPATH statically.
+set CP=%CP%;%CATALINA_HOME%\lib\jasper.jar
+set CP=%CP%;%CATALINA_HOME%\lib\jaxp.jar
+set CP=%CP%;%CATALINA_HOME%\lib\parser.jar
+set CP=%CP%;%CATALINA_HOME%\lib\servlet.jar
+
+:installClasspath
+set CLASSPATH=%CP%
echo Using CLASSPATH: %CLASSPATH%
@@ -70,23 +117,23 @@
:doRun
if "%2" == "-security" goto doRunSecure
-java %CATALINA_OPTS% -Xbootclasspath:%BP% -Dcatalina.home="%CATALINA_HOME%" org.apache.catalina.startup.Bootstrap %2 %3 %4 %5 %6 %7 %8 %9 start
+%_RUNJAVA% %CATALINA_OPTS% -Xbootclasspath:%BP% -Dcatalina.home="%CATALINA_HOME%" org.apache.catalina.startup.Bootstrap %2 %3 %4 %5 %6 %7 %8 %9 start
goto cleanup
:doRunSecure
-java %CATALINA_OPTS% -Djava.security.manager -Djava.security.policy=="%CATALINA_HOME%/conf/catalina.policy" -Xbootclasspath:%BP% -Dcatalina.home="%CATALINA_HOME%" org.apache.catalina.startup.Bootstrap %3 %4 %5 %6 %7 %8 %9 start
+%_RUNJAVA% %CATALINA_OPTS% -Djava.security.manager -Djava.security.policy=="%CATALINA_HOME%/conf/catalina.policy" -Xbootclasspath:%BP% -Dcatalina.home="%CATALINA_HOME%" org.apache.catalina.startup.Bootstrap %3 %4 %5 %6 %7 %8 %9 start
goto cleanup
:doStart
if "%2" == "-security" goto doStartSecure
-start java %CATALINA_OPTS% -Xbootclasspath:%BP% -Dcatalina.home="%CATALINA_HOME%" org.apache.catalina.startup.Bootstrap %2 %3 %4 %5 %6 %7 %8 %9 start
+%_STARTJAVA% %CATALINA_OPTS% -Xbootclasspath:%BP% -Dcatalina.home="%CATALINA_HOME%" org.apache.catalina.startup.Bootstrap %2 %3 %4 %5 %6 %7 %8 %9 start
goto cleanup
:doStartSecure
echo Using Security Manager
-start java %CATALINA_OPTS% -Djava.security.manager -Djava.security.policy=="%CATALINA_HOME%/conf/catalina.policy" -Xbootclasspath:%BP% -Dcatalina.home="%CATALINA_HOME%" org.apache.catalina.startup.Bootstrap %3 %4 %5 %6 %7 %8 %9 start
+%_STARTJAVA% %CATALINA_OPTS% -Djava.security.manager -Djava.security.policy=="%CATALINA_HOME%/conf/catalina.policy" -Xbootclasspath:%BP% -Dcatalina.home="%CATALINA_HOME%" org.apache.catalina.startup.Bootstrap %3 %4 %5 %6 %7 %8 %9 start
goto cleanup
:doStop
-java %CATALINA_OPTS% -Xbootclasspath:%BP% -Dcatalina.home=%CATALINA_HOME% org.apache.catalina.startup.Bootstrap %2 %3 %4 %5 %6 %7 %8 %9 stop
+%_RUNJAVA% %CATALINA_OPTS% -Xbootclasspath:%BP% -Dcatalina.home=%CATALINA_HOME% org.apache.catalina.startup.Bootstrap %2 %3 %4 %5 %6 %7 %8 %9 stop
goto cleanup
@@ -100,4 +147,8 @@
set _CATALINA_HOME=
set CLASSPATH=%_CLASSPATH%
set _CLASSPATH=
+set CP=%_CP%
+set _LIBJARS=
+set _RUNJAVA=
+set _STARTJAVA=
:finish
1.2 +2 -1 jakarta-tomcat-4.0/catalina/src/bin/cpappend.bat
Index: cpappend.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/cpappend.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cpappend.bat 2000/08/11 05:22:16 1.1
+++ cpappend.bat 2000/09/05 01:04:53 1.2
@@ -1 +1,2 @@
-set CLASSPATH=%CLASSPATH%;%1
+set CP=%CP%;%1
+set _LIBJARS=%_LIBJARS%;%1
1.2 +2 -2 jakarta-tomcat-4.0/catalina/src/bin/shutdown.bat
Index: shutdown.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/shutdown.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shutdown.bat 2000/08/11 05:22:16 1.1
+++ shutdown.bat 2000/09/05 01:04:53 1.2
@@ -2,13 +2,13 @@
rem ---------------------------------------------------------------------------
rem shutdown.bat - Stop Script for the CATALINA Server
rem
-rem $Id: shutdown.bat,v 1.1 2000/08/11 05:22:16 craigmcc Exp $
+rem $Id: shutdown.bat,v 1.2 2000/09/05 01:04:53 craigmcc 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 -2 jakarta-tomcat-4.0/catalina/src/bin/startup.bat
Index: startup.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/startup.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- startup.bat 2000/08/11 05:22:16 1.1
+++ startup.bat 2000/09/05 01:04:53 1.2
@@ -2,14 +2,14 @@
rem ---------------------------------------------------------------------------
rem startup.bat - Start Script for the CATALINA Server
rem
-rem $Id: startup.bat,v 1.1 2000/08/11 05:22:16 craigmcc Exp $
+rem $Id: startup.bat,v 1.2 2000/09/05 01:04:53 craigmcc 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=
1.2 +4 -4 jakarta-tomcat-4.0/jasper/src/bin/jasper.bat
Index: jasper.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/bin/jasper.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jasper.bat 2000/08/12 00:52:05 1.1
+++ jasper.bat 2000/09/05 01:04:54 1.2
@@ -11,7 +11,7 @@
rem JAVA_HOME
rem Must point at your Java Development Kit installation.
rem
-rem $Id: jasper.bat,v 1.1 2000/08/12 00:52:05 pierred Exp $
+rem $Id: jasper.bat,v 1.2 2000/09/05 01:04:54 craigmcc Exp $
rem ---------------------------------------------------------------------------
rem ----- Save Environment Variables That May Change --------------------------
@@ -29,9 +29,9 @@
if not "%JASPER_HOME%" == "" goto gotJasperHome
set JASPER_HOME=.
:gotJasperHome
-if exist %JASPER_HOME%\bin\cpappend.bat goto jasperHomeOk
+if exist %JASPER_HOME%\bin\jpappend.bat goto jasperHomeOk
echo Using JASPER_HOME: %JASPER_HOME%
-echo JASPER_HOME/bin/cpappend.bat does not exist. Please specify JASPER_HOME properly.
+echo JASPER_HOME/bin/jpappend.bat does not exist. Please specify JASPER_HOME properly.
goto cleanup
:jasperHomeOk
@@ -40,7 +40,7 @@
rem FIXME set CLASSPATH=%JASPER_HOME%\dummy
rem FIXME below
set CLASSPATH=%JASPER_HOME%\classes
-for %%i in (%JASPER_HOME%\lib\*.jar) do call %JASPER_HOME%\bin\cpappend.bat %%i
+for %%i in (%JASPER_HOME%\lib\*.jar) do call %JASPER_HOME%\bin\jpappend.bat %%i
echo Using CLASSPATH: %CLASSPATH%
rem ----- Execute The Requested Command ---------------------------------------
1.1 jakarta-tomcat-4.0/jasper/src/bin/jpappend.bat
Index: jpappend.bat
===================================================================
set CLASSPATH=%CLASSPATH%;%1