You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ni...@apache.org on 2009/11/27 02:13:55 UTC
svn commit: r884736 - in
/commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src:
java/org/apache/commons/dbcp/ java/org/apache/commons/dbcp/cpdsadapter/
java/org/apache/commons/dbcp/datasources/
java/org/apache/commons/dbcp/managed/ test/org/apache/com...
Author: niallp
Date: Fri Nov 27 01:13:54 2009
New Revision: 884736
URL: http://svn.apache.org/viewvc?rev=884736&view=rev
Log:
Comment out JDBC 4 methods
Modified:
commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/BasicDataSource.java
commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java
commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingConnection.java
commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java
commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java
commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingResultSet.java
commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingStatement.java
commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/PoolingDataSource.java
commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java
commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java
commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/managed/BasicManagedDataSource.java
commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TestDelegatingDatabaseMetaData.java
commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterCallableStatement.java
commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterConnection.java
commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterDatabaseMetaData.java
commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java
commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterResultSet.java
commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterStatement.java
commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/datasources/PooledConnectionProxy.java
Modified: commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/BasicDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/BasicDataSource.java?rev=884736&r1=884735&r2=884736&view=diff
==============================================================================
--- commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/BasicDataSource.java (original)
+++ commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/BasicDataSource.java Fri Nov 27 01:13:54 2009
@@ -1322,7 +1322,7 @@
return closed;
}
- /* JDBC_4_ANT_KEY_BEGIN */
+ /*
public boolean isWrapperFor(Class<?> iface) throws SQLException {
return false;
}
@@ -1330,7 +1330,7 @@
public <T> T unwrap(Class<T> iface) throws SQLException {
throw new SQLException("BasicDataSource is not a wrapper.");
}
- /* JDBC_4_ANT_KEY_END */
+ */
// ------------------------------------------------------ Protected Methods
Modified: commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java?rev=884736&r1=884735&r2=884736&view=diff
==============================================================================
--- commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java (original)
+++ commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java Fri Nov 27 01:13:54 2009
@@ -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 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 @@
handleException(e);
}
}
-/* JDBC_4_ANT_KEY_END */
+*/
}
Modified: commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingConnection.java?rev=884736&r1=884735&r2=884736&view=diff
==============================================================================
--- commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingConnection.java (original)
+++ commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingConnection.java Fri Nov 27 01:13:54 2009
@@ -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<String, ClientInfoStatus> EMPTY_FAILED_PROPERTIES =
Collections.<String, ClientInfoStatus>emptyMap();
-/* JDBC_4_ANT_KEY_END */
+*/
/** My delegate {@link Connection}. */
protected Connection _conn = null;
@@ -534,7 +534,7 @@
}
}
-/* JDBC_4_ANT_KEY_BEGIN */
+/*
public boolean isWrapperFor(Class<?> iface) throws SQLException {
return iface.isAssignableFrom(getClass()) || _conn.isWrapperFor(iface);
@@ -674,5 +674,5 @@
return null;
}
}
-/* JDBC_4_ANT_KEY_END */
+*/
}
Modified: commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java?rev=884736&r1=884735&r2=884736&view=diff
==============================================================================
--- commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java (original)
+++ commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java Fri Nov 27 01:13:54 2009
@@ -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 @@
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 @@
}
}
- /* JDBC_4_ANT_KEY_END */
+ */
}
Modified: commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java?rev=884736&r1=884735&r2=884736&view=diff
==============================================================================
--- commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java (original)
+++ commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java Fri Nov 27 01:13:54 2009
@@ -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 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 @@
handleException(e);
}
}
-/* JDBC_4_ANT_KEY_END */
+*/
}
Modified: commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingResultSet.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingResultSet.java?rev=884736&r1=884735&r2=884736&view=diff
==============================================================================
--- commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingResultSet.java (original)
+++ commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingResultSet.java Fri Nov 27 01:13:54 2009
@@ -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(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 @@
handleException(e);
}
}
-/* JDBC_4_ANT_KEY_END */
+*/
}
Modified: commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingStatement.java?rev=884736&r1=884735&r2=884736&view=diff
==============================================================================
--- commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingStatement.java (original)
+++ commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingStatement.java Fri Nov 27 01:13:54 2009
@@ -345,7 +345,7 @@
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 @@
return false;
}
}
-/* JDBC_4_ANT_KEY_END */
+*/
}
Modified: commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/PoolingDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/PoolingDataSource.java?rev=884736&r1=884735&r2=884736&view=diff
==============================================================================
--- commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/PoolingDataSource.java (original)
+++ commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/PoolingDataSource.java Fri Nov 27 01:13:54 2009
@@ -85,7 +85,7 @@
this.accessToUnderlyingConnectionAllowed = allow;
}
- /* JDBC_4_ANT_KEY_BEGIN */
+ /*
public boolean isWrapperFor(Class<?> iface) throws SQLException {
return false;
}
@@ -93,7 +93,7 @@
public <T> T unwrap(Class<T> iface) throws SQLException {
throw new SQLException("PoolingDataSource is not a wrapper.");
}
- /* JDBC_4_ANT_KEY_END */
+ */
//--- DataSource methods -----------------------------------------
Modified: commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java?rev=884736&r1=884735&r2=884736&view=diff
==============================================================================
--- commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java (original)
+++ commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java Fri Nov 27 01:13:54 2009
@@ -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 @@
}
}
- /* 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 @@
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
Modified: commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java?rev=884736&r1=884735&r2=884736&view=diff
==============================================================================
--- commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java (original)
+++ commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java Fri Nov 27 01:13:54 2009
@@ -155,7 +155,7 @@
*/
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 <T> T unwrap(Class<T> iface) throws SQLException {
throw new SQLException("InstanceKeyDataSource is not a wrapper.");
}
- /* JDBC_4_ANT_KEY_END */
+ */
// -------------------------------------------------------------------
// Properties
Modified: commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/managed/BasicManagedDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/managed/BasicManagedDataSource.java?rev=884736&r1=884735&r2=884736&view=diff
==============================================================================
--- commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/managed/BasicManagedDataSource.java (original)
+++ commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/managed/BasicManagedDataSource.java Fri Nov 27 01:13:54 2009
@@ -148,9 +148,9 @@
logWriter.println(message);
t.printStackTrace(logWriter);
throw new SQLException(message
- /* JDBC_4_ANT_KEY_BEGIN */
+ /*
, t
- /* JDBC_4_ANT_KEY_END */
+ */
);
}
@@ -161,9 +161,9 @@
logWriter.println(message);
t.printStackTrace(logWriter);
throw new SQLException(message
- /* JDBC_4_ANT_KEY_BEGIN */
+ /*
, t
- /* JDBC_4_ANT_KEY_END */
+ */
);
}
}
@@ -210,9 +210,9 @@
throw e;
} catch (Exception e) {
throw new SQLException("Cannot create PoolableConnectionFactory (" + e.getMessage() + ")"
- /* JDBC_4_ANT_KEY_BEGIN */
+ /*
, e
- /* JDBC_4_ANT_KEY_END */
+ */
);
}
}
Modified: commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TestDelegatingDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TestDelegatingDatabaseMetaData.java?rev=884736&r1=884735&r2=884736&view=diff
==============================================================================
--- commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TestDelegatingDatabaseMetaData.java (original)
+++ commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TestDelegatingDatabaseMetaData.java Fri Nov 27 01:13:54 2009
@@ -85,12 +85,12 @@
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 */
+ */
}
Modified: commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterCallableStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterCallableStatement.java?rev=884736&r1=884735&r2=884736&view=diff
==============================================================================
--- commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterCallableStatement.java (original)
+++ commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterCallableStatement.java Fri Nov 27 01:13:54 2009
@@ -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 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 setNClob(String parameterName, Reader reader) throws SQLException {
}
-/* JDBC_4_ANT_KEY_END */
+*/
}
Modified: commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterConnection.java?rev=884736&r1=884735&r2=884736&view=diff
==============================================================================
--- commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterConnection.java (original)
+++ commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterConnection.java Fri Nov 27 01:13:54 2009
@@ -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 @@
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 String getClientInfo(String name) throws SQLException {
throw new SQLException("Not implemented.");
}
-/* JDBC_4_ANT_KEY_END */
+*/
}
Modified: commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterDatabaseMetaData.java?rev=884736&r1=884735&r2=884736&view=diff
==============================================================================
--- commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterDatabaseMetaData.java (original)
+++ commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterDatabaseMetaData.java Fri Nov 27 01:13:54 2009
@@ -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 @@
return false;
}
- /* JDBC_4_ANT_KEY_BEGIN */
+ /*
public boolean isWrapperFor(Class<?> iface) throws SQLException {
return false;
@@ -760,5 +760,5 @@
return null;
}
- /* JDBC_4_ANT_KEY_END */
+ */
}
Modified: commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java?rev=884736&r1=884735&r2=884736&view=diff
==============================================================================
--- commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java (original)
+++ commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java Fri Nov 27 01:13:54 2009
@@ -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 @@
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 setNClob(int parameterIndex, Reader reader) throws SQLException {
throw new SQLException("Not implemented.");
}
-/* JDBC_4_ANT_KEY_END */
+*/
}
Modified: commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterResultSet.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterResultSet.java?rev=884736&r1=884735&r2=884736&view=diff
==============================================================================
--- commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterResultSet.java (original)
+++ commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterResultSet.java Fri Nov 27 01:13:54 2009
@@ -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 @@
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(String columnLabel, Reader reader) throws SQLException {
throw new SQLException("Not implemented.");
}
-/* JDBC_4_ANT_KEY_END */
+*/
}
Modified: commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterStatement.java?rev=884736&r1=884735&r2=884736&view=diff
==============================================================================
--- commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterStatement.java (original)
+++ commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterStatement.java Fri Nov 27 01:13:54 2009
@@ -274,7 +274,7 @@
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 boolean isPoolable() throws SQLException {
throw new SQLException("Not implemented.");
}
-/* JDBC_4_ANT_KEY_END */
+*/
}
Modified: commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/datasources/PooledConnectionProxy.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/datasources/PooledConnectionProxy.java?rev=884736&r1=884735&r2=884736&view=diff
==============================================================================
--- commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/datasources/PooledConnectionProxy.java (original)
+++ commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/datasources/PooledConnectionProxy.java Fri Nov 27 01:13:54 2009
@@ -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 @@
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 @@
}
}
- /* 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