Index: java/org/apache/catalina/ha/session/mbeans-descriptors.xml =================================================================== --- java/org/apache/catalina/ha/session/mbeans-descriptors.xml (revision 786608) +++ java/org/apache/catalina/ha/session/mbeans-descriptors.xml (working copy) @@ -15,7 +15,7 @@ --> +"http://commons.apache.org/dtds/mbeans-descriptors.dtd"> + "http://commons.apache.org/dtds/mbeans-descriptors.dtd"> Jakarta Tomcat group [tomcat-dev@jakarta.apache.org] + * Tomcat group [dev@tomcat.apache.org] * with amendments. * *

Index: java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml =================================================================== --- java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml (revision 786608) +++ java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml (working copy) @@ -15,7 +15,7 @@ --> + "http://commons.apache.org/dtds/mbeans-descriptors.dtd"> + "http://commons.apache.org/dtds/mbeans-descriptors.dtd"> * *

This rule now uses - * + * * org.apache.commons.beanutils.MethodUtils#invokeMethod * by default. * This increases the kinds of methods successfully and allows primitives Index: webapps/docs/balancer-howto.xml =================================================================== --- webapps/docs/balancer-howto.xml (revision 786608) +++ webapps/docs/balancer-howto.xml (working copy) @@ -116,7 +116,7 @@ so that you can write your own rules quickly. Rules should be JavaBeans (public no-args constructor, public setter method setXXX for property xxx), as they are -instantiated by Jakarta Commons Digester. Feel free +instantiated by Apache Commons Digester. Feel free to inquire on the tomcat-user mailing list regarding the availability of rules or the inclusion of your rules in the distribution. Index: webapps/docs/class-loader-howto.xml =================================================================== --- webapps/docs/class-loader-howto.xml (revision 786608) +++ webapps/docs/class-loader-howto.xml (working copy) @@ -91,7 +91,7 @@

  • $CATALINA_HOME/bin/bootstrap.jar - Contains the main() method that is used to initialize the Tomcat 6 server, and the class loader implementation classes it depends on.
    • -
  • $CATALINA_HOME/bin/tomcat-juli.jar - Package renamed Jakarta commons +
  • $CATALINA_HOME/bin/tomcat-juli.jar - Package renamed Apache Commons logging API, and java.util.logging LogManager.
  • Common - This class loader contains additional classes Index: webapps/docs/jndi-datasource-examples-howto.xml =================================================================== --- webapps/docs/jndi-datasource-examples-howto.xml (revision 786608) +++ webapps/docs/jndi-datasource-examples-howto.xml (working copy) @@ -80,17 +80,17 @@ JDBC 3.0 features with a 1.4 JVM.

    -

    See the +

    See the DBCP documentation for a complete list of configuration parameters.

    -

    DBCP uses the Jakarta-Commons Database Connection Pool. It relies on -number of Jakarta-Commons components: +

    DBCP uses the Apache Commons Database Connection Pool. It relies on +number of Commons components:

      -
    • Jakarta-Commons DBCP
      • -
    • Jakarta-Commons Collections
      • -
    • Jakarta-Commons Pool
      • +
    • Commons DBCP
      • +
    • Commons Collections
      • +
    • Commons Pool
    These libraries are located in a single JAR at $CATALINA_HOME/lib/tomcat-dbcp.jar. However, @@ -117,7 +117,7 @@ if there are no more available connections.

    -There is a solution to this problem. The Jakarta-Commons DBCP can be +There is a solution to this problem. The Commons DBCP can be configured to track and recover these abandoned dB connections. Not only can it recover them, but also generate a stack trace for the code which opened these resources and never closed them.

    Index: webapps/docs/setup.xml =================================================================== --- webapps/docs/setup.xml (revision 786608) +++ webapps/docs/setup.xml (working copy) @@ -101,7 +101,7 @@

    Please note that you should use the GNU make (gmake) instead of the native BSD make on FreeBSD systems.

    -

    Download a commons-daemon binary from the Jakarta Commons download page, +

    Download a commons-daemon binary from the Apache Commons download page, and place jsvc.tar.gz and commons-daemon.jar in the $CATALINA_HOME/bin folder.

    Index: webapps/examples/WEB-INF/web.xml =================================================================== --- webapps/examples/WEB-INF/web.xml (revision 786608) +++ webapps/examples/WEB-INF/web.xml (working copy) @@ -184,7 +184,7 @@ - http://jakarta.apache.org/tomcat/debug-taglib + http://tomcat.apache.org/debug-taglib /WEB-INF/jsp/debug-taglib.tld @@ -193,7 +193,7 @@ - http://jakarta.apache.org/tomcat/examples-taglib + http://tomcat.apache.org/examples-taglib /WEB-INF/jsp/example-taglib.tld @@ -202,7 +202,7 @@ - http://jakarta.apache.org/tomcat/jsp2-example-taglib + http://tomcat.apache.org/jsp2-example-taglib /WEB-INF/jsp2/jsp2-example-taglib.tld