Author: kkolinko
Date: Fri Jan 26 02:18:30 2018
New Revision: 1822244
URL: http://svn.apache.org/viewvc?rev=1822244&view=rev
Log:
Clarify documentation for migration to Tomcat 8.0: DBCP pool configuration
changes are not applicable to Tomcat JDBC pool.
https://bz.apache.org/bugzilla/show_bug.cgi?id=62047
Modified:
tomcat/site/trunk/docs/migration-8.html
tomcat/site/trunk/xdocs/migration-8.xml
Modified: tomcat/site/trunk/docs/migration-8.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-8.html?rev=1822244&r1=1822243&r2=1822244&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-8.html (original)
+++ tomcat/site/trunk/docs/migration-8.html Fri Jan 26 02:18:30 2018
@@ -546,12 +546,17 @@ of Apache Tomcat.</p>
<div class="text">
-<p>Tomcat 8 embeds a packaged renamed version of
- <a href="http://commons.apache.org/proper/commons-dbcp/";>Apache Commons
DBCP</a>
- 2.x as the default implementation of a
- <a href="tomcat-8.0-doc/jndi-datasource-examples-howto.html">database
connection pool</a>.
- There are a number of notable changes between Commons DBCP 1.x
- (used by Tomcat 7 and earlier) and Commons DBCP 2.x
+<p>Tomcat 8, as well as Tomcat 7, is shipped with two implementations
+ of a database connection pool. The
+ <a href="tomcat-8.0-doc/jndi-datasource-examples-howto.html">first
implementation</a> (the default one; though technically this can
+ be changed via <code>javax.sql.DataSource.Factory</code>
+ system property) is a copy of <a
href="http://commons.apache.org/proper/commons-dbcp/";>Apache Commons DBCP</a>
2.x project, renamed to a different package.
+ The <a href="tomcat-8.0-doc/jdbc-pool.html">second implementation</a>
+ is Tomcat JDBC Connection Pool, a separate project.</p>
+
+
+<p>There are a number of notable changes between Apache Commons DBCP 1.x
+ (used by Tomcat 7 and earlier) and Apache Commons DBCP 2.x
which are likely to require configuration changes.</p>
<ul>
@@ -585,6 +590,11 @@ of Apache Tomcat.</p>
options. These should be reviewed to determine which, if any, should be
used.</p>
+
+<p>Note that the above changes are not needed if you are using
+ Tomcat JDBC Connection Pool (or any 3-rd party database connection
+ pool implementation).</p>
+
</div>
</div>
Modified: tomcat/site/trunk/xdocs/migration-8.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-8.xml?rev=1822244&r1=1822243&r2=1822244&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/migration-8.xml (original)
+++ tomcat/site/trunk/xdocs/migration-8.xml Fri Jan 26 02:18:30 2018
@@ -187,12 +187,19 @@ of Apache Tomcat.</p>
<subsection name="Database Connection Pooling">
- <p>Tomcat 8 embeds a packaged renamed version of
- <a href="http://commons.apache.org/proper/commons-dbcp/";>Apache Commons
DBCP</a>
- 2.x as the default implementation of a
- <a href="tomcat-8.0-doc/jndi-datasource-examples-howto.html">database
connection pool</a>.
- There are a number of notable changes between Commons DBCP 1.x
- (used by Tomcat 7 and earlier) and Commons DBCP 2.x
+ <p>Tomcat 8, as well as Tomcat 7, is shipped with two implementations
+ of a database connection pool. The
+ <a href="tomcat-8.0-doc/jndi-datasource-examples-howto.html"
+ >first implementation</a> (the default one; though technically this can
+ be changed via <code>javax.sql.DataSource.Factory</code>
+ system property) is a copy of <a
+ href="http://commons.apache.org/proper/commons-dbcp/";
+ >Apache Commons DBCP</a> 2.x project, renamed to a different package.
+ The <a href="tomcat-8.0-doc/jdbc-pool.html">second implementation</a>
+ is Tomcat JDBC Connection Pool, a separate project.</p>
+
+ <p>There are a number of notable changes between Apache Commons DBCP 1.x
+ (used by Tomcat 7 and earlier) and Apache Commons DBCP 2.x
which are likely to require configuration changes.</p>
<ul>
<li>The <code>maxActive</code> configuration option has been renamed
@@ -216,6 +223,10 @@ of Apache Tomcat.</p>
options. These should be reviewed to determine which, if any, should be
used.</p>
+ <p>Note that the above changes are not needed if you are using
+ Tomcat JDBC Connection Pool (or any 3-rd party database connection
+ pool implementation).</p>
+
</subsection>
<subsection name="Clustering">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
