You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mt...@apache.org on 2004/03/28 08:40:44 UTC
cvs commit: jakarta-tomcat-catalina/catalina/src/bin startup.bat shutdown.bat catalina.bat
mturk 2004/03/27 22:40:44
Modified: catalina/src/bin startup.bat shutdown.bat catalina.bat
Log:
Change to the absolute path using %CD% for setting CATALINA_HOME.
This enables that java.io.tempdir is set to absolute path instead relative.
Revision Changes Path
1.5 +6 -3 jakarta-tomcat-catalina/catalina/src/bin/startup.bat
Index: startup.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/startup.bat,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- startup.bat 4 Aug 2002 18:19:43 -0000 1.4
+++ startup.bat 28 Mar 2004 06:40:44 -0000 1.5
@@ -7,10 +7,13 @@
rem ---------------------------------------------------------------------------
rem Guess CATALINA_HOME if not defined
+set CURRENT_DIR=%cd%
if not "%CATALINA_HOME%" == "" goto gotHome
-set CATALINA_HOME=.
+set CATALINA_HOME=%CURRENT_DIR%
if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
-set CATALINA_HOME=..
+cd ..
+set CATALINA_HOME=%cd%
+cd CURRENT_DIR
:gotHome
if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
echo The CATALINA_HOME environment variable is not defined correctly
1.4 +6 -3 jakarta-tomcat-catalina/catalina/src/bin/shutdown.bat
Index: shutdown.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/shutdown.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- shutdown.bat 4 Aug 2002 18:19:43 -0000 1.3
+++ shutdown.bat 28 Mar 2004 06:40:44 -0000 1.4
@@ -7,10 +7,13 @@
rem ---------------------------------------------------------------------------
rem Guess CATALINA_HOME if not defined
+set CURRENT_DIR=%cd%
if not "%CATALINA_HOME%" == "" goto gotHome
-set CATALINA_HOME=.
+set CATALINA_HOME=%CURRENT_DIR%
if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
-set CATALINA_HOME=..
+cd ..
+set CATALINA_HOME=%cd%
+cd CURRENT_DIR
:gotHome
if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
echo The CATALINA_HOME environment variable is not defined correctly
1.8 +6 -3 jakarta-tomcat-catalina/catalina/src/bin/catalina.bat
Index: catalina.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.bat,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- catalina.bat 5 Nov 2003 11:40:18 -0000 1.7
+++ catalina.bat 28 Mar 2004 06:40:44 -0000 1.8
@@ -37,10 +37,13 @@
rem ---------------------------------------------------------------------------
rem Guess CATALINA_HOME if not defined
+set CURRENT_DIR=%cd%
if not "%CATALINA_HOME%" == "" goto gotHome
-set CATALINA_HOME=.
+set CATALINA_HOME=%CURRENT_DIR%
if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
-set CATALINA_HOME=..
+cd ..
+set CATALINA_HOME=%cd%
+cd CURRENT_DIR
:gotHome
if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
echo The CATALINA_HOME environment variable is not defined correctly
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org