Author: rjung Date: Wed Jul 1 19:48:05 2009 New Revision: 790342 URL: http://svn.apache.org/viewvc?rev=790342&view=rev Log: Remove obsolete classpath entry for commons-logging from start script. It is already present in the classpath set by the manifest in bootstrap.jar.
Modified: tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh tomcat/container/tc5.5.x/webapps/docs/changelog.xml tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh?rev=790342&r1=790341&r2=790342&view=diff ============================================================================== --- tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh (original) +++ tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh Wed Jul 1 19:48:05 2009 @@ -134,7 +134,7 @@ if [ -n "$JSSE_HOME" ]; then CLASSPATH="$CLASSPATH":"$JSSE_HOME"/lib/jcert.jar:"$JSSE_HOME"/lib/jnet.jar:"$JSSE_HOME"/lib/jsse.jar fi -CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar:"$CATALINA_HOME"/bin/commons-logging-api.jar +CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar if [ -z "$CATALINA_BASE" ] ; then CATALINA_BASE="$CATALINA_HOME" Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=790342&r1=790341&r2=790342&view=diff ============================================================================== --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Jul 1 19:48:05 2009 @@ -180,6 +180,11 @@ <bug>44943</bug>: Reduce copy/paste issues caused by different engine names in server.xml. (markt, kkolinko) </fix> + <fix> + Remove obsolete classpath entry for commons-logging from start script. + It is already present in the classpath set by the manifest in bootstrap.jar. + (rjung) + </fix> </changelog> </subsection> <subsection name="Jasper"> Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=790342&r1=790341&r2=790342&view=diff ============================================================================== --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 1 19:48:05 2009 @@ -67,14 +67,6 @@ +1: markt - patch does much more than fix a memory leak -1: -* Remove obsolete classpath entry for commons-logging from start script. - The cl jar is contained in the cp via the manifest of the bootstrap.jar. - The cl jar file name in the startup script also is no longer correct, - so remove it completely. - http://people.apache.org/~rjung/patches/remove_cl_from_cp.patch - +1: rjung, kkolinko, markt - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=36574 (again) Don't corrupt non-text files when chaging line endings http://people.apache.org/~markt/patches/2009-07-01-bug36574.patch --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org