Author: markt
Date: Fri Aug 24 19:53:47 2018
New Revision: 1838947
URL: http://svn.apache.org/viewvc?rev=1838947&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62652
Make it clearer that it is DBCP 1 that is packaged with Tomcat 7.
Modified:
tomcat/tc7.0.x/trunk/BUILDING.txt
tomcat/tc7.0.x/trunk/RELEASE-NOTES
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/class-loader-howto.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/globalresources.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml
tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml
tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml
Modified: tomcat/tc7.0.x/trunk/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/BUILDING.txt?rev=1838947&r1=1838946&r2=1838947&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/BUILDING.txt (original)
+++ tomcat/tc7.0.x/trunk/BUILDING.txt Fri Aug 24 19:53:47 2018
@@ -44,7 +44,7 @@ source distribution, do the following:
Note regarding later versions of Java:
As documented elsewhere, one of the components in Apache Tomcat includes
- a private copy of the Apache Commons DBCP library. The source code
+ a private copy of the Apache Commons DBCP 1.x library. The source code
for this library is downloaded, processed by the build script
(renaming the packages) and compiled.
@@ -54,7 +54,7 @@ source distribution, do the following:
implementing this version of specification. Therefore, the build Tomcat
build process must be executed with a Java 6 JDK.
- See Apache Commons DBCP project web site for more details on
+ See Apache Commons DBCP 1.x project web site for more details on
available versions of the library and its requirements,
https://commons.apache.org/dbcp/
Modified: tomcat/tc7.0.x/trunk/RELEASE-NOTES
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/RELEASE-NOTES?rev=1838947&r1=1838946&r2=1838947&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/RELEASE-NOTES (original)
+++ tomcat/tc7.0.x/trunk/RELEASE-NOTES Fri Aug 24 19:53:47 2018
@@ -112,7 +112,7 @@ for use by web applications (by placing
* tomcat7-websocket.jar (WebSocket 1.1 implementation)
* tomcat-api.jar (Interfaces shared by Catalina and Jasper)
* tomcat-coyote.jar (Tomcat connectors and utility classes)
-* tomcat-dbcp.jar (package renamed database connection pool based on Commons
DBCP)
+* tomcat-dbcp.jar (package renamed database connection pool based on Commons
DBCP 1.x)
* tomcat-jdbc.jar (Tomcat's database connection pooling solution)
* tomcat-util.jar (Various utilities)
* websocket-api.jar (WebSocket 1.1 API)
Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1838947&r1=1838946&r2=1838947&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Fri Aug 24 19:53:47 2018
@@ -180,7 +180,7 @@ tomcat-native.loc.2=${base-tomcat.loc.2}
tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
-# ----- Commons DBCP, version 1.1 or later -----
+# ----- Commons DBCP 1.x, version 1.1 or later -----
commons-dbcp.version=1.4
commons-dbcp-src.checksum.enabled=true
commons-dbcp-src.checksum.algorithm=SHA-256
@@ -189,7 +189,7 @@ commons-dbcp.home=${base.path}/commons-d
commons-dbcp-src.loc.1=${base-commons.loc.1}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
-# ----- Commons Pool, version 1.1 or later -----
+# ----- Commons Pool 1.x, version 1.1 or later -----
commons-pool.version=1.5.7
commons-pool-src.checksum.enabled=true
commons-pool-src.checksum.algorithm=MD5|SHA-1
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1838947&r1=1838946&r2=1838947&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Fri Aug 24 19:53:47 2018
@@ -2583,7 +2583,7 @@ Apache Tomcat ${version} native binaries
filesDir="java"
filesId="files.jasper-el" />
- <!-- Repackaged DBCP -->
+ <!-- Repackaged DBCP 1.x -->
<copy file="${tomcat-dbcp-src.jar}" todir="${tomcat.src.jars}" />
<!-- jdbc-pool JAR File -->
<copy file="${tomcat-jdbc-src.jar}" todir="${tomcat.src.jars}" />
@@ -2656,7 +2656,7 @@ Apache Tomcat ${version} native binaries
<param name="checksum.value"
value="${commons-daemon.bin.checksum.value}"/>
</antcall>
- <!-- Download src and build Tomcat DBCP bundle -->
+ <!-- Download src and build Tomcat DBCP 1.x bundle -->
<antcall target="downloadgz-2">
<param name="sourcefile.1" value="${commons-pool-src.loc.1}"/>
<param name="sourcefile.2" value="${commons-pool-src.loc.2}"/>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1838947&r1=1838946&r2=1838947&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Aug 24 19:53:47 2018
@@ -167,6 +167,10 @@
the use of <code>CATALINA_HOME</code> and <code>CATALINA_BASE</code>.
Patch provided by Marek Czernek. (markt)
</add>
+ <fix>
+ <bug>62652</bug>: Make it clearer that the version of DBCP that is
+ packaged in Tomcat 7.0.x is DBCP 1. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Tribes">
@@ -9694,7 +9698,7 @@
<bug>52853</bug>: Clarify how Jar Scanner handles directories. (markt)
</fix>
<fix>
- <bug>53158</bug>: Fix documented defaults for DBCP.
+ <bug>53158</bug>: Fix documented defaults for DBCP 1.x.
Patch provided by ph.dezanneau at gmail.com. (rjung)
</fix>
<fix>
@@ -12718,7 +12722,7 @@
annotations. (markt)
</fix>
<add>
- <bug>25060</bug>: Close Apache Commons DBCP datasources when the
+ <bug>25060</bug>: Close Apache Commons DBCP 1.x datasources when the
associated JNDI naming context is stopped (e.g. for a non-global
DataSource resource on web application reload) to close remaining
database connections immediately rather than waiting for garbage
Modified: tomcat/tc7.0.x/trunk/webapps/docs/class-loader-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/class-loader-howto.xml?rev=1838947&r1=1838946&r2=1838947&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/class-loader-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/class-loader-howto.xml Fri Aug 24
19:53:47 2018
@@ -146,7 +146,7 @@ loaders as it is initialized:</p>
<li><em>tomcat-coyote.jar</em> — Tomcat connectors and utility
classes.</li>
<li><em>tomcat-dbcp.jar</em> — Database connection pool
implementation based on package-renamed copy of Apache Commons Pool
- and Apache Commons DBCP.</li>
+ and Apache Commons DBCP 1.x.</li>
<li><em>tomcat-i18n-**.jar</em> — Optional JARs containing resource
bundles
for other languages. As default bundles are also included in each
individual JAR, they can be safely removed if no internationalization
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml?rev=1838947&r1=1838946&r2=1838947&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml Fri Aug 24 19:53:47
2018
@@ -1282,7 +1282,7 @@
This attribute is ignored if the <code>singleton</code> attribute is
false. If not specified, no default is defined and no close method will
be called.</p>
- <p>For Apache Commons DBCP and Apache Tomcat JDBC connection pools
+ <p>For Apache Commons DBCP 1.x and Apache Tomcat JDBC connection pools
you can use <code>closeMethod="close"</code>.</p>
</attribute>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/globalresources.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/globalresources.xml?rev=1838947&r1=1838946&r2=1838947&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/globalresources.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/globalresources.xml Fri Aug 24
19:53:47 2018
@@ -187,7 +187,7 @@
This attribute is ignored if the <code>singleton</code> attribute is
false. If not specified, no default is defined and no close method will
be called.</p>
- <p>For Apache Commons DBCP and Apache Tomcat JDBC connection pools
+ <p>For Apache Commons DBCP 1.x and Apache Tomcat JDBC connection pools
you can use <code>closeMethod="close"</code>.</p>
</attribute>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml?rev=1838947&r1=1838946&r2=1838947&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml Fri Aug 24
19:53:47 2018
@@ -647,7 +647,7 @@
<code>javax.sql.DataSource</code>. If not specified the default of
<code>org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory</code> is used
which is a package renamed (to avoid conflicts) copy of
- <a href="https://commons.apache.org/dbcp";>Apache Commons DBCP</a>.</p>
+ <a href="https://commons.apache.org/dbcp";>Apache Commons DBCP
1.x</a>.</p>
</property>
<property name="javax.mail.Session.Factory">
Modified: tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1838947&r1=1838946&r2=1838947&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml
(original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml Fri
Aug 24 19:53:47 2018
@@ -106,7 +106,7 @@ a <code>ServletContextListener</code>.
</section>
-<section name="Database Connection Pool (DBCP) Configurations">
+<section name="Database Connection Pool (DBCP 1.x) Configurations">
<p>The default database connection pool implementation in Apache Tomcat
relies on the libraries from the
@@ -115,8 +115,8 @@ The following libraries are used:
</p>
<ul>
-<li>Commons DBCP</li>
-<li>Commons Pool</li>
+<li>Commons DBCP 1.x</li>
+<li>Commons Pool 1.x</li>
</ul>
<p>
@@ -131,7 +131,7 @@ packages have been renamed to avoid inte
<subsection name="Installation">
<p>See the <a href="https://commons.apache.org/dbcp/configuration.html";>
-DBCP documentation</a> for a complete list of configuration parameters.
+DBCP 1.x documentation</a> for a complete list of configuration parameters.
</p>
</subsection>
@@ -153,21 +153,21 @@ This can eventually result in your web a
if there are no more available connections.</p>
<p>
-There is a solution to this problem. The Apache Commons DBCP can be
+There is a solution to this problem. The Apache Commons DBCP 1.x can be
configured to track and recover these abandoned database connections. Not
only can it recover them, but also generate a stack trace for the code
which opened these resources and never closed them.</p>
<p>
-To configure a DBCP DataSource so that abandoned database connections are
+To configure a DBCP 1.x DataSource so that abandoned database connections are
removed and recycled add the following attribute to the
-<code>Resource</code> configuration for your DBCP DataSource:
+<code>Resource</code> configuration for your DBCP 1.x DataSource:
</p>
<source>removeAbandoned="true"</source>
<p>
-When available database connections run low DBCP will recover and recycle
+When available database connections run low DBCP 1.x will recover and recycle
any abandoned database connections it finds. The default is <code>false</code>.
</p>
@@ -184,7 +184,7 @@ The default timeout for removing abandon
<p>
The <code>logAbandoned</code> attribute can be set to <code>true</code>
-if you want DBCP to log a stack trace of the code which abandoned the
+if you want DBCP 1.x to log a stack trace of the code which abandoned the
database connection resources.
</p>
<source>logAbandoned="true"</source>
@@ -194,7 +194,7 @@ The default is <code>false</code>.
</subsection>
-<subsection name="MySQL DBCP Example">
+<subsection name="MySQL DBCP 1.x Example">
<h5>0. Introduction</h5>
<p>Versions of <a
href="https://www.mysql.com/products/mysql/index.html";>MySQL</a> and JDBC
@@ -257,7 +257,7 @@ resource to your <a href="config/context
-->
<!-- maxIdle: Maximum number of idle database connections to retain in
pool.
- Set to -1 for no limit. See also the DBCP documentation on this
+ Set to -1 for no limit. See also the DBCP 1.x documentation on this
and the minEvictableIdleTimeMillis configuration parameter.
-->
@@ -405,7 +405,7 @@ Connection conn = ds.getConnection();
<h5>1. Required files </h5>
<p>
Copy the Postgres JDBC jar to $CATALINA_HOME/lib. As with Oracle, the
-jars need to be in this directory in order for DBCP's Classloader to find
+jars need to be in this directory in order for DBCP 1.x's Classloader to find
them. This has to be done regardless of which configuration step you take next.
</p>
@@ -491,7 +491,7 @@ than testing!) or some other pooling tec
<section name="Oracle 8i with OCI client">
<subsection name="Introduction">
<p>Whilst not strictly addressing the creation of a JNDI DataSource using the
OCI client, these notes can be combined with the
-Oracle and DBCP solution above.</p>
+Oracle and DBCP 1.x solution above.</p>
<p>
In order to use OCI driver, you should have an Oracle client installed. You
should have installed
Oracle8i(8.1.7) client from cd, and download the suitable JDBC/OCI
@@ -578,7 +578,7 @@ than one second. The remainder will onl
if ever should a GC take more than 10 seconds.</p>
<p>Make sure that the db connection timeout is set to 10-15 seconds.
-For the DBCP you set this using the parameter <code>maxWait</code>.</p>
+For the DBCP 1.x you set this using the parameter <code>maxWait</code>.</p>
</subsection>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml?rev=1838947&r1=1838946&r2=1838947&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml Fri Aug 24
19:53:47 2018
@@ -663,7 +663,7 @@ Transport.send(message);]]></source>
</ul>
<p><strong>NOTE</strong> - The default data source support in Tomcat
- is based on the <strong>DBCP</strong> connection pool from the
+ is based on the <strong>DBCP 1.x</strong> connection pool from the
<a href="https://commons.apache.org/";>Commons</a>
project. However, it is possible to use any other connection pool
that implements <code>javax.sql.DataSource</code>, by writing your
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
