Replaced 1.3 release branch.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/dbcp/branches/DBCP_1_3_BRANCH@894280 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build-1.3.xml b/build-1.3.xml
new file mode 100644
index 0000000..b8bb0e7
--- /dev/null
+++ b/build-1.3.xml
@@ -0,0 +1,247 @@
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+ -->
+
+<!-- $Id: build.xml 887831 2009-12-07 03:56:29Z psteitz $ -->
+<project name="commons-dbcp" default="test" basedir=".">
+
+ <target name="init">
+ <tstamp/>
+
+ <!-- read properties from the build.properties, if any -->
+ <property name="component-propfile" value="${basedir}/build.properties"/>
+ <property file="${component-propfile}"/>
+
+ <!-- read properties from the commons build.properties, if any -->
+ <property name="commons-propfile" value="${basedir}/../build.properties"/>
+ <property file="${commons-propfile}"/>
+
+ <!-- read properties from the ${user.home}/propfile, if any -->
+ <property name="user-propfile" value="${user.home}/build.properties"/>
+ <property file="${user-propfile}"/>
+
+ <property name="commons-pool.jar" value="${basedir}/../pool/dist/commons-pool.jar"/>
+
+ <!-- command line classpath, if any -->
+ <property name="cp" value=""/>
+
+ <!-- now combine the classpaths -->
+ <property name="classpath"
+ value="${cp}:${commons-pool.jar}:${junit.jar}:
+ ${naming-common.jar}:${naming-java.jar}:${commons-logging.jar}:
+ ${xerces.jar}:${jta-spec.jar}:${jta-impl.jar}:
+ ${backport-util-concurrent.jar}:${ejb-spec.jar}"/>
+
+ <property name="name" value="commons-dbcp"/>
+ <property name="title" value="Apache Commons Database Pooling Package"/>
+ <property name="version" value="1.3"/>
+ <property name="package" value="org.apache.commons.dbcp.*"/>
+
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="build.classes.dir" value="${build.dir}/classes"/>
+ <property name="build.test-classes.dir" value="${build.dir}/test-classes"/>
+ <property name="dist.dir" value="${basedir}/dist"/>
+ <property name="dist.jar" value="${dist.dir}/${name}.jar"/>
+
+ <property name="test.entry" value="org.apache.commons.dbcp.TestAll"/>
+ <property name="test.failonerror" value="true" />
+ <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-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"/>
+ </target>
+
+ <target name="check_jar">
+ <available file="${file}" property="found"/>
+ <antcall target="check_message"/>
+ </target>
+
+ <target name="check_message" unless="found">
+ <!-- echo could be replaced with fail if required -->
+ <echo message="Could not find ${file}"/>
+ </target>
+
+ <!-- Check that all the dependencies exist -->
+ <target name="check_depends" depends="init">
+ <echo>Checking dependencies</echo>
+ <antcall target="check_jar">
+ <param name="file" value="${commons-pool.jar}"/>
+ </antcall>
+ <antcall target="check_jar">
+ <param name="file" value="${junit.jar}"/>
+ </antcall>
+ <antcall target="check_jar">
+ <param name="file" value="${naming-common.jar}"/>
+ </antcall>
+ <antcall target="check_jar">
+ <param name="file" value="${naming-java.jar}"/>
+ </antcall>
+ <antcall target="check_jar">
+ <param name="file" value="${commons-logging.jar}"/>
+ </antcall>
+ <antcall target="check_jar">
+ <param name="file" value="${xerces.jar}"/>
+ </antcall>
+ <antcall target="check_jar">
+ <param name="file" value="${jta-spec.jar}"/>
+ </antcall>
+ <antcall target="check_jar">
+ <param name="file" value="${jta-impl.jar}"/>
+ </antcall>
+ <antcall target="check_jar">
+ <param name="file" value="${backport-util-concurrent.jar}"/>
+ </antcall>
+ <antcall target="check_jar">
+ <param name="file" value="${ejb-spec.jar}"/>
+ </antcall>
+ </target>
+
+ <!-- ######################################################### -->
+
+ <target name="clean" depends="init" description="removes generated files">
+ <delete dir="${build.dir}"/>
+ <delete dir="${dist.dir}"/>
+ </target>
+
+ <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"/>
+
+ <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,filter-sources"/>
+
+ <target name="javadoc" depends="prepare" description="generates javadocs">
+ <mkdir dir="${javadoc.dir}"/>
+ <javadoc packagenames="org.*"
+ sourcepath="${src.java.dir}"
+ classpath="${classpath}"
+ destdir="${javadoc.dir}"
+ windowtitle="${title}"
+ doctitle="${title}"
+ bottom="${javadoc.bottom}"
+ overview="${javadoc.overview}"
+ public="true"
+ version="true"
+ author="true"
+ splitindex="false"
+ nodeprecated="true"
+ nodeprecatedlist="true"
+ notree="true"
+ noindex="false"
+ nohelp="true"
+ nonavbar="false"
+ serialwarn="false">
+ <link href="http://java.sun.com/j2se/1.5.0/docs/api"/>
+ <link href="http://commons.apache.org/pool/apidocs"/>
+ </javadoc>
+ </target>
+
+ <!-- ######################################################### -->
+
+ <target name="compile" depends="check_depends,prepare" description="compiles source files">
+ <mkdir dir="${build.classes.dir}"/>
+ <javac destdir="${build.classes.dir}"
+ srcdir="${src.java.dir}"
+ classpath="${classpath}"
+ debug="${javac.debug}"
+ deprecation="${javac.deprecation}"
+ optimize="${javac.optimize}"
+ source="${javac.source}">
+ <exclude name="org/apache/commons/dbcp/BasicDataSourceFactory.java"
+ unless="jndi.present"/>
+ <exclude name="org/apache/commons/dbcp/datasources/**"
+ unless="jndi.present"/>
+ <exclude name="org/apache/commons/dbcp/cpdsadapter/**"
+ unless="jndi.present"/>
+ </javac>
+ </target>
+
+ <target name="compile-test" depends="compile">
+ <mkdir dir="${build.test-classes.dir}"/>
+ <javac destdir="${build.test-classes.dir}"
+ srcdir="${src.test.dir}"
+ debug="${javac.debug}"
+ deprecation="${javac.deprecation}"
+ optimize="${javac.optimize}"
+ source="${javac.source}">
+ <classpath>
+ <pathelement location="${build.classes.dir}" />
+ <pathelement location="${build.test-classes.dir}" />
+ <pathelement path="${classpath}" />
+ </classpath>
+ </javac>
+ <copy todir="${build.test-classes.dir}" file="${src.test.dir}/testpool.jocl"/>
+ </target>
+
+ <target name="test" depends="compile-test" description="runs (junit) unit tests">
+ <echo message="${classpath}"/>
+ <junit printsummary="true" showoutput="true" fork="yes" haltonfailure="${test.failonerror}">
+ <classpath>
+ <pathelement location="${build.classes.dir}" />
+ <pathelement location="${build.test-classes.dir}" />
+ <pathelement path="${classpath}" />
+ </classpath>
+ <formatter type="plain" usefile="false" />
+ <test name="${test.entry}"/>
+ </junit>
+ </target>
+
+ <target name="build-jar" depends="compile">
+ <mkdir dir="${dist.dir}"/>
+ <jar jarfile="${dist.jar}">
+ <fileset dir="${build.classes.dir}"/>
+ <metainf dir="${basedir}" includes="LICENSE.txt,NOTICE.txt"/>
+ <manifest>
+ <attribute name="Built-By" value="${user.name}"/>
+ <attribute name="Package" value="${package}"/>
+ <attribute name="Extension-Name" value="${name}"/>
+ <attribute name="Specification-Vendor" value="Apache Software Foundation"/>
+ <attribute name="Specification-Title" value="${title}"/>
+ <attribute name="Implementation-Version" value="${version}"/>
+ <attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
+ </manifest>
+ </jar>
+ </target>
+
+ <target name="build" depends="clean,build-jar,javadoc">
+ <copy todir="${dist.dir}" file="${basedir}/LICENSE.txt"/>
+ <copy todir="${dist.dir}" file="${basedir}/NOTICE.txt"/>
+ <copy todir="${dist.dir}" file="${basedir}/README.txt"/>
+ </target>
+
+ <target name="dist" depends="build" description="gump target"/>
+
+</project>
diff --git a/build.xml b/build.xml
index b8bb0e7..e231b48 100644
--- a/build.xml
+++ b/build.xml
@@ -19,7 +19,7 @@
*/
-->
-<!-- $Id: build.xml 887831 2009-12-07 03:56:29Z psteitz $ -->
+<!-- $Id$ -->
<project name="commons-dbcp" default="test" basedir=".">
<target name="init">
@@ -51,7 +51,7 @@
<property name="name" value="commons-dbcp"/>
<property name="title" value="Apache Commons Database Pooling Package"/>
- <property name="version" value="1.3"/>
+ <property name="version" value="Nightly-${DSTAMP}${TSTAMP}"/>
<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-2009 Apache Software Foundation. Documenation generated ${TODAY}</small>."/>
+ <property name="javadoc.bottom" value="<small>Copyright &copy; 2001-2004 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,20 +128,36 @@
<delete dir="${dist.dir}"/>
</target>
- <target name="filter-sources">
- <echo message="Comment out the jdbc4 additional methods."/>
+ <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."/>
<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"/>
-
- <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="*/"/>
+ <property name="javac.source" value="1.5" />
</target>
- <target name="prepare" depends="init,filter-sources"/>
+ <target name="prepare" depends="init,prepare-nojdbc4,prepare-jdbc4"/>
<target name="javadoc" depends="prepare" description="generates javadocs">
<mkdir dir="${javadoc.dir}"/>
diff --git a/pom-1.3.xml b/pom-1.3.xml
new file mode 100644
index 0000000..d587951
--- /dev/null
+++ b/pom-1.3.xml
@@ -0,0 +1,371 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-parent</artifactId>
+ <version>12</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.3</version>
+ <name>Commons DBCP</name>
+
+ <inceptionYear>2001</inceptionYear>
+ <description>Commons Database Connection Pooling</description>
+ <url>http://commons.apache.org/dbcp/</url>
+
+ <distributionManagement>
+ <site>
+ <id>people.apache.org</id>
+ <name>Commons DBCP</name>
+ <url>scp://people.apache.org/www/commons.apache.org/dbcp</url>
+ </site>
+ </distributionManagement>
+
+ <issueManagement>
+ <system>jira</system>
+ <url>http://issues.apache.org/jira/browse/DBCP</url>
+ </issueManagement>
+
+ <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/branches/DBCP_1_3_BRANCH</developerConnection>
+ <url>http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_3_BRANCH</url>
+ </scm>
+
+ <developers>
+ <developer>
+ <name>Morgan Delagrange</name>
+ <id>morgand</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Geir Magnusson</name>
+ <id>geirm</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Craig McClanahan</name>
+ <id>craigmcc</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>John McNally</name>
+ <id>jmcnally</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Martin Poeschl</name>
+ <id>mpoeschl</id>
+ <email>mpoeschl@marmot.at</email>
+ <organization>tucana.at</organization>
+ </developer>
+ <developer>
+ <name>Rodney Waldhoff</name>
+ <id>rwaldhoff</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>David Weinrich</name>
+ <id>dweinr1</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Dirk Verbeeck</name>
+ <id>dirkv</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Yoav Shapira</name>
+ <id>yoavs</id>
+ <email>yoavs@apache.org</email>
+ <organization>Apache Software Foundation</organization>
+ </developer>
+ <developer>
+ <name>Phil Steitz</name>
+ <id>psteitz</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Jörg Schaible</name>
+ <id>joehni</id>
+ <email>joerg.schaible@gmx.de</email>
+ <organization></organization>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <name>Mark Thomas</name>
+ <id>markt</id>
+ <email>markt@apache.org</email>
+ <organization>Apache Software Foundation</organization>
+ </developer>
+ </developers>
+ <contributors>
+ <contributor>
+ <name>Todd Carmichael</name>
+ <email>toddc@concur.com</email>
+ </contributor>
+ <contributor>
+ <name>Wayne Woodfield</name>
+ </contributor>
+ <contributor>
+ <name>Dain Sundstrom</name>
+ <email>dain@apache.org</email>
+ </contributor>
+ <contributor>
+ <name>Philippe Mouawad</name>
+ </contributor>
+ </contributors>
+
+ <dependencies>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.5.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- For managed connections -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1</version>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- tomcat naming jars for jndi reference tests -->
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>naming-common</artifactId>
+ <version>5.0.28</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>naming-java</artifactId>
+ <version>5.0.28</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- dragged in by tomcat-naming jars - only for jndi tests -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- for testing of managed connections -->
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-transaction</artifactId>
+ <version>1.2-beta</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- required under jdk 1.4 so jocl can have a sax parser -->
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.3.04</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.4.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <!-- 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.3</commons.release.version>
+ <commons.jira.id>DBCP</commons.jira.id>
+ <commons.jira.pid>12310469</commons.jira.pid>
+ </properties>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/test</directory>
+ <includes>
+ <include>testpool.jocl</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>.</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/src/test</directory>
+ <includes>
+ <include>testpool.jocl</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <!-- Specify cobertura version for "cobertura:cobertura" goal -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <reportFormat>plain</reportFormat>
+ <includes>
+ <include>org/apache/commons/dbcp/TestAbandonedObjectPool.java</include>
+ <include>org/apache/commons/jocl/TestJOCLContentHandler.java</include>
+ <include>org/apache/commons/dbcp/TestDelegatingConnection.java</include>
+ <include>org/apache/commons/dbcp/TestPoolableConnection.java</include>
+ <include>org/apache/commons/dbcp/TestDelegatingPreparedStatement.java</include>
+ <include>org/apache/commons/dbcp/TestDelegatingStatement.java</include>
+ <include>org/apache/commons/dbcp/TestJOCLed.java</include>
+ <include>org/apache/commons/dbcp/TestManual.java</include>
+
+ <include>org/apache/commons/dbcp/TestBasicDataSourceFactory.java</include>
+ <include>org/apache/commons/dbcp/TestBasicDataSource.java</include>
+ <include>org/apache/commons/dbcp/TestAbandonedBasicDataSource.java</include>
+ <include>org/apache/commons/dbcp/TestPStmtPooling.java</include>
+ <include>org/apache/commons/dbcp/TestPStmtPoolingBasicDataSource.java</include>
+ <include>org/apache/commons/dbcp/TestPoolingDataSource.java</include>
+ <include>org/apache/commons/dbcp/TestJndi.java</include>
+
+ <include>org/apache/commons/dbcp/cpdsadapter/TestDriverAdapterCPDS.java</include>
+
+ <include>org/apache/commons/dbcp/datasources/TestFactory.java</include>
+ <include>org/apache/commons/dbcp/datasources/TestCPDSConnectionFactory.java</include>
+ <include>org/apache/commons/dbcp/datasources/TestKeyedCPDSConnectionFactory.java</include>
+ <include>org/apache/commons/dbcp/datasources/TestPerUserPoolDataSource.java</include>
+ <include>org/apache/commons/dbcp/datasources/TestSharedPoolDataSource.java</include>
+ <include>org/apache/commons/dbcp/datasources/TestInstanceKeyDataSource.java</include>
+
+ <include>org/apache/commons/dbcp/managed/TestBasicManagedDataSource.java</include>
+ <include>org/apache/commons/dbcp/managed/TestManagedDataSource.java</include>
+ <include>org/apache/commons/dbcp/managed/TestManagedDataSourceInTx.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/bin.xml</descriptor>
+ <descriptor>src/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+ <link>http://commons.apache.org/pool/api-1.5.4</link>
+ <link>http://java.sun.com/j2ee/sdk_1.3/techdocs/api</link>
+ </links>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <xmlPath>${basedir}/xdocs/changes.xml</xmlPath>
+ <issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <configLocation>${basedir}/checkstyle.xml</configLocation>
+ <enableRulesSummary>false</enableRulesSummary>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <rulesets>
+ <ruleset>checkstyle.xml</ruleset>
+ </rulesets>
+ <targetJdk>${maven.compile.target}</targetJdk>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <version>2.2.2</version>
+ <configuration>
+ <comparisonVersion>1.2.2</comparisonVersion>
+ <minSeverity>info</minSeverity>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
diff --git a/pom.xml b/pom.xml
index 2e85830..4896e4a 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.3</version>
+ <version>1.4</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/branches/DBCP_1_3_BRANCH</developerConnection>
- <url>http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_3_BRANCH</url>
+ <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>
</scm>
<developers>
@@ -163,7 +163,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.1</version>
+ <version>1.1.1</version>
<optional>true</optional>
</dependency>
@@ -197,28 +197,15 @@
<version>1.2-beta</version>
<scope>test</scope>
</dependency>
-
- <!-- required under jdk 1.4 so jocl can have a sax parser -->
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.3.04</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.4.0</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<properties>
- <!-- 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>
+ <!-- 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>
<commons.componentid>dbcp</commons.componentid>
- <commons.release.version>1.3</commons.release.version>
+ <commons.release.version>1.4</commons.release.version>
<commons.jira.id>DBCP</commons.jira.id>
<commons.jira.pid>12310469</commons.jira.pid>
</properties>
@@ -320,6 +307,11 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.4</version>
@@ -338,6 +330,8 @@
<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/release-process.txt b/release-process.txt
index 0b2f2b0..763decb 100644
--- a/release-process.txt
+++ b/release-process.txt
@@ -42,6 +42,7 @@
9. From the DBCP_1_3_x_BRANCH
svn rm pom.xml
svn rm build.xml
+ svn rm findbugs-exclude-filter.xml
svn mv build-1.3.xml build.xml
svn mv pom-1.3.xml pom.xml
@@ -58,7 +59,7 @@
svn commit -m "Tagging 1.3.x RCy" tags/DBCP_1_3_x_RCy
svn commit -m "Tagging 1.4.x RCy" tags/DBCP_1_4_x_RCy
-12. From a fresh checkout of the DBCP_1_4_x_RCy tag, execute
+12. From a fresh checkout of the DBCP_1_4_x_RCy tag, using JDK 1.6 execute
mvn -Prc install
13. From a fresh checkout of the DBCP_1_3_x_RCy tag using JDK 1.5,
diff --git a/src/java/org/apache/commons/dbcp/BasicDataSource.java b/src/java/org/apache/commons/dbcp/BasicDataSource.java
index 239eee5..6649b5d 100644
--- a/src/java/org/apache/commons/dbcp/BasicDataSource.java
+++ b/src/java/org/apache/commons/dbcp/BasicDataSource.java
@@ -1330,7 +1330,7 @@
return closed;
}
- /*
+ /* JDBC_4_ANT_KEY_BEGIN */
public boolean isWrapperFor(Class<?> iface) throws SQLException {
return false;
}
@@ -1338,7 +1338,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 ad666f6..0642840 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 334bc5d..774b445 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 ecaa621..df88046 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 fcb650d..a7af77d 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 2ea1c86..5aa2e63 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 ca6280a..4aa56b0 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 ea91fd6..9f46b5a 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 981fbb0..ef3a2b0 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 337d033..05b1b6b 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 0e1f491..f6ef529 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 4afd0ab..801929a 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 95b8501..8ec949b 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 56c26f1..017cd7a 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 7cec55a..e757f14 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 3268d02..bb2bf5f 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 0c20986..0d367d2 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 8b37cff..26a12b3 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
