commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1571716 - in /commons/proper/dbcp/trunk/src: main/java/org/apache/commons/dbcp2/ main/java/org/apache/commons/dbcp2/cpdsadapter/ test/java/org/apache/commons/dbcp2/ test/java/org/apache/commons/dbcp2/datasources/
Date Tue, 25 Feb 2014 14:59:26 GMT
Author: markt
Date: Tue Feb 25 14:59:25 2014
New Revision: 1571716

URL: http://svn.apache.org/r1571716
Log:
DBCP 2 has a minimum Java version of 7 so no need for JDBC 4 markers.

Modified:
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
    commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterCallableStatement.java
    commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterConnection.java
    commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterDatabaseMetaData.java
    commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java
    commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java
    commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterStatement.java
    commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/PooledConnectionProxy.java

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java?rev=1571716&r1=1571715&r2=1571716&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java
(original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java
Tue Feb 25 14:59:25 2014
@@ -32,11 +32,9 @@ import java.util.Calendar;
 import java.io.InputStream;
 import java.io.Reader;
 import java.sql.SQLException;
-/* JDBC_4_ANT_KEY_BEGIN */
 import java.sql.NClob;
 import java.sql.RowId;
 import java.sql.SQLXML;
-/* JDBC_4_ANT_KEY_END */
 
 /**
  * A base delegating implementation of {@link CallableStatement}.
@@ -394,7 +392,6 @@ public class DelegatingCallableStatement
     public URL getURL(String parameterName) throws SQLException
     { checkOpen(); try { return ((CallableStatement)getDelegate()).getURL(parameterName);
} catch (SQLException e) { handleException(e); return null; } }
 
-/* JDBC_4_ANT_KEY_BEGIN */
 
     @Override
     public RowId getRowId(int parameterIndex) throws SQLException {
@@ -759,7 +756,6 @@ public class DelegatingCallableStatement
             handleException(e);
         }
     }
-/* JDBC_4_ANT_KEY_END */
 
     @Override
     public <T> T getObject(int parameterIndex, Class<T> type)

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java?rev=1571716&r1=1571715&r2=1571716&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
(original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
Tue Feb 25 14:59:25 2014
@@ -28,7 +28,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.sql.ResultSet;
-/* JDBC_4_ANT_KEY_BEGIN */
 import java.sql.Array;
 import java.sql.Blob;
 import java.sql.ClientInfoStatus;
@@ -40,7 +39,6 @@ import java.sql.Savepoint;
 import java.sql.Struct;
 import java.util.Collections;
 import java.util.Properties;
-/* JDBC_4_ANT_KEY_END */
 import java.util.concurrent.Executor;
 
 /**
@@ -67,10 +65,8 @@ import java.util.concurrent.Executor;
 public class DelegatingConnection<C extends Connection> extends AbandonedTrace
         implements Connection {
 
-/* JDBC_4_ANT_KEY_BEGIN */
     private static final Map<String, ClientInfoStatus> EMPTY_FAILED_PROPERTIES =
         Collections.<String, ClientInfoStatus>emptyMap();
-/* JDBC_4_ANT_KEY_END */
 
     /** My delegate {@link Connection}. */
     private volatile C _conn = null;
@@ -816,7 +812,6 @@ public class DelegatingConnection<C exte
         }
     }
 
-/* JDBC_4_ANT_KEY_BEGIN */
 
     @Override
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
@@ -977,7 +972,6 @@ public class DelegatingConnection<C exte
             return null;
         }
     }
