1668N/Ahttp://pkgs.fedoraproject.org/cgit/apache-commons-dbcp.git/tree/jdbc41.patch

1668N/A

1668N/Adiff -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

1668N/A--- src/java/org/apache/commons/dbcp/BasicDataSource.java 2010-02-07 17:59:20.000000000 +0100

1668N/A+++ src/java/org/apache/commons/dbcp/BasicDataSource.java 2012-02-23 09:11:04.481618663 +0100

1668N/A@@ -24,10 +24,12 @@

1668N/A import java.util.ArrayList;

1668N/A import java.util.Iterator;

1668N/A import java.util.Collections;

1668N/A+import java.util.logging.Logger;

1668N/A import java.sql.Connection;

1668N/A import java.sql.Driver;

1668N/A import java.sql.DriverManager;

1668N/A import java.sql.SQLException;

1668N/A+import java.sql.SQLFeatureNotSupportedException;

1668N/A import javax.sql.DataSource;

1668N/A

1668N/A import org.apache.commons.pool.KeyedObjectPoolFactory;

1668N/A@@ -1579,4 +1581,10 @@

1668N/A logWriter.println(message);

1668N/A }

1668N/A }

1668N/A+

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A+

1668N/A }

1668N/Adiff -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

1668N/A--- src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java 2010-02-07 17:59:19.000000000 +0100

1668N/A+++ src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java 2012-02-23 09:13:29.490605580 +0100

1668N/A@@ -19,10 +19,12 @@

1668N/A

1668N/A import java.util.Hashtable;

1668N/A import java.util.Properties;

1668N/A+import java.util.logging.Logger;

1668N/A import java.io.PrintWriter;

1668N/A import java.io.Serializable;

1668N/A import java.sql.DriverManager;

1668N/A import java.sql.SQLException;

1668N/A+import java.sql.SQLFeatureNotSupportedException;

1668N/A import javax.sql.PooledConnection;

1668N/A import javax.sql.ConnectionPoolDataSource;

1668N/A import javax.naming.Name;

1668N/A@@ -719,4 +721,10 @@

1668N/A {

1668N/A _maxPreparedStatements = maxPreparedStatements;

1668N/A }

1668N/A+

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A+

1668N/A }

1668N/Adiff -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

1668N/A--- src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java 2010-02-07 17:59:20.000000000 +0100

1668N/A+++ src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java 2012-02-23 09:12:13.582612432 +0100

1668N/A@@ -21,10 +21,12 @@

1668N/A import java.io.ObjectInputStream;

1668N/A import java.sql.Connection;

1668N/A import java.sql.SQLException;

1668N/A+import java.sql.SQLFeatureNotSupportedException;

1668N/A import java.util.HashMap;

1668N/A import java.util.Iterator;

1668N/A import java.util.Map;

1668N/A import java.util.NoSuchElementException;

1668N/A+import java.util.logging.Logger;

1668N/A

1668N/A import javax.naming.NamingException;

1668N/A import javax.naming.Reference;

1668N/A@@ -561,4 +563,10 @@

1668N/A CPDSConnectionFactory mgr = (CPDSConnectionFactory) managers.get(key);

1668N/A return mgr == null ? null : (GenericObjectPool) mgr.getPool();

1668N/A }

1668N/A+

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A+

1668N/A }

1668N/Adiff -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

1668N/A--- src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java 2010-02-07 17:59:20.000000000 +0100

1668N/A+++ src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java 2012-02-23 09:14:10.326601896 +0100

1668N/A@@ -21,6 +21,8 @@

1668N/A import java.io.ObjectInputStream;

1668N/A import java.sql.Connection;

1668N/A import java.sql.SQLException;

1668N/A+import java.sql.SQLFeatureNotSupportedException;

1668N/A+import java.util.logging.Logger;

1668N/A

1668N/A import javax.naming.NamingException;

1668N/A import javax.naming.Reference;

1668N/A@@ -269,5 +271,11 @@

1668N/A throw new IOException("NamingException: " + e);

1668N/A }

1668N/A }

1668N/A+

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A+

1668N/A }

1668N/A

1668N/Adiff -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

1668N/A--- src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java 2010-02-07 17:59:20.000000000 +0100

1668N/A+++ src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java 2012-02-23 09:17:35.805583354 +0100

1668N/A@@ -37,6 +37,7 @@

1668N/A import java.sql.RowId;

1668N/A import java.sql.SQLXML;

1668N/A /* JDBC_4_ANT_KEY_END */

1668N/A+import java.sql.SQLFeatureNotSupportedException;

1668N/A

1668N/A /**

1668N/A * A base delegating implementation of {@link CallableStatement}.

1668N/A@@ -661,4 +662,14 @@

1668N/A }

1668N/A }

1668N/A /* JDBC_4_ANT_KEY_END */

1668N/A+

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A+

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A }

1668N/Adiff -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

1668N/A--- src/java/org/apache/commons/dbcp/DelegatingConnection.java 2010-02-07 17:59:20.000000000 +0100

1668N/A+++ src/java/org/apache/commons/dbcp/DelegatingConnection.java 2012-02-23 09:04:56.488651873 +0100

