Author: markt
Date: Fri Jul 17 10:47:46 2009
New Revision: 795036
URL: http://svn.apache.org/viewvc?rev=795036&view=rev
Log:
Opps. Missed these in fix for 39194.
Modified:
tomcat/container/tc5.5.x/catalina/src/bin/tool-wrapper.bat
tomcat/container/tc5.5.x/catalina/src/bin/tool-wrapper.sh
Modified: tomcat/container/tc5.5.x/catalina/src/bin/tool-wrapper.bat
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/bin/tool-wrapper.bat?rev=795036&r1=795035&r2=795036&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/bin/tool-wrapper.bat (original)
+++ tomcat/container/tc5.5.x/catalina/src/bin/tool-wrapper.bat Fri Jul 17
10:47:46 2009
@@ -30,6 +30,10 @@
goto end
:okHome
+rem Ensure that any user defined CLASSPATH variables are not used on startup,
+rem but allow them to be specified in setenv.bat, in rare case when it is
needed.
+set CLASSPATH=
+
rem Get standard environment variables
if exist "%CATALINA_HOME%\bin\setenv.bat" call "%CATALINA_HOME%\bin\setenv.bat"
@@ -43,7 +47,14 @@
call "%CATALINA_HOME%\bin\setclasspath.bat"
rem Add on extra jar files to CLASSPATH
-set
CLASSPATH=%CLASSPATH%;%CATALINA_HOME%\bin\bootstrap.jar;"%BASEDIR%"\common\lib\jmx.jar;"%BASEDIR%"\common\lib\servlet-api.jar
+rem Note that there are no quotes as we do not want to introduce random
+rem quotes into the 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=
Modified: tomcat/container/tc5.5.x/catalina/src/bin/tool-wrapper.sh
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/bin/tool-wrapper.sh?rev=795036&r1=795035&r2=795036&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/bin/tool-wrapper.sh (original)
+++ tomcat/container/tc5.5.x/catalina/src/bin/tool-wrapper.sh Fri Jul 17
10:47:46 2009
@@ -36,6 +36,10 @@
fi
done
+# Ensure that any user defined CLASSPATH variables are not used on startup,
+# but allow them to be specified in setenv.sh, in rare case when it is needed.
+CLASSPATH=
+
# Get standard environment variables
PRGDIR=`dirname "$PRG"`
CATALINA_HOME=`cd "$PRGDIR/.." ; pwd`
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