-/* JDBC_4_ANT_KEY_END */
 
     @Override
     public void setSchema(String schema) throws SQLException {

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java?rev=1571716&r1=1571715&r2=1571716&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java
(original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java
Tue Feb 25 14:59:25 2014
@@ -19,9 +19,7 @@ package org.apache.commons.dbcp2;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
-/* JDBC_4_ANT_KEY_BEGIN */
 import java.sql.RowIdLifetime;
-/* JDBC_4_ANT_KEY_END */
 import java.sql.SQLException;
 
 /**

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java?rev=1571716&r1=1571715&r2=1571716&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
(original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
Tue Feb 25 14:59:25 2014
@@ -27,13 +27,11 @@ import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.util.Calendar;
-/* JDBC_4_ANT_KEY_BEGIN */
 import java.io.InputStream;
 import java.io.Reader;
 import java.sql.NClob;
 import java.sql.RowId;
 import java.sql.SQLXML;
-/* JDBC_4_ANT_KEY_END */
 
 /**
  * A base delegating implementation of {@link PreparedStatement}.
@@ -267,7 +265,6 @@ public class DelegatingPreparedStatement
     public java.sql.ParameterMetaData getParameterMetaData() throws SQLException
     { checkOpen(); try { return ((PreparedStatement)getDelegate()).getParameterMetaData();
} catch (SQLException e) { handleException(e); throw new AssertionError(); } }
 
-/* JDBC_4_ANT_KEY_BEGIN */
 
     @Override
     public void setRowId(int parameterIndex, RowId value) throws SQLException {
@@ -466,5 +463,4 @@ public class DelegatingPreparedStatement
             handleException(e);
         }
     }
-/* JDBC_4_ANT_KEY_END */
 }

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java?rev=1571716&r1=1571715&r2=1571716&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
(original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
Tue Feb 25 14:59:25 2014
@@ -35,11 +35,9 @@ import java.sql.Blob;
 import java.sql.Clob;
 import java.sql.Array;
 import java.util.Calendar;
-/* JDBC_4_ANT_KEY_BEGIN */
 import java.sql.NClob;
 import java.sql.RowId;
 import java.sql.SQLXML;
-/* JDBC_4_ANT_KEY_END */
 
 /**
  * A base delegating implementation of {@link ResultSet}.
@@ -746,7 +744,6 @@ public class DelegatingResultSet extends
     public void updateArray(String columnName, java.sql.Array x) throws SQLException
     { try { _res.updateArray(columnName, x); } catch (SQLException e) { handleException(e);
} }
 
-/* JDBC_4_ANT_KEY_BEGIN */
 
     @Override
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
@@ -1261,7 +1258,6 @@ public class DelegatingResultSet extends
             handleException(e);
         }
     }
-/* JDBC_4_ANT_KEY_END */
 
     @Override
     public <T> T getObject(int columnIndex, Class<T> type) throws SQLException
{

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java?rev=1571716&r1=1571715&r2=1571716&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
(original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
Tue Feb 25 14:59:25 2014
@@ -468,7 +468,6 @@ public class DelegatingStatement extends
         return _closed;
     }
 
-/* JDBC_4_ANT_KEY_BEGIN */
 
     @Override
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
@@ -514,7 +513,6 @@ public class DelegatingStatement extends
             return false;
         }
     }
