You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ps...@apache.org on 2010/01/01 03:07:27 UTC
svn commit: r894968 - in /commons/proper/dbcp/trunk: README.txt
xdocs/changes.xml xdocs/index.xml
Author: psteitz
Date: Fri Jan 1 02:07:26 2010
New Revision: 894968
URL: http://svn.apache.org/viewvc?rev=894968&view=rev
Log:
Improved 1.3/1.4 documentation.
Modified:
commons/proper/dbcp/trunk/README.txt
commons/proper/dbcp/trunk/xdocs/changes.xml
commons/proper/dbcp/trunk/xdocs/index.xml
Modified: commons/proper/dbcp/trunk/README.txt
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/README.txt?rev=894968&r1=894967&r2=894968&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/README.txt (original)
+++ commons/proper/dbcp/trunk/README.txt Fri Jan 1 02:07:26 2010
@@ -2,31 +2,31 @@
===========================
Welcome to the DBCP component of the Apache Commons
-project (http://commons.apache.org).
+project (http://commons.apache.org).
-DBCP uses Maven 2 (http://maven.apache.org) for build
-process management.
+DBCP now comes in two different versions, one to support JDBC 3
+and one to support JDBC 4. Here is how it works:
+
+DBCP 1.4 compiles and runs under JDK 1.6 only (JDBC 4)
+DBCP 1.3 compiles and runs under JDK 1.4-1.5 only (JDBC 3)
+DBCP 1.4 binaries should be used by applications running under under JDK 1.6
+DBCP 1.3 should be used when running under JDK 1.4 or 1.5.
+
+There is no difference in the codebase supporting these two
+versions, other than that the code implementing methods added
+to support JDBC 4 has been filtered out of the DBCP 1.3 sources.
+
+Both versions can be built using either Ant or Maven (version 2).
To build DBCP using Maven, type "mvn package" at a command line prompt
from the top-level directory of the source distribution (the directory
-that contains the file named pom.xml).
+that contains the file named pom.xml).
DBCP can also be built using Ant from the build.xml file.
Locations of dependent jars for the Ant build need to be specified in
-build.properties. There is a build.properties.sample file included in the
+build.properties. There is a build.properties.sample file included in the
source distribution.
-The 1.4 binary distribution was built using JDK 1.6.0_17. The Ant build includes
-conditional compilation to support building on JDK 1.4 or 1.5.
-
-This release of JDBC compiles with and supports JDK 1.4-1.5 (JDBC 3.0)
-and JDK 1.6 (JDBC 4.0). The 1.4 binary release requires JDK 1.6 (JDBC 4.0).
-The 1.3 binary release was built from filtered versions of the same sources
-using JDK 1.5.0_19.
-
-DBCP 1.4 binaries should be used by applications running under under JDK 1.6
-and DBCP 1.3 should be used when running under JDK 1.4 or 1.5.
-
See http://commons.apache.org/dbcp/ for additional and
up-to-date information on Commons DBCP.
Modified: commons/proper/dbcp/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/xdocs/changes.xml?rev=894968&r1=894967&r2=894968&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/xdocs/changes.xml (original)
+++ commons/proper/dbcp/trunk/xdocs/changes.xml Fri Jan 1 02:07:26 2010
@@ -42,11 +42,13 @@
new features as well as bug fixes and enhancements. Some bug fixes
change semantics (e.g. connection close is now idempotent). The 1.3
and 1.4 releases of DBCP are built from the same sources. Version 1.4
- supports JDBC 4, so requires JDK 1.6. Version 1.3 supports JDBC 3 and
- has JDK 1.4 as its minimum JDK requirement. Other than support for the
- added methods in JDBC 4, there is nothing new or different in DBCP 1.4
- vs. DBCP 1.3. Applications running under JDK 1.4-1.5 must use DBCP 1.3.
- Applications running under JDK 1.6 may use DBCP 1.4.">
+ supports JDBC 4, so requires JDK 1.6. Applications running under
+ JDK 1.4-1.5 must use DBCP 1.3. Applications running under JDK 1.6
+ should use DBCP 1.4. Other than support for the added methods in JDBC 4,
+ there is nothing new or different in DBCP 1.4 vs. DBCP 1.3. The list of
+ changes below since 1.2.2 applies to both the 1.3 and 1.4 release. Other than
+ the one issue related to adding JDBC 4 support (DBCP-191), all bug fixes
+ or new features are included in both DBCP 1.3 and 1.4 ">
<action dev="psteitz" type="update" issue="DBCP-312" due-to="Glen Mazza">
Clarified javadoc for BasicDataSource close() method.
</action>
@@ -236,8 +238,14 @@
both getter and setter for _pool synchronized.
</action>
</release>
- <release version="1.3" date="TBD" description="Compatability release
- for JDBC 3. See version 1.4 description."/>
+ <release version="1.3" date="TBD" description="Compatability release for JDBC 3.
+ See version 1.4 description and change log.">
+ <action type="update">
+ See <a href="changes-report.html#a1.4">DBCP 1.4 Changes </a> for details. Version
+ 1.3 is identical to 1.4, other than JDBC 4 methods being filtered out of the DBCP 1.3 sources. Changes
+ Since 1.2.2 are the same for 1.3 and 1.4.
+ </action>
+ </release>
<release version="1.2.2" date="2007-04-04"
description="This is a maintenance release containing bug fixes
and enhancements. All API changes are binary compatible with version 1.2.1.">
Modified: commons/proper/dbcp/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/xdocs/index.xml?rev=894968&r1=894967&r2=894968&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/xdocs/index.xml (original)
+++ commons/proper/dbcp/trunk/xdocs/index.xml Fri Jan 1 02:07:26 2010
@@ -48,18 +48,19 @@
<code>commons-pool</code> package to provide the underlying object pool
mechanisms that it utilizes.</p>
-<p>Applications can use the <code>commons-dbcp</code> component directly
-or through the existing interface of their container / supporting framework.
-For example the <a href="http://tomcat.apache.org/">Tomcat</a>
-servlet container presents a DBCP DataSource as a JNDI Datasource.
-<a href="http://james.apache.org/">James</a> (Java Apache Mail Enterprise Server)
-has integrated DBCP into the <a href="http://avalon.apache.org/">Avalon</a> framework.
-A Avalon-style datasource is created by
-<a href="http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/util/dbcp/JdbcDataSource.java?view=markup">
-wrapping</a> the DBCP implementation.
-The pooling logic of DBCP and the configuration found in Avalon's excalibur
-code is what was needed to create an integrated reliable DataSource.
+<p>DBCP now comes in two different versions, one to support JDBC 3
+and one to support JDBC 4. Here is how it works:
+<ul>
+<li>DBCP 1.4 compiles and runs under JDK 1.6 only (JDBC 4)</li>
+<li>DBCP 1.3 compiles and runs under JDK 1.4-1.5 only (JDBC 3)</li>
+</ul>
</p>
+<p>DBCP 1.4 binaries should be used by applications running under under JDK 1.6.</p>
+<p>DBCP 1.3 should be used when running under JDK 1.4 or 1.5.</p>
+
+<p>There is no difference in the codebase supporting these two
+versions, other than that the code implementing methods added
+to support JDBC 4 has been filtered out of the DBCP 1.3 sources.</p>
</section>