Author: markt
Date: Thu Jul 25 13:07:03 2013
New Revision: 1506952
URL: http://svn.apache.org/r1506952
Log:
Name change
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingConnection.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/KeyedCPDSConnectionFactory.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java
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=1506952&r1=1506951&r2=1506952&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 Jul 25 13:07:03 2013
@@ -31,7 +31,7 @@ import org.apache.commons.pool2.PooledOb
import org.apache.commons.pool2.PooledObjectFactory;
import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
-import org.apache.commons.pool2.impl.PooledObjectImpl;
+import org.apache.commons.pool2.impl.DefaultPooledObject;
/**
* A {@link PooledObjectFactory} that creates
@@ -208,7 +208,7 @@ public class PoolableConnectionFactory
((PoolingConnection)conn).setStatementPool(stmtPool);
((PoolingConnection) conn).setCacheState(_cacheState);
}
- return new PooledObjectImpl<>(new PoolableConnection(conn,_pool));
+ return new DefaultPooledObject<>(new PoolableConnection(conn,_pool));
}
protected void initializeConnection(Connection conn) throws SQLException {
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=1506952&r1=1506951&r2=1506952&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 Jul 25 13:07:03 2013
@@ -28,7 +28,7 @@ import org.apache.commons.pool2.KeyedObj
import org.apache.commons.pool2.KeyedPoolableObjectFactory;
import org.apache.commons.pool2.KeyedPooledObjectFactory;
import org.apache.commons.pool2.PooledObject;
-import org.apache.commons.pool2.impl.PooledObjectImpl;
+import org.apache.commons.pool2.impl.DefaultPooledObject;
/**
* A {@link DelegatingConnection} that pools {@link PreparedStatement}s.
@@ -287,19 +287,19 @@ public class PoolingConnection extends D
} else {
if( null == key.getResultSetType() && null ==
key.getResultSetConcurrency()) {
if (key.getStmtType() == STATEMENT_PREPAREDSTMT ) {
- return new PooledObjectImpl<DelegatingPreparedStatement>(
+ return new
DefaultPooledObject<DelegatingPreparedStatement>(
new
PoolablePreparedStatement(getDelegate().prepareStatement( key.getSql()), key,
_pstmtPool, this));
} else {
- return new PooledObjectImpl<DelegatingPreparedStatement>(
+ return new
DefaultPooledObject<DelegatingPreparedStatement>(
new
PoolableCallableStatement(getDelegate().prepareCall( key.getSql()), key,
_pstmtPool, this));
}
} else { // Both _resultSetType and _resultSetConcurrency are
non-null here (both or neither are set by constructors)
if(key.getStmtType() == STATEMENT_PREPAREDSTMT) {
- return new PooledObjectImpl<DelegatingPreparedStatement>(
+ return new
DefaultPooledObject<DelegatingPreparedStatement>(
new
PoolablePreparedStatement(getDelegate().prepareStatement(
key.getSql(),
key.getResultSetType().intValue(),key.getResultSetConcurrency().intValue()),
key, _pstmtPool, this));
} else {
- return new PooledObjectImpl<DelegatingPreparedStatement>(
+ return new
DefaultPooledObject<DelegatingPreparedStatement>(
new PoolableCallableStatement(
getDelegate().prepareCall(
key.getSql(),key.getResultSetType().intValue(),
key.getResultSetConcurrency().intValue()), key, _pstmtPool, this));
}
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=1506952&r1=1506951&r2=1506952&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 Jul 25 13:07:03 2013
@@ -34,7 +34,7 @@ import org.apache.commons.dbcp2.Poolable
import org.apache.commons.pool2.KeyedObjectPool;
import org.apache.commons.pool2.KeyedPooledObjectFactory;
import org.apache.commons.pool2.PooledObject;
-import org.apache.commons.pool2.impl.PooledObjectImpl;
+import org.apache.commons.pool2.impl.DefaultPooledObject;
/**
* Implementation of PooledConnection that is returned by
@@ -437,19 +437,19 @@ class PooledConnectionImpl implements Po
if (null == key.getResultSetType()
&& null == key.getResultSetConcurrency()) {
if (null == key.getAutoGeneratedKeys()) {
- return new
PooledObjectImpl<PoolablePreparedStatement<PStmtKeyCPDS,PoolablePreparedStatementStub>>(
+ return new
DefaultPooledObject<PoolablePreparedStatement<PStmtKeyCPDS,PoolablePreparedStatementStub>>(
new PoolablePreparedStatementStub(
connection.prepareStatement(key.getSql()),
key, pstmtPool, delegatingConnection));
} else {
- return new
PooledObjectImpl<PoolablePreparedStatement<PStmtKeyCPDS,PoolablePreparedStatementStub>>(
+ return new
DefaultPooledObject<PoolablePreparedStatement<PStmtKeyCPDS,PoolablePreparedStatementStub>>(
new PoolablePreparedStatementStub(
connection.prepareStatement(key.getSql(),
key.getAutoGeneratedKeys().intValue()),
key, pstmtPool, delegatingConnection));
}
} else {
- return new
PooledObjectImpl<PoolablePreparedStatement<PStmtKeyCPDS,PoolablePreparedStatementStub>>(
+ return new
DefaultPooledObject<PoolablePreparedStatement<PStmtKeyCPDS,PoolablePreparedStatementStub>>(
new PoolablePreparedStatementStub(
connection.prepareStatement(key.getSql(),
key.getResultSetType().intValue(),
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=1506952&r1=1506951&r2=1506952&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 Jul 25 13:07:03 2013
@@ -36,7 +36,7 @@ import org.apache.commons.pool2.ObjectPo
import org.apache.commons.pool2.PoolableObjectFactory;
import org.apache.commons.pool2.PooledObject;
import org.apache.commons.pool2.PooledObjectFactory;
-import org.apache.commons.pool2.impl.PooledObjectImpl;
+import org.apache.commons.pool2.impl.DefaultPooledObject;
/**
* A {@link PoolableObjectFactory} that creates
@@ -140,7 +140,7 @@ class CPDSConnectionFactory
} catch (SQLException e) {
throw new RuntimeException(e.getMessage());
}
- return new PooledObjectImpl<>(pci);
+ return new DefaultPooledObject<>(pci);
}
/**
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=1506952&r1=1506951&r2=1506952&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 Jul 25 13:07:03 2013
@@ -34,7 +34,7 @@ import org.apache.commons.dbcp2.Utils;
import org.apache.commons.pool2.KeyedObjectPool;
import org.apache.commons.pool2.KeyedPooledObjectFactory;
import org.apache.commons.pool2.PooledObject;
-import org.apache.commons.pool2.impl.PooledObjectImpl;
+import org.apache.commons.pool2.impl.DefaultPooledObject;
/**
* A {*link PoolableObjectFactory} that creates
@@ -141,7 +141,7 @@ class KeyedCPDSConnectionFactory
pci = new PooledConnectionAndInfo(pc, username, password);
pcMap.put(pc, pci);
- return new PooledObjectImpl<>(pci);
+ return new DefaultPooledObject<>(pci);
}
/**
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=1506952&r1=1506951&r2=1506952&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 Jul 25 13:07:03 2013
@@ -27,7 +27,7 @@ import org.apache.commons.pool2.KeyedObj
import org.apache.commons.pool2.PooledObject;
import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
-import org.apache.commons.pool2.impl.PooledObjectImpl;
+import org.apache.commons.pool2.impl.DefaultPooledObject;
/**
* A {@link PoolableConnectionFactory} that creates {@link
PoolableManagedConnection}s.
@@ -76,7 +76,7 @@ public class PoolableManagedConnectionFa
((PoolingConnection)conn).setStatementPool(stmtPool);
((PoolingConnection) conn).setCacheState(_cacheState);
}
- return new PooledObjectImpl<PoolableConnection>(
+ return new DefaultPooledObject<PoolableConnection>(
new PoolableManagedConnection(transactionRegistry, conn,
_pool));
}
