Package renaming for version 2.0.0 onwards
authorMark Thomas <markt@apache.org>
Thu, 5 May 2011 17:04:12 +0000 (17:04 +0000)
committerMark Thomas <markt@apache.org>
Thu, 5 May 2011 17:04:12 +0000 (17:04 +0000)
o.a.c.dbcp -> o.a.c.dbcp2
o.a.c.jocl -> o.a.c.jocl2

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/dbcp/trunk@1099872 13f79535-47bb-0310-9956-ffa450edef68

103 files changed:
doc/BasicDataSourceExample.java
doc/JOCLPoolingDriverExample.java
doc/ManualPoolingDataSourceExample.java
doc/ManualPoolingDriverExample.java
src/java/org/apache/commons/dbcp2/AbandonedConfig.java [moved from src/java/org/apache/commons/dbcp/AbandonedConfig.java with 99% similarity]
src/java/org/apache/commons/dbcp2/AbandonedObjectPool.java [moved from src/java/org/apache/commons/dbcp/AbandonedObjectPool.java with 99% similarity]
src/java/org/apache/commons/dbcp2/AbandonedTrace.java [moved from src/java/org/apache/commons/dbcp/AbandonedTrace.java with 99% similarity]
src/java/org/apache/commons/dbcp2/BasicDataSource.java [moved from src/java/org/apache/commons/dbcp/BasicDataSource.java with 99% similarity]
src/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java [moved from src/java/org/apache/commons/dbcp/BasicDataSourceFactory.java with 99% similarity]
src/java/org/apache/commons/dbcp2/ConnectionFactory.java [moved from src/java/org/apache/commons/dbcp/ConnectionFactory.java with 97% similarity]
src/java/org/apache/commons/dbcp2/DataSourceConnectionFactory.java [moved from src/java/org/apache/commons/dbcp/DataSourceConnectionFactory.java with 98% similarity]
src/java/org/apache/commons/dbcp2/DbcpException.java [moved from src/java/org/apache/commons/dbcp/DbcpException.java with 98% similarity]
src/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java [moved from src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java with 99% similarity]
src/java/org/apache/commons/dbcp2/DelegatingConnection.java [moved from src/java/org/apache/commons/dbcp/DelegatingConnection.java with 99% similarity]
src/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java [moved from src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java with 99% similarity]
src/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java [moved from src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java with 99% similarity]
src/java/org/apache/commons/dbcp2/DelegatingResultSet.java [moved from src/java/org/apache/commons/dbcp/DelegatingResultSet.java with 99% similarity]
src/java/org/apache/commons/dbcp2/DelegatingStatement.java [moved from src/java/org/apache/commons/dbcp/DelegatingStatement.java with 99% similarity]
src/java/org/apache/commons/dbcp2/DriverConnectionFactory.java [moved from src/java/org/apache/commons/dbcp/DriverConnectionFactory.java with 98% similarity]
src/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java [moved from src/java/org/apache/commons/dbcp/DriverManagerConnectionFactory.java with 98% similarity]
src/java/org/apache/commons/dbcp2/PoolableCallableStatement.java [moved from src/java/org/apache/commons/dbcp/PoolableCallableStatement.java with 99% similarity]
src/java/org/apache/commons/dbcp2/PoolableConnection.java [moved from src/java/org/apache/commons/dbcp/PoolableConnection.java with 99% similarity]
src/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java [moved from src/java/org/apache/commons/dbcp/PoolableConnectionFactory.java with 99% similarity]
src/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java [moved from src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java with 99% similarity]
src/java/org/apache/commons/dbcp2/PoolingConnection.java [moved from src/java/org/apache/commons/dbcp/PoolingConnection.java with 99% similarity]
src/java/org/apache/commons/dbcp2/PoolingDataSource.java [moved from src/java/org/apache/commons/dbcp/PoolingDataSource.java with 98% similarity]
src/java/org/apache/commons/dbcp2/PoolingDriver.java [moved from src/java/org/apache/commons/dbcp/PoolingDriver.java with 98% similarity]
src/java/org/apache/commons/dbcp2/SQLNestedException.java [moved from src/java/org/apache/commons/dbcp/SQLNestedException.java with 97% similarity]
src/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java [moved from src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java with 97% similarity]
src/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java [moved from src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java with 99% similarity]
src/java/org/apache/commons/dbcp2/cpdsadapter/PoolablePreparedStatementStub.java [moved from src/java/org/apache/commons/dbcp/cpdsadapter/PoolablePreparedStatementStub.java with 94% similarity]
src/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java [moved from src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java with 99% similarity]
src/java/org/apache/commons/dbcp2/cpdsadapter/package.html [moved from src/java/org/apache/commons/dbcp/cpdsadapter/package.html with 100% similarity]
src/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java [moved from src/java/org/apache/commons/dbcp/datasources/CPDSConnectionFactory.java with 99% similarity]
src/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java [moved from src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java with 99% similarity]
src/java/org/apache/commons/dbcp2/datasources/InstanceKeyObjectFactory.java [moved from src/java/org/apache/commons/dbcp/datasources/InstanceKeyObjectFactory.java with 99% similarity]
src/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java [moved from src/java/org/apache/commons/dbcp/datasources/KeyedCPDSConnectionFactory.java with 99% similarity]
src/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java [moved from src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java with 99% similarity]
src/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSourceFactory.java [moved from src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSourceFactory.java with 98% similarity]
src/java/org/apache/commons/dbcp2/datasources/PoolKey.java [moved from src/java/org/apache/commons/dbcp/datasources/PoolKey.java with 97% similarity]
src/java/org/apache/commons/dbcp2/datasources/PooledConnectionAndInfo.java [moved from src/java/org/apache/commons/dbcp/datasources/PooledConnectionAndInfo.java with 97% similarity]
src/java/org/apache/commons/dbcp2/datasources/PooledConnectionManager.java [moved from src/java/org/apache/commons/dbcp/datasources/PooledConnectionManager.java with 97% similarity]
src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java [moved from src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java with 98% similarity]
src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSourceFactory.java [moved from src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSourceFactory.java with 97% similarity]
src/java/org/apache/commons/dbcp2/datasources/UserPassKey.java [moved from src/java/org/apache/commons/dbcp/datasources/UserPassKey.java with 98% similarity]
src/java/org/apache/commons/dbcp2/datasources/package.html [moved from src/java/org/apache/commons/dbcp/datasources/package.html with 100% similarity]
src/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java [moved from src/java/org/apache/commons/dbcp/managed/BasicManagedDataSource.java with 96% similarity]
src/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java [moved from src/java/org/apache/commons/dbcp/managed/DataSourceXAConnectionFactory.java with 99% similarity]
src/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java [moved from src/java/org/apache/commons/dbcp/managed/LocalXAConnectionFactory.java with 99% similarity]
src/java/org/apache/commons/dbcp2/managed/ManagedConnection.java [moved from src/java/org/apache/commons/dbcp/managed/ManagedConnection.java with 99% similarity]
src/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java [moved from src/java/org/apache/commons/dbcp/managed/ManagedDataSource.java with 97% similarity]
src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnection.java [moved from src/java/org/apache/commons/dbcp/managed/PoolableManagedConnection.java with 94% similarity]
src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java [moved from src/java/org/apache/commons/dbcp/managed/PoolableManagedConnectionFactory.java with 96% similarity]
src/java/org/apache/commons/dbcp2/managed/TransactionContext.java [moved from src/java/org/apache/commons/dbcp/managed/TransactionContext.java with 99% similarity]
src/java/org/apache/commons/dbcp2/managed/TransactionContextListener.java [moved from src/java/org/apache/commons/dbcp/managed/TransactionContextListener.java with 96% similarity]
src/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java [moved from src/java/org/apache/commons/dbcp/managed/TransactionRegistry.java with 99% similarity]
src/java/org/apache/commons/dbcp2/managed/XAConnectionFactory.java [moved from src/java/org/apache/commons/dbcp/managed/XAConnectionFactory.java with 96% similarity]
src/java/org/apache/commons/dbcp2/managed/package.html [moved from src/java/org/apache/commons/dbcp/managed/package.html with 100% similarity]
src/java/org/apache/commons/dbcp2/overview.html [moved from src/java/org/apache/commons/dbcp/overview.html with 100% similarity]
src/java/org/apache/commons/dbcp2/package.html [moved from src/java/org/apache/commons/dbcp/package.html with 100% similarity]
src/java/org/apache/commons/jocl2/ConstructorUtil.java [moved from src/java/org/apache/commons/jocl/ConstructorUtil.java with 99% similarity]
src/java/org/apache/commons/jocl2/JOCLContentHandler.java [moved from src/java/org/apache/commons/jocl/JOCLContentHandler.java with 99% similarity]
src/java/org/apache/commons/jocl2/package.html [moved from src/java/org/apache/commons/jocl/package.html with 100% similarity]
src/test/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java [moved from src/test/org/apache/commons/dbcp/TestAbandonedBasicDataSource.java with 99% similarity]
src/test/org/apache/commons/dbcp2/TestAbandonedObjectPool.java [moved from src/test/org/apache/commons/dbcp/TestAbandonedObjectPool.java with 99% similarity]
src/test/org/apache/commons/dbcp2/TestBasicDataSource.java [moved from src/test/org/apache/commons/dbcp/TestBasicDataSource.java with 98% similarity]
src/test/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java [moved from src/test/org/apache/commons/dbcp/TestBasicDataSourceFactory.java with 97% similarity]
src/test/org/apache/commons/dbcp2/TestConnectionPool.java [moved from src/test/org/apache/commons/dbcp/TestConnectionPool.java with 99% similarity]
src/test/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java [moved from src/test/org/apache/commons/dbcp/TestDelegatingCallableStatement.java with 99% similarity]
src/test/org/apache/commons/dbcp2/TestDelegatingConnection.java [moved from src/test/org/apache/commons/dbcp/TestDelegatingConnection.java with 99% similarity]
src/test/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java [moved from src/test/org/apache/commons/dbcp/TestDelegatingDatabaseMetaData.java with 99% similarity]
src/test/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java [moved from src/test/org/apache/commons/dbcp/TestDelegatingPreparedStatement.java with 99% similarity]
src/test/org/apache/commons/dbcp2/TestDelegatingStatement.java [moved from src/test/org/apache/commons/dbcp/TestDelegatingStatement.java with 99% similarity]
src/test/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java [moved from src/test/org/apache/commons/dbcp/TestDriverManagerConnectionFactory.java with 97% similarity]
src/test/org/apache/commons/dbcp2/TestJOCLed.java [moved from src/test/org/apache/commons/dbcp/TestJOCLed.java with 98% similarity]
src/test/org/apache/commons/dbcp2/TestJndi.java [moved from src/test/org/apache/commons/dbcp/TestJndi.java with 96% similarity]
src/test/org/apache/commons/dbcp2/TestManual.java [moved from src/test/org/apache/commons/dbcp/TestManual.java with 99% similarity]
src/test/org/apache/commons/dbcp2/TestPStmtPooling.java [moved from src/test/org/apache/commons/dbcp/TestPStmtPooling.java with 99% similarity]
src/test/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java [moved from src/test/org/apache/commons/dbcp/TestPStmtPoolingBasicDataSource.java with 99% similarity]
src/test/org/apache/commons/dbcp2/TestPoolableConnection.java [moved from src/test/org/apache/commons/dbcp/TestPoolableConnection.java with 98% similarity]
src/test/org/apache/commons/dbcp2/TestPoolingDataSource.java [moved from src/test/org/apache/commons/dbcp/TestPoolingDataSource.java with 99% similarity]
src/test/org/apache/commons/dbcp2/TesterCallableStatement.java [moved from src/test/org/apache/commons/dbcp/TesterCallableStatement.java with 99% similarity]
src/test/org/apache/commons/dbcp2/TesterClassLoader.java [moved from src/test/org/apache/commons/dbcp/TesterClassLoader.java with 97% similarity]
src/test/org/apache/commons/dbcp2/TesterConnection.java [moved from src/test/org/apache/commons/dbcp/TesterConnection.java with 99% similarity]
src/test/org/apache/commons/dbcp2/TesterDatabaseMetaData.java [moved from src/test/org/apache/commons/dbcp/TesterDatabaseMetaData.java with 99% similarity]
src/test/org/apache/commons/dbcp2/TesterDriver.java [moved from src/test/org/apache/commons/dbcp/TesterDriver.java with 99% similarity]
src/test/org/apache/commons/dbcp2/TesterPreparedStatement.java [moved from src/test/org/apache/commons/dbcp/TesterPreparedStatement.java with 99% similarity]
src/test/org/apache/commons/dbcp2/TesterResultSet.java [moved from src/test/org/apache/commons/dbcp/TesterResultSet.java with 99% similarity]
src/test/org/apache/commons/dbcp2/TesterStatement.java [moved from src/test/org/apache/commons/dbcp/TesterStatement.java with 99% similarity]
src/test/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java [moved from src/test/org/apache/commons/dbcp/cpdsadapter/TestDriverAdapterCPDS.java with 97% similarity]
src/test/org/apache/commons/dbcp2/datasources/ConnectionPoolDataSourceProxy.java [moved from src/test/org/apache/commons/dbcp/datasources/ConnectionPoolDataSourceProxy.java with 98% similarity]
src/test/org/apache/commons/dbcp2/datasources/PooledConnectionProxy.java [moved from src/test/org/apache/commons/dbcp/datasources/PooledConnectionProxy.java with 98% similarity]
src/test/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java [moved from src/test/org/apache/commons/dbcp/datasources/TestCPDSConnectionFactory.java with 96% similarity]
src/test/org/apache/commons/dbcp2/datasources/TestFactory.java [moved from src/test/org/apache/commons/dbcp/datasources/TestFactory.java with 98% similarity]
src/test/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.java [moved from src/test/org/apache/commons/dbcp/datasources/TestInstanceKeyDataSource.java with 93% similarity]
src/test/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java [moved from src/test/org/apache/commons/dbcp/datasources/TestKeyedCPDSConnectionFactory.java with 96% similarity]
src/test/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java [moved from src/test/org/apache/commons/dbcp/datasources/TestPerUserPoolDataSource.java with 98% similarity]
src/test/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java [moved from src/test/org/apache/commons/dbcp/datasources/TestSharedPoolDataSource.java with 98% similarity]
src/test/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java [moved from src/test/org/apache/commons/dbcp/managed/TestBasicManagedDataSource.java with 94% similarity]
src/test/org/apache/commons/dbcp2/managed/TestManagedDataSource.java [moved from src/test/org/apache/commons/dbcp/managed/TestManagedDataSource.java with 95% similarity]
src/test/org/apache/commons/dbcp2/managed/TestManagedDataSourceInTx.java [moved from src/test/org/apache/commons/dbcp/managed/TestManagedDataSourceInTx.java with 99% similarity]
src/test/org/apache/commons/jocl2/TestAll.java [moved from src/test/org/apache/commons/jocl/TestAll.java with 97% similarity]
src/test/org/apache/commons/jocl2/TestJOCLContentHandler.java [moved from src/test/org/apache/commons/jocl/TestJOCLContentHandler.java with 99% similarity]