-/* JDBC_4_ANT_KEY_END */
 
     @Override
     public void closeOnCompletion() throws SQLException {

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java?rev=1571716&r1=1571715&r2=1571716&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
(original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
Tue Feb 25 14:59:25 2014
@@ -25,9 +25,7 @@ import java.util.Vector;
 import javax.sql.ConnectionEvent;
 import javax.sql.ConnectionEventListener;
 import javax.sql.PooledConnection;
-/* JDBC_4_ANT_KEY_BEGIN */
 import javax.sql.StatementEventListener;
-/* JDBC_4_ANT_KEY_END */
 
 import org.apache.commons.dbcp2.DelegatingConnection;
 import org.apache.commons.dbcp2.PoolablePreparedStatement;

Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterCallableStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterCallableStatement.java?rev=1571716&r1=1571715&r2=1571716&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterCallableStatement.java
(original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterCallableStatement.java
Tue Feb 25 14:59:25 2014
@@ -33,11 +33,9 @@ import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.Calendar;
 import java.util.Map;
-/* JDBC_4_ANT_KEY_BEGIN */
 import java.sql.NClob;
 import java.sql.RowId;
 import java.sql.SQLXML;
-/* JDBC_4_ANT_KEY_END */
 
 /**
  * Trivial implementation of a CallableStatement to avoid null pointer exceptions in tests.
@@ -426,7 +424,6 @@ public class TesterCallableStatement ext
     public URL getURL(String parameterName) throws SQLException {
         return null;
     }
-/* JDBC_4_ANT_KEY_BEGIN */
 
     @Override
     public RowId getRowId(int parameterIndex) throws SQLException {
@@ -567,7 +564,6 @@ public class TesterCallableStatement ext
     @Override
     public void setNClob(String parameterName, Reader reader) throws SQLException {
     }
-/* JDBC_4_ANT_KEY_END */
 
     @Override
     public <T> T getObject(int parameterIndex, Class<T> type) throws SQLException
{

Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterConnection.java?rev=1571716&r1=1571715&r2=1571716&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterConnection.java
(original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterConnection.java
Tue Feb 25 14:59:25 2014
@@ -25,7 +25,6 @@ import java.sql.SQLException;
 import java.sql.SQLWarning;
 import java.sql.Statement;
 import java.util.Map;
-/* JDBC_4_ANT_KEY_BEGIN */
 import java.sql.Array;
 import java.sql.Blob;
 import java.sql.Clob;
@@ -34,7 +33,6 @@ import java.sql.SQLClientInfoException;
 import java.sql.SQLXML;
 import java.sql.Struct;
 import java.util.Properties;
-/* JDBC_4_ANT_KEY_END */
 import java.util.concurrent.Executor;
 
 /**
@@ -317,7 +315,6 @@ public class TesterConnection implements
         return prepareStatement(sql);
     }
 
-/* JDBC_4_ANT_KEY_BEGIN */
 
     @Override
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
@@ -383,7 +380,6 @@ public class TesterConnection implements
     public String getClientInfo(String name) throws SQLException {
         throw new SQLException("Not implemented.");
     }
-/* JDBC_4_ANT_KEY_END */
 
     @Override
     public void setSchema(String schema) throws SQLException {

Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterDatabaseMetaData.java?rev=1571716&r1=1571715&r2=1571716&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterDatabaseMetaData.java
(original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterDatabaseMetaData.java
Tue Feb 25 14:59:25 2014
@@ -20,9 +20,7 @@ package org.apache.commons.dbcp2;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
-/* JDBC_4_ANT_KEY_BEGIN */
 import java.sql.RowIdLifetime;
-/* JDBC_4_ANT_KEY_END */
 import java.sql.SQLException;
 
 /**

Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java?rev=1571716&r1=1571715&r2=1571716&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java
(original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java
Tue Feb 25 14:59:25 2014
@@ -28,13 +28,11 @@ import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.util.Calendar;
-/* JDBC_4_ANT_KEY_BEGIN */
 import java.io.InputStream;
 import java.io.Reader;
 import java.sql.NClob;
 import java.sql.RowId;
 import java.sql.SQLXML;
-/* JDBC_4_ANT_KEY_END */
 
 /**
  * A dummy {@link PreparedStatement}, for testing purposes.
@@ -342,7 +340,6 @@ public class TesterPreparedStatement ext
         throw new SQLException("Not implemented.");
     }
 
-/* JDBC_4_ANT_KEY_BEGIN */
 
     @Override
     public void setRowId(int parameterIndex, RowId value) throws SQLException {
@@ -433,7 +430,6 @@ public class TesterPreparedStatement ext
     public void setNClob(int parameterIndex, Reader reader) throws SQLException {
         throw new SQLException("Not implemented.");
     }
-/* JDBC_4_ANT_KEY_END */
 
     @Override
     public String toString() {

Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java?rev=1571716&r1=1571715&r2=1571716&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java
(original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java
Tue Feb 25 14:59:25 2014
@@ -29,13 +29,11 @@ import java.sql.SQLWarning;
 import java.sql.Statement;
 import java.util.Calendar;
 import java.util.Map;
-/* JDBC_4_ANT_KEY_BEGIN */
 import java.io.InputStream;
 import java.io.Reader;
 import java.sql.NClob;
 import java.sql.RowId;
 import java.sql.SQLXML;
-/* JDBC_4_ANT_KEY_END */
 
 /**
  * A dummy {@link ResultSet}, for testing purposes.
@@ -911,7 +909,6 @@ public SQLWarning getWarnings() throws S
         throw new SQLException("Not implemented.");
     }
 
-/* JDBC_4_ANT_KEY_BEGIN */
 
     @Override
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
@@ -1162,7 +1159,6 @@ public SQLWarning getWarnings() throws S
     public void updateNClob(String columnLabel, Reader reader) throws SQLException {
         throw new SQLException("Not implemented.");
     }
-/* JDBC_4_ANT_KEY_END */
 
     @Override
     public <T> T getObject(int columnIndex, Class<T> type) throws SQLException
{

Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterStatement.java?rev=1571716&r1=1571715&r2=1571716&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterStatement.java
(original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterStatement.java
Tue Feb 25 14:59:25 2014
@@ -311,7 +311,6 @@ public class TesterStatement implements 
         throw new SQLException("Not implemented.");
     }
 
-/* JDBC_4_ANT_KEY_BEGIN */
 
     @Override
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
@@ -337,7 +336,6 @@ public class TesterStatement implements 
     public boolean isPoolable() throws SQLException {
         throw new SQLException("Not implemented.");
     }
-/* JDBC_4_ANT_KEY_END */
 
     @Override
     public void closeOnCompletion() throws SQLException {

Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/PooledConnectionProxy.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/PooledConnectionProxy.java?rev=1571716&r1=1571715&r2=1571716&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/PooledConnectionProxy.java
(original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/PooledConnectionProxy.java
Tue Feb 25 14:59:25 2014
@@ -27,9 +27,7 @@ import java.util.Vector;
 import javax.sql.ConnectionEvent;
 import javax.sql.ConnectionEventListener;
 import javax.sql.PooledConnection;
-/* JDBC_4_ANT_KEY_BEGIN */
 import javax.sql.StatementEventListener;
-/* JDBC_4_ANT_KEY_END */
 
 /**
  * PooledConnection implementation that wraps a driver-supplied



Mime
View raw message