You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by rw...@apache.org on 2003/03/06 01:05:00 UTC
cvs commit: jakarta-commons/dbcp/src/test/org/apache/commons/dbcp TesterConnection.java TesterPreparedStatement.java TesterResultSet.java TesterStatement.java
rwaldhoff 2003/03/05 16:04:59
Modified: dbcp build.xml
dbcp/src/java/org/apache/commons/dbcp/cpdsadapter
ConnectionImpl.java
dbcp/src/java/org/apache/commons/dbcp
DelegatingCallableStatement.java
DelegatingConnection.java
DelegatingPreparedStatement.java
DelegatingResultSet.java DelegatingStatement.java
dbcp/src/test/org/apache/commons/dbcp TesterConnection.java
TesterPreparedStatement.java TesterResultSet.java
TesterStatement.java
Log:
enable JDBC 3 methods by default, comment out only when JDBC 3 is not available
Revision Changes Path
1.18 +4 -4 jakarta-commons/dbcp/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/dbcp/build.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- build.xml 5 Mar 2003 23:39:34 -0000 1.17
+++ build.xml 6 Mar 2003 00:04:57 -0000 1.18
@@ -199,10 +199,10 @@
</copy>
</target>
- <target name="prepare-jdbc3" if="jdbc3.present">
+ <target name="prepare-jdbc3" unless="jdbc3.present">
<echo message="Uncommenting jdbc3 additional methods."/>
- <replace dir="${dest.src}" token="/* JDBC_3_ANT_KEY" value=""/>
- <replace dir="${dest.src}" token="JDBC_3_ANT_KEY */" value=""/>
+ <replace dir="${dest.src}" token="/* JDBC_3_ANT_KEY_BEGIN */" value="/*"/>
+ <replace dir="${dest.src}" token="/* JDBC_3_ANT_KEY_END */" value="*/"/>
</target>
<target name="build-java" depends="copy-src,prepare-jdbc3" if="available-src-java">
1.3 +4 -4 jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java
Index: ConnectionImpl.java
===================================================================
RCS file: /home/cvs/jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConnectionImpl.java 8 Nov 2002 18:51:07 -0000 1.2
+++ ConnectionImpl.java 6 Mar 2003 00:04:58 -0000 1.3
@@ -469,9 +469,9 @@
}
// ------------------- JDBC 3.0 -----------------------------------------
- // Will be uncommented by the build process on a JDBC 3.0 system
+ // Will be commented by the build process on a JDBC 2.0 system
-/* JDBC_3_ANT_KEY
+/* JDBC_3_ANT_KEY_BEGIN */
public int getHoldability() throws SQLException {
assertOpen();
@@ -550,5 +550,5 @@
return connection.prepareStatement(sql, columnNames);
}
-JDBC_3_ANT_KEY */
+/* JDBC_3_ANT_KEY_END */
}
1.7 +6 -6 jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java
Index: DelegatingCallableStatement.java
===================================================================
RCS file: /home/cvs/jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DelegatingCallableStatement.java 31 Oct 2002 21:14:32 -0000 1.6
+++ DelegatingCallableStatement.java 6 Mar 2003 00:04:58 -0000 1.7
@@ -261,7 +261,7 @@
// ------------------- JDBC 3.0 -----------------------------------------
// Will be uncommented by the build process on a JDBC 3.0 system
-/* JDBC_3_ANT_KEY
+/* JDBC_3_ANT_KEY_BEGIN */
public boolean getMoreResults(int current) throws SQLException {
return _stmt.getMoreResults(current);
@@ -557,6 +557,6 @@
return _stmt.getURL(parameterName);
}
-JDBC_3_ANT_KEY */
+/* JDBC_3_ANT_KEY_END */
}
1.9 +6 -6 jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/DelegatingConnection.java
Index: DelegatingConnection.java
===================================================================
RCS file: /home/cvs/jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/DelegatingConnection.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DelegatingConnection.java 1 Nov 2002 15:47:05 -0000 1.8
+++ DelegatingConnection.java 6 Mar 2003 00:04:58 -0000 1.9
@@ -276,7 +276,7 @@
// ------------------- JDBC 3.0 -----------------------------------------
// Will be uncommented by the build process on a JDBC 3.0 system
-/* JDBC_3_ANT_KEY
+/* JDBC_3_ANT_KEY_BEGIN */
public int getHoldability() throws SQLException {
checkOpen();
@@ -355,6 +355,6 @@
return _conn.prepareStatement(sql, columnNames);
}
-JDBC_3_ANT_KEY */
+/* JDBC_3_ANT_KEY_END */
}
1.8 +6 -6 jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java
Index: DelegatingPreparedStatement.java
===================================================================
RCS file: /home/cvs/jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DelegatingPreparedStatement.java 1 Nov 2002 15:42:32 -0000 1.7
+++ DelegatingPreparedStatement.java 6 Mar 2003 00:04:58 -0000 1.8
@@ -283,7 +283,7 @@
// ------------------- JDBC 3.0 -----------------------------------------
// Will be uncommented by the build process on a JDBC 3.0 system
-/* JDBC_3_ANT_KEY
+/* JDBC_3_ANT_KEY_BEGIN */
public boolean getMoreResults(int current) throws SQLException {
checkOpen();
@@ -347,6 +347,6 @@
return _stmt.getParameterMetaData();
}
-JDBC_3_ANT_KEY */
+/* JDBC_3_ANT_KEY_END */
}
1.6 +5 -5 jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/DelegatingResultSet.java
Index: DelegatingResultSet.java
===================================================================
RCS file: /home/cvs/jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/DelegatingResultSet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DelegatingResultSet.java 28 Nov 2002 19:09:36 -0000 1.5
+++ DelegatingResultSet.java 6 Mar 2003 00:04:58 -0000 1.6
@@ -279,7 +279,7 @@
// ------------------- JDBC 3.0 -----------------------------------------
// Will be uncommented by the build process on a JDBC 3.0 system
-/* JDBC_3_ANT_KEY
+/* JDBC_3_ANT_KEY_BEGIN */
public java.net.URL getURL(int columnIndex) throws SQLException {
return _res.getURL(columnIndex);
@@ -329,5 +329,5 @@
_res.updateArray(columnName, x);
}
-JDBC_3_ANT_KEY */
+/* JDBC_3_ANT_KEY_END */
}
1.7 +6 -6 jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/DelegatingStatement.java
Index: DelegatingStatement.java
===================================================================
RCS file: /home/cvs/jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/DelegatingStatement.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DelegatingStatement.java 31 Oct 2002 21:14:32 -0000 1.6
+++ DelegatingStatement.java 6 Mar 2003 00:04:58 -0000 1.7
@@ -235,7 +235,7 @@
// ------------------- JDBC 3.0 -----------------------------------------
// Will be uncommented by the build process on a JDBC 3.0 system
-/* JDBC_3_ANT_KEY
+/* JDBC_3_ANT_KEY_BEGIN */
public boolean getMoreResults(int current) throws SQLException {
checkOpen();
@@ -288,6 +288,6 @@
return _stmt.getResultSetHoldability();
}
-JDBC_3_ANT_KEY */
+/* JDBC_3_ANT_KEY_END */
}
1.3 +6 -6 jakarta-commons/dbcp/src/test/org/apache/commons/dbcp/TesterConnection.java
Index: TesterConnection.java
===================================================================
RCS file: /home/cvs/jakarta-commons/dbcp/src/test/org/apache/commons/dbcp/TesterConnection.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TesterConnection.java 19 Mar 2002 06:05:34 -0000 1.2
+++ TesterConnection.java 6 Mar 2003 00:04:59 -0000 1.3
@@ -202,7 +202,7 @@
// ------------------- JDBC 3.0 -----------------------------------------
// Will be uncommented by the build process on a JDBC 3.0 system
-/* JDBC_3_ANT_KEY
+/* JDBC_3_ANT_KEY_BEGIN */
public int getHoldability() throws SQLException {
throw new SQLException("Not implemented.");
@@ -264,6 +264,6 @@
throw new SQLException("Not implemented.");
}
-JDBC_3_ANT_KEY */
+/* JDBC_3_ANT_KEY_END */
}
1.4 +5 -5 jakarta-commons/dbcp/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java
Index: TesterPreparedStatement.java
===================================================================
RCS file: /home/cvs/jakarta-commons/dbcp/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TesterPreparedStatement.java 31 Oct 2002 21:41:50 -0000 1.3
+++ TesterPreparedStatement.java 6 Mar 2003 00:04:59 -0000 1.4
@@ -247,7 +247,7 @@
// ------------------- JDBC 3.0 -----------------------------------------
// Will be uncommented by the build process on a JDBC 3.0 system
-/* JDBC_3_ANT_KEY
+/* JDBC_3_ANT_KEY_BEGIN */
public boolean getMoreResults(int current) throws SQLException {
throw new SQLException("Not implemented.");
@@ -301,6 +301,6 @@
throw new SQLException("Not implemented.");
}
-JDBC_3_ANT_KEY */
+/* JDBC_3_ANT_KEY_END */
}
1.4 +2 -2 jakarta-commons/dbcp/src/test/org/apache/commons/dbcp/TesterResultSet.java
Index: TesterResultSet.java
===================================================================
RCS file: /home/cvs/jakarta-commons/dbcp/src/test/org/apache/commons/dbcp/TesterResultSet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TesterResultSet.java 30 Oct 2002 23:26:59 -0000 1.3
+++ TesterResultSet.java 6 Mar 2003 00:04:59 -0000 1.4
@@ -641,7 +641,7 @@
// ------------------- JDBC 3.0 -----------------------------------------
// Will be uncommented by the build process on a JDBC 3.0 system
-/* JDBC_3_ANT_KEY
+/* JDBC_3_ANT_KEY_BEGIN */
public java.net.URL getURL(int columnIndex) throws SQLException {
throw new SQLException("Not implemented.");
@@ -691,6 +691,6 @@
throw new SQLException("Not implemented.");
}
-JDBC_3_ANT_KEY */
+/* JDBC_3_ANT_KEY_END */
}
1.5 +5 -5 jakarta-commons/dbcp/src/test/org/apache/commons/dbcp/TesterStatement.java
Index: TesterStatement.java
===================================================================
RCS file: /home/cvs/jakarta-commons/dbcp/src/test/org/apache/commons/dbcp/TesterStatement.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TesterStatement.java 8 Nov 2002 18:51:07 -0000 1.4
+++ TesterStatement.java 6 Mar 2003 00:04:59 -0000 1.5
@@ -234,7 +234,7 @@
// ------------------- JDBC 3.0 -----------------------------------------
// Will be uncommented by the build process on a JDBC 3.0 system
-/* JDBC_3_ANT_KEY
+/* JDBC_3_ANT_KEY_BEGIN */
public boolean getMoreResults(int current) throws SQLException {
throw new SQLException("Not implemented.");
@@ -279,6 +279,6 @@
throw new SQLException("Not implemented.");
}
-JDBC_3_ANT_KEY */
+/* JDBC_3_ANT_KEY_END */
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org