tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1838942 - in /tomcat/trunk: ./ webapps/docs/ webapps/docs/config/
Date Fri, 24 Aug 2018 19:46:58 GMT
Author: markt
Date: Fri Aug 24 19:46:57 2018
New Revision: 1838942

URL: http://svn.apache.org/viewvc?rev=1838942&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62652
Make it clearer that it is DBCP 2 that is packaged with Tomcat 9.

Modified:
    tomcat/trunk/BUILDING.txt
    tomcat/trunk/RELEASE-NOTES
    tomcat/trunk/build.xml
    tomcat/trunk/webapps/docs/changelog.xml
    tomcat/trunk/webapps/docs/class-loader-howto.xml
    tomcat/trunk/webapps/docs/config/context.xml
    tomcat/trunk/webapps/docs/config/globalresources.xml
    tomcat/trunk/webapps/docs/config/systemprops.xml
    tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
    tomcat/trunk/webapps/docs/jndi-resources-howto.xml

Modified: tomcat/trunk/BUILDING.txt
URL: http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1838942&r1=1838941&r2=1838942&view=diff
==============================================================================
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Fri Aug 24 19:46:57 2018
@@ -45,15 +45,15 @@ source distribution, do the following:
     Note regarding later versions of Java:
 
       As documented elsewhere, one of components in Apache Tomcat includes
-      a private copy of the Apache Commons DBCP library.
+      a private copy of the Apache Commons DBCP 2 library.
 
       The JDBC interfaces implemented by DBCP frequently change in non-backwards
       compatible ways between versions of the Java SE specification. Therefore,
-      it is likely that DBCP will only compile with the specific version of Java
+      it is likely that DBCP 2 will only compile with the specific version of Java
       listed above and that compilation will fail if a later version of Java is
       used.
 
-      See Apache Commons DBCP project web site for more details on
+      See Apache Commons DBCP 2 project web site for more details on
       available versions of the library and its requirements,
 
         https://commons.apache.org/dbcp/

