Tagged dbcp-1.3-RC1.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/dbcp/tags/DBCP_1_3_RC1@887834 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build.xml b/build.xml
index 5447cb7..e79f589 100644
--- a/build.xml
+++ b/build.xml
@@ -51,7 +51,7 @@
<property name="name" value="commons-dbcp"/>
<property name="title" value="Apache Commons Database Pooling Package"/>
- <property name="version" value="Nightly-${DSTAMP}${TSTAMP}"/>
+ <property name="version" value="1.3"/>
<property name="package" value="org.apache.commons.dbcp.*"/>
<property name="build.dir" value="${basedir}/build"/>
@@ -65,15 +65,15 @@
<property name="test.runner" value="junit.textui.TestRunner" />
<property name="javadoc.dir" value="${dist.dir}/docs/api"/>
- <property name="javadoc.bottom" value="<small>Copyright &copy; 2001-2004 Apache Software Foundation. Documenation generated ${TODAY}</small>."/>
+ <property name="javadoc.bottom" value="<small>Copyright &copy; 2001-2009 Apache Software Foundation. Documenation generated ${TODAY}</small>."/>
<property name="javadoc.overview" value="${basedir}/src/java/org/apache/commons/dbcp/overview.html"/>
<property name="javac.optimize" value="false"/>
<property name="javac.debug" value="true"/>
<property name="javac.deprecation" value="false"/>
+ <property name="javac.source" value="1.4" />
<available property="jndi.present" classname="javax.naming.Context"/>
- <available property="jdbc4.present" classname="java.sql.Wrapper"/>
</target>
<target name="check_jar">
@@ -128,36 +128,20 @@
<delete dir="${dist.dir}"/>
</target>
- <target name="prepare-nojdbc4" depends="init" unless="jdbc4.present">
- <echo message="Commenting out the jdbc4 additional methods since JDBC 4 was not detected."/>
- <property name="src.dir" value="${build.dir}/src"/>
- <property name="src.java.dir" value="${src.dir}/java"/>
- <property name="src.test.dir" value="${src.dir}/test"/>
- <property name="javac.source" value="1.4" />
-
- <mkdir dir="${src.dir}"/>
- <copy todir="${src.dir}" filtering="yes">
- <fileset dir="${basedir}/src" defaultexcludes="no">
- <include name="**/*.java"/>
- <include name="**/*.xml"/>
- <include name="**/*.properties"/>
- <include name="**/*.jocl"/>
- <include name="**/package.html"/>
- </fileset>
- </copy>
- <replace dir="${src.dir}" token="/* JDBC_4_ANT_KEY_BEGIN */" value="/*"/>
- <replace dir="${src.dir}" token="/* JDBC_4_ANT_KEY_END */" value="*/"/>
- </target>
-
- <target name="prepare-jdbc4" depends="init" if="jdbc4.present">
- <echo message="JDBC 4 was detected."/>
+ <target name="filter-sources">
+ <echo message="Comment out the jdbc4 additional methods."/>
<property name="src.dir" value="${basedir}/src"/>
<property name="src.java.dir" value="${src.dir}/java"/>
<property name="src.test.dir" value="${src.dir}/test"/>
- <property name="javac.source" value="1.5" />
+
+ <replace dir="${src.java.dir}" token="/* JDBC_4_ANT_KEY_BEGIN */" value="/*"/>
+ <replace dir="${src.java.dir}" token="/* JDBC_4_ANT_KEY_END */" value="*/"/>
+
+ <replace dir="${src.test.dir}" token="/* JDBC_4_ANT_KEY_BEGIN */" value="/*"/>
+ <replace dir="${src.test.dir}" token="/* JDBC_4_ANT_KEY_END */" value="*/"/>
</target>
- <target name="prepare" depends="init,prepare-nojdbc4,prepare-jdbc4"/>
+ <target name="prepare" depends="init,filter-sources"/>
<target name="javadoc" depends="prepare" description="generates javadocs">
<mkdir dir="${javadoc.dir}"/>
diff --git a/pom.xml b/pom.xml
index 4271bfb..7ea32a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.4</version>
+ <version>1.3</version>
<name>Commons DBCP</name>
<inceptionYear>2001</inceptionYear>
@@ -49,8 +49,8 @@
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/dbcp/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/dbcp/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/commons/proper/dbcp/trunk</url>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/dbcp/branches/DBCP_1_3_BRANCH</developerConnection>
+ <url>http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_3_BRANCH</url>
</scm>
<developers>
@@ -214,12 +214,11 @@
</dependencies>
<properties>
- <!-- Target Java versions are actually 1.4, 1.5 and 1.6
- but maven build only supports 1.6 -->
- <maven.compile.source>1.6</maven.compile.source>
- <maven.compile.target>1.6</maven.compile.target>
+ <!-- Target Java versions are actually 1.4, 1.5 and 1.6 -->
+ <maven.compile.source>1.4</maven.compile.source>
+ <maven.compile.target>1.4</maven.compile.target>
<commons.componentid>dbcp</commons.componentid>
- <commons.release.version>1.4</commons.release.version>
+ <commons.release.version>1.3</commons.release.version>
<commons.binary.suffix></commons.binary.suffix>
<commons.jira.id>DBCP</commons.jira.id>
<commons.jira.pid>12310469</commons.jira.pid>
@@ -345,8 +344,6 @@
<configuration>
<xmlPath>${basedir}/xdocs/changes.xml</xmlPath>
<issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate>
- <template>dbcp-release-notes.vm</template>
- <templateDirectory>src/template</templateDirectory>
</configuration>
<reportSets>
<reportSet>
diff --git a/src/java/org/apache/commons/dbcp/BasicDataSource.java b/src/java/org/apache/commons/dbcp/BasicDataSource.java
index 6016ec8..108a5f5 100644
--- a/src/java/org/apache/commons/dbcp/BasicDataSource.java
+++ b/src/java/org/apache/commons/dbcp/BasicDataSource.java
@@ -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
diff --git a/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java b/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java
index 0642840..ad666f6 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 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 */
+*/
}
diff --git a/src/java/org/apache/commons/dbcp/DelegatingConnection.java b/src/java/org/apache/commons/dbcp/DelegatingConnection.java
index 3aa8147..f920f76 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<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 */
+*/
}
diff --git a/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java b/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java
index df88046..ecaa621 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 @@
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 */
+ */
}
diff --git a/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java b/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java
index a7af77d..fcb650d 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 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 */
+*/
}
diff --git a/src/java/org/apache/commons/dbcp/DelegatingResultSet.java b/src/java/org/apache/commons/dbcp/DelegatingResultSet.java
index 5aa2e63..2ea1c86 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(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 */
+*/
}
diff --git a/src/java/org/apache/commons/dbcp/DelegatingStatement.java b/src/java/org/apache/commons/dbcp/DelegatingStatement.java
index 4aa56b0..ca6280a 100644
--- a/src/java/org/apache/commons/dbcp/DelegatingStatement.java
+++ b/src/java/org/apache/commons/dbcp/DelegatingStatement.java
@@ -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 */
+*/
}
diff --git a/src/java/org/apache/commons/dbcp/PoolingDataSource.java b/src/java/org/apache/commons/dbcp/PoolingDataSource.java
index 9f46b5a..ea91fd6 100644
--- a/src/java/org/apache/commons/dbcp/PoolingDataSource.java
+++ b/src/java/org/apache/commons/dbcp/PoolingDataSource.java
@@ -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 -----------------------------------------
diff --git a/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java b/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java
index ef3a2b0..981fbb0 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 @@
}
}
- /* 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
diff --git a/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java b/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java
index 05b1b6b..337d033 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 @@
*/
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
diff --git a/src/test/org/apache/commons/dbcp/TestDelegatingDatabaseMetaData.java b/src/test/org/apache/commons/dbcp/TestDelegatingDatabaseMetaData.java
index f6ef529..0e1f491 100644
--- a/src/test/org/apache/commons/dbcp/TestDelegatingDatabaseMetaData.java
+++ b/src/test/org/apache/commons/dbcp/TestDelegatingDatabaseMetaData.java
@@ -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 */
+ */
}
diff --git a/src/test/org/apache/commons/dbcp/TesterCallableStatement.java b/src/test/org/apache/commons/dbcp/TesterCallableStatement.java
index 801929a..4afd0ab 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 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 */
+*/
}
diff --git a/src/test/org/apache/commons/dbcp/TesterConnection.java b/src/test/org/apache/commons/dbcp/TesterConnection.java
index 8ec949b..95b8501 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 @@
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 */
+*/
}
diff --git a/src/test/org/apache/commons/dbcp/TesterDatabaseMetaData.java b/src/test/org/apache/commons/dbcp/TesterDatabaseMetaData.java
index 017cd7a..56c26f1 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 @@
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 */
+ */
}
diff --git a/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java b/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java
index e757f14..7cec55a 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 @@
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 */
+*/
}
diff --git a/src/test/org/apache/commons/dbcp/TesterResultSet.java b/src/test/org/apache/commons/dbcp/TesterResultSet.java
index bb2bf5f..3268d02 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 @@
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 */
+*/
}
diff --git a/src/test/org/apache/commons/dbcp/TesterStatement.java b/src/test/org/apache/commons/dbcp/TesterStatement.java
index 0d367d2..0c20986 100644
--- a/src/test/org/apache/commons/dbcp/TesterStatement.java
+++ b/src/test/org/apache/commons/dbcp/TesterStatement.java
@@ -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 */
+*/
}
diff --git a/src/test/org/apache/commons/dbcp/datasources/PooledConnectionProxy.java b/src/test/org/apache/commons/dbcp/datasources/PooledConnectionProxy.java
index 26a12b3..8b37cff 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 @@
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
