View | Details | Raw Unified | Return to bug 47444
Collapse All | Expand All

(-)java/org/apache/catalina/ha/session/mbeans-descriptors.xml (-1 / +1 lines)
Lines 15-21 Link Here
15
-->
15
-->
16
<!DOCTYPE mbeans-descriptors PUBLIC
16
<!DOCTYPE mbeans-descriptors PUBLIC
17
"-//Apache Software Foundation//DTD Model MBeans Configuration File"
17
"-//Apache Software Foundation//DTD Model MBeans Configuration File"
18
"http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd">
18
"http://commons.apache.org/dtds/mbeans-descriptors.dtd">
19
<mbeans-descriptors>
19
<mbeans-descriptors>
20
  <mbean
20
  <mbean
21
    name="JvmRouteBinderValve"
21
    name="JvmRouteBinderValve"
(-)java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml (-1 / +1 lines)
Lines 15-21 Link Here
15
-->
15
-->
16
<!DOCTYPE mbeans-descriptors PUBLIC
16
<!DOCTYPE mbeans-descriptors PUBLIC
17
   "-//Apache Software Foundation//DTD Model MBeans Configuration File"
17
   "-//Apache Software Foundation//DTD Model MBeans Configuration File"
18
   "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd">
18
   "http://commons.apache.org/dtds/mbeans-descriptors.dtd">
19
<mbeans-descriptors>
19
<mbeans-descriptors>
20
  <mbean
20
  <mbean
21
    name="SimpleTcpCluster"
21
    name="SimpleTcpCluster"
(-)java/org/apache/catalina/servlets/CGIServlet.java (-1 / +1 lines)
Lines 122-128 Link Here
122
 * or an instance where the specification cited differs from Best
122
 * or an instance where the specification cited differs from Best
123
 * Community Practice (BCP).
123
 * Community Practice (BCP).
124
 * Such instances should be well-documented here.  Please email the
124
 * Such instances should be well-documented here.  Please email the
125
 * <a href="mailto:tomcat-dev@jakarta.apache.org">Jakarta Tomcat group [tomcat-dev@jakarta.apache.org]</a>
125
 * <a href="mailto:dev@tomcat.apache.org">Tomcat group [dev@tomcat.apache.org]</a>
126
 * with amendments.
126
 * with amendments.
127
 *
127
 *
128
 * </p>
128
 * </p>
(-)java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml (-1 / +1 lines)
Lines 15-21 Link Here
15
-->
15
-->
16
<!DOCTYPE mbeans-descriptors PUBLIC
16
<!DOCTYPE mbeans-descriptors PUBLIC
17
   "-//Apache Software Foundation//DTD Model MBeans Configuration File"
17
   "-//Apache Software Foundation//DTD Model MBeans Configuration File"
18
   "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd">
18
   "http://commons.apache.org/dtds/mbeans-descriptors.dtd">
19
<mbeans-descriptors>
19
<mbeans-descriptors>
20
  <mbean
20
  <mbean
21
    name="McastService"
21
    name="McastService"
(-)java/org/apache/catalina/tribes/transport/mbeans-descriptors.xml (-1 / +1 lines)
Lines 15-21 Link Here
15
-->
15
-->
16
<!DOCTYPE mbeans-descriptors PUBLIC
16
<!DOCTYPE mbeans-descriptors PUBLIC
17
   "-//Apache Software Foundation//DTD Model MBeans Configuration File"
17
   "-//Apache Software Foundation//DTD Model MBeans Configuration File"
18
   "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd">
18
   "http://commons.apache.org/dtds/mbeans-descriptors.dtd">
19
<mbeans-descriptors>
19
<mbeans-descriptors>
20
  <mbean
20
  <mbean
21
    name="SimpleTcpCluster"
21
    name="SimpleTcpCluster"
(-)java/org/apache/tomcat/util/digester/CallMethodRule.java (-1 / +1 lines)
Lines 39-45 Link Here
39
 * </p>
39
 * </p>
40
 *
40
 *
41
 * <p>This rule now uses
41
 * <p>This rule now uses
42
 * <a href="http://jakarta.apache.org/commons/beanutils/apidocs/org/apache/commons/beanutils/MethodUtils.html">
42
 * <a href="http://commons.apache.org/beanutils/apidocs/org/apache/commons/beanutils/MethodUtils.html">
43
 * org.apache.commons.beanutils.MethodUtils#invokeMethod
43
 * org.apache.commons.beanutils.MethodUtils#invokeMethod
44
 * </a> by default.
44
 * </a> by default.
45
 * This increases the kinds of methods successfully and allows primitives
45
 * This increases the kinds of methods successfully and allows primitives
(-)webapps/docs/balancer-howto.xml (-1 / +1 lines)
Lines 116-122 Link Here
116
so that you can write your own rules quickly.  Rules
116
so that you can write your own rules quickly.  Rules
117
should be JavaBeans (public no-args constructor, public
117
should be JavaBeans (public no-args constructor, public
118
setter method setXXX for property xxx), as they are
118
setter method setXXX for property xxx), as they are
119
instantiated by Jakarta Commons Digester.  Feel free
119
instantiated by Apache Commons Digester.  Feel free
120
to inquire on the tomcat-user mailing list regarding
120
to inquire on the tomcat-user mailing list regarding
121
the availability of rules or the inclusion of your rules
121
the availability of rules or the inclusion of your rules
122
in the distribution.
122
in the distribution.
(-)webapps/docs/class-loader-howto.xml (-1 / +1 lines)
Lines 91-97 Link Here
91
    <li><em>$CATALINA_HOME/bin/bootstrap.jar</em> - Contains the main() method
