Author: sebb
Date: Wed Nov 25 01:00:03 2009
New Revision: 883942
URL: http://svn.apache.org/viewvc?rev=883942&view=rev
Log:
Drop JDBC3 conditional compilation markers
Modified:
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TesterConnection.java
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TesterResultSet.java
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TesterStatement.java
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TesterConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TesterConnection.java?rev=883942&r1=883941&r2=883942&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TesterConnection.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TesterConnection.java Wed Nov
25 01:00:03 2009
@@ -220,11 +220,6 @@
this.failure = failure;
}
- // ------------------- 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 {
throw new SQLException("Not implemented.");
}
@@ -284,7 +279,7 @@
throws SQLException {
return prepareStatement(sql);
}
-/* JDBC_3_ANT_KEY_END */
+
/* JDBC_4_ANT_KEY_BEGIN */
public boolean isWrapperFor(Class<?> iface) throws SQLException {
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java?rev=883942&r1=883941&r2=883942&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java
(original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java
Wed Nov 25 01:00:03 2009
@@ -239,12 +239,6 @@
checkOpen();
}
-
- // ------------------- 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 {
throw new SQLException("Not implemented.");
}
@@ -295,7 +289,7 @@
public java.sql.ParameterMetaData getParameterMetaData() throws SQLException {
throw new SQLException("Not implemented.");
}
-/* 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/test/org/apache/commons/dbcp/TesterResultSet.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TesterResultSet.java?rev=883942&r1=883941&r2=883942&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TesterResultSet.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TesterResultSet.java Wed Nov
25 01:00:03 2009
@@ -719,11 +719,6 @@
}
}
- // ------------------- 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 {
throw new SQLException("Not implemented.");
}
@@ -771,7 +766,7 @@
throws SQLException {
throw new SQLException("Not implemented.");
}
-/* JDBC_3_ANT_KEY_END */
+
/* JDBC_4_ANT_KEY_BEGIN */
public boolean isWrapperFor(Class<?> iface) throws SQLException {
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TesterStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TesterStatement.java?rev=883942&r1=883941&r2=883942&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TesterStatement.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TesterStatement.java Wed Nov
25 01:00:03 2009
@@ -231,10 +231,6 @@
}
}
- // ------------------- 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 {
throw new SQLException("Not implemented.");
}
@@ -277,7 +273,7 @@
checkOpen();
throw new SQLException("Not implemented.");
}
-/* JDBC_3_ANT_KEY_END */
+
/* JDBC_4_ANT_KEY_BEGIN */
public boolean isWrapperFor(Class<?> iface) throws SQLException {
|