index f5a9316..62e32be 100644 (file)
@@ -27,7 +27,7 @@ import java.sql.SQLException;
 // method. In normal use, your classes interact
 // only with the standard JDBC API
 //
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
 
 //
 // Here's a simple example of how to use the BasicDataSource.
index 3c971b4..b1e1ef0 100644 (file)
@@ -52,7 +52,7 @@ import java.sql.SQLException;
 //  * the connect string for the JDBC driver (see below)
 //  * the query you'd like to execute
 // You'll also want to ensure your both your underlying JDBC
-// driver and the org.apache.commons.dbcp.PoolingDriver
+// driver and the org.apache.commons.dbcp2.PoolingDriver
 // are registered.  You can use the "jdbc.drivers"
 // property to do this.  Note that jdbc.drivers is colon
 // seperated list, on all platforms.
@@ -72,7 +72,7 @@ import java.sql.SQLException;
 //
 // For pooling:
 //
-//  java -Djdbc.drivers=oracle.jdbc.driver.OracleDriver:org.apache.commons.dbcp.PoolingDriver \
+//  java -Djdbc.drivers=oracle.jdbc.driver.OracleDriver:org.apache.commons.dbcp2.PoolingDriver \
 //       -classpath commons-pool-1.5.6.jar:commons-dbcp-1.4.jar:oracle-jdbc.jar:jaxp.jar:parser.jar:sax2.jar:. \
 //       JOCLPoolingDriverExample \
 //       "jdbc:apache:commons:dbcp:/poolingDriverExample" \
