remm 01/10/12 09:48:57
Modified: catalina/src/bin Tag: tomcat_40_branch catalina.bat
digest.bat shutdown.bat startup.bat
Log:
- Fix for 4043. The labels are now shorter, and the first eight are significant.
CatalinaHome -> Home
CatalinaBase -> Base
Revision Changes Path
No revision
No revision
1.18.2.2 +8 -8 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.18.2.1
retrieving revision 1.18.2.2
diff -u -r1.18.2.1 -r1.18.2.2
--- catalina.bat 2001/10/10 17:48:17 1.18.2.1
+++ catalina.bat 2001/10/12 16:48:57 1.18.2.2
@@ -20,7 +20,7 @@
rem (JSSE) installation, whose JAR files will be added to the
rem system class path used to start Tomcat.
rem
-rem $Id: catalina.bat,v 1.18.2.1 2001/10/10 17:48:17 remm Exp $
+rem $Id: catalina.bat,v 1.18.2.2 2001/10/12 16:48:57 remm Exp $
rem ---------------------------------------------------------------------------
@@ -39,20 +39,20 @@
goto cleanup
:gotJavaHome
-if not "%CATALINA_HOME%" == "" goto gotCatalinaHome
+if not "%CATALINA_HOME%" == "" goto gotHome
set CATALINA_HOME=.
-if exist "%CATALINA_HOME%\bin\catalina.bat" goto okCatalinaHome
+if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
set CATALINA_HOME=..
-:gotCatalinaHome
-if exist "%CATALINA_HOME%\bin\catalina.bat" goto okCatalinaHome
+:gotHome
+if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
echo Cannot find catalina.bat in %CATALINA_HOME%\bin
echo Please check your CATALINA_HOME setting
goto cleanup
-:okCatalinaHome
+:okHome
-if not "%CATALINA_BASE%" == "" goto gotCatalinaBase
+if not "%CATALINA_BASE%" == "" goto gotBase
set CATALINA_BASE=%CATALINA_HOME%
-:gotCatalinaBase
+:gotBase
rem ----- Prepare Appropriate Java Execution Commands -------------------------
1.2.2.1 +6 -6 jakarta-tomcat-4.0/catalina/src/bin/digest.bat
Index: digest.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/digest.bat,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- digest.bat 2001/09/10 20:12:58 1.2
+++ digest.bat 2001/10/12 16:48:57 1.2.2.1
@@ -10,7 +10,7 @@
rem This script is assumed to run from the bin directory or have the
rem CATALINA_HOME env variable set.
rem
-rem $Id: digest.bat,v 1.2 2001/09/10 20:12:58 ccain Exp $
+rem $Id: digest.bat,v 1.2.2.1 2001/10/12 16:48:57 remm Exp $
rem ---------------------------------------------------------------------------
@@ -27,16 +27,16 @@
goto cleanup
:gotJavaHome
-if not "%CATALINA_HOME%" == "" goto gotCatalinaHome
+if not "%CATALINA_HOME%" == "" goto gotHome
set CATALINA_HOME=.
-if exist "%CATALINA_HOME%\server\lib\catalina.jar" goto okCatalinaHome
+if exist "%CATALINA_HOME%\server\lib\catalina.jar" goto okHome
set CATALINA_HOME=..
-:gotCatalinaHome
-if exist "%CATALINA_HOME%\server\lib\catalina.jar" goto okCatalinaHome
+:gotHome
+if exist "%CATALINA_HOME%\server\lib\catalina.jar" goto okHome
echo Cannot find catalina.jar in %CATALINA_HOME%\server\lib
echo Please check your CATALINA_HOME setting or run this script from the bin directory
goto cleanup
-:okCatalinaHome
+:okHome
rem ----- Prepare Appropriate Java Execution Commands -------------------------
1.4.4.1 +5 -5 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.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- shutdown.bat 2000/10/16 19:13:14 1.4
+++ shutdown.bat 2001/10/12 16:48:57 1.4.4.1
@@ -2,18 +2,18 @@
rem ---------------------------------------------------------------------------
rem shutdown.bat - Stop Script for the CATALINA Server
rem
-rem $Id: shutdown.bat,v 1.4 2000/10/16 19:13:14 craigmcc Exp $
+rem $Id: shutdown.bat,v 1.4.4.1 2001/10/12 16:48:57 remm Exp $
rem ---------------------------------------------------------------------------
set _CATALINA_HOME=%CATALINA_HOME%
-if not "%CATALINA_HOME%" == "" goto gotCatalinaHome
+if not "%CATALINA_HOME%" == "" goto gotHome
set CATALINA_HOME=.
-if exist "%CATALINA_HOME%\bin\catalina.bat" goto gotCatalinaHome
+if exist "%CATALINA_HOME%\bin\catalina.bat" goto gotHome
set CATALINA_HOME=..
-if exist "%CATALINA_HOME%\bin\catalina.bat" goto gotCatalinaHome
+if exist "%CATALINA_HOME%\bin\catalina.bat" goto gotHome
echo Unable to determine the value of CATALINA_HOME
goto cleanup
-:gotCatalinaHome
+:gotHome
"%CATALINA_HOME%\bin\catalina" stop %1 %2 %3 %4 %5 %6 %7 %8 %9
:cleanup
set CATALINA_HOME=%_CATALINA_HOME%
1.3.4.1 +5 -5 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.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- startup.bat 2000/10/16 18:50:58 1.3
+++ startup.bat 2001/10/12 16:48:57 1.3.4.1
@@ -2,18 +2,18 @@
rem ---------------------------------------------------------------------------
rem startup.bat - Start Script for the CATALINA Server
rem
-rem $Id: startup.bat,v 1.3 2000/10/16 18:50:58 craigmcc Exp $
+rem $Id: startup.bat,v 1.3.4.1 2001/10/12 16:48:57 remm Exp $
rem ---------------------------------------------------------------------------
set _CATALINA_HOME=%CATALINA_HOME%
-if not "%CATALINA_HOME%" == "" goto gotCatalinaHome
+if not "%CATALINA_HOME%" == "" goto gotHome
set CATALINA_HOME=.
-if exist "%CATALINA_HOME%\bin\catalina.bat" goto gotCatalinaHome
+if exist "%CATALINA_HOME%\bin\catalina.bat" goto gotHome
set CATALINA_HOME=..
-if exist "%CATALINA_HOME%\bin\catalina.bat" goto gotCatalinaHome
+if exist "%CATALINA_HOME%\bin\catalina.bat" goto gotHome
echo Unable to determine the value of CATALINA_HOME
goto cleanup
-:gotCatalinaHome
+:gotHome
"%CATALINA_HOME%\bin\catalina" start %1 %2 %3 %4 %5 %6 %7 %8 %9
:cleanup
set CATALINA_HOME=%_CATALINA_HOME%
|