yoavs 2004/10/05 07:27:27
Modified: catalina/src/bin Tag: TOMCAT_5_0 shutdown-using-launcher.bat
tool-wrapper-using-launcher.bat
webapps/docs Tag: TOMCAT_5_0 changelog.xml
Log:
Bugzilla 31511: don't call setenv.bat if not found in *using-launcher scripts.
Revision Changes Path
No revision
No revision
1.3.2.1 +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.3.2.1
diff -u -r1.3 -r1.3.2.1
--- shutdown-using-launcher.bat 4 Sep 2002 15:31:17 -0000 1.3
+++ shutdown-using-launcher.bat 5 Oct 2004 14:27:11 -0000 1.3.2.1
@@ -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.3.2.1 +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.3.2.1
diff -u -r1.3 -r1.3.2.1
--- tool-wrapper-using-launcher.bat 4 Sep 2002 15:31:17 -0000 1.3
+++ tool-wrapper-using-launcher.bat 5 Oct 2004 14:27:11 -0000 1.3.2.1
@@ -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
No revision
No revision
1.70.2.47 +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.70.2.46
retrieving revision 1.70.2.47
diff -u -r1.70.2.46 -r1.70.2.47
--- changelog.xml 30 Sep 2004 16:02:36 -0000 1.70.2.46
+++ changelog.xml 5 Oct 2004 14:27:11 -0000 1.70.2.47
@@ -97,6 +97,9 @@
<fix>
<bug>30949</bug>: Make sure ApplicationDispatcher unwraps requests even if
include fails. (yoavs)
</fix>
+ <fix>
+ <bug>31511</bug>: Don't call setenv.bat if not found in *using-launcher
scripts. (yoavs)
+ </fix>
</changelog>
</subsection>
<subsection name="Webapps">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
