patrickl 2002/08/29 11:19:27 Modified: catalina/src/bin shutdown-using-launcher.bat startup-using-launcher.bat tool-wrapper-using-launcher.bat Log: Update scripts that use commons-launcher.jar so that %PATH% is only used on Window 9x Revision Changes Path 1.2 +7 -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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- shutdown-using-launcher.bat 4 Aug 2002 18:19:43 -0000 1.1 +++ shutdown-using-launcher.bat 29 Aug 2002 18:19:26 -0000 1.2 @@ -34,7 +34,13 @@ goto setArgs :doneSetArgs +rem Set classpath to handle when %0 does not contain any path +set PRG_CLASSPATH=%PRG%\.. +if "%OS%" == "Windows_NT" goto gotClasspath +set PRG_CLASSPATH=%PRG_CLASSPATH%;"%PATH%;." +:gotClasspath + rem Execute the Launcher using the "catalina" target -"%JAVA_HOME%\bin\java.exe" -classpath %PRG%\..;"%PATH%" LauncherBootstrap -launchfile catalina.xml -verbose catalina %CMD_LINE_ARGS% stop +"%JAVA_HOME%\bin\java.exe" -classpath %PRG_CLASSPATH% LauncherBootstrap -launchfile catalina.xml -verbose catalina %CMD_LINE_ARGS% stop :end 1.2 +7 -1 jakarta-tomcat-catalina/catalina/src/bin/startup-using-launcher.bat Index: startup-using-launcher.bat =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/startup-using-launcher.bat,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- startup-using-launcher.bat 4 Aug 2002 18:19:43 -0000 1.1 +++ startup-using-launcher.bat 29 Aug 2002 18:19:26 -0000 1.2 @@ -33,7 +33,13 @@ goto setArgs :doneSetArgs +rem Set classpath to handle when %0 does not contain any path +set PRG_CLASSPATH=%PRG%\.. +if "%OS%" == "Windows_NT" goto gotClasspath +set PRG_CLASSPATH=%PRG_CLASSPATH%;"%PATH%;." +:gotClasspath + rem Execute the Launcher using the "catalina" target -"%JAVA_HOME%\bin\java.exe" -classpath %PRG%\..;"%PATH%" LauncherBootstrap -launchfile catalina.xml -verbose catalina %CMD_LINE_ARGS% start +"%JAVA_HOME%\bin\java.exe" -classpath %PRG_CLASSPATH% LauncherBootstrap -launchfile catalina.xml -verbose catalina %CMD_LINE_ARGS% start :end 1.2 +7 -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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tool-wrapper-using-launcher.bat 4 Aug 2002 18:19:43 -0000 1.1 +++ tool-wrapper-using-launcher.bat 29 Aug 2002 18:19:26 -0000 1.2 @@ -34,7 +34,13 @@ goto setArgs :doneSetArgs +rem Set classpath to handle when %0 does not contain any path +set PRG_CLASSPATH=%PRG%\.. +if "%OS%" == "Windows_NT" goto gotClasspath +set PRG_CLASSPATH=%PRG_CLASSPATH%;"%PATH%;." +:gotClasspath + rem Execute the Launcher using the "tool-wrapper" target -"%JAVA_HOME%\bin\java.exe" -classpath %PRG%\..;"%PATH%" LauncherBootstrap -launchfile catalina.xml -verbose tool-wrapper %CMD_LINE_ARGS% +"%JAVA_HOME%\bin\java.exe" -classpath %PRG_CLASSPATH% LauncherBootstrap -launchfile catalina.xml -verbose tool-wrapper %CMD_LINE_ARGS% :end
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>