commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1099872 [1/2] - in /commons/proper/dbcp/trunk: doc/ src/java/org/apache/commons/dbcp/ src/java/org/apache/commons/dbcp2/ src/java/org/apache/commons/dbcp2/cpdsadapter/ src/java/org/apache/commons/dbcp2/datasources/ src/java/org/apache/comm...
Date Thu, 05 May 2011 17:04:15 GMT
Author: markt
Date: Thu May  5 17:04:12 2011
New Revision: 1099872

URL: http://svn.apache.org/viewvc?rev=1099872&view=rev
Log:
Package renaming for version 2.0.0 onwards
o.a.c.dbcp -> o.a.c.dbcp2
o.a.c.jocl -> o.a.c.jocl2

Added:
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/
      - copied from r1099867, commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/
    commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl2/
      - copied from r1099867, commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl/
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/
      - copied from r1099867, commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/
    commons/proper/dbcp/trunk/src/test/org/apache/commons/jocl2/
      - copied from r1099867, commons/proper/dbcp/trunk/src/test/org/apache/commons/jocl/
Removed:
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/
    commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl/
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/
    commons/proper/dbcp/trunk/src/test/org/apache/commons/jocl/
Modified:
    commons/proper/dbcp/trunk/doc/BasicDataSourceExample.java
    commons/proper/dbcp/trunk/doc/JOCLPoolingDriverExample.java
    commons/proper/dbcp/trunk/doc/ManualPoolingDataSourceExample.java
    commons/proper/dbcp/trunk/doc/ManualPoolingDriverExample.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/AbandonedConfig.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/AbandonedObjectPool.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/AbandonedTrace.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/BasicDataSource.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/ConnectionFactory.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DataSourceConnectionFactory.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DbcpException.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingConnection.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingResultSet.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingStatement.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DriverConnectionFactory.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableCallableStatement.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnection.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingConnection.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDataSource.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDriver.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/SQLNestedException.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PoolablePreparedStatementStub.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyObjectFactory.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSourceFactory.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PoolKey.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PooledConnectionAndInfo.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PooledConnectionManager.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSourceFactory.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/UserPassKey.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/ManagedConnection.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnection.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/TransactionContext.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/TransactionContextListener.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/XAConnectionFactory.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl2/ConstructorUtil.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl2/JOCLContentHandler.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestAbandonedObjectPool.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestBasicDataSource.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestConnectionPool.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingConnection.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingStatement.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestJOCLed.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestJndi.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestManual.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPStmtPooling.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPoolableConnection.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPoolingDataSource.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterCallableStatement.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterClassLoader.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterConnection.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterDatabaseMetaData.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterDriver.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterPreparedStatement.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterResultSet.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterStatement.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/ConnectionPoolDataSourceProxy.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/PooledConnectionProxy.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestFactory.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/managed/TestManagedDataSourceInTx.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/jocl2/TestAll.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/jocl2/TestJOCLContentHandler.java

Modified: commons/proper/dbcp/trunk/doc/BasicDataSourceExample.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/doc/BasicDataSourceExample.java?rev=1099872&r1=1099871&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/doc/BasicDataSourceExample.java (original)
+++ commons/proper/dbcp/trunk/doc/BasicDataSourceExample.java Thu May  5 17:04:12 2011
@@ -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.

Modified: commons/proper/dbcp/trunk/doc/JOCLPoolingDriverExample.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/doc/JOCLPoolingDriverExample.java?rev=1099872&r1=1099871&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/doc/JOCLPoolingDriverExample.java (original)
+++ commons/proper/dbcp/trunk/doc/JOCLPoolingDriverExample.java Thu May  5 17:04:12 2011
@@ -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" \

Modified: commons/proper/dbcp/trunk/doc/ManualPoolingDataSourceExample.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/doc/ManualPoolingDataSourceExample.java?rev=1099872&r1=1099871&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/doc/ManualPoolingDataSourceExample.java (original)
+++ commons/proper/dbcp/trunk/doc/ManualPoolingDataSourceExample.java Thu May  5 17:04:12 2011
@@ -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.

Modified: commons/proper/dbcp/trunk/doc/ManualPoolingDriverExample.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/doc/ManualPoolingDriverExample.java?rev=1099872&r1=1099871&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/doc/ManualPoolingDriverExample.java (original)
+++ commons/proper/dbcp/trunk/doc/ManualPoolingDriverExample.java Thu May  5 17:04:12 2011
@@ -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:");
 
         //

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/AbandonedConfig.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/AbandonedConfig.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/AbandonedConfig.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/AbandonedConfig.java Thu May  5 17:04:12 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.io.PrintWriter;
 

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/AbandonedObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/AbandonedObjectPool.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/AbandonedObjectPool.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/AbandonedObjectPool.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/AbandonedTrace.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/AbandonedTrace.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/AbandonedTrace.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/AbandonedTrace.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/BasicDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/BasicDataSource.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/BasicDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/BasicDataSource.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/ConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/ConnectionFactory.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/ConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/ConnectionFactory.java Thu May  5 17:04:12 2011
@@ -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;
 

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DataSourceConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DataSourceConnectionFactory.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DataSourceConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DataSourceConnectionFactory.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DbcpException.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DbcpException.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DbcpException.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DbcpException.java Thu May  5 17:04:12 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 
 /**

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingConnection.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingConnection.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingConnection.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingResultSet.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingResultSet.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingResultSet.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingResultSet.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingStatement.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingStatement.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingStatement.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DriverConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DriverConnectionFactory.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DriverConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DriverConnectionFactory.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableCallableStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableCallableStatement.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableCallableStatement.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableCallableStatement.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnection.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnection.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnection.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingConnection.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingConnection.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingConnection.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDataSource.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDataSource.java Thu May  5 17:04:12 2011
@@ -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 implement
         }
 
         /**
-         * @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 implement
         }
 
         /**
-         * @see org.apache.commons.dbcp.DelegatingConnection#getInnermostDelegate()
+         * @see org.apache.commons.dbcp2.DelegatingConnection#getInnermostDelegate()
          */
         public Connection getInnermostDelegate() {
             if (isAccessToUnderlyingConnectionAllowed()) {

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDriver.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDriver.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDriver.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDriver.java Thu May  5 17:04:12 2011
@@ -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 Dr
         }
 
         /**
-         * @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 Dr
         }
 
         /**
-         * @see org.apache.commons.dbcp.DelegatingConnection#getInnermostDelegate()
+         * @see org.apache.commons.dbcp2.DelegatingConnection#getInnermostDelegate()
          */
         public Connection getInnermostDelegate() {
             if (isAccessToUnderlyingConnectionAllowed()) {

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/SQLNestedException.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/SQLNestedException.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/SQLNestedException.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/SQLNestedException.java Thu May  5 17:04:12 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.sql.SQLException;
 

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java Thu May  5 17:04:12 2011
@@ -15,14 +15,14 @@
  * 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

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java Thu May  5 17:04:12 2011
@@ -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.Gene
  * <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

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PoolablePreparedStatementStub.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PoolablePreparedStatementStub.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PoolablePreparedStatementStub.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PoolablePreparedStatementStub.java Thu May  5 17:04:12 2011
@@ -15,13 +15,13 @@
  * 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

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java Thu May  5 17:04:12 2011
@@ -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;
 

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java Thu May  5 17:04:12 2011
@@ -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.ConnectionPoolDataSourc
 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.Gene
  *
  * <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

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyObjectFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyObjectFactory.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyObjectFactory.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyObjectFactory.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSourceFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSourceFactory.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSourceFactory.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSourceFactory.java Thu May  5 17:04:12 2011
@@ -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.util.Map;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PoolKey.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PoolKey.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PoolKey.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PoolKey.java Thu May  5 17:04:12 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp.datasources;
+package org.apache.commons.dbcp2.datasources;
 
 import java.io.Serializable;
 

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PooledConnectionAndInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PooledConnectionAndInfo.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PooledConnectionAndInfo.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PooledConnectionAndInfo.java Thu May  5 17:04:12 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp.datasources;
+package org.apache.commons.dbcp2.datasources;
 
 import javax.sql.PooledConnection;
 

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PooledConnectionManager.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PooledConnectionManager.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PooledConnectionManager.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PooledConnectionManager.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java Thu May  5 17:04:12 2011
@@ -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.ConnectionPoolDataSourc
 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

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSourceFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSourceFactory.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSourceFactory.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSourceFactory.java Thu May  5 17:04:12 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp.datasources;
+package org.apache.commons.dbcp2.datasources;
 
 import javax.naming.RefAddr;
 import javax.naming.Reference;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/UserPassKey.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/UserPassKey.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/UserPassKey.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/UserPassKey.java Thu May  5 17:04:12 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp.datasources;
+package org.apache.commons.dbcp2.datasources;
 
 import java.io.Serializable;
 

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java Thu May  5 17:04:12 2011
@@ -15,13 +15,13 @@
  *  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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/ManagedConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/ManagedConnection.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/ManagedConnection.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/ManagedConnection.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java Thu May  5 17:04:12 2011
@@ -15,10 +15,10 @@
  *  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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnection.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnection.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnection.java Thu May  5 17:04:12 2011
@@ -15,13 +15,13 @@
  * 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;
 
 /**

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java Thu May  5 17:04:12 2011
@@ -15,13 +15,13 @@
  * 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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/TransactionContext.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/TransactionContext.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/TransactionContext.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/TransactionContext.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/TransactionContextListener.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/TransactionContextListener.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/TransactionContextListener.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/TransactionContextListener.java Thu May  5 17:04:12 2011
@@ -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.

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/XAConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/XAConnectionFactory.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/XAConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/XAConnectionFactory.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl2/ConstructorUtil.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl2/ConstructorUtil.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl2/ConstructorUtil.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl2/ConstructorUtil.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl2/JOCLContentHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl2/JOCLContentHandler.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl2/JOCLContentHandler.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl2/JOCLContentHandler.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestAbandonedObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestAbandonedObjectPool.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestAbandonedObjectPool.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestAbandonedObjectPool.java Thu May  5 17:04:12 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp;
+package org.apache.commons.dbcp2;
 
 import java.util.Vector;
 

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestBasicDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestBasicDataSource.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestBasicDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestBasicDataSource.java Thu May  5 17:04:12 2011
@@ -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
     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
         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
         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");

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java Thu May  5 17:04:12 2011
@@ -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 
 
     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 
 
         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());

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestConnectionPool.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestConnectionPool.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestConnectionPool.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestConnectionPool.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingConnection.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingConnection.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingConnection.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingStatement.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingStatement.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingStatement.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java Thu May  5 17:04:12 2011
@@ -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 TestDriverManagerConnection
 
     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 =

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestJOCLed.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestJOCLed.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestJOCLed.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestJOCLed.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestJndi.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestJndi.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestJndi.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestJndi.java Thu May  5 17:04:12 2011
@@ -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.

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestManual.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestManual.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestManual.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestManual.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPStmtPooling.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPStmtPooling.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPStmtPooling.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPStmtPooling.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPoolableConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPoolableConnection.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPoolableConnection.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPoolableConnection.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPoolingDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPoolingDataSource.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPoolingDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPoolingDataSource.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterCallableStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterCallableStatement.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterCallableStatement.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterCallableStatement.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterClassLoader.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterClassLoader.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterClassLoader.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterClassLoader.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterConnection.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterConnection.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterConnection.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterDatabaseMetaData.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterDatabaseMetaData.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterDatabaseMetaData.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterDriver.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterDriver.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterDriver.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterDriver.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterPreparedStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterPreparedStatement.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterPreparedStatement.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterPreparedStatement.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterResultSet.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterResultSet.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterResultSet.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterResultSet.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterStatement.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterStatement.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterStatement.java Thu May  5 17:04:12 2011
@@ -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;

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java Thu May  5 17:04:12 2011
@@ -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 exten
 
     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");

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/ConnectionPoolDataSourceProxy.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/ConnectionPoolDataSourceProxy.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/ConnectionPoolDataSourceProxy.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/ConnectionPoolDataSourceProxy.java Thu May  5 17:04:12 2011
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.dbcp.datasources;
+package org.apache.commons.dbcp2.datasources;
 
 import java.io.PrintWriter;
 import java.sql.SQLException;

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/PooledConnectionProxy.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/PooledConnectionProxy.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/PooledConnectionProxy.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/PooledConnectionProxy.java Thu May  5 17:04:12 2011
@@ -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;



Mime
View raw message