Author: markt
Date: Tue Jan 14 12:10:07 2014
New Revision: 1558020
URL: http://svn.apache.org/r1558020
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56003
tool-wrapper.[sh|bat] requires tomcat-util.jar on the class path
Modified:
tomcat/trunk/bin/tool-wrapper.bat
tomcat/trunk/bin/tool-wrapper.sh
Modified: tomcat/trunk/bin/tool-wrapper.bat
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/tool-wrapper.bat?rev=1558020&r1=1558019&r2=1558020&view=diff
==============================================================================
--- tomcat/trunk/bin/tool-wrapper.bat (original)
+++ tomcat/trunk/bin/tool-wrapper.bat Tue Jan 14 12:10:07 2014
@@ -79,7 +79,7 @@ rem quotes into the CLASSPATH
if "%CLASSPATH%" == "" goto emptyClasspath
set "CLASSPATH=%CLASSPATH%;"
:emptyClasspath
-set
"CLASSPATH=%CLASSPATH%%CATALINA_HOME%\bin\bootstrap.jar;%CATALINA_HOME%\bin\tomcat-juli.jar;%CATALINA_HOME%\lib\servlet-api.jar"
+set
"CLASSPATH=%CLASSPATH%%CATALINA_HOME%\bin\bootstrap.jar;%CATALINA_HOME%\bin\tomcat-juli.jar;%CATALINA_HOME%\lib\servlet-api.jar;%CATALINA_HOME%\lib\tomcat-util.jar"
set JAVA_OPTS=%JAVA_OPTS%
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
Modified: tomcat/trunk/bin/tool-wrapper.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/tool-wrapper.sh?rev=1558020&r1=1558019&r2=1558020&view=diff
==============================================================================
--- tomcat/trunk/bin/tool-wrapper.sh (original)
+++ tomcat/trunk/bin/tool-wrapper.sh Tue Jan 14 12:10:07 2014
@@ -120,7 +120,7 @@ fi
if [ ! -z "$CLASSPATH" ] ; then
CLASSPATH="$CLASSPATH":
fi
-CLASSPATH="$CLASSPATH""$CATALINA_HOME"/bin/bootstrap.jar:"$CATALINA_HOME"/bin/tomcat-juli.jar:"$CATALINA_HOME"/lib/servlet-api.jar
+CLASSPATH="$CLASSPATH""$CATALINA_HOME"/bin/bootstrap.jar:"$CATALINA_HOME"/bin/tomcat-juli.jar:"$CATALINA_HOME"/lib/servlet-api.jar:"$CATALINA_HOME"/lib/tomcat-util.jar
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
