yoavs 2004/10/05 07:24:48
Modified: catalina/src/bin shutdown-using-launcher.bat
tool-wrapper-using-launcher.bat
webapps/docs changelog.xml
Log:
Bugzilla 31511: don't call setenv.bat if not found in *using-launcher scripts.
Revision Changes Path
1.4 +0 -1
jakarta-tomcat-catalina/catalina/src/bin/shutdown-using-launcher.bat
Index: shutdown-using-launcher.bat
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/bin/shutdown-using-launcher.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- shutdown-using-launcher.bat 4 Sep 2002 15:31:17 -0000 1.3
+++ shutdown-using-launcher.bat 5 Oct 2004 14:24:37 -0000 1.4
@@ -12,7 +12,6 @@
if exist %PRG%\..\setenv.bat goto gotCmdPath
rem %0 must have been found by DOS using the %PATH% so we assume that
rem setenv.bat will also be found in the %PATH%
-call setenv.bat
goto doneSetenv
:gotCmdPath
call %PRG%\..\setenv.bat
1.4 +0 -1
jakarta-tomcat-catalina/catalina/src/bin/tool-wrapper-using-launcher.bat
Index: tool-wrapper-using-launcher.bat
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/bin/tool-wrapper-using-launcher.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tool-wrapper-using-launcher.bat 4 Sep 2002 15:31:17 -0000 1.3
+++ tool-wrapper-using-launcher.bat 5 Oct 2004 14:24:37 -0000 1.4
@@ -12,7 +12,6 @@
if exist %PRG%\..\setenv.bat goto gotCmdPath
rem %0 must have been found by DOS using the %PATH% so we assume that
rem setenv.bat will also be found in the %PATH%
-call setenv.bat
goto doneSetenv
:gotCmdPath
call %PRG%\..\setenv.bat
1.135 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- changelog.xml 5 Oct 2004 14:01:58 -0000 1.134
+++ changelog.xml 5 Oct 2004 14:24:37 -0000 1.135
@@ -134,6 +134,9 @@
<update>
Remove Watchdog references, as it is no longer used. (yoavs)
</update>
+ <fix>
+ <bug>31511</bug>: Don't call setenv.bat if not found, in *using-launcher
scripts. (yoavs)
+ </fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
