You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2014/02/13 15:08:36 UTC

svn commit: r1567933 - /commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/

Author: markt
Date: Thu Feb 13 14:08:35 2014
New Revision: 1567933

URL: http://svn.apache.org/r1567933
Log:
Rename for consistency

Added:
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSourceFactory.java
      - copied, changed from r1567033, commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyObjectFactory.java
Removed:
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyObjectFactory.java
Modified:
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSourceFactory.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSourceFactory.java

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java?rev=1567933&r1=1567932&r2=1567933&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java Thu Feb 13 14:08:35 2014
@@ -224,7 +224,7 @@ public abstract class InstanceKeyDataSou
                 "The CPDS has already been set. It cannot be altered.");
         }
         dataSource = v;
-        instanceKey = InstanceKeyObjectFactory.registerNewInstance(this);
+        instanceKey = InstanceKeyDataSourceFactory.registerNewInstance(this);
     }
 
     /**
@@ -259,7 +259,7 @@ public abstract class InstanceKeyDataSou
                 "It cannot be altered.");
         }
         this.dataSourceName = v;
-        instanceKey = InstanceKeyObjectFactory.registerNewInstance(this);
+        instanceKey = InstanceKeyDataSourceFactory.registerNewInstance(this);
     }
 
     /**

Copied: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSourceFactory.java (from r1567033, commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyObjectFactory.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSourceFactory.java?p2=commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSourceFactory.java&p1=commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyObjectFactory.java&r1=1567033&r2=1567933&rev=1567933&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyObjectFactory.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSourceFactory.java Thu Feb 13 14:08:35 2014
@@ -39,7 +39,7 @@ import javax.naming.spi.ObjectFactory;
  *
  * @version $Revision$ $Date$
  */
-abstract class InstanceKeyObjectFactory implements ObjectFactory {
+abstract class InstanceKeyDataSourceFactory implements ObjectFactory {
 
     private static final Map<String, InstanceKeyDataSource> instanceMap =
             new ConcurrentHashMap<>();

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java?rev=1567933&r1=1567932&r2=1567933&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java Thu Feb 13 14:08:35 2014
@@ -100,7 +100,7 @@ public class PerUserPoolDataSource exten
                     //ignore and try to close others.
             }
         }
-        InstanceKeyObjectFactory.removeInstance(getInstanceKey());
+        InstanceKeyDataSourceFactory.removeInstance(getInstanceKey());
     }
 
     // -------------------------------------------------------------------

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSourceFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSourceFactory.java?rev=1567933&r1=1567932&r2=1567933&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSourceFactory.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSourceFactory.java Thu Feb 13 14:08:35 2014
@@ -29,7 +29,7 @@ import javax.naming.Reference;
  * @version $Revision$ $Date$
  */
 public class PerUserPoolDataSourceFactory
-    extends InstanceKeyObjectFactory
+    extends InstanceKeyDataSourceFactory
 {
     private static final String PER_USER_POOL_CLASSNAME =
         PerUserPoolDataSource.class.getName();

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java?rev=1567933&r1=1567932&r2=1567933&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java Thu Feb 13 14:08:35 2014
@@ -75,7 +75,7 @@ public class SharedPoolDataSource
         if (pool != null) {
             pool.close();
         }
-        InstanceKeyObjectFactory.removeInstance(getInstanceKey());
+        InstanceKeyDataSourceFactory.removeInstance(getInstanceKey());
     }
 
     // -------------------------------------------------------------------

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSourceFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSourceFactory.java?rev=1567933&r1=1567932&r2=1567933&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSourceFactory.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSourceFactory.java Thu Feb 13 14:08:35 2014
@@ -25,7 +25,7 @@ import javax.naming.Reference;
  * @version $Revision$ $Date$
  */
 public class SharedPoolDataSourceFactory
-    extends InstanceKeyObjectFactory
+    extends InstanceKeyDataSourceFactory
 {
     private static final String SHARED_POOL_CLASSNAME =
         SharedPoolDataSource.class.getName();