index 76e1f55..f1611a2 100644 (file)
@@ -29,10 +29,10 @@ import java.sql.SQLException;
 //
 import org.apache.commons.pool.ObjectPool;
 import org.apache.commons.pool.impl.GenericObjectPool;
-import org.apache.commons.dbcp.ConnectionFactory;
-import org.apache.commons.dbcp.PoolingDataSource;
-import org.apache.commons.dbcp.PoolableConnectionFactory;
-import org.apache.commons.dbcp.DriverManagerConnectionFactory;
+import org.apache.commons.dbcp2.ConnectionFactory;
+import org.apache.commons.dbcp2.PoolingDataSource;
+import org.apache.commons.dbcp2.PoolableConnectionFactory;
+import org.apache.commons.dbcp2.DriverManagerConnectionFactory;
 
 //
 // Here's a simple example of how to use the PoolingDataSource.
index 88b68f5..70d49b4 100644 (file)
@@ -29,10 +29,10 @@ import java.sql.SQLException;
 //
 import org.apache.commons.pool.ObjectPool;
 import org.apache.commons.pool.impl.GenericObjectPool;
-import org.apache.commons.dbcp.ConnectionFactory;
-import org.apache.commons.dbcp.PoolingDriver;
-import org.apache.commons.dbcp.PoolableConnectionFactory;
-import org.apache.commons.dbcp.DriverManagerConnectionFactory;
+import org.apache.commons.dbcp2.ConnectionFactory;
+import org.apache.commons.dbcp2.PoolingDriver;
+import org.apache.commons.dbcp2.PoolableConnectionFactory;
+import org.apache.commons.dbcp2.DriverManagerConnectionFactory;
 
 //
 // Here's a simple example of how to use the PoolingDriver.