91
    <li><em>$CATALINA_HOME/bin/bootstrap.jar</em> - Contains the main() method
92
        that is used to initialize the Tomcat 6 server, and the class loader
92
        that is used to initialize the Tomcat 6 server, and the class loader
93
        implementation classes it depends on.</li>
93
        implementation classes it depends on.</li>
94
    <li><em>$CATALINA_HOME/bin/tomcat-juli.jar</em> - Package renamed Jakarta commons 
94
    <li><em>$CATALINA_HOME/bin/tomcat-juli.jar</em> - Package renamed Apache Commons 
95
        logging API, and java.util.logging LogManager.</li>
95
        logging API, and java.util.logging LogManager.</li>
96
    </ul></li>
96
    </ul></li>
97
<li><strong>Common</strong> - This class loader contains additional classes
97
<li><strong>Common</strong> - This class loader contains additional classes
(-)webapps/docs/jndi-datasource-examples-howto.xml (-7 / +7 lines)
Lines 80-96 Link Here
80
JDBC 3.0 features with a 1.4 JVM.
80
JDBC 3.0 features with a 1.4 JVM.
81
</p>
81
</p>
82
82
83
<p>See the <a href="http://jakarta.apache.org/commons/dbcp/configuration.html">
83
<p>See the <a href="http://commons.apache.org/dbcp/configuration.html">
84
DBCP documentation</a> for a complete list of configuration parameters.
84
DBCP documentation</a> for a complete list of configuration parameters.
85
</p>
85
</p>
86
86
87
<subsection name="Installation">
87
<subsection name="Installation">
88
<p>DBCP uses the Jakarta-Commons Database Connection Pool. It relies on
88
<p>DBCP uses the Apache Commons Database Connection Pool. It relies on
89
number of Jakarta-Commons components:
89
number of Commons components:
90
<ul>
90
<ul>
91
<li>Jakarta-Commons DBCP</li>
91
<li>Commons DBCP</li>
92
<li>Jakarta-Commons Collections</li>
92
<li>Commons Collections</li>
93
<li>Jakarta-Commons Pool</li>
93
<li>Commons Pool</li>
94
</ul>
94
</ul>
95
These libraries are located in a single JAR at 
95
These libraries are located in a single JAR at 
96
<code>$CATALINA_HOME/lib/tomcat-dbcp.jar</code>. However,
96
<code>$CATALINA_HOME/lib/tomcat-dbcp.jar</code>. However,
Lines 117-123 Link Here
117
if there are no more available connections.</p>
117
if there are no more available connections.</p>
118
118
119
<p>
119
<p>
120
There is a solution to this problem.  The Jakarta-Commons DBCP can be
120
There is a solution to this problem.  The Commons DBCP can be
121
configured to track and recover these abandoned dB connections.  Not
121
configured to track and recover these abandoned dB connections.  Not
122
only can it recover them, but also generate a stack trace for the code
122
only can it recover them, but also generate a stack trace for the code
123
which opened these resources and never closed them.</p>
123
which opened these resources and never closed them.</p>
(-)webapps/docs/setup.xml (-1 / +1 lines)
Lines 101-107 Link Here
101
    <p>Please note that you should use the GNU make (gmake) instead of
101
    <p>Please note that you should use the GNU make (gmake) instead of
102
       the native BSD make on FreeBSD systems.</p>
102
       the native BSD make on FreeBSD systems.</p>
103
103
104
    <p>Download a commons-daemon binary from the Jakarta Commons download page, 
104
    <p>Download a commons-daemon binary from the Apache Commons download page, 
105
       and place jsvc.tar.gz and commons-daemon.jar in the 
105
       and place jsvc.tar.gz and commons-daemon.jar in the 
106
       <code>$CATALINA_HOME/bin</code> folder.</p>
106
       <code>$CATALINA_HOME/bin</code> folder.</p>
107
107
(-)webapps/examples/WEB-INF/web.xml (-3 / +3 lines)
Lines 184-190 Link Here
184
    <jsp-config>
184
    <jsp-config>
185
        <taglib>
185
        <taglib>
186
	    <taglib-uri>
186
	    <taglib-uri>
187
	       http://jakarta.apache.org/tomcat/debug-taglib
187
	       http://tomcat.apache.org/debug-taglib
188
	    </taglib-uri>
188
	    </taglib-uri>
189
	    <taglib-location>
189
	    <taglib-location>
190
	       /WEB-INF/jsp/debug-taglib.tld
190
	       /WEB-INF/jsp/debug-taglib.tld
Lines 193-199 Link Here
193
193
194
	<taglib>
194
	<taglib>
195
	    <taglib-uri>
195
	    <taglib-uri>
196
	       http://jakarta.apache.org/tomcat/examples-taglib
196
	       http://tomcat.apache.org/examples-taglib
197
	    </taglib-uri>
197
	    </taglib-uri>
198
	    <taglib-location>
198
	    <taglib-location>
199
	       /WEB-INF/jsp/example-taglib.tld
199
	       /WEB-INF/jsp/example-taglib.tld
Lines 202-208 Link Here
202
202
203
	<taglib>
203
	<taglib>
204
	    <taglib-uri>
204
	    <taglib-uri>
205
	       http://jakarta.apache.org/tomcat/jsp2-example-taglib
205
	       http://tomcat.apache.org/jsp2-example-taglib
206
	    </taglib-uri>
206
	    </taglib-uri>
207
	    <taglib-location>
207
	    <taglib-location>
208
	       /WEB-INF/jsp2/jsp2-example-taglib.tld
208
	       /WEB-INF/jsp2/jsp2-example-taglib.tld

Return to bug 47444