You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2009/11/25 01:58:51 UTC
svn commit: r883941 - in
/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp: ./ cpdsadapter/
Author: sebb
Date: Wed Nov 25 00:58:50 2009
New Revision: 883941
URL: http://svn.apache.org/viewvc?rev=883941&view=rev
Log:
Drop JDBC3 conditional compilation markers
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingConnection.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingResultSet.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingStatement.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingConnection.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingDataSource.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingDriver.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java?rev=883941&r1=883940&r2=883941&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java Wed Nov 25 00:58:50 2009
@@ -173,11 +173,6 @@
public void registerOutParameter(int paramIndex, int sqlType, String typeName) throws SQLException
{ checkOpen(); try { ((CallableStatement)_stmt).registerOutParameter( paramIndex, sqlType, typeName); } catch (SQLException e) { handleException(e); } }
- // ------------------- JDBC 3.0 -----------------------------------------
- // Will be commented by the build process on a JDBC 2.0 system
-
-/* JDBC_3_ANT_KEY_BEGIN */
-
public void registerOutParameter(String parameterName, int sqlType) throws SQLException
{ checkOpen(); try { ((CallableStatement)_stmt).registerOutParameter(parameterName, sqlType); } catch (SQLException e) { handleException(e); } }
@@ -333,7 +328,7 @@
public URL getURL(String parameterName) throws SQLException
{ checkOpen(); try { return ((CallableStatement)_stmt).getURL(parameterName); } catch (SQLException e) { handleException(e); return null; } }
-/* JDBC_3_ANT_KEY_END */
+
/* JDBC_4_ANT_KEY_BEGIN */
public RowId getRowId(int parameterIndex) throws SQLException {
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingConnection.java?rev=883941&r1=883940&r2=883941&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingConnection.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingConnection.java Wed Nov 25 00:58:50 2009
@@ -438,11 +438,6 @@
}
}
- // ------------------- JDBC 3.0 -----------------------------------------
- // Will be commented by the build process on a JDBC 2.0 system
-
-/* JDBC_3_ANT_KEY_BEGIN */
-
public int getHoldability() throws SQLException
{ checkOpen(); try { return _conn.getHoldability(); } catch (SQLException e) { handleException(e); return 0; } }
@@ -538,7 +533,7 @@
return null;
}
}
-/* JDBC_3_ANT_KEY_END */
+
/* JDBC_4_ANT_KEY_BEGIN */
public boolean isWrapperFor(Class<?> iface) throws SQLException {
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java?rev=883941&r1=883940&r2=883941&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java Wed Nov 25 00:58:50 2009
@@ -214,17 +214,12 @@
return _stmt.toString();
}
- // ------------------- JDBC 3.0 -----------------------------------------
- // Will be commented by the build process on a JDBC 2.0 system
-
-/* JDBC_3_ANT_KEY_BEGIN */
-
public void setURL(int parameterIndex, java.net.URL x) throws SQLException
{ checkOpen(); try { ((PreparedStatement)_stmt).setURL(parameterIndex, x); } catch (SQLException e) { handleException(e); } }
public java.sql.ParameterMetaData getParameterMetaData() throws SQLException
{ checkOpen(); try { return ((PreparedStatement)_stmt).getParameterMetaData(); } catch (SQLException e) { handleException(e); throw new AssertionError(); } }
-/* JDBC_3_ANT_KEY_END */
+
/* JDBC_4_ANT_KEY_BEGIN */
public void setRowId(int parameterIndex, RowId value) throws SQLException {
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingResultSet.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingResultSet.java?rev=883941&r1=883940&r2=883941&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingResultSet.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingResultSet.java Wed Nov 25 00:58:50 2009
@@ -589,11 +589,6 @@
{ try { return _res.getTimestamp(columnName, cal); } catch (SQLException e) { handleException(e); return null; } }
- // ------------------- JDBC 3.0 -----------------------------------------
- // Will be commented by the build process on a JDBC 2.0 system
-
-/* JDBC_3_ANT_KEY_BEGIN */
-
public java.net.URL getURL(int columnIndex) throws SQLException
{ try { return _res.getURL(columnIndex); } catch (SQLException e) { handleException(e); return null; } }
@@ -623,7 +618,7 @@
public void updateArray(String columnName, java.sql.Array x) throws SQLException
{ try { _res.updateArray(columnName, x); } catch (SQLException e) { handleException(e); } }
-/* JDBC_3_ANT_KEY_END */
+
/* JDBC_4_ANT_KEY_BEGIN */
public boolean isWrapperFor(Class<?> iface) throws SQLException {
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingStatement.java?rev=883941&r1=883940&r2=883941&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingStatement.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingStatement.java Wed Nov 25 00:58:50 2009
@@ -302,11 +302,6 @@
return _stmt.toString();
}
- // ------------------- JDBC 3.0 -----------------------------------------
- // Will be commented by the build process on a JDBC 2.0 system
-
-/* JDBC_3_ANT_KEY_BEGIN */
-
public boolean getMoreResults(int current) throws SQLException
{ checkOpen(); try { return _stmt.getMoreResults(current); } catch (SQLException e) { handleException(e); return false; } }
@@ -341,8 +336,6 @@
public int getResultSetHoldability() throws SQLException
{ checkOpen(); try { return _stmt.getResultSetHoldability(); } catch (SQLException e) { handleException(e); return 0; } }
-/* JDBC_3_ANT_KEY_END */
-
/*
* Note was protected prior to JDBC 4
* TODO Consider adding build flags to make this protected unless we are
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingConnection.java?rev=883941&r1=883940&r2=883941&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingConnection.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingConnection.java Wed Nov 25 00:58:50 2009
@@ -175,11 +175,6 @@
}
- // ------------------- JDBC 3.0 -----------------------------------------
- // Will be commented by the build process on a JDBC 2.0 system
-
-/* JDBC_3_ANT_KEY_BEGIN */
-
// TODO: possible enhancement, cache these preparedStatements as well
// public PreparedStatement prepareStatement(String sql, int resultSetType,
@@ -205,9 +200,6 @@
// return super.prepareStatement(sql, columnNames);
// }
-/* JDBC_3_ANT_KEY_END */
-
-
/**
* Create a PStmtKey for the given arguments.
*/
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingDataSource.java?rev=883941&r1=883940&r2=883941&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingDataSource.java Wed Nov 25 00:58:50 2009
@@ -355,11 +355,6 @@
return delegate.toString();
}
- // ------------------- JDBC 3.0 -----------------------------------------
- // Will be commented by the build process on a JDBC 2.0 system
-
-/* JDBC_3_ANT_KEY_BEGIN */
-
public int getHoldability() throws SQLException {
checkOpen();
return delegate.getHoldability();
@@ -420,8 +415,6 @@
return new DelegatingPreparedStatement(this, delegate.prepareStatement(sql, columnNames));
}
-/* JDBC_3_ANT_KEY_END */
-
/**
* @see org.apache.commons.dbcp.DelegatingConnection#getDelegate()
*/
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingDriver.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingDriver.java?rev=883941&r1=883940&r2=883941&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingDriver.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingDriver.java Wed Nov 25 00:58:50 2009
@@ -414,11 +414,6 @@
return delegate.toString();
}
- // ------------------- JDBC 3.0 -----------------------------------------
- // Will be commented by the build process on a JDBC 2.0 system
-
-/* JDBC_3_ANT_KEY_BEGIN */
-
public int getHoldability() throws SQLException {
checkOpen();
return delegate.getHoldability();
@@ -479,8 +474,6 @@
return new DelegatingPreparedStatement(this, delegate.prepareStatement(sql, columnNames));
}
-/* JDBC_3_ANT_KEY_END */
-
/**
* @see org.apache.commons.dbcp.DelegatingConnection#getDelegate()
*/
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java?rev=883941&r1=883940&r2=883941&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java Wed Nov 25 00:58:50 2009
@@ -121,7 +121,6 @@
}
}
-/* JDBC_3_ANT_KEY_BEGIN */
public PreparedStatement prepareStatement(String sql, int resultSetType,
int resultSetConcurrency,
int resultSetHoldability)
@@ -176,7 +175,6 @@
return null;
}
}
-/* JDBC_3_ANT_KEY_END */
//
// Methods for accessing the delegate connection
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java?rev=883941&r1=883940&r2=883941&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java Wed Nov 25 00:58:50 2009
@@ -269,7 +269,6 @@
}
}
-/* JDBC_3_ANT_KEY_BEGIN */
/**
* Create or obtain a {*link PreparedStatement} from my pool.
* @return a {*link PoolablePreparedStatement}
@@ -371,8 +370,6 @@
return new PStmtKey(normalizeSQL(sql), columnNames);
}
-/* JDBC_3_ANT_KEY_END */
-
/**
* Create a {*link PooledConnectionImpl.PStmtKey} for the given arguments.
*/