1668N/A@@ -27,6 +27,7 @@

1668N/A import java.util.Iterator;

1668N/A import java.util.List;

1668N/A import java.util.Map;

1668N/A+import java.util.concurrent.Executor;

1668N/A import java.sql.ResultSet;

1668N/A /* JDBC_4_ANT_KEY_BEGIN */

1668N/A import java.sql.Array;

1668N/A@@ -40,6 +41,7 @@

1668N/A import java.util.Collections;

1668N/A import java.util.Properties;

1668N/A /* JDBC_4_ANT_KEY_END */

1668N/A+import java.sql.SQLFeatureNotSupportedException;

1668N/A

1668N/A /**

1668N/A * A base delegating implementation of {@link Connection}.

1668N/A@@ -678,5 +680,31 @@

1668N/A return null;

1668N/A }

1668N/A }

1668N/A-/* JDBC_4_ANT_KEY_END */

1668N/A+ /* JDBC_4_ANT_KEY_END */

1668N/A+

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public int getNetworkTimeout() throws SQLException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A+

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A+

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public void abort(Executor executor) throws SQLException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A+

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public String getSchema() throws SQLException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A+

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public void setSchema(String schema) throws SQLException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A }

1668N/A+

1668N/Adiff -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

1668N/A--- src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java 2010-02-07 17:59:20.000000000 +0100

1668N/A+++ src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java 2012-02-23 09:20:38.181566898 +0100

1668N/A@@ -24,6 +24,7 @@

1668N/A import java.sql.RowIdLifetime;

1668N/A /* JDBC_4_ANT_KEY_END */

1668N/A import java.sql.SQLException;

1668N/A+import java.sql.SQLFeatureNotSupportedException;

1668N/A

1668N/A /**

1668N/A * A base delegating implementation of {@link DatabaseMetaData}.

1668N/A@@ -1208,4 +1209,13 @@

1668N/A

1668N/A /* JDBC_4_ANT_KEY_END */

1668N/A

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public boolean generatedKeyAlwaysReturned() throws SQLException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A+

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public ResultSet getPseudoColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) throws SQLException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A }

1668N/Adiff -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

1668N/A--- src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java 2010-02-07 17:59:20.000000000 +0100

1668N/A+++ src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java 2012-02-23 09:04:37.793653560 +0100

1668N/A@@ -34,6 +34,7 @@

1668N/A import java.sql.RowId;

1668N/A import java.sql.SQLXML;

1668N/A /* JDBC_4_ANT_KEY_END */

1668N/A+import java.sql.SQLFeatureNotSupportedException;

1668N/A

1668N/A /**

1668N/A * A base delegating implementation of {@link PreparedStatement}.

1668N/A@@ -402,4 +403,15 @@

1668N/A }

1668N/A }

1668N/A /* JDBC_4_ANT_KEY_END */

1668N/A+

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public boolean isCloseOnCompletion() throws SQLException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A+

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public void closeOnCompletion() throws SQLException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A+

1668N/A }

1668N/Adiff -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

1668N/A--- src/java/org/apache/commons/dbcp/DelegatingResultSet.java 2010-02-07 17:59:20.000000000 +0100

1668N/A+++ src/java/org/apache/commons/dbcp/DelegatingResultSet.java 2012-02-23 09:17:19.905584789 +0100

1668N/A@@ -40,6 +40,7 @@

1668N/A import java.sql.RowId;

1668N/A import java.sql.SQLXML;

1668N/A /* JDBC_4_ANT_KEY_END */

1668N/A+import java.sql.SQLFeatureNotSupportedException;

1668N/A

1668N/A /**

1668N/A * A base delegating implementation of {@link ResultSet}.

1668N/A@@ -1079,4 +1080,14 @@

1668N/A }

1668N/A }

1668N/A /* JDBC_4_ANT_KEY_END */

1668N/A+

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A+

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A }

1668N/Adiff -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

1668N/A--- src/java/org/apache/commons/dbcp/DelegatingStatement.java 2010-02-07 17:59:20.000000000 +0100

1668N/A+++ src/java/org/apache/commons/dbcp/DelegatingStatement.java 2012-02-23 09:04:41.171653252 +0100

1668N/A@@ -22,6 +22,7 @@

1668N/A import java.sql.SQLException;

1668N/A import java.sql.SQLWarning;

1668N/A import java.sql.Statement;

1668N/A+import java.sql.SQLFeatureNotSupportedException;

1668N/A import java.util.List;

1668N/A

1668N/A /**

1668N/A@@ -386,4 +387,15 @@

1668N/A }

1668N/A }

1668N/A /* JDBC_4_ANT_KEY_END */

1668N/A+

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public boolean isCloseOnCompletion() throws SQLException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A+

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public void closeOnCompletion() throws SQLException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A+

1668N/A }

1668N/Adiff -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

1668N/A--- src/java/org/apache/commons/dbcp/PoolableCallableStatement.java 2010-02-07 17:59:20.000000000 +0100

