diff --git a/build-1.3.xml b/build-1.3.xml deleted file mode 100644 index b8bb0e70aa..0000000000 --- a/build-1.3.xml +++ /dev/null @@ -1,247 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Checking dependencies - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build.xml b/build.xml index e231b4810c..b8bb0e70aa 100644 --- a/build.xml +++ b/build.xml @@ -19,7 +19,7 @@ */ --> - + @@ -51,7 +51,7 @@ - + @@ -65,15 +65,15 @@ - + + - @@ -128,36 +128,20 @@ - - - + + + - - - - - - - - - - - - - - + + - - - - - - + + - + diff --git a/findbugs-exclude-filter.xml b/findbugs-exclude-filter.xml deleted file mode 100644 index 2052bad705..0000000000 --- a/findbugs-exclude-filter.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - * - - - diff --git a/pom-1.3.xml b/pom-1.3.xml deleted file mode 100644 index d587951260..0000000000 --- a/pom-1.3.xml +++ /dev/null @@ -1,371 +0,0 @@ - - - - - org.apache.commons - commons-parent - 12 - - 4.0.0 - commons-dbcp - commons-dbcp - 1.3 - Commons DBCP - - 2001 - Commons Database Connection Pooling - http://commons.apache.org/dbcp/ - - - - people.apache.org - Commons DBCP - scp://people.apache.org/www/commons.apache.org/dbcp - - - - - jira - http://issues.apache.org/jira/browse/DBCP - - - - scm:svn:http://svn.apache.org/repos/asf/commons/proper/dbcp/trunk - scm:svn:https://svn.apache.org/repos/asf/commons/proper/dbcp/branches/DBCP_1_3_BRANCH - http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_3_BRANCH - - - - - Morgan Delagrange - morgand - - - - - Geir Magnusson - geirm - - - - - Craig McClanahan - craigmcc - - - - - John McNally - jmcnally - - - - - Martin Poeschl - mpoeschl - mpoeschl@marmot.at - tucana.at - - - Rodney Waldhoff - rwaldhoff - - - - - David Weinrich - dweinr1 - - - - - Dirk Verbeeck - dirkv - - - - - Yoav Shapira - yoavs - yoavs@apache.org - Apache Software Foundation - - - Phil Steitz - psteitz - - - - - Jörg Schaible - joehni - joerg.schaible@gmx.de - - +1 - - - Mark Thomas - markt - markt@apache.org - Apache Software Foundation - - - - - Todd Carmichael - toddc@concur.com - - - Wayne Woodfield - - - Dain Sundstrom - dain@apache.org - - - Philippe Mouawad - - - - - - commons-pool - commons-pool - 1.5.4 - - - - junit - junit - 3.8.2 - test - - - - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - 1.1 - true - - - - - tomcat - naming-common - 5.0.28 - test - - - - tomcat - naming-java - 5.0.28 - test - - - - - commons-logging - commons-logging - 1.1.1 - test - - - - - org.apache.geronimo.modules - geronimo-transaction - 1.2-beta - test - - - - - xml-apis - xml-apis - 1.3.04 - test - - - xerces - xercesImpl - 2.4.0 - test - - - - - - 1.4 - 1.4 - dbcp - 1.3 - DBCP - 12310469 - - - - src/java - src/test - - - src/test - - testpool.jocl - - - - . - META-INF - - NOTICE.txt - LICENSE.txt - - - - - - ${basedir}/src/test - - testpool.jocl - - - - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.3 - - - org.apache.maven.plugins - maven-surefire-plugin - - plain - - org/apache/commons/dbcp/TestAbandonedObjectPool.java - org/apache/commons/jocl/TestJOCLContentHandler.java - org/apache/commons/dbcp/TestDelegatingConnection.java - org/apache/commons/dbcp/TestPoolableConnection.java - org/apache/commons/dbcp/TestDelegatingPreparedStatement.java - org/apache/commons/dbcp/TestDelegatingStatement.java - org/apache/commons/dbcp/TestJOCLed.java - org/apache/commons/dbcp/TestManual.java - - org/apache/commons/dbcp/TestBasicDataSourceFactory.java - org/apache/commons/dbcp/TestBasicDataSource.java - org/apache/commons/dbcp/TestAbandonedBasicDataSource.java - org/apache/commons/dbcp/TestPStmtPooling.java - org/apache/commons/dbcp/TestPStmtPoolingBasicDataSource.java - org/apache/commons/dbcp/TestPoolingDataSource.java - org/apache/commons/dbcp/TestJndi.java - - org/apache/commons/dbcp/cpdsadapter/TestDriverAdapterCPDS.java - - org/apache/commons/dbcp/datasources/TestFactory.java - org/apache/commons/dbcp/datasources/TestCPDSConnectionFactory.java - org/apache/commons/dbcp/datasources/TestKeyedCPDSConnectionFactory.java - org/apache/commons/dbcp/datasources/TestPerUserPoolDataSource.java - org/apache/commons/dbcp/datasources/TestSharedPoolDataSource.java - org/apache/commons/dbcp/datasources/TestInstanceKeyDataSource.java - - org/apache/commons/dbcp/managed/TestBasicManagedDataSource.java - org/apache/commons/dbcp/managed/TestManagedDataSource.java - org/apache/commons/dbcp/managed/TestManagedDataSourceInTx.java - - - - - maven-assembly-plugin - - - src/assembly/bin.xml - src/assembly/src.xml - - gnu - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.4 - - - http://java.sun.com/j2se/1.5.0/docs/api - http://commons.apache.org/pool/api-1.5.4 - http://java.sun.com/j2ee/sdk_1.3/techdocs/api - - - - - org.apache.maven.plugins - maven-changes-plugin - 2.0 - - ${basedir}/xdocs/changes.xml - %URL%/%ISSUE% - - - - - changes-report - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.1 - - ${basedir}/checkstyle.xml - false - - - - org.apache.maven.plugins - maven-pmd-plugin - 2.4 - - - checkstyle.xml - - ${maven.compile.target} - - - - org.codehaus.mojo - clirr-maven-plugin - 2.2.2 - - 1.2.2 - info - - - - - diff --git a/pom.xml b/pom.xml index 4896e4a2e3..d587951260 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 4.0.0 commons-dbcp commons-dbcp - 1.4 + 1.3 Commons DBCP 2001 @@ -49,8 +49,8 @@ scm:svn:http://svn.apache.org/repos/asf/commons/proper/dbcp/trunk - scm:svn:https://svn.apache.org/repos/asf/commons/proper/dbcp/trunk - http://svn.apache.org/viewvc/commons/proper/dbcp/trunk + scm:svn:https://svn.apache.org/repos/asf/commons/proper/dbcp/branches/DBCP_1_3_BRANCH + http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_3_BRANCH @@ -163,7 +163,7 @@ org.apache.geronimo.specs geronimo-jta_1.1_spec - 1.1.1 + 1.1 true @@ -197,15 +197,28 @@ 1.2-beta test + + + + xml-apis + xml-apis + 1.3.04 + test + + + xerces + xercesImpl + 2.4.0 + test + - - 1.6 - 1.6 + + 1.4 + 1.4 dbcp - 1.4 + 1.3 DBCP 12310469 @@ -296,21 +309,6 @@ - - org.codehaus.mojo - findbugs-maven-plugin - 2.1 - - Normal - Default - ${basedir}/findbugs-exclude-filter.xml - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.3 - org.apache.maven.plugins maven-javadoc-plugin @@ -330,8 +328,6 @@ ${basedir}/xdocs/changes.xml %URL%/%ISSUE% - - src/template diff --git a/src/java/org/apache/commons/dbcp/BasicDataSource.java b/src/java/org/apache/commons/dbcp/BasicDataSource.java index 6649b5d4de..239eee5388 100644 --- a/src/java/org/apache/commons/dbcp/BasicDataSource.java +++ b/src/java/org/apache/commons/dbcp/BasicDataSource.java @@ -1330,7 +1330,7 @@ public synchronized boolean isClosed() { return closed; } - /* JDBC_4_ANT_KEY_BEGIN */ + /* public boolean isWrapperFor(Class iface) throws SQLException { return false; } @@ -1338,7 +1338,7 @@ public boolean isWrapperFor(Class iface) throws SQLException { public T unwrap(Class iface) throws SQLException { throw new SQLException("BasicDataSource is not a wrapper."); } - /* JDBC_4_ANT_KEY_END */ + */ // ------------------------------------------------------ Protected Methods diff --git a/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java b/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java index 064284094d..ad666f6a0c 100644 --- a/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java +++ b/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java @@ -32,11 +32,11 @@ 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}. @@ -329,7 +329,7 @@ public Timestamp getTimestamp(String parameterName, Calendar cal) throws SQLExce public URL getURL(String parameterName) throws SQLException { checkOpen(); try { return ((CallableStatement)_stmt).getURL(parameterName); } catch (SQLException e) { handleException(e); return null; } } -/* JDBC_4_ANT_KEY_BEGIN */ +/* public RowId getRowId(int parameterIndex) throws SQLException { checkOpen(); @@ -660,5 +660,5 @@ public void setNClob(String parameterName, Reader reader) throws SQLException { handleException(e); } } -/* JDBC_4_ANT_KEY_END */ +*/ } diff --git a/src/java/org/apache/commons/dbcp/DelegatingConnection.java b/src/java/org/apache/commons/dbcp/DelegatingConnection.java index 774b44523c..334bc5d2be 100644 --- a/src/java/org/apache/commons/dbcp/DelegatingConnection.java +++ b/src/java/org/apache/commons/dbcp/DelegatingConnection.java @@ -28,7 +28,7 @@ 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; @@ -39,7 +39,7 @@ import java.sql.Struct; import java.util.Collections; import java.util.Properties; -/* JDBC_4_ANT_KEY_END */ +*/ /** * A base delegating implementation of {@link Connection}. @@ -65,10 +65,10 @@ public class DelegatingConnection extends AbandonedTrace implements Connection { -/* JDBC_4_ANT_KEY_BEGIN */ +/* private static final Map EMPTY_FAILED_PROPERTIES = Collections.emptyMap(); -/* JDBC_4_ANT_KEY_END */ +*/ /** My delegate {@link Connection}. */ protected Connection _conn = null; @@ -534,7 +534,7 @@ public PreparedStatement prepareStatement(String sql, String columnNames[]) thro } } -/* JDBC_4_ANT_KEY_BEGIN */ +/* public boolean isWrapperFor(Class iface) throws SQLException { return iface.isAssignableFrom(getClass()) || _conn.isWrapperFor(iface); @@ -674,5 +674,5 @@ public String getClientInfo(String name) throws SQLException { return null; } } -/* JDBC_4_ANT_KEY_END */ +*/ } diff --git a/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java b/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java index df880469c9..ecaa6212e4 100644 --- a/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java +++ b/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java @@ -20,9 +20,9 @@ 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; /** @@ -1121,7 +1121,7 @@ public boolean usesLocalFiles() throws SQLException { catch (SQLException e) { handleException(e); return false; } } } - /* JDBC_4_ANT_KEY_BEGIN */ + /* public boolean isWrapperFor(Class iface) throws SQLException { return iface.isAssignableFrom(getClass()) || _meta.isWrapperFor(iface); @@ -1206,6 +1206,6 @@ public ResultSet getFunctionColumns(String catalog, String schemaPattern, } } - /* JDBC_4_ANT_KEY_END */ + */ } diff --git a/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java b/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java index a7af77d48e..fcb650d8ca 100644 --- a/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java +++ b/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java @@ -27,13 +27,13 @@ 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}. @@ -220,7 +220,7 @@ public void setURL(int parameterIndex, java.net.URL x) throws SQLException public java.sql.ParameterMetaData getParameterMetaData() throws SQLException { checkOpen(); try { return ((PreparedStatement)_stmt).getParameterMetaData(); } catch (SQLException e) { handleException(e); throw new AssertionError(); } } -/* JDBC_4_ANT_KEY_BEGIN */ +/* public void setRowId(int parameterIndex, RowId value) throws SQLException { checkOpen(); @@ -401,5 +401,5 @@ public void setNClob(int parameterIndex, Reader reader) throws SQLException { handleException(e); } } -/* JDBC_4_ANT_KEY_END */ +*/ } diff --git a/src/java/org/apache/commons/dbcp/DelegatingResultSet.java b/src/java/org/apache/commons/dbcp/DelegatingResultSet.java index 5aa2e63bab..2ea1c86a60 100644 --- a/src/java/org/apache/commons/dbcp/DelegatingResultSet.java +++ b/src/java/org/apache/commons/dbcp/DelegatingResultSet.java @@ -35,11 +35,11 @@ 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}. @@ -619,7 +619,7 @@ public void updateArray(int columnIndex, java.sql.Array x) throws SQLException 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 */ +/* public boolean isWrapperFor(Class iface) throws SQLException { return iface.isAssignableFrom(getClass()) || _res.isWrapperFor(iface); @@ -1078,5 +1078,5 @@ public void updateNClob(String columnLabel, Reader reader) throws SQLException { handleException(e); } } -/* JDBC_4_ANT_KEY_END */ +*/ } diff --git a/src/java/org/apache/commons/dbcp/DelegatingStatement.java b/src/java/org/apache/commons/dbcp/DelegatingStatement.java index 4aa56b0469..ca6280ab8f 100644 --- a/src/java/org/apache/commons/dbcp/DelegatingStatement.java +++ b/src/java/org/apache/commons/dbcp/DelegatingStatement.java @@ -345,7 +345,7 @@ public boolean isClosed() throws SQLException { return _closed; } -/* JDBC_4_ANT_KEY_BEGIN */ +/* public boolean isWrapperFor(Class iface) throws SQLException { return iface.isAssignableFrom(getClass()) || _stmt.isWrapperFor(iface); @@ -381,5 +381,5 @@ public boolean isPoolable() throws SQLException { return false; } } -/* JDBC_4_ANT_KEY_END */ +*/ } diff --git a/src/java/org/apache/commons/dbcp/PoolingDataSource.java b/src/java/org/apache/commons/dbcp/PoolingDataSource.java index 9f46b5aa70..ea91fd642d 100644 --- a/src/java/org/apache/commons/dbcp/PoolingDataSource.java +++ b/src/java/org/apache/commons/dbcp/PoolingDataSource.java @@ -85,7 +85,7 @@ public void setAccessToUnderlyingConnectionAllowed(boolean allow) { this.accessToUnderlyingConnectionAllowed = allow; } - /* JDBC_4_ANT_KEY_BEGIN */ + /* public boolean isWrapperFor(Class iface) throws SQLException { return false; } @@ -93,7 +93,7 @@ public boolean isWrapperFor(Class iface) throws SQLException { public T unwrap(Class iface) throws SQLException { throw new SQLException("PoolingDataSource is not a wrapper."); } - /* JDBC_4_ANT_KEY_END */ + */ //--- DataSource methods ----------------------------------------- diff --git a/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java b/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java index ef3a2b062e..981fbb0609 100644 --- a/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java +++ b/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java @@ -26,9 +26,9 @@ 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.dbcp.DelegatingConnection; import org.apache.commons.dbcp.DelegatingPreparedStatement; @@ -113,13 +113,13 @@ public void addConnectionEventListener(ConnectionEventListener listener) { } } - /* JDBC_4_ANT_KEY_BEGIN */ + /* public void addStatementEventListener(StatementEventListener listener) { if (!statementEventListeners.contains(listener)) { statementEventListeners.add(listener); } } - /* JDBC_4_ANT_KEY_END */ + */ /** * Closes the physical connection and marks this @@ -190,11 +190,11 @@ public void removeConnectionEventListener( eventListeners.remove(listener); } - /* JDBC_4_ANT_KEY_BEGIN */ + /* public void removeStatementEventListener(StatementEventListener listener) { statementEventListeners.remove(listener); } - /* JDBC_4_ANT_KEY_END */ + */ /** * Closes the physical connection and checks that the logical connection diff --git a/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java b/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java index 05b1b6b0b3..337d03347e 100644 --- a/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java +++ b/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java @@ -155,7 +155,7 @@ protected void assertInitializationAllowed() */ public abstract void close() throws Exception; - /* JDBC_4_ANT_KEY_BEGIN */ + /* public boolean isWrapperFor(Class iface) throws SQLException { return false; } @@ -163,7 +163,7 @@ public boolean isWrapperFor(Class iface) throws SQLException { public T unwrap(Class iface) throws SQLException { throw new SQLException("InstanceKeyDataSource is not a wrapper."); } - /* JDBC_4_ANT_KEY_END */ + */ // ------------------------------------------------------------------- // Properties diff --git a/src/test/org/apache/commons/dbcp/TestDelegatingDatabaseMetaData.java b/src/test/org/apache/commons/dbcp/TestDelegatingDatabaseMetaData.java index f6ef5297fb..0e1f4912c8 100644 --- a/src/test/org/apache/commons/dbcp/TestDelegatingDatabaseMetaData.java +++ b/src/test/org/apache/commons/dbcp/TestDelegatingDatabaseMetaData.java @@ -85,12 +85,12 @@ public void testEquals() { assertTrue(!meta.equals(meta3)); } - /* JDBC_4_ANT_KEY_BEGIN */ + /* public void testCheckOpen() throws Exception { ResultSet rst = meta.getSchemas(); assertTrue(!rst.isClosed()); conn.close(); assertTrue(rst.isClosed()); } - /* JDBC_4_ANT_KEY_END */ + */ } diff --git a/src/test/org/apache/commons/dbcp/TesterCallableStatement.java b/src/test/org/apache/commons/dbcp/TesterCallableStatement.java index 801929a7eb..4afd0ab524 100644 --- a/src/test/org/apache/commons/dbcp/TesterCallableStatement.java +++ b/src/test/org/apache/commons/dbcp/TesterCallableStatement.java @@ -33,11 +33,11 @@ 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. @@ -346,7 +346,7 @@ public Timestamp getTimestamp(String parameterName, Calendar cal) throws SQLExce public URL getURL(String parameterName) throws SQLException { return null; } -/* JDBC_4_ANT_KEY_BEGIN */ +/* public RowId getRowId(int parameterIndex) throws SQLException { return null; @@ -455,5 +455,5 @@ public void setBlob(String parameterName, InputStream inputStream) throws SQLExc public void setNClob(String parameterName, Reader reader) throws SQLException { } -/* JDBC_4_ANT_KEY_END */ +*/ } diff --git a/src/test/org/apache/commons/dbcp/TesterConnection.java b/src/test/org/apache/commons/dbcp/TesterConnection.java index 8ec949b57e..95b8501d77 100644 --- a/src/test/org/apache/commons/dbcp/TesterConnection.java +++ b/src/test/org/apache/commons/dbcp/TesterConnection.java @@ -25,7 +25,7 @@ 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 +34,7 @@ import java.sql.SQLXML; import java.sql.Struct; import java.util.Properties; -/* JDBC_4_ANT_KEY_END */ +*/ /** * A dummy {@link Connection}, for testing purposes. @@ -280,7 +280,7 @@ public PreparedStatement prepareStatement(String sql, String columnNames[]) return prepareStatement(sql); } -/* JDBC_4_ANT_KEY_BEGIN */ +/* public boolean isWrapperFor(Class iface) throws SQLException { throw new SQLException("Not implemented."); @@ -333,5 +333,5 @@ public Properties getClientInfo() throws SQLException { public String getClientInfo(String name) throws SQLException { throw new SQLException("Not implemented."); } -/* JDBC_4_ANT_KEY_END */ +*/ } diff --git a/src/test/org/apache/commons/dbcp/TesterDatabaseMetaData.java b/src/test/org/apache/commons/dbcp/TesterDatabaseMetaData.java index 017cd7a4dd..56c26f1d67 100644 --- a/src/test/org/apache/commons/dbcp/TesterDatabaseMetaData.java +++ b/src/test/org/apache/commons/dbcp/TesterDatabaseMetaData.java @@ -20,9 +20,9 @@ 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; /** @@ -718,7 +718,7 @@ public boolean usesLocalFiles() throws SQLException { return false; } - /* JDBC_4_ANT_KEY_BEGIN */ + /* public boolean isWrapperFor(Class iface) throws SQLException { return false; @@ -760,5 +760,5 @@ public ResultSet getFunctions(String catalog, String schemaPattern, return null; } - /* JDBC_4_ANT_KEY_END */ + */ } diff --git a/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java b/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java index e757f148ca..7cec55a0a5 100644 --- a/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java +++ b/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java @@ -28,13 +28,13 @@ 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. @@ -290,7 +290,7 @@ public java.sql.ParameterMetaData getParameterMetaData() throws SQLException { throw new SQLException("Not implemented."); } -/* JDBC_4_ANT_KEY_BEGIN */ +/* public void setRowId(int parameterIndex, RowId value) throws SQLException { throw new SQLException("Not implemented."); @@ -363,5 +363,5 @@ public void setBlob(int parameterIndex, InputStream inputStream) throws SQLExcep public void setNClob(int parameterIndex, Reader reader) throws SQLException { throw new SQLException("Not implemented."); } -/* JDBC_4_ANT_KEY_END */ +*/ } diff --git a/src/test/org/apache/commons/dbcp/TesterResultSet.java b/src/test/org/apache/commons/dbcp/TesterResultSet.java index bb2bf5f0ae..3268d02eed 100644 --- a/src/test/org/apache/commons/dbcp/TesterResultSet.java +++ b/src/test/org/apache/commons/dbcp/TesterResultSet.java @@ -28,13 +28,13 @@ import java.sql.SQLWarning; import java.sql.Statement; 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 ResultSet}, for testing purposes. @@ -767,7 +767,7 @@ public void updateArray(String columnName, java.sql.Array x) throw new SQLException("Not implemented."); } -/* JDBC_4_ANT_KEY_BEGIN */ +/* public boolean isWrapperFor(Class iface) throws SQLException { throw new SQLException("Not implemented."); @@ -968,5 +968,5 @@ public void updateNClob(int columnIndex, Reader reader) throws SQLException { public void updateNClob(String columnLabel, Reader reader) throws SQLException { throw new SQLException("Not implemented."); } -/* JDBC_4_ANT_KEY_END */ +*/ } diff --git a/src/test/org/apache/commons/dbcp/TesterStatement.java b/src/test/org/apache/commons/dbcp/TesterStatement.java index 0d367d28d3..0c20986061 100644 --- a/src/test/org/apache/commons/dbcp/TesterStatement.java +++ b/src/test/org/apache/commons/dbcp/TesterStatement.java @@ -274,7 +274,7 @@ public int getResultSetHoldability() throws SQLException { throw new SQLException("Not implemented."); } -/* JDBC_4_ANT_KEY_BEGIN */ +/* public boolean isWrapperFor(Class iface) throws SQLException { throw new SQLException("Not implemented."); @@ -295,5 +295,5 @@ public void setPoolable(boolean poolable) throws SQLException { public boolean isPoolable() throws SQLException { throw new SQLException("Not implemented."); } -/* JDBC_4_ANT_KEY_END */ +*/ } diff --git a/src/test/org/apache/commons/dbcp/datasources/PooledConnectionProxy.java b/src/test/org/apache/commons/dbcp/datasources/PooledConnectionProxy.java index 26a12b3196..8b37cff108 100644 --- a/src/test/org/apache/commons/dbcp/datasources/PooledConnectionProxy.java +++ b/src/test/org/apache/commons/dbcp/datasources/PooledConnectionProxy.java @@ -26,9 +26,9 @@ 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 @@ -80,11 +80,11 @@ public void removeConnectionEventListener(ConnectionEventListener listener) { eventListeners.remove(listener); } - /* JDBC_4_ANT_KEY_BEGIN */ + /* public void removeStatementEventListener(StatementEventListener listener) { eventListeners.remove(listener); } - /* JDBC_4_ANT_KEY_END */ + */ public boolean isNotifyOnClose() { return notifyOnClose; @@ -114,13 +114,13 @@ public void addConnectionEventListener(ConnectionEventListener listener) { } } - /* JDBC_4_ANT_KEY_BEGIN */ + /* public void addStatementEventListener(StatementEventListener listener) { if (!eventListeners.contains(listener)) { eventListeners.add(listener); } } - /* JDBC_4_ANT_KEY_END */ + */ /** * Pass closed events on to listeners