Author: markt
Date: Tue Mar 25 16:47:22 2008
New Revision: 641079
URL: http://svn.apache.org/viewvc?rev=641079&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44556
Use new filename for coommons-logging-api jar
Modified:
tomcat/connectors/trunk/jk/jkstatus/conf/jkstatus-tasks.xml
tomcat/connectors/trunk/jk/jkstatus/example/jkstatus.xml
tomcat/connectors/trunk/jk/jkstatus/example/show.xml
tomcat/connectors/trunk/jk/xdocs/miscellaneous/jkstatustasks.xml
tomcat/container/tc5.5.x/catalina/src/bin/catalina-tasks.xml
tomcat/container/tc5.5.x/webapps/docs/class-loader-howto.xml
tomcat/container/tc5.5.x/webapps/docs/logging.xml
tomcat/container/tc5.5.x/webapps/docs/realm-howto.xml
tomcat/current/tc5.5.x/STATUS.txt
Modified: tomcat/connectors/trunk/jk/jkstatus/conf/jkstatus-tasks.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/conf/jkstatus-tasks.xml?rev=641079&r1=641078&r2=641079&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/jkstatus/conf/jkstatus-tasks.xml (original)
+++ tomcat/connectors/trunk/jk/jkstatus/conf/jkstatus-tasks.xml Tue Mar 25
16:47:22 2008
@@ -26,7 +26,9 @@
<dirname property="jkstatus.home.bin.dir" file="${ant.file.jkstatus-tasks}"/>
<property name="jkstatus.home" value="${jkstatus.home.bin.dir}/.."/>
<path id="jkstatus.path">
- <pathelement location="${jkstatus.home}/bin/commons-logging-api.jar"/>
+ <fileset dir="${jkstatus.home}/bin">
+ <include name="commons-logging-api-*.jar"/>
+ </fileset>
<pathelement location="${jkstatus.home}/lib/catalina-ant.jar"/>
<pathelement location="${jkstatus.home}/lib/tomcat-jkstatus-ant.jar"/>
<pathelement location="${jkstatus.home}/lib/tomcat-util.jar"/>
Modified: tomcat/connectors/trunk/jk/jkstatus/example/jkstatus.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/example/jkstatus.xml?rev=641079&r1=641078&r2=641079&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/jkstatus/example/jkstatus.xml (original)
+++ tomcat/connectors/trunk/jk/jkstatus/example/jkstatus.xml Tue Mar 25
16:47:22 2008
@@ -25,7 +25,9 @@
<property file="jkstatus${profile}.properties.default"/>
<path id="jkstatus.path">
- <pathelement location="${catalina.home}/bin/commons-logging-api.jar"/>
+ <fileset dir="${catalina.home}/bin">
+ <include name="commons-logging-api-*.jar"/>
+ </fileset>
<pathelement location="${catalina.home}/server/lib/catalina-ant.jar"/>
<pathelement location="../dist/tomcat-jkstatus-ant.jar"/>
<pathelement location="${catalina.home}/server/lib/tomcat-util.jar"/>
Modified: tomcat/connectors/trunk/jk/jkstatus/example/show.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/example/show.xml?rev=641079&r1=641078&r2=641079&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/jkstatus/example/show.xml (original)
+++ tomcat/connectors/trunk/jk/jkstatus/example/show.xml Tue Mar 25 16:47:22
2008
@@ -25,7 +25,9 @@
<property file="jkstatus.properties.default"/>
<path id="jkstatus.classpath">
- <pathelement location="${catalina.home}/bin/commons-logging-api.jar"/>
+ <fileset dir="${catalina.home}/bin">
+ <include name="commons-logging-api-*.jar"/>
+ </fileset>
<pathelement location="${catalina.home}/server/lib/catalina-ant.jar"/>
<!--<pathelement
location="${catalina.home}/server/lib/tomcat-jkstatus-ant.jar"/>-->
<pathelement location="../dist/tomcat-jkstatus-ant.jar"/>
Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/jkstatustasks.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/jkstatustasks.xml?rev=641079&r1=641078&r2=641079&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/jkstatustasks.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/jkstatustasks.xml Tue Mar 25
16:47:22 2008
@@ -53,7 +53,9 @@
<property file="jkstatus.properties.default"/>
<path id="jkstatus.classpath">
- <pathelement
location="${catalina.home}/bin/commons-logging-api.jar"/>
+ <fileset dir="${catalina.home}/bin">
+ <include name="commons-logging-api-*.jar"/>
+ </fileset>
<pathelement
location="${catalina.home}/server/lib/catalina-ant.jar"/>
<pathelement location="../dist/tomcat-jkstatus-ant.jar"/>
<pathelement
location="${catalina.home}/server/lib/tomcat-util.jar"/>
Modified: tomcat/container/tc5.5.x/catalina/src/bin/catalina-tasks.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/bin/catalina-tasks.xml?rev=641079&r1=641078&r2=641079&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/bin/catalina-tasks.xml (original)
+++ tomcat/container/tc5.5.x/catalina/src/bin/catalina-tasks.xml Tue Mar 25
16:47:22 2008
@@ -27,7 +27,9 @@
<property name="catalina.home" value="${catalina.home.bin.dir}/.."/>
<taskdef resource="org/apache/catalina/ant/catalina.tasks">
<classpath>
- <fileset file="${catalina.home}/bin/commons-logging-api.jar"/>
+ <fileset dir="${catalina.home}/bin">
+ <include name="commons-logging-api-*.jar"/>
+ </fileset>
<fileset file="${catalina.home}/common/lib/jasper-compiler.jar"/>
<fileset file="${catalina.home}/common/lib/jasper-runtime.jar"/>
<fileset file="${catalina.home}/common/lib/servlet-api.jar"/>
Modified: tomcat/container/tc5.5.x/webapps/docs/class-loader-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/class-loader-howto.xml?rev=641079&r1=641078&r2=641079&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/class-loader-howto.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/class-loader-howto.xml Tue Mar 25
16:47:22 2008
@@ -116,8 +116,8 @@
implementation classes it depends on.</li>
<li><em>$JAVA_HOME/lib/tools.jar</em> - Contains the "javac" compiler used
to convert JSP pages into servlet classes.</li>
- <li><em>$CATALINA_HOME/bin/commons-logging-api.jar</em> - Jakarta commons
- logging API.</li>
+ <li><em>$CATALINA_HOME/bin/commons-logging-api-x.y.z.jar</em> - Jakarta
+ commons logging API.</li>
<li><em>$CATALINA_HOME/bin/commons-daemon.jar</em> - Jakarta commons
daemon API.</li>
<li><em>jmx.jar</em> - The JMX 1.2 implementation.</li>
Modified: tomcat/container/tc5.5.x/webapps/docs/logging.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/logging.xml?rev=641079&r1=641078&r2=641079&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/logging.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/logging.xml Tue Mar 25 16:47:22 2008
@@ -93,8 +93,8 @@
(v1.2 or later) and place the log4j jar in
$CATALINA_HOME/common/lib.</li>
<li><a href="http://commons.apache.org/downloads/download_logging.cgi";>
- Download Commons Logging</a> and place the commons-logging.jar
- (not commons-logging-api.jar) in $CATALINA_HOME/common/lib with
+ Download Commons Logging</a> and place the
commons-logging-x.y.z.jar
+ (not commons-logging-api-x.y.z.jar) in $CATALINA_HOME/common/lib
with
the log4j jar.</li>
<li>Start Tomcat</li>
Modified: tomcat/container/tc5.5.x/webapps/docs/realm-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/realm-howto.xml?rev=641079&r1=641078&r2=641079&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/realm-howto.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/realm-howto.xml Tue Mar 25 16:47:22
2008
@@ -237,9 +237,8 @@
<p>To use either of the above techniques, the
<code>$CATALINA_HOME/server/lib/catalina.jar</code> file will need to be
on your class path to make the <code>RealmBase</code> class available. In
-addition, you will need the JMX jar and the commons-logging jar (either
-commons-logging-api.jar or commons-logging.jar). Both of these are included
-with the Tomcat distribution.
+addition, you will need the JMX jar and commons-logging-api.x.y.z.jar. Both of
+these are included with the Tomcat distribution.
</p>
<p>Non-ASCII usernames and/or passwords are supported using
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=641079&r1=641078&r2=641079&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Tue Mar 25 16:47:22 2008
@@ -59,13 +59,6 @@
+1: markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44556
- http://people.apache.org/~markt/patches/2008-03-10-bug44556.patch
- +1: markt, fhanik, rjung
- -1:
- rjung: in realm-howto.xml: "Both of these are included with the Tomcat
distribution."
- This is not true, we only include the api file.
-
* Fix docs re use of maxActive
http://svn.apache.org/viewvc?rev=639842&view=rev
+1: rjung, markt
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
