Author: jfclere
Date: Fri Feb 9 02:22:58 2007
New Revision: 505241
URL: http://svn.apache.org/viewvc?view=rev&rev=505241
Log:
Don add tools.jar if it doesn exist.
Modified:
tomcat/tc6.0.x/trunk/bin/setclasspath.bat
tomcat/tc6.0.x/trunk/bin/tool-wrapper.bat
Modified: tomcat/tc6.0.x/trunk/bin/setclasspath.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/setclasspath.bat?view=diff&rev=505241&r1=505240&r2=505241
==============================================================================
--- tomcat/tc6.0.x/trunk/bin/setclasspath.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/setclasspath.bat Fri Feb 9 02:22:58 2007
@@ -51,7 +51,9 @@
rem Set standard CLASSPATH
rem Note that there are no quotes as we do not want to introduce random
rem quotes into the CLASSPATH
+if not exist "%JAVA_HOME%\bin\tools.jar" goto noJavac
set CLASSPATH=%JAVA_HOME%\lib\tools.jar
+:noJavac
rem Set standard command for invoking Java.
rem Note that NT requires a window name argument when using start.
Modified: tomcat/tc6.0.x/trunk/bin/tool-wrapper.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/tool-wrapper.bat?view=diff&rev=505241&r1=505240&r2=505241
==============================================================================
--- tomcat/tc6.0.x/trunk/bin/tool-wrapper.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/tool-wrapper.bat Fri Feb 9 02:22:58 2007
@@ -43,7 +43,12 @@
call "%CATALINA_HOME%\bin\setclasspath.bat"
rem Add on extra jar files to CLASSPATH
+if "%CLASSPATH%" == "" goto noclasspath
set
CLASSPATH=%CLASSPATH%;%CATALINA_HOME%\bin\bootstrap.jar;"%BASEDIR%"\lib\servlet-api.jar
+goto :okclasspath
+:noclasspath
+set CLASSPATH=%CATALINA_HOME%\bin\bootstrap.jar;"%BASEDIR%"\lib\servlet-api.jar
+:okclasspath
rem Get remaining unshifted command line arguments and save them in the
set CMD_LINE_ARGS=
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