1668N/A+++ src/java/org/apache/commons/dbcp/PoolableCallableStatement.java 2012-02-23 09:17:44.514582568 +0100

1668N/A@@ -21,6 +21,7 @@

1668N/A import java.sql.Connection;

1668N/A import java.sql.ResultSet;

1668N/A import java.sql.SQLException;

1668N/A+import java.sql.SQLFeatureNotSupportedException;

1668N/A import java.util.List;

1668N/A

1668N/A import org.apache.commons.pool.KeyedObjectPool;

1668N/A@@ -123,4 +124,13 @@

1668N/A super.passivate();

1668N/A }

1668N/A

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A+

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A }

1668N/Adiff -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

1668N/A--- src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java 2010-02-07 17:59:20.000000000 +0100

1668N/A+++ src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java 2012-02-23 09:16:01.670591848 +0100

1668N/A@@ -21,6 +21,7 @@

1668N/A import java.sql.PreparedStatement;

1668N/A import java.sql.ResultSet;

1668N/A import java.sql.SQLException;

1668N/A+import java.sql.SQLFeatureNotSupportedException;

1668N/A import java.util.List;

1668N/A

1668N/A import org.apache.commons.pool.KeyedObjectPool;

1668N/A@@ -137,4 +138,14 @@

1668N/A super.passivate();

1668N/A }

1668N/A

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public boolean isCloseOnCompletion() throws SQLException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A+

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public void closeOnCompletion() throws SQLException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A+

1668N/A }

1668N/Adiff -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

1668N/A--- src/java/org/apache/commons/dbcp/PoolingConnection.java 2010-02-07 17:59:20.000000000 +0100

1668N/A+++ src/java/org/apache/commons/dbcp/PoolingConnection.java 2012-02-23 09:08:08.716634524 +0100

1668N/A@@ -21,8 +21,10 @@

1668N/A import java.sql.Connection;

1668N/A import java.sql.PreparedStatement;

1668N/A import java.sql.SQLException;

1668N/A+import java.sql.SQLFeatureNotSupportedException;

1668N/A

1668N/A import java.util.NoSuchElementException;

1668N/A+import java.util.concurrent.Executor;

1668N/A

1668N/A import org.apache.commons.pool.KeyedObjectPool;

1668N/A import org.apache.commons.pool.KeyedPoolableObjectFactory;

1668N/A@@ -455,4 +457,30 @@

1668N/A return buf.toString();

1668N/A }

1668N/A }

1668N/A+

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public int getNetworkTimeout() throws SQLException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A+

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A+

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public void abort(Executor executor) throws SQLException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A+

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public String getSchema() throws SQLException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A+

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public void setSchema(String schema) throws SQLException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A }

1668N/A+

1668N/Adiff -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

1668N/A--- src/java/org/apache/commons/dbcp/PoolingDataSource.java 2010-02-07 17:59:20.000000000 +0100

1668N/A+++ src/java/org/apache/commons/dbcp/PoolingDataSource.java 2012-02-23 09:11:31.873616194 +0100

1668N/A@@ -23,10 +23,12 @@

1668N/A import java.sql.DatabaseMetaData;

1668N/A import java.sql.PreparedStatement;

1668N/A import java.sql.SQLException;

1668N/A+import java.sql.SQLFeatureNotSupportedException;

1668N/A import java.sql.SQLWarning;

1668N/A import java.sql.Statement;

1668N/A import java.util.Map;

1668N/A import java.util.NoSuchElementException;

1668N/A+import java.util.logging.Logger;

1668N/A

1668N/A import javax.sql.DataSource;

1668N/A

1668N/A@@ -437,4 +439,9 @@

1668N/A }

1668N/A }

1668N/A }

1668N/A+

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A }

1668N/Adiff -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

1668N/A--- src/java/org/apache/commons/dbcp/PoolingDriver.java 2010-02-07 17:59:20.000000000 +0100

1668N/A+++ src/java/org/apache/commons/dbcp/PoolingDriver.java 2012-02-23 09:14:12.193601726 +0100

1668N/A@@ -27,6 +27,7 @@

1668N/A import java.sql.DriverPropertyInfo;

1668N/A import java.sql.PreparedStatement;

1668N/A import java.sql.SQLException;

1668N/A+import java.sql.SQLFeatureNotSupportedException;

1668N/A import java.sql.SQLWarning;

1668N/A import java.sql.Statement;

1668N/A import java.util.HashMap;

1668N/A@@ -34,6 +35,7 @@

1668N/A import java.util.NoSuchElementException;

1668N/A import java.util.Properties;

1668N/A import java.util.Set;

1668N/A+import java.util.logging.Logger;

1668N/A

1668N/A import org.apache.commons.jocl.JOCLContentHandler;

1668N/A import org.apache.commons.pool.ObjectPool;

1668N/A@@ -496,4 +498,10 @@

1668N/A }

1668N/A }

1668N/A }

1668N/A+

1668N/A+ /* This functionality is not implemented yet */

1668N/A+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {

1668N/A+ throw new SQLFeatureNotSupportedException();

1668N/A+ }

1668N/A+

1668N/A }