|
|
cc0dea |
diff -u -r dbcp/BasicDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/BasicDataSource.java
|
|
|
cc0dea |
--- src/java/org/apache/commons/dbcp/BasicDataSource.java 2010-02-07 17:59:20.000000000 +0100
|
|
|
cc0dea |
+++ src/java/org/apache/commons/dbcp/BasicDataSource.java 2012-02-23 09:11:04.481618663 +0100
|
|
|
cc0dea |
@@ -24,10 +24,12 @@
|
|
|
cc0dea |
import java.util.ArrayList;
|
|
|
cc0dea |
import java.util.Iterator;
|
|
|
cc0dea |
import java.util.Collections;
|
|
|
cc0dea |
+import java.util.logging.Logger;
|
|
|
cc0dea |
import java.sql.Connection;
|
|
|
cc0dea |
import java.sql.Driver;
|
|
|
cc0dea |
import java.sql.DriverManager;
|
|
|
cc0dea |
import java.sql.SQLException;
|
|
|
cc0dea |
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
cc0dea |
import javax.sql.DataSource;
|
|
|
cc0dea |
|
|
|
cc0dea |
import org.apache.commons.pool.KeyedObjectPoolFactory;
|
|
|
cc0dea |
@@ -1579,4 +1581,10 @@
|
|
|
cc0dea |
logWriter.println(message);
|
|
|
cc0dea |
}
|
|
|
cc0dea |
}
|
|
|
cc0dea |
+
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
+
|
|
|
cc0dea |
}
|
|
|
cc0dea |
diff -u -r dbcp/cpdsadapter/DriverAdapterCPDS.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java
|
|
|
cc0dea |
--- src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java 2010-02-07 17:59:19.000000000 +0100
|
|
|
cc0dea |
+++ src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java 2012-02-23 09:13:29.490605580 +0100
|
|
|
cc0dea |
@@ -19,10 +19,12 @@
|
|
|
cc0dea |
|
|
|
cc0dea |
import java.util.Hashtable;
|
|
|
cc0dea |
import java.util.Properties;
|
|
|
cc0dea |
+import java.util.logging.Logger;
|
|
|
cc0dea |
import java.io.PrintWriter;
|
|
|
cc0dea |
import java.io.Serializable;
|
|
|
cc0dea |
import java.sql.DriverManager;
|
|
|
cc0dea |
import java.sql.SQLException;
|
|
|
cc0dea |
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
cc0dea |
import javax.sql.PooledConnection;
|
|
|
cc0dea |
import javax.sql.ConnectionPoolDataSource;
|
|
|
cc0dea |
import javax.naming.Name;
|
|
|
cc0dea |
@@ -719,4 +721,10 @@
|
|
|
cc0dea |
{
|
|
|
cc0dea |
_maxPreparedStatements = maxPreparedStatements;
|
|
|
cc0dea |
}
|
|
|
cc0dea |
+
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
+
|
|
|
cc0dea |
}
|
|
|
cc0dea |
diff -u -r dbcp/datasources/PerUserPoolDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java
|
|
|
cc0dea |
--- src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java 2010-02-07 17:59:20.000000000 +0100
|
|
|
cc0dea |
+++ src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java 2012-02-23 09:12:13.582612432 +0100
|
|
|
cc0dea |
@@ -21,10 +21,12 @@
|
|
|
cc0dea |
import java.io.ObjectInputStream;
|
|
|
cc0dea |
import java.sql.Connection;
|
|
|
cc0dea |
import java.sql.SQLException;
|
|
|
cc0dea |
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
cc0dea |
import java.util.HashMap;
|
|
|
cc0dea |
import java.util.Iterator;
|
|
|
cc0dea |
import java.util.Map;
|
|
|
cc0dea |
import java.util.NoSuchElementException;
|
|
|
cc0dea |
+import java.util.logging.Logger;
|
|
|
cc0dea |
|
|
|
cc0dea |
import javax.naming.NamingException;
|
|
|
cc0dea |
import javax.naming.Reference;
|
|
|
cc0dea |
@@ -561,4 +563,10 @@
|
|
|
cc0dea |
CPDSConnectionFactory mgr = (CPDSConnectionFactory) managers.get(key);
|
|
|
cc0dea |
return mgr == null ? null : (GenericObjectPool) mgr.getPool();
|
|
|
cc0dea |
}
|
|
|
cc0dea |
+
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
+
|
|
|
cc0dea |
}
|
|
|
cc0dea |
diff -u -r dbcp/datasources/SharedPoolDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java
|
|
|
cc0dea |
--- src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java 2010-02-07 17:59:20.000000000 +0100
|
|
|
cc0dea |
+++ src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java 2012-02-23 09:14:10.326601896 +0100
|
|
|
cc0dea |
@@ -21,6 +21,8 @@
|
|
|
cc0dea |
import java.io.ObjectInputStream;
|
|
|
cc0dea |
import java.sql.Connection;
|
|
|
cc0dea |
import java.sql.SQLException;
|
|
|
cc0dea |
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
cc0dea |
+import java.util.logging.Logger;
|
|
|
cc0dea |
|
|
|
cc0dea |
import javax.naming.NamingException;
|
|
|
cc0dea |
import javax.naming.Reference;
|
|
|
cc0dea |
@@ -269,5 +271,11 @@
|
|
|
cc0dea |
throw new IOException("NamingException: " + e);
|
|
|
cc0dea |
}
|
|
|
cc0dea |
}
|
|
|
cc0dea |
+
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
+
|
|
|
cc0dea |
}
|
|
|
cc0dea |
|
|
|
cc0dea |
diff -u -r dbcp/DelegatingCallableStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java
|
|
|
cc0dea |
--- src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java 2010-02-07 17:59:20.000000000 +0100
|
|
|
cc0dea |
+++ src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java 2012-02-23 09:17:35.805583354 +0100
|
|
|
cc0dea |
@@ -37,6 +37,7 @@
|
|
|
cc0dea |
import java.sql.RowId;
|
|
|
cc0dea |
import java.sql.SQLXML;
|
|
|
cc0dea |
/* JDBC_4_ANT_KEY_END */
|
|
|
cc0dea |
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
cc0dea |
|
|
|
cc0dea |
/**
|
|
|
cc0dea |
* A base delegating implementation of {@link CallableStatement}.
|
|
|
cc0dea |
@@ -661,4 +662,14 @@
|
|
|
cc0dea |
}
|
|
|
cc0dea |
}
|
|
|
cc0dea |
/* JDBC_4_ANT_KEY_END */
|
|
|
cc0dea |
+
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
+
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
}
|
|
|
cc0dea |
diff -u -r dbcp/DelegatingConnection.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingConnection.java
|
|
|
cc0dea |
--- src/java/org/apache/commons/dbcp/DelegatingConnection.java 2010-02-07 17:59:20.000000000 +0100
|
|
|
cc0dea |
+++ src/java/org/apache/commons/dbcp/DelegatingConnection.java 2012-02-23 09:04:56.488651873 +0100
|
|
|
cc0dea |
@@ -27,6 +27,7 @@
|
|
|
cc0dea |
import java.util.Iterator;
|
|
|
cc0dea |
import java.util.List;
|
|
|
cc0dea |
import java.util.Map;
|
|
|
cc0dea |
+import java.util.concurrent.Executor;
|
|
|
cc0dea |
import java.sql.ResultSet;
|
|
|
cc0dea |
/* JDBC_4_ANT_KEY_BEGIN */
|
|
|
cc0dea |
import java.sql.Array;
|
|
|
cc0dea |
@@ -40,6 +41,7 @@
|
|
|
cc0dea |
import java.util.Collections;
|
|
|
cc0dea |
import java.util.Properties;
|
|
|
cc0dea |
/* JDBC_4_ANT_KEY_END */
|
|
|
cc0dea |
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
cc0dea |
|
|
|
cc0dea |
/**
|
|
|
cc0dea |
* A base delegating implementation of {@link Connection}.
|
|
|
cc0dea |
@@ -678,5 +680,31 @@
|
|
|
cc0dea |
return null;
|
|
|
cc0dea |
}
|
|
|
cc0dea |
}
|
|
|
cc0dea |
-/* JDBC_4_ANT_KEY_END */
|
|
|
cc0dea |
+ /* JDBC_4_ANT_KEY_END */
|
|
|
cc0dea |
+
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public int getNetworkTimeout() throws SQLException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
+
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
+
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public void abort(Executor executor) throws SQLException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
+
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public String getSchema() throws SQLException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
+
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public void setSchema(String schema) throws SQLException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
}
|
|
|
cc0dea |
+
|
|
|
cc0dea |
diff -u -r dbcp/DelegatingDatabaseMetaData.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java
|
|
|
cc0dea |
--- src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java 2010-02-07 17:59:20.000000000 +0100
|
|
|
cc0dea |
+++ src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java 2012-02-23 09:20:38.181566898 +0100
|
|
|
cc0dea |
@@ -24,6 +24,7 @@
|
|
|
cc0dea |
import java.sql.RowIdLifetime;
|
|
|
cc0dea |
/* JDBC_4_ANT_KEY_END */
|
|
|
cc0dea |
import java.sql.SQLException;
|
|
|
cc0dea |
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
cc0dea |
|
|
|
cc0dea |
/**
|
|
|
cc0dea |
* A base delegating implementation of {@link DatabaseMetaData}.
|
|
|
cc0dea |
@@ -1208,4 +1209,13 @@
|
|
|
cc0dea |
|
|
|
cc0dea |
/* JDBC_4_ANT_KEY_END */
|
|
|
cc0dea |
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public boolean generatedKeyAlwaysReturned() throws SQLException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
+
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public ResultSet getPseudoColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) throws SQLException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
}
|
|
|
cc0dea |
diff -u -r dbcp/DelegatingPreparedStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java
|
|
|
cc0dea |
--- src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java 2010-02-07 17:59:20.000000000 +0100
|
|
|
cc0dea |
+++ src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java 2012-02-23 09:04:37.793653560 +0100
|
|
|
cc0dea |
@@ -34,6 +34,7 @@
|
|
|
cc0dea |
import java.sql.RowId;
|
|
|
cc0dea |
import java.sql.SQLXML;
|
|
|
cc0dea |
/* JDBC_4_ANT_KEY_END */
|
|
|
cc0dea |
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
cc0dea |
|
|
|
cc0dea |
/**
|
|
|
cc0dea |
* A base delegating implementation of {@link PreparedStatement}.
|
|
|
cc0dea |
@@ -402,4 +403,15 @@
|
|
|
cc0dea |
}
|
|
|
cc0dea |
}
|
|
|
cc0dea |
/* JDBC_4_ANT_KEY_END */
|
|
|
cc0dea |
+
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public boolean isCloseOnCompletion() throws SQLException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
+
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public void closeOnCompletion() throws SQLException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
+
|
|
|
cc0dea |
}
|
|
|
cc0dea |
diff -u -r dbcp/DelegatingResultSet.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingResultSet.java
|
|
|
cc0dea |
--- src/java/org/apache/commons/dbcp/DelegatingResultSet.java 2010-02-07 17:59:20.000000000 +0100
|
|
|
cc0dea |
+++ src/java/org/apache/commons/dbcp/DelegatingResultSet.java 2012-02-23 09:17:19.905584789 +0100
|
|
|
cc0dea |
@@ -40,6 +40,7 @@
|
|
|
cc0dea |
import java.sql.RowId;
|
|
|
cc0dea |
import java.sql.SQLXML;
|
|
|
cc0dea |
/* JDBC_4_ANT_KEY_END */
|
|
|
cc0dea |
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
cc0dea |
|
|
|
cc0dea |
/**
|
|
|
cc0dea |
* A base delegating implementation of {@link ResultSet}.
|
|
|
cc0dea |
@@ -1079,4 +1080,14 @@
|
|
|
cc0dea |
}
|
|
|
cc0dea |
}
|
|
|
cc0dea |
/* JDBC_4_ANT_KEY_END */
|
|
|
cc0dea |
+
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
+
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
}
|
|
|
cc0dea |
diff -u -r dbcp/DelegatingStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingStatement.java
|
|
|
cc0dea |
--- src/java/org/apache/commons/dbcp/DelegatingStatement.java 2010-02-07 17:59:20.000000000 +0100
|
|
|
cc0dea |
+++ src/java/org/apache/commons/dbcp/DelegatingStatement.java 2012-02-23 09:04:41.171653252 +0100
|
|
|
cc0dea |
@@ -22,6 +22,7 @@
|
|
|
cc0dea |
import java.sql.SQLException;
|
|
|
cc0dea |
import java.sql.SQLWarning;
|
|
|
cc0dea |
import java.sql.Statement;
|
|
|
cc0dea |
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
cc0dea |
import java.util.List;
|
|
|
cc0dea |
|
|
|
cc0dea |
/**
|
|
|
cc0dea |
@@ -386,4 +387,15 @@
|
|
|
cc0dea |
}
|
|
|
cc0dea |
}
|
|
|
cc0dea |
/* JDBC_4_ANT_KEY_END */
|
|
|
cc0dea |
+
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public boolean isCloseOnCompletion() throws SQLException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
+
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public void closeOnCompletion() throws SQLException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
+
|
|
|
cc0dea |
}
|
|
|
cc0dea |
diff -u -r dbcp/PoolableCallableStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java
|
|
|
cc0dea |
--- src/java/org/apache/commons/dbcp/PoolableCallableStatement.java 2010-02-07 17:59:20.000000000 +0100
|
|
|
cc0dea |
+++ src/java/org/apache/commons/dbcp/PoolableCallableStatement.java 2012-02-23 09:17:44.514582568 +0100
|
|
|
cc0dea |
@@ -21,6 +21,7 @@
|
|
|
cc0dea |
import java.sql.Connection;
|
|
|
cc0dea |
import java.sql.ResultSet;
|
|
|
cc0dea |
import java.sql.SQLException;
|
|
|
cc0dea |
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
cc0dea |
import java.util.List;
|
|
|
cc0dea |
|
|
|
cc0dea |
import org.apache.commons.pool.KeyedObjectPool;
|
|
|
cc0dea |
@@ -123,4 +124,13 @@
|
|
|
cc0dea |
super.passivate();
|
|
|
cc0dea |
}
|
|
|
cc0dea |
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
+
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
}
|
|
|
cc0dea |
diff -u -r dbcp/PoolablePreparedStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java
|
|
|
cc0dea |
--- src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java 2010-02-07 17:59:20.000000000 +0100
|
|
|
cc0dea |
+++ src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java 2012-02-23 09:16:01.670591848 +0100
|
|
|
cc0dea |
@@ -21,6 +21,7 @@
|
|
|
cc0dea |
import java.sql.PreparedStatement;
|
|
|
cc0dea |
import java.sql.ResultSet;
|
|
|
cc0dea |
import java.sql.SQLException;
|
|
|
cc0dea |
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
cc0dea |
import java.util.List;
|
|
|
cc0dea |
|
|
|
cc0dea |
import org.apache.commons.pool.KeyedObjectPool;
|
|
|
cc0dea |
@@ -137,4 +138,14 @@
|
|
|
cc0dea |
super.passivate();
|
|
|
cc0dea |
}
|
|
|
cc0dea |
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public boolean isCloseOnCompletion() throws SQLException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
+
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public void closeOnCompletion() throws SQLException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
+
|
|
|
cc0dea |
}
|
|
|
cc0dea |
diff -u -r dbcp/PoolingConnection.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolingConnection.java
|
|
|
cc0dea |
--- src/java/org/apache/commons/dbcp/PoolingConnection.java 2010-02-07 17:59:20.000000000 +0100
|
|
|
cc0dea |
+++ src/java/org/apache/commons/dbcp/PoolingConnection.java 2012-02-23 09:08:08.716634524 +0100
|
|
|
cc0dea |
@@ -21,8 +21,10 @@
|
|
|
cc0dea |
import java.sql.Connection;
|
|
|
cc0dea |
import java.sql.PreparedStatement;
|
|
|
cc0dea |
import java.sql.SQLException;
|
|
|
cc0dea |
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
cc0dea |
|
|
|
cc0dea |
import java.util.NoSuchElementException;
|
|
|
cc0dea |
+import java.util.concurrent.Executor;
|
|
|
cc0dea |
|
|
|
cc0dea |
import org.apache.commons.pool.KeyedObjectPool;
|
|
|
cc0dea |
import org.apache.commons.pool.KeyedPoolableObjectFactory;
|
|
|
cc0dea |
@@ -455,4 +457,30 @@
|
|
|
cc0dea |
return buf.toString();
|
|
|
cc0dea |
}
|
|
|
cc0dea |
}
|
|
|
cc0dea |
+
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public int getNetworkTimeout() throws SQLException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
+
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
+
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public void abort(Executor executor) throws SQLException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
+
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public String getSchema() throws SQLException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
+
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public void setSchema(String schema) throws SQLException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
}
|
|
|
cc0dea |
+
|
|
|
cc0dea |
diff -u -r dbcp/PoolingDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolingDataSource.java
|
|
|
cc0dea |
--- src/java/org/apache/commons/dbcp/PoolingDataSource.java 2010-02-07 17:59:20.000000000 +0100
|
|
|
cc0dea |
+++ src/java/org/apache/commons/dbcp/PoolingDataSource.java 2012-02-23 09:11:31.873616194 +0100
|
|
|
cc0dea |
@@ -23,10 +23,12 @@
|
|
|
cc0dea |
import java.sql.DatabaseMetaData;
|
|
|
cc0dea |
import java.sql.PreparedStatement;
|
|
|
cc0dea |
import java.sql.SQLException;
|
|
|
cc0dea |
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
cc0dea |
import java.sql.SQLWarning;
|
|
|
cc0dea |
import java.sql.Statement;
|
|
|
cc0dea |
import java.util.Map;
|
|
|
cc0dea |
import java.util.NoSuchElementException;
|
|
|
cc0dea |
+import java.util.logging.Logger;
|
|
|
cc0dea |
|
|
|
cc0dea |
import javax.sql.DataSource;
|
|
|
cc0dea |
|
|
|
cc0dea |
@@ -437,4 +439,9 @@
|
|
|
cc0dea |
}
|
|
|
cc0dea |
}
|
|
|
cc0dea |
}
|
|
|
cc0dea |
+
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
}
|
|
|
cc0dea |
diff -u -r dbcp/PoolingDriver.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolingDriver.java
|
|
|
cc0dea |
--- src/java/org/apache/commons/dbcp/PoolingDriver.java 2010-02-07 17:59:20.000000000 +0100
|
|
|
cc0dea |
+++ src/java/org/apache/commons/dbcp/PoolingDriver.java 2012-02-23 09:14:12.193601726 +0100
|
|
|
cc0dea |
@@ -27,6 +27,7 @@
|
|
|
cc0dea |
import java.sql.DriverPropertyInfo;
|
|
|
cc0dea |
import java.sql.PreparedStatement;
|
|
|
cc0dea |
import java.sql.SQLException;
|
|
|
cc0dea |
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
cc0dea |
import java.sql.SQLWarning;
|
|
|
cc0dea |
import java.sql.Statement;
|
|
|
cc0dea |
import java.util.HashMap;
|
|
|
cc0dea |
@@ -34,6 +35,7 @@
|
|
|
cc0dea |
import java.util.NoSuchElementException;
|
|
|
cc0dea |
import java.util.Properties;
|
|
|
cc0dea |
import java.util.Set;
|
|
|
cc0dea |
+import java.util.logging.Logger;
|
|
|
cc0dea |
|
|
|
cc0dea |
import org.apache.commons.jocl.JOCLContentHandler;
|
|
|
cc0dea |
import org.apache.commons.pool.ObjectPool;
|
|
|
cc0dea |
@@ -496,4 +498,10 @@
|
|
|
cc0dea |
}
|
|
|
cc0dea |
}
|
|
|
cc0dea |
}
|
|
|
cc0dea |
+
|
|
|
cc0dea |
+ /* This functionality is not implemented yet */
|
|
|
cc0dea |
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
|
|
|
cc0dea |
+ throw new SQLFeatureNotSupportedException();
|
|
|
cc0dea |
+ }
|
|
|
cc0dea |
+
|
|
|
cc0dea |
}
|