Modified: tomcat/trunk/RELEASE-NOTES
URL: http://svn.apache.org/viewvc/tomcat/trunk/RELEASE-NOTES?rev=1838942&r1=1838941&r2=1838942&view=diff
==============================================================================
--- tomcat/trunk/RELEASE-NOTES (original)
+++ tomcat/trunk/RELEASE-NOTES Fri Aug 24 19:46:57 2018
@@ -80,7 +80,7 @@ for use by web applications (by placing
 * servlet-api.jar (Servlet 4.0 API)
 * 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 2)
 * tomcat-jdbc.jar (Tomcat's database connection pooling solution)
 * tomcat-jni.jar (Interface to the native component of the APR/native connector)
 * tomcat-util.jar (Various utilities)

Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1838942&r1=1838941&r2=1838942&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Aug 24 19:46:57 2018
@@ -886,7 +886,7 @@
       filesId="files.jasper-el"
       addOSGi="true" />
 
-    <!-- Re-packaged Apache Commons DBCP-->
+    <!-- Re-packaged Apache Commons DBCP 2-->
     <jarIt jarfile="${tomcat-dbcp.jar}"
       filesDir="${tomcat.classes}"
       filesId="files.tomcat-dbcp"
@@ -2635,7 +2635,7 @@ skip.installer property in build.propert
       filesDir="java"
       filesId="files.jasper-el" />
 
-    <!-- Repackaged DBCP -->
+    <!-- Repackaged DBCP 2 -->
     <jarIt jarfile="${tomcat-dbcp-src.jar}"
       filesDir="java"
       filesId="files.tomcat-dbcp" />

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1838942&r1=1838941&r2=1838942&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Aug 24 19:46:57 2018
@@ -69,6 +69,11 @@
         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 9.0.x is DBCP 2. Correct the names of some DBCP 2
+        configuration attributes that changed between 1.x and 2.x. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Other">
@@ -882,8 +887,8 @@
         Always report the OS's umask when launching the JVM. (schultz)
       </add>
       <add>
-        Add managed connections package to the package renamed DBCP2 to provide
-        a complete DBCP2 in Tomcat. (remm)
+        Add managed connections package to the package renamed DBCP 2 to provide
+        a complete DBCP 2 in Tomcat. (remm)
       </add>
     </changelog>
   </subsection>
@@ -4454,7 +4459,7 @@
         BCEL 6 release. (markt)
       </update>
       <update>
-        Update the internal fork of Commons DBCP2 to r1757164 to pick up a
+        Update the internal fork of Commons DBCP 2 to r1757164 to pick up a
         couple of bug fixes. (markt)
       </update>
       <update>

Modified: tomcat/trunk/webapps/docs/class-loader-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/class-loader-howto.xml?rev=1838942&r1=1838941&r2=1838942&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/class-loader-howto.xml (original)
+++ tomcat/trunk/webapps/docs/class-loader-howto.xml Fri Aug 24 19:46:57 2018
@@ -147,8 +147,8 @@ loaders as it is initialized:</p>
     <li><em>tomcat-api.jar</em> &#8212; Several interfaces defined
by Tomcat.</li>
     <li><em>tomcat-coyote.jar</em> &#8212; Tomcat connectors and utility
classes.</li>
     <li><em>tomcat-dbcp.jar</em> &#8212; Database connection pool
-        implementation based on package-renamed copy of Apache Commons Pool
-        and Apache Commons DBCP.</li>
+        implementation based on package-renamed copy of Apache Commons Pool 2
+        and Apache Commons DBCP 2.</li>
     <li><em>tomcat-i18n-**.jar</em> &#8212; 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/trunk/webapps/docs/config/context.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/context.xml?rev=1838942&r1=1838941&r2=1838942&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/trunk/webapps/docs/config/context.xml Fri Aug 24 19:46:57 2018
@@ -1203,7 +1203,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 2 and Apache Tomcat JDBC connection pools
         you can use <code>closeMethod="close"</code>.</p>
       </attribute>
 
@@ -1315,7 +1315,7 @@
     <p>Shared Data Source Example:</p>
     <p><strong>Warning:</strong> This feature works only if the global
DataSource
 supports <code>getConnection(username, password)</code> method.
-<a href="https://commons.apache.org/dbcp/">Apache Commons DBCP</a> pool that
+<a href="https://commons.apache.org/dbcp/">Apache Commons DBCP 2</a> pool that
 Tomcat uses by default does not support it. See its Javadoc for
 <code>BasicDataSource</code> class.
 <a href="../jdbc-pool.html">Apache Tomcat JDBC pool</a> does support it,

Modified: tomcat/trunk/webapps/docs/config/globalresources.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/globalresources.xml?rev=1838942&r1=1838941&r2=1838942&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/globalresources.xml (original)
+++ tomcat/trunk/webapps/docs/config/globalresources.xml Fri Aug 24 19:46:57 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 2 and Apache Tomcat JDBC connection pools
         you can use <code>closeMethod="close"</code>.</p>
       </attribute>
 

Modified: tomcat/trunk/webapps/docs/config/systemprops.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=1838942&r1=1838941&r2=1838942&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/trunk/webapps/docs/config/systemprops.xml Fri Aug 24 19:46:57 2018
@@ -580,7 +580,7 @@
       <code>javax.sql.DataSource</code>. If not specified the default of
       <code>org.apache.tomcat.dbcp.dbcp2.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 2</a>.</p>
     </property>
 
     <property name="javax.mail.Session.Factory">

Modified: tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1838942&r1=1838941&r2=1838942&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml Fri Aug 24 19:46:57 2018
@@ -118,8 +118,8 @@ The following libraries are used:
 </p>
 
 <ul>
-<li>Commons DBCP</li>
-<li>Commons Pool</li>
+<li>Commons DBCP 2</li>
+<li>Commons Pool 2</li>
 </ul>
 
 <p>
@@ -129,12 +129,12 @@ only the classes needed for connection p
 packages have been renamed to avoid interfering with applications.
 </p>
 
-<p>DBCP 2.0 provides support for JDBC 4.1.</p>
+<p>DBCP 2 provides support for JDBC 4.1.</p>
 
 <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 2 documentation</a> for a complete list of configuration parameters.
 </p>
 
 </subsection>
@@ -156,15 +156,15 @@ 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 2 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 2 DataSource so that abandoned database connections are
 removed and recycled, add one or both of the following attributes to the
-<code>Resource</code> configuration for your DBCP DataSource:
+<code>Resource</code> configuration for your DBCP 2 DataSource:
 </p>
 <source>removeAbandonedOnBorrow=true</source>
 <source>removeAbandonedOnMaintenance=true</source>
@@ -173,7 +173,7 @@ removed and recycled, add one or both of
 maintenance is enabled by setting <code>timeBetweenEvictionRunsMillis</code>
 to a positive value.  See the
 <a href="https://commons.apache.org/dbcp/configuration.html">
-DBCP documentation</a> for full documentation on these attributes.
+DBCP 2 documentation</a> for full documentation on these attributes.
 </p>
 
 <p>
@@ -189,7 +189,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 2 to log a stack trace of the code which abandoned the
 database connection resources.
 </p>
 <source>logAbandoned="true"</source>
@@ -199,7 +199,7 @@ The default is <code>false</code>.
 
 </subsection>
 
-<subsection name="MySQL DBCP Example">
+<subsection name="MySQL DBCP 2 Example">
 
 <h5>0. Introduction</h5>
 <p>Versions of <a href="https://www.mysql.com/products/mysql/index.html">MySQL</a>
and JDBC
@@ -262,7 +262,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 2 documentation on this
          and the minEvictableIdleTimeMillis configuration parameter.
          -->
 
@@ -410,7 +410,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 2's Classloader to find
 them. This has to be done regardless of which configuration step you take next.
 </p>
 
@@ -496,7 +496,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 2 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
@@ -583,7 +583,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>maxWaitMillis</code>.</p>
+For DBCP 2 you set this using the parameter <code>maxWaitMillis</code>.</p>
 
 </subsection>
 

Modified: tomcat/trunk/webapps/docs/jndi-resources-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-resources-howto.xml?rev=1838942&r1=1838941&r2=1838942&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/jndi-resources-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jndi-resources-howto.xml Fri Aug 24 19:46:57 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 2</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
@@ -828,8 +828,12 @@ conn.close();]]></source>
     <p>The abandoning feature is disabled by default and can be configured
     using the following properties:</p>
     <ul>
-    <li><strong>removeAbandoned</strong> - true or false: whether to
-        remove abandoned connections from the pool. Default: false</li>
+    <li><strong>removeAbandonedOnBorrow</strong> - true or false: whether
to
+        remove abandoned connections from the pool when a connection is
+        borrowed. Default: false</li>
+    <li><strong>removeAbandonedOnMaintenance</strong> - true or false:
whether
+        to remove abandoned connections from the pool during pool maintenance.
+        Default: false</li>
     <li><strong>removeAbandonedTimeout</strong> - The number of
         seconds after which a borrowed connection is assumed to be abandoned.
         Default: 300</li>
@@ -868,7 +872,7 @@ conn.close();]]></source>
     <li><strong>accessToUnderlyingConnectionAllowed</strong> - true or
false: whether
         accessing the underlying connections is allowed. Default: false</li>
     </ul>
-    <p>For more details, please refer to the commons-dbcp documentation.</p>
+    <p>For more details, please refer to the Commons DBCP 2 documentation.</p>
 
   </subsection>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message