@@ -178,7 +178,7 @@ public class ManualPoolingDriverExample {
         //
         // Finally, we create the PoolingDriver itself...
         //
-        Class.forName("org.apache.commons.dbcp.PoolingDriver");
+        Class.forName("org.apache.commons.dbcp2.PoolingDriver");
         PoolingDriver driver = (PoolingDriver) DriverManager.getDriver("jdbc:apache:commons:dbcp:");
 
         //
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.io.PrintWriter;
 
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.io.PrintWriter;
 import java.util.Properties;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.io.ByteArrayInputStream;
 import java.sql.Connection;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 import java.sql.Connection;
 import java.sql.SQLException;
 
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 
 /**
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.net.URL;
 import java.sql.CallableStatement;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.CallableStatement;
 import java.sql.Connection;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.math.BigDecimal;
 import java.sql.Array;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.ResultSet;
 import java.math.BigDecimal;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 import java.sql.Connection;
 import java.sql.Driver;
 import java.sql.SQLException;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.CallableStatement;
 import java.sql.Connection;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.Connection;
 import java.sql.Statement;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.CallableStatement;
 import java.sql.Connection;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.io.PrintWriter;
 import java.sql.CallableStatement;
@@ -416,7 +416,7 @@ public class PoolingDataSource implements DataSource {
         }
 
         /**
-         * @see org.apache.commons.dbcp.DelegatingConnection#getDelegate()
+         * @see org.apache.commons.dbcp2.DelegatingConnection#getDelegate()
          */
         public Connection getDelegate() {
             if (isAccessToUnderlyingConnectionAllowed()) {
@@ -427,7 +427,7 @@ public class PoolingDataSource implements DataSource {
         }
 
         /**
-         * @see org.apache.commons.dbcp.DelegatingConnection#getInnermostDelegate()
+         * @see org.apache.commons.dbcp2.DelegatingConnection#getInnermostDelegate()
          */
         public Connection getInnermostDelegate() {
             if (isAccessToUnderlyingConnectionAllowed()) {
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -35,7 +35,7 @@ import java.util.NoSuchElementException;
 import java.util.Properties;
 import java.util.Set;
 
-import org.apache.commons.jocl.JOCLContentHandler;
+import org.apache.commons.jocl2.JOCLContentHandler;
 import org.apache.commons.pool.ObjectPool;
 import org.xml.sax.SAXException;
 
@@ -476,7 +476,7 @@ public class PoolingDriver implements Driver {
         }
 
         /**
-         * @see org.apache.commons.dbcp.DelegatingConnection#getDelegate()
+         * @see org.apache.commons.dbcp2.DelegatingConnection#getDelegate()
          */
         public Connection getDelegate() {
             if (isAccessToUnderlyingConnectionAllowed()) {
@@ -487,7 +487,7 @@ public class PoolingDriver implements Driver {
         }
 
         /**
-         * @see org.apache.commons.dbcp.DelegatingConnection#getInnermostDelegate()
+         * @see org.apache.commons.dbcp2.DelegatingConnection#getInnermostDelegate()
          */
         public Connection getInnermostDelegate() {
             if (isAccessToUnderlyingConnectionAllowed()) {
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.SQLException;
 
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp.cpdsadapter;
+package org.apache.commons.dbcp2.cpdsadapter;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.apache.commons.dbcp.DelegatingConnection;
-import org.apache.commons.dbcp.DelegatingPreparedStatement;
+import org.apache.commons.dbcp2.DelegatingConnection;
+import org.apache.commons.dbcp2.DelegatingPreparedStatement;
 
 /**
  * This class is the <code>Connection</code> that will be returned
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp.cpdsadapter;
+package org.apache.commons.dbcp2.cpdsadapter;
 
 import java.util.Hashtable;
 import java.util.Properties;
@@ -45,7 +45,7 @@ import org.apache.commons.pool.impl.GenericKeyedObjectPool;
  * <code>ConnectionPoolDataSource</code>s are not used within general 
  * applications.  They are used by <code>DataSource</code> implementations
  * that pool <code>Connection</code>s, such as 
- * {@link org.apache.commons.dbcp.datasources.SharedPoolDataSource}.  A J2EE
+ * {@link org.apache.commons.dbcp2.datasources.SharedPoolDataSource}.  A J2EE
  * container will normally provide some method of initializing the
  * <code>ConnectionPoolDataSource</code> whose attributes are presented
  * as bean getters/setters and then deploying it via JNDI.  It is then
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp.cpdsadapter;
+package org.apache.commons.dbcp2.cpdsadapter;
 
 import java.sql.PreparedStatement;
 import java.sql.Connection;
 import java.sql.SQLException;
 import org.apache.commons.pool.KeyedObjectPool;
-import org.apache.commons.dbcp.PoolablePreparedStatement;
+import org.apache.commons.dbcp2.PoolablePreparedStatement;
 
 /**
  * A {@link PoolablePreparedStatement} stub since activate and passivate
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp.cpdsadapter;
+package org.apache.commons.dbcp2.cpdsadapter;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -30,9 +30,9 @@ import javax.sql.PooledConnection;
 import javax.sql.StatementEventListener;
 /* JDBC_4_ANT_KEY_END */
 
-import org.apache.commons.dbcp.DelegatingConnection;
-import org.apache.commons.dbcp.DelegatingPreparedStatement;
-import org.apache.commons.dbcp.SQLNestedException;
+import org.apache.commons.dbcp2.DelegatingConnection;
+import org.apache.commons.dbcp2.DelegatingPreparedStatement;
+import org.apache.commons.dbcp2.SQLNestedException;
 import org.apache.commons.pool.KeyedObjectPool;
 import org.apache.commons.pool.KeyedPoolableObjectFactory;
 
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp.datasources;
+package org.apache.commons.dbcp2.datasources;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp.datasources;
+package org.apache.commons.dbcp2.datasources;
 
 import java.io.Serializable;
 import java.io.PrintWriter;
@@ -34,7 +34,7 @@ import javax.sql.ConnectionPoolDataSource;
 import javax.sql.DataSource;
 import javax.sql.PooledConnection;
 
-import org.apache.commons.dbcp.SQLNestedException;
+import org.apache.commons.dbcp2.SQLNestedException;
 import org.apache.commons.pool.impl.GenericObjectPool;
 
 /**
@@ -67,7 +67,7 @@ import org.apache.commons.pool.impl.GenericObjectPool;
  *
  * <p>
  * The dbcp package contains an adapter, 
- * {@link org.apache.commons.dbcp.cpdsadapter.DriverAdapterCPDS},
+ * {@link org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS},
  * that can be used to allow the use of <code>DataSource</code>'s based on this
  * class with jdbc driver implementations that do not supply a 
  * <code>ConnectionPoolDataSource</code>, but still
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp.datasources;
+package org.apache.commons.dbcp2.datasources;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp.datasources;
+package org.apache.commons.dbcp2.datasources;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -31,7 +31,7 @@ import javax.naming.Reference;
 import javax.naming.StringRefAddr;
 import javax.sql.ConnectionPoolDataSource;
 
-import org.apache.commons.dbcp.SQLNestedException;
+import org.apache.commons.dbcp2.SQLNestedException;
 
 import org.apache.commons.pool.ObjectPool;
 import org.apache.commons.pool.impl.GenericObjectPool;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp.datasources;
+package org.apache.commons.dbcp2.datasources;
 
 import java.io.Serializable;
 
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp.datasources;
+package org.apache.commons.dbcp2.datasources;
 
 import java.sql.SQLException;
 import javax.sql.PooledConnection;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp.datasources;
+package org.apache.commons.dbcp2.datasources;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -30,7 +30,7 @@ import javax.sql.ConnectionPoolDataSource;
 import org.apache.commons.pool.KeyedObjectPool;
 import org.apache.commons.pool.impl.GenericKeyedObjectPool;
 import org.apache.commons.pool.impl.GenericObjectPool;
-import org.apache.commons.dbcp.SQLNestedException;
+import org.apache.commons.dbcp2.SQLNestedException;
 
 /**
  * <p>A pooling <code>DataSource</code> appropriate for deployment within
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp.datasources;
+package org.apache.commons.dbcp2.datasources;
 
 import java.io.Serializable;
 
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.commons.dbcp.managed;
+package org.apache.commons.dbcp2.managed;
 
-import org.apache.commons.dbcp.AbandonedConfig;
-import org.apache.commons.dbcp.BasicDataSource;
-import org.apache.commons.dbcp.ConnectionFactory;
-import org.apache.commons.dbcp.PoolableConnectionFactory;
-import org.apache.commons.dbcp.PoolingDataSource;
+import org.apache.commons.dbcp2.AbandonedConfig;
+import org.apache.commons.dbcp2.BasicDataSource;
+import org.apache.commons.dbcp2.ConnectionFactory;
+import org.apache.commons.dbcp2.PoolableConnectionFactory;
+import org.apache.commons.dbcp2.PoolingDataSource;
 import org.apache.commons.pool.KeyedObjectPoolFactory;
 
 import javax.sql.XADataSource;
@@ -15,7 +15,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.commons.dbcp.managed;
+package org.apache.commons.dbcp2.managed;
 
 import javax.sql.XAConnection;
 import javax.sql.XADataSource;
@@ -15,9 +15,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.commons.dbcp.managed;
+package org.apache.commons.dbcp2.managed;
 
-import org.apache.commons.dbcp.ConnectionFactory;
+import org.apache.commons.dbcp2.ConnectionFactory;
 
 import javax.transaction.TransactionManager;
 import javax.transaction.xa.XAException;
@@ -15,9 +15,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.commons.dbcp.managed;
+package org.apache.commons.dbcp2.managed;
 
-import org.apache.commons.dbcp.DelegatingConnection;
+import org.apache.commons.dbcp2.DelegatingConnection;
 import org.apache.commons.pool.ObjectPool;
 
 import java.sql.Connection;
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.commons.dbcp.managed;
+package org.apache.commons.dbcp2.managed;
 
 import org.apache.commons.pool.ObjectPool;
-import org.apache.commons.dbcp.PoolingDataSource;
+import org.apache.commons.dbcp2.PoolingDataSource;
 
 import java.sql.Connection;
 import java.sql.SQLException;
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp.managed;
+package org.apache.commons.dbcp2.managed;
 
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import org.apache.commons.dbcp.AbandonedConfig;
-import org.apache.commons.dbcp.PoolableConnection;
+import org.apache.commons.dbcp2.AbandonedConfig;
+import org.apache.commons.dbcp2.PoolableConnection;
 import org.apache.commons.pool.ObjectPool;
 
 /**
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp.managed;
+package org.apache.commons.dbcp2.managed;
 import java.sql.Connection;
 import java.util.Collection;
 
-import org.apache.commons.dbcp.AbandonedConfig;
-import org.apache.commons.dbcp.PoolableConnectionFactory;
-import org.apache.commons.dbcp.PoolingConnection;
+import org.apache.commons.dbcp2.AbandonedConfig;
+import org.apache.commons.dbcp2.PoolableConnectionFactory;
+import org.apache.commons.dbcp2.PoolingConnection;
 import org.apache.commons.pool.KeyedObjectPool;
 import org.apache.commons.pool.KeyedObjectPoolFactory;
 import org.apache.commons.pool.ObjectPool;
@@ -15,7 +15,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.commons.dbcp.managed;
+package org.apache.commons.dbcp2.managed;
 
 import javax.transaction.RollbackException;
 import javax.transaction.Status;
@@ -15,7 +15,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.commons.dbcp.managed;
+package org.apache.commons.dbcp2.managed;
 
 /**
  * A listener for transaction completion events.
@@ -15,7 +15,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.commons.dbcp.managed;
+package org.apache.commons.dbcp2.managed;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -15,9 +15,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.commons.dbcp.managed;
+package org.apache.commons.dbcp2.managed;
 
-import org.apache.commons.dbcp.ConnectionFactory;
+import org.apache.commons.dbcp2.ConnectionFactory;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jocl;
+package org.apache.commons.jocl2;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jocl;
+package org.apache.commons.jocl2;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -53,7 +53,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     public void setUp() throws Exception {
         super.setUp();
         ds = createDataSource();
-        ds.setDriverClassName("org.apache.commons.dbcp.TesterDriver");
+        ds.setDriverClassName("org.apache.commons.dbcp2.TesterDriver");
         ds.setUrl("jdbc:apache:commons:testdriver");
         ds.setMaxActive(getMaxActive());
         ds.setMaxWait(getMaxWait());
@@ -479,7 +479,7 @@ public class TestBasicDataSource extends TestConnectionPool {
         ds.close();
         ds = null;
         ds = createDataSource();
-        ds.setDriverClassName("org.apache.commons.dbcp.TesterDriver");
+        ds.setDriverClassName("org.apache.commons.dbcp2.TesterDriver");
         ds.setUrl("jdbc:apache:commons:testdriver");
         ds.setMaxActive(getMaxActive());
         ds.setMaxWait(getMaxWait());
@@ -526,7 +526,7 @@ public class TestBasicDataSource extends TestConnectionPool {
         ds.close();
         ds = null;
         ds = createDataSource();
-        ds.setDriverClassName("org.apache.commons.dbcp.TesterConnRequestCountDriver");
+        ds.setDriverClassName("org.apache.commons.dbcp2.TesterConnRequestCountDriver");
         ds.setUrl("jdbc:apache:commons:testerConnRequestCountDriver");
         ds.setValidationQuery("SELECT DUMMY FROM DUAL");
         ds.setUsername("username");
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.Connection;
 import java.util.Properties;
@@ -51,7 +51,7 @@ public class TestBasicDataSourceFactory extends TestCase {
 
     public void testProperties() throws Exception {
         Properties properties = new Properties();
-        properties.setProperty("driverClassName", "org.apache.commons.dbcp.TesterDriver");
+        properties.setProperty("driverClassName", "org.apache.commons.dbcp2.TesterDriver");
         properties.setProperty("url", "jdbc:apache:commons:testdriver");
         properties.setProperty("maxActive", "10");
         properties.setProperty("maxIdle", "8");
@@ -84,7 +84,7 @@ public class TestBasicDataSourceFactory extends TestCase {
 
         BasicDataSource ds = (BasicDataSource) BasicDataSourceFactory.createDataSource(properties);
         
-        assertEquals("org.apache.commons.dbcp.TesterDriver", ds.getDriverClassName());
+        assertEquals("org.apache.commons.dbcp2.TesterDriver", ds.getDriverClassName());
         assertEquals("jdbc:apache:commons:testdriver", ds.getUrl());
         assertEquals(10, ds.getMaxActive());
         assertEquals(8, ds.getMaxIdle());
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.CallableStatement;
 import java.sql.Connection;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.Connection;
 
@@ -46,7 +46,7 @@ public class TestDriverManagerConnectionFactory extends TestCase {
 
     public void testDriverManagerInit() throws Exception {
         System.setProperty("jdbc.drivers",
-                "org.apache.commons.dbcp.TesterDriver");
+                "org.apache.commons.dbcp2.TesterDriver");
         GenericObjectPool connectionPool = new GenericObjectPool(null, 10,
                 GenericObjectPool.WHEN_EXHAUSTED_BLOCK, -1, 0);
         final ConnectionFactory connectionFactory =
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.util.Hashtable;
 
@@ -28,8 +28,8 @@ import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.commons.dbcp.datasources.SharedPoolDataSource;
-import org.apache.commons.dbcp.datasources.PerUserPoolDataSource;
+import org.apache.commons.dbcp2.datasources.SharedPoolDataSource;
+import org.apache.commons.dbcp2.datasources.PerUserPoolDataSource;
 
 /**
  * Tests JNID bind and lookup for DataSource implementations.
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.Connection;
 import java.sql.Statement;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.Connection;
 import java.util.Properties;
@@ -15,7 +15,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.io.InputStream;
 import java.io.Reader;
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.CallableStatement;
 import java.sql.Connection;
@@ -15,7 +15,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.Connection;
 import java.sql.Driver;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.math.BigDecimal;
 import java.sql.Array;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.math.BigDecimal;
 import java.sql.Array;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp.cpdsadapter;
+package org.apache.commons.dbcp2.cpdsadapter;
 
 import java.util.Properties;
 
@@ -46,7 +46,7 @@ public class TestDriverAdapterCPDS extends TestCase {
 
     public void setUp() throws Exception {
         pcds = new DriverAdapterCPDS();
-        pcds.setDriver("org.apache.commons.dbcp.TesterDriver");
+        pcds.setDriver("org.apache.commons.dbcp2.TesterDriver");
         pcds.setUrl("jdbc:apache:commons:testdriver");
         pcds.setUser("foo");
         pcds.setPassword("bar");
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp.datasources;
+package org.apache.commons.dbcp2.datasources;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp.datasources;
+package org.apache.commons.dbcp2.datasources;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -26,7 +26,7 @@ import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.commons.dbcp.cpdsadapter.DriverAdapterCPDS;
+import org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS;
 
 import org.apache.commons.pool.impl.GenericObjectPool;
 
@@ -48,7 +48,7 @@ public class TestCPDSConnectionFactory extends TestCase {
     public void setUp() throws Exception {
         cpds = new ConnectionPoolDataSourceProxy(new DriverAdapterCPDS());
         DriverAdapterCPDS delegate = (DriverAdapterCPDS) cpds.getDelegate();
-        delegate.setDriver("org.apache.commons.dbcp.TesterDriver");
+        delegate.setDriver("org.apache.commons.dbcp2.TesterDriver");
         delegate.setUrl("jdbc:apache:commons:testdriver");
         delegate.setUser("username");
         delegate.setPassword("password");
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp.datasources;
+package org.apache.commons.dbcp2.datasources;
 
 import java.util.Hashtable;
 
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp.datasources;
+package org.apache.commons.dbcp2.datasources;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -24,7 +24,7 @@ import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.commons.dbcp.cpdsadapter.DriverAdapterCPDS;
+import org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS;
 
 /**
  * @version $Revision$ $Date$
@@ -50,7 +50,7 @@ public class TestInstanceKeyDataSource extends TestCase {
     public void testExceptionOnSetupDefaults() throws Exception {
         DriverAdapterCPDS pcds;
         pcds = new DriverAdapterCPDS();
-        pcds.setDriver("org.apache.commons.dbcp.TesterDriver");
+        pcds.setDriver("org.apache.commons.dbcp2.TesterDriver");
         pcds.setUrl("jdbc:apache:commons:testdriver");
         pcds.setUser("foo");
         pcds.setPassword("bar");
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp.datasources;
+package org.apache.commons.dbcp2.datasources;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -26,7 +26,7 @@ import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.commons.dbcp.cpdsadapter.DriverAdapterCPDS;
+import org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS;
 
 import org.apache.commons.pool.impl.GenericKeyedObjectPool;
 
@@ -48,7 +48,7 @@ public class TestKeyedCPDSConnectionFactory extends TestCase {
     public void setUp() throws Exception {
         cpds = new ConnectionPoolDataSourceProxy(new DriverAdapterCPDS());
         DriverAdapterCPDS delegate = (DriverAdapterCPDS) cpds.getDelegate();
-        delegate.setDriver("org.apache.commons.dbcp.TesterDriver");
+        delegate.setDriver("org.apache.commons.dbcp2.TesterDriver");
         delegate.setUrl("jdbc:apache:commons:testdriver");
         delegate.setUser("username");
         delegate.setPassword("password");
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp.datasources;
+package org.apache.commons.dbcp2.datasources;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -31,9 +31,9 @@ import javax.sql.DataSource;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.commons.dbcp.TestConnectionPool;
-import org.apache.commons.dbcp.TesterDriver;
-import org.apache.commons.dbcp.cpdsadapter.DriverAdapterCPDS;
+import org.apache.commons.dbcp2.TestConnectionPool;
+import org.apache.commons.dbcp2.TesterDriver;
+import org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS;
 
 /**
  * @author John McNally
@@ -58,7 +58,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     public void setUp() throws Exception {
         super.setUp();
         DriverAdapterCPDS pcds = new DriverAdapterCPDS();
-        pcds.setDriver("org.apache.commons.dbcp.TesterDriver");
+        pcds.setDriver("org.apache.commons.dbcp2.TesterDriver");
         pcds.setUrl("jdbc:apache:commons:testdriver");
         pcds.setUser("foo");
         pcds.setPassword("bar");
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp.datasources;
+package org.apache.commons.dbcp2.datasources;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -27,9 +27,9 @@ import javax.sql.DataSource;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.commons.dbcp.TestConnectionPool;
-import org.apache.commons.dbcp.TesterDriver;
-import org.apache.commons.dbcp.cpdsadapter.DriverAdapterCPDS;
+import org.apache.commons.dbcp2.TestConnectionPool;
+import org.apache.commons.dbcp2.TesterDriver;
+import org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS;
 
 /**
  * @author John McNally
@@ -55,7 +55,7 @@ public class TestSharedPoolDataSource extends TestConnectionPool {
     public void setUp() throws Exception {
         super.setUp();
         pcds = new DriverAdapterCPDS();
-        pcds.setDriver("org.apache.commons.dbcp.TesterDriver");
+        pcds.setDriver("org.apache.commons.dbcp2.TesterDriver");
         pcds.setUrl("jdbc:apache:commons:testdriver");
         pcds.setUser("foo");
         pcds.setPassword("bar");
@@ -470,7 +470,7 @@ public class TestSharedPoolDataSource extends TestConnectionPool {
     throws Exception {
         DriverAdapterCPDS mypcds = new DriverAdapterCPDS();
         DataSource myds = null;
-        mypcds.setDriver("org.apache.commons.dbcp.TesterDriver");
+        mypcds.setDriver("org.apache.commons.dbcp2.TesterDriver");
         mypcds.setUrl("jdbc:apache:commons:testdriver");
         mypcds.setUser("foo");
         mypcds.setPassword("bar");
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.commons.dbcp.managed;
+package org.apache.commons.dbcp2.managed;
 
 import java.sql.SQLException;
-import org.apache.commons.dbcp.BasicDataSource;
-import org.apache.commons.dbcp.TestBasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
+import org.apache.commons.dbcp2.TestBasicDataSource;
 import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -54,7 +54,7 @@ public class TestBasicManagedDataSource extends TestBasicDataSource {
     public void testReallyClose() throws Exception {
         BasicManagedDataSource basicManagedDataSource = new BasicManagedDataSource();
         basicManagedDataSource.setTransactionManager(new TransactionManagerImpl());
-        basicManagedDataSource.setDriverClassName("org.apache.commons.dbcp.TesterDriver");
+        basicManagedDataSource.setDriverClassName("org.apache.commons.dbcp2.TesterDriver");
         basicManagedDataSource.setUrl("jdbc:apache:commons:testdriver");
         basicManagedDataSource.setUsername("username");
         basicManagedDataSource.setPassword("password");
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.commons.dbcp.managed;
+package org.apache.commons.dbcp2.managed;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
-import org.apache.commons.dbcp.ConnectionFactory;
-import org.apache.commons.dbcp.DelegatingConnection;
-import org.apache.commons.dbcp.DriverConnectionFactory;
-import org.apache.commons.dbcp.PoolableConnectionFactory;
-import org.apache.commons.dbcp.PoolingDataSource;
-import org.apache.commons.dbcp.TestConnectionPool;
-import org.apache.commons.dbcp.TesterDriver;
+import org.apache.commons.dbcp2.ConnectionFactory;
+import org.apache.commons.dbcp2.DelegatingConnection;
+import org.apache.commons.dbcp2.DriverConnectionFactory;
+import org.apache.commons.dbcp2.PoolableConnectionFactory;
+import org.apache.commons.dbcp2.PoolingDataSource;
+import org.apache.commons.dbcp2.TestConnectionPool;
+import org.apache.commons.dbcp2.TesterDriver;
 import org.apache.commons.pool.ObjectPool;
 import org.apache.commons.pool.impl.GenericObjectPool;
 import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
@@ -15,9 +15,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.commons.dbcp.managed;
+package org.apache.commons.dbcp2.managed;
 
-import org.apache.commons.dbcp.DelegatingConnection;
+import org.apache.commons.dbcp2.DelegatingConnection;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jocl;
+package org.apache.commons.jocl2;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.jocl;
+package org.apache.commons.jocl2;
 
 import junit.framework.Test;
 import junit.framework.TestCase;