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/10/16 20:51:12 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/bin catalina.bat shutdown.bat startup.bat
craigmcc 00/10/16 11:51:04
Modified: catalina/src/bin catalina.bat shutdown.bat startup.bat
Log:
Update the Catalina startup scripts so that you can double click them
on Windows systems. This involved doing a little bit more calculation in
setting the value of CATALINA_HOME if it is not already set.
Revision Changes Path
1.11 +5 -3 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- catalina.bat 2000/09/30 19:47:08 1.10
+++ catalina.bat 2000/10/16 18:50:56 1.11
@@ -12,7 +12,7 @@
rem
rem JAVA_HOME Must point at your Java Development Kit installation.
rem
-rem $Id: catalina.bat,v 1.10 2000/09/30 19:47:08 craigmcc Exp $
+rem $Id: catalina.bat,v 1.11 2000/10/16 18:50:56 craigmcc Exp $
rem ---------------------------------------------------------------------------
@@ -32,9 +32,11 @@
if not "%CATALINA_HOME%" == "" goto gotCatalinaHome
set CATALINA_HOME=.
+if exist "%CATALINA_HOME%\bin\catalina.bat" goto okCatalinaHome
+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
+if exist "%CATALINA_HOME%\bin\catalina.bat" goto okCatalinaHome
+echo Unable to determine the value of CATALINA_HOME
goto cleanup
:okCatalinaHome
1.3 +7 -1 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- shutdown.bat 2000/09/05 01:04:53 1.2
+++ shutdown.bat 2000/10/16 18:50:57 1.3
@@ -2,13 +2,19 @@
rem ---------------------------------------------------------------------------
rem shutdown.bat - Stop Script for the CATALINA Server
rem
-rem $Id: shutdown.bat,v 1.2 2000/09/05 01:04:53 craigmcc Exp $
+rem $Id: shutdown.bat,v 1.3 2000/10/16 18:50:57 craigmcc Exp $
rem ---------------------------------------------------------------------------
set _CATALINA_HOME=%CATALINA_HOME%
if not "%CATALINA_HOME%" == "" goto gotCatalinaHome
set CATALINA_HOME=.
:gotCatalinaHome
+if exist "%CATALINA_HOME%\bin\catalina.bat" goto gotCatalinaHome
+set CATALINA_HOME=..
+if exist "%CATALINA_HOME%\bin\catalina.bat" goto gotCatalinaHome
+echo Unable to determine the value of CATALINA_HOME
+goto cleanup
"%CATALINA_HOME%\bin\catalina" stop %1 %2 %3 %4 %5 %6 %7 %8 %9
+:cleanup
set CATALINA_HOME=%_CATALINA_HOME%
set _CATALINA_HOME=
1.3 +7 -1 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- startup.bat 2000/09/05 01:04:53 1.2
+++ startup.bat 2000/10/16 18:50:58 1.3
@@ -2,14 +2,20 @@
rem ---------------------------------------------------------------------------
rem startup.bat - Start Script for the CATALINA Server
rem
-rem $Id: startup.bat,v 1.2 2000/09/05 01:04:53 craigmcc Exp $
+rem $Id: startup.bat,v 1.3 2000/10/16 18:50:58 craigmcc Exp $
rem ---------------------------------------------------------------------------
set _CATALINA_HOME=%CATALINA_HOME%
if not "%CATALINA_HOME%" == "" goto gotCatalinaHome
set CATALINA_HOME=.
+if exist "%CATALINA_HOME%\bin\catalina.bat" goto gotCatalinaHome
+set CATALINA_HOME=..
+if exist "%CATALINA_HOME%\bin\catalina.bat" goto gotCatalinaHome
+echo Unable to determine the value of CATALINA_HOME
+goto cleanup
:gotCatalinaHome
"%CATALINA_HOME%\bin\catalina" start %1 %2 %3 %4 %5 %6 %7 %8 %9
+:cleanup
set CATALINA_HOME=%_CATALINA_HOME%
set _CATALINA_HOME=