commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1099872 [2/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
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java
(original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.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;
@@ -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 e
     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");

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestFactory.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestFactory.java
(original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestFactory.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.util.Hashtable;
 

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.java
(original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.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;
@@ -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 e
     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");

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java
(original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.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;
@@ -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 TestKeyedCPDSConnectionFact
     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");

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
(original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.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.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 e
     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");

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java
(original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.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.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 ex
     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 ex
     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");

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

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

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/managed/TestManagedDataSourceInTx.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/managed/TestManagedDataSourceInTx.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/managed/TestManagedDataSourceInTx.java
(original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/managed/TestManagedDataSourceInTx.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 java.sql.Connection;
 import java.sql.SQLException;

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/jocl2/TestAll.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/jocl2/TestAll.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/jocl2/TestAll.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/jocl2/TestAll.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 junit.framework.Test;
 import junit.framework.TestCase;

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/jocl2/TestJOCLContentHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/jocl2/TestJOCLContentHandler.java?rev=1099872&r1=1099867&r2=1099872&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/jocl2/TestJOCLContentHandler.java
(original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/jocl2/TestJOCLContentHandler.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 junit.framework.Test;
 import junit.framework.TestCase;



Mime
View raw message