remm 2003/10/24 00:55:41 Modified: catalina/src/bin setclasspath.bat Log: - Improve setclasspath according to bug 23608. - Submitted by Adam Hardy. Revision Changes Path 1.5 +10 -5 jakarta-tomcat-catalina/catalina/src/bin/setclasspath.bat Index: setclasspath.bat =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/setclasspath.bat,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- setclasspath.bat 17 Jan 2003 10:05:40 -0000 1.4 +++ setclasspath.bat 24 Oct 2003 07:55:41 -0000 1.5 @@ -8,7 +8,7 @@ if not "%JAVA_HOME%" == "" goto gotJavaHome echo The JAVA_HOME environment variable is not defined echo This environment variable is needed to run this program -goto end +goto exit :gotJavaHome if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome if not exist "%JAVA_HOME%\bin\javaw.exe" goto noJavaHome @@ -18,18 +18,18 @@ :noJavaHome echo The JAVA_HOME environment variable is not defined correctly echo This environment variable is needed to run this program -goto end +goto exit :okJavaHome if not "%BASEDIR%" == "" goto gotBasedir echo The BASEDIR environment variable is not defined echo This environment variable is needed to run this program -goto end +goto exit :gotBasedir if exist "%BASEDIR%\bin\setclasspath.bat" goto okBasedir echo The BASEDIR environment variable is not defined correctly echo This environment variable is needed to run this program -goto end +goto exit :okBasedir rem Set the default -Djava.endorsed.dirs argument @@ -47,5 +47,10 @@ set _RUNJAVAW="%JAVA_HOME%\bin\javaw" set _RUNJDB="%JAVA_HOME%\bin\jdb" set _RUNJAVAC="%JAVA_HOME%\bin\javac" + +goto end + +:exit +exit :end
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
