commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@apache.org
Subject cvs commit: jakarta-commons/dbcp/src/test/org/apache/commons/dbcp TesterConnection.java TesterPreparedStatement.java TesterResultSet.java TesterStatement.java
Date Tue, 19 Mar 2002 06:05:34 GMT
craigmcc    02/03/18 22:05:34

  Modified:    dbcp     build.xml
               dbcp/src/java/org/apache/commons/dbcp
                        DelegatingConnection.java
                        DelegatingPreparedStatement.java
                        DelegatingStatement.java
               dbcp/src/test/org/apache/commons/dbcp TesterConnection.java
                        TesterPreparedStatement.java TesterResultSet.java
                        TesterStatement.java
  Log:
  Implement the proposed changes required to make the commons-dbcp project compile under
  either JDK 1.3 or JDK 1.4.  The solution is based on using Ant <replace> tasks to
remove
  comment statements in a 1.4 environment so that the required extra method calls will be
  compiled.
  
  Submitted by:	Lev Assinovsky <lev at peterlink.ru> and
                  John McNally <jmcnally at collab.net>
  
  Revision  Changes    Path
  1.7       +37 -9     jakarta-commons/dbcp/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/dbcp/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml	19 Mar 2002 02:09:55 -0000	1.6
  +++ build.xml	19 Mar 2002 06:05:34 -0000	1.7
  @@ -1,4 +1,4 @@
  -<!-- $Id: build.xml,v 1.6 2002/03/19 02:09:55 jefft Exp $ -->
  +<!-- $Id: build.xml,v 1.7 2002/03/19 06:05:34 craigmcc Exp $ -->
   <project name="jakarta-commons-dbcp" default="test" basedir=".">
   
      <!-- patternset describing files to be copied from the doc directory -->
  @@ -49,9 +49,9 @@
         <property name="Name-Long" value="Jakarta Commons Database Connection Pool"/>
   
         <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="test.failonerror" value="true" />
  +      <property name="test.runner" value="junit.textui.TestRunner" />
  +
         <property name="workdir" value="${java.io.tmpdir}/buildtemp_${DSTAMP}${TSTAMP}"/>
         <property name="source" value="${basedir}"/>
         <property name="source.src" value="${basedir}/src"/>
  @@ -59,6 +59,7 @@
         <property name="source.src.test" value="${source.src}/test"/>
         <property name="source.doc" value="${basedir}/doc"/>
         <property name="dest" value="${basedir}/dist"/>
  +      <property name="dest.src" value="${dest}/src"/>
         <property name="dest.classes" value="${dest}/classes"/>
         <property name="dest.doc" value="${dest}/docs"/>
         <property name="dest.doc.api" value="${dest.doc}/api"/>
  @@ -66,9 +67,10 @@
         <property name="dest.jardir.jar" value="${dest.jardir}/${name}.jar"/>
   
         <available property="available-doc" file="${source.doc}"/> <!-- does this
module have docs? -->
  -      <available property="available-src-java" file="${source.src.java}"/> <!--
does this module have java src? -->      
  -      <available property="available-src-test" file="${source.src.test}"/> <!--
does this module have test src? -->      
  +      <available property="available-src-java" file="${source.src.java}"/> <!--
does this module have java src? -->
  +      <available property="available-src-test" file="${source.src.test}"/> <!--
does this module have test src? -->
         <available property="jndi.present" classname="javax.naming.Context"/>
  +      <available property="jdbc3.present" classname="java.sql.Savepoint"/>
   
      </target>
   
  @@ -171,10 +173,28 @@
   
      <target name="build" depends="init,build-java" description="compiles source files"/>
   
  -   <target name="build-java" depends="init" if="available-src-java">
  +   <target name="copy-src" depends="init">
  +      <mkdir dir="${dest.src}"/>
  +      <!-- the source code directory -->
  +      <copy todir="${dest.src}/org" filtering="yes">
  +         <fileset dir="${source.src.java}" defaultexcludes="no">
  +            <include name="**/*.java"/>
  +            <include name="**/*.xml"/>
  +            <include name="**/*.properties"/>
  +            <include name="**/package.html"/>
  +         </fileset>
  +      </copy>
  +   </target>
  +
  +   <target name="prepare-jdbc3" if="jdbc3.present">
  +      <replace dir="${dest.src}" token="/* JDBC_3_ANT_KEY" value=""/>
  +      <replace dir="${dest.src}" token="JDBC_3_ANT_KEY */" value=""/>
  +   </target>
  +
  +   <target name="build-java" depends="copy-src,prepare-jdbc3" if="available-src-java">
         <mkdir dir="${dest.classes}"/>
         <javac destdir="${dest.classes}"
  -             srcdir="${source.src.java}"
  +             srcdir="${dest.src}"
                classpath="${classpath}"
                debug="false"
                deprecation="true"
  @@ -185,9 +205,17 @@
      </target>
   
      <target name="build-test" depends="init,build-java" if="available-src-test">
  +      <mkdir dir="${dest.src}"/>
  +      <!-- the source code directory -->
  +      <copy todir="${dest.src}/org" filtering="yes">
  +        <fileset dir="${source.src.test}" defaultexcludes="no">
  +          <include name="**/*.java"/>
  +        </fileset>
  +      </copy>
  +      <antcall target="prepare-jdbc3"/>
         <mkdir dir="${dest.classes}"/>
         <javac destdir="${dest.classes}"
  -             srcdir="${source.src.test}"
  +             srcdir="${dest.src}"
                classpath="${classpath}"
                debug="false"
                deprecation="true"
  
  
  
  1.2       +89 -4     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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DelegatingConnection.java	14 Apr 2001 17:15:17 -0000	1.1
  +++ DelegatingConnection.java	19 Mar 2002 06:05:34 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/DelegatingConnection.java,v
1.1 2001/04/14 17:15:17 rwaldhoff Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/04/14 17:15:17 $
  + * $Header: /home/cvs/jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/DelegatingConnection.java,v
1.2 2002/03/19 06:05:34 craigmcc Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/03/19 06:05:34 $
    *
    * ====================================================================
    *
  @@ -73,7 +73,7 @@
    * provided in my constructor.
    *
    * @author Rodney Waldhoff
  - * @version $Id: DelegatingConnection.java,v 1.1 2001/04/14 17:15:17 rwaldhoff Exp $
  + * @version $Id: DelegatingConnection.java,v 1.2 2002/03/19 06:05:34 craigmcc Exp $
    */
   public class DelegatingConnection implements Connection {
       /** My delegate {@link Connection}. */
  @@ -172,4 +172,89 @@
               ((DelegatingConnection)_conn).passivate();
           }
       }
  -}
  \ No newline at end of file
  +
  +    // ------------------- JDBC 3.0 -----------------------------------------
  +    // Will be uncommented by the build process on a JDBC 3.0 system
  +
  +/* JDBC_3_ANT_KEY
  +
  +    public int getHoldability() throws SQLException {
  +        checkOpen();
  +        return _conn.getHoldability();
  +    }
  +
  +    public void setHoldability(int holdability) throws SQLException {
  +        checkOpen();
  +        _conn.setHoldability(holdability);
  +    }
  +
  +    public java.sql.Savepoint setSavepoint() throws SQLException {
  +        checkOpen();
  +        return _conn.setSavepoint();
  +    }
  +
  +    public java.sql.Savepoint setSavepoint(String name) throws SQLException {
  +        checkOpen();
  +        return _conn.setSavepoint(name);
  +    }
  +
  +    public void rollback(java.sql.Savepoint savepoint) throws SQLException {
  +        checkOpen();
  +        _conn.rollback(savepoint);
  +    }
  +
  +    public void releaseSavepoint(java.sql.Savepoint savepoint) throws SQLException {
  +        checkOpen();
  +        _conn.releaseSavepoint(savepoint);
  +    }
  +
  +    public Statement createStatement(int resultSetType,
  +                                     int resultSetConcurrency,
  +                                     int resultSetHoldability)
  +        throws SQLException {
  +        checkOpen();
  +        return _conn.createStatement(resultSetType, resultSetConcurrency,
  +                                     resultSetHoldability);
  +    }
  +
  +    public PreparedStatement prepareStatement(String sql, int resultSetType,
  +                                              int resultSetConcurrency,
  +                                              int resultSetHoldability)
  +        throws SQLException {
  +        checkOpen();
  +        return _conn.prepareStatement(sql, resultSetType,
  +                                      resultSetConcurrency,
  +                                      resultSetHoldability);
  +    }
  +
  +    public CallableStatement prepareCall(String sql, int resultSetType,
  +                                         int resultSetConcurrency,
  +                                         int resultSetHoldability)
  +        throws SQLException {
  +        checkOpen();
  +        return _conn.prepareCall(sql, resultSetType,
  +                                 resultSetConcurrency,
  +                                 resultSetHoldability);
  +    }
  +
  +    public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys)
  +        throws SQLException {
  +        checkOpen();
  +        return _conn.prepareStatement(sql, autoGeneratedKeys);
  +    }
  +
  +    public PreparedStatement prepareStatement(String sql, int columnIndexes[])
  +        throws SQLException {
  +        checkOpen();
  +        return _conn.prepareStatement(sql, columnIndexes);
  +    }
  +
  +    public PreparedStatement prepareStatement(String sql, String columnNames[])
  +        throws SQLException {
  +        checkOpen();
  +        return _conn.prepareStatement(sql, columnNames);
  +    }
  +
  +JDBC_3_ANT_KEY */
  +
  +}
  
  
  
  1.2       +73 -3     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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DelegatingPreparedStatement.java	14 Apr 2001 17:15:22 -0000	1.1
  +++ DelegatingPreparedStatement.java	19 Mar 2002 06:05:34 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java,v
1.1 2001/04/14 17:15:22 rwaldhoff Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/04/14 17:15:22 $
  + * $Header: /home/cvs/jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java,v
1.2 2002/03/19 06:05:34 craigmcc Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/03/19 06:05:34 $
    *
    * ====================================================================
    *
  @@ -215,4 +215,74 @@
       }
   
       protected boolean _closed = false;
  -}
  \ No newline at end of file
  +
  +    // ------------------- JDBC 3.0 -----------------------------------------
  +    // Will be uncommented by the build process on a JDBC 3.0 system
  +
  +/* JDBC_3_ANT_KEY
  +
  +    public boolean getMoreResults(int current) throws SQLException {
  +        checkOpen();
  +        return _stmt.getMoreResults(current);
  +    }
  +
  +    public ResultSet getGeneratedKeys() throws SQLException {
  +        checkOpen();
  +        return _stmt.getGeneratedKeys();
  +    }
  +
  +    public int executeUpdate(String sql, int autoGeneratedKeys)
  +        throws SQLException {
  +        checkOpen();
  +        return _stmt.executeUpdate(sql, autoGeneratedKeys);
  +    }
  +
  +    public int executeUpdate(String sql, int columnIndexes[])
  +        throws SQLException {
  +        checkOpen();
  +        return _stmt.executeUpdate(sql, columnIndexes);
  +    }
  +
  +    public int executeUpdate(String sql, String columnNames[])
  +        throws SQLException {
  +        checkOpen();
  +        return _stmt.executeUpdate(sql, columnNames);
  +    }
  +
  +    public boolean execute(String sql, int autoGeneratedKeys)
  +        throws SQLException {
  +        checkOpen();
  +        return _stmt.execute(sql, autoGeneratedKeys);
  +    }
  +
  +    public boolean execute(String sql, int columnIndexes[])
  +        throws SQLException {
  +        checkOpen();
  +        return _stmt.execute(sql, columnIndexes);
  +    }
  +
  +    public boolean execute(String sql, String columnNames[])
  +        throws SQLException {
  +        checkOpen();
  +        return _stmt.execute(sql, columnNames);
  +    }
  +
  +    public int getResultSetHoldability() throws SQLException {
  +        checkOpen();
  +        return _stmt.getResultSetHoldability();
  +    }
  +
  +    public void setURL(int parameterIndex, java.net.URL x)
  +        throws SQLException {
  +        checkOpen();
  +        _stmt.setURL(parameterIndex, x);
  +    }
  +
  +    public ParameterMetaData getParameterMetaData() throws SQLException {
  +        checkOpen();
  +        return _stmt.getParameterMetaData();
  +    }
  +
  +JDBC_3_ANT_KEY */
  +
  +}
  
  
  
  1.2       +62 -3     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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DelegatingStatement.java	14 Apr 2001 17:15:27 -0000	1.1
  +++ DelegatingStatement.java	19 Mar 2002 06:05:34 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/DelegatingStatement.java,v
1.1 2001/04/14 17:15:27 rwaldhoff Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/04/14 17:15:27 $
  + * $Header: /home/cvs/jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/DelegatingStatement.java,v
1.2 2002/03/19 06:05:34 craigmcc Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/03/19 06:05:34 $
    *
    * ====================================================================
    *
  @@ -174,4 +174,63 @@
       }
   
       protected boolean _closed = false;
  -}
  \ No newline at end of file
  +
  +    // ------------------- JDBC 3.0 -----------------------------------------
  +    // Will be uncommented by the build process on a JDBC 3.0 system
  +
  +/* JDBC_3_ANT_KEY
  +
  +    public boolean getMoreResults(int current) throws SQLException {
  +        checkOpen();
  +        return _stmt.getMoreResults(current);
  +    }
  +
  +    public ResultSet getGeneratedKeys() throws SQLException {
  +        checkOpen();
  +        return _stmt.getGeneratedKeys();
  +    }
  +
  +    public int executeUpdate(String sql, int autoGeneratedKeys)
  +        throws SQLException {
  +        checkOpen();
  +        return _stmt.executeUpdate(sql, autoGeneratedKeys);
  +    }
  +
  +    public int executeUpdate(String sql, int columnIndexes[])
  +        throws SQLException {
  +        checkOpen();
  +        return _stmt.executeUpdate(sql, columnIndexes);
  +    }
  +
  +    public int executeUpdate(String sql, String columnNames[])
  +        throws SQLException {
  +        checkOpen();
  +        return _stmt.executeUpdate(sql, columnNames);
  +    }
  +
  +    public boolean execute(String sql, int autoGeneratedKeys)
  +        throws SQLException {
  +        checkOpen();
  +        return _stmt.execute(sql, autoGeneratedKeys);
  +    }
  +
  +    public boolean execute(String sql, int columnIndexes[])
  +        throws SQLException {
  +        checkOpen();
  +        return _stmt.execute(sql, columnIndexes);
  +    }
  +
  +    public boolean execute(String sql, String columnNames[])
  +        throws SQLException {
  +        checkOpen();
  +        return _stmt.execute(sql, columnNames);
  +    }
  +
  +    public int getResultSetHoldability() throws SQLException {
  +        checkOpen();
  +        return _stmt.getResultSetHoldability();
  +    }
  +
  +JDBC_3_ANT_KEY */
  +
  +}
  
  
  
  1.2       +70 -3     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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TesterConnection.java	14 Apr 2001 17:16:27 -0000	1.1
  +++ TesterConnection.java	19 Mar 2002 06:05:34 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/dbcp/src/test/org/apache/commons/dbcp/TesterConnection.java,v
1.1 2001/04/14 17:16:27 rwaldhoff Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/04/14 17:16:27 $
  + * $Header: /home/cvs/jakarta-commons/dbcp/src/test/org/apache/commons/dbcp/TesterConnection.java,v
1.2 2002/03/19 06:05:34 craigmcc Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/03/19 06:05:34 $
    *
    * ====================================================================
    *
  @@ -67,7 +67,7 @@
   /**
    * A dummy {@link Connection}, for testing purposes.
    * @author Rodney Waldhoff
  - * @version $Id: TesterConnection.java,v 1.1 2001/04/14 17:16:27 rwaldhoff Exp $
  + * @version $Id: TesterConnection.java,v 1.2 2002/03/19 06:05:34 craigmcc Exp $
    */
   public class TesterConnection implements Connection {
       protected boolean _open = true;
  @@ -199,4 +199,71 @@
               throw new SQLException("Connection is closed.");
           }
       }
  +    // ------------------- JDBC 3.0 -----------------------------------------
  +    // Will be uncommented by the build process on a JDBC 3.0 system
  +
  +/* JDBC_3_ANT_KEY
  +
  +    public int getHoldability() throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public void setHoldability(int holdability) throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public java.sql.Savepoint setSavepoint() throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public java.sql.Savepoint setSavepoint(String name) throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public void rollback(java.sql.Savepoint savepoint) throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public void releaseSavepoint(java.sql.Savepoint savepoint) throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public Statement createStatement(int resultSetType,
  +                                     int resultSetConcurrency,
  +                                     int resultSetHoldability)
  +        throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public PreparedStatement prepareStatement(String sql, int resultSetType,
  +                                              int resultSetConcurrency,
  +                                              int resultSetHoldability)
  +        throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public CallableStatement prepareCall(String sql, int resultSetType,
  +                                         int resultSetConcurrency,
  +                                         int resultSetHoldability)
  +        throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys)
  +        throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public PreparedStatement prepareStatement(String sql, int columnIndexes[])
  +        throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public PreparedStatement prepareStatement(String sql, String columnNames[])
  +        throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +JDBC_3_ANT_KEY */
  +
   }
  
  
  
  1.2       +63 -2     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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TesterPreparedStatement.java	14 Apr 2001 17:16:40 -0000	1.1
  +++ TesterPreparedStatement.java	19 Mar 2002 06:05:34 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/dbcp/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java,v
1.1 2001/04/14 17:16:40 rwaldhoff Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/04/14 17:16:40 $
  + * $Header: /home/cvs/jakarta-commons/dbcp/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java,v
1.2 2002/03/19 06:05:34 craigmcc Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/03/19 06:05:34 $
    *
    * ====================================================================
    *
  @@ -232,4 +232,65 @@
       public void setNull (int paramIndex, int sqlType, String typeName) throws SQLException
{
           checkOpen();
       }
  +
  +
  +    // ------------------- JDBC 3.0 -----------------------------------------
  +    // Will be uncommented by the build process on a JDBC 3.0 system
  +
  +/* JDBC_3_ANT_KEY
  +
  +    public boolean getMoreResults(int current) throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public ResultSet getGeneratedKeys() throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +
  +    public int executeUpdate(String sql, int autoGeneratedKeys)
  +        throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public int executeUpdate(String sql, int columnIndexes[])
  +        throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public int executeUpdate(String sql, String columnNames[])
  +        throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public boolean execute(String sql, int autoGeneratedKeys)
  +        throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public boolean execute(String sl, int columnIndexes[])
  +        throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public boolean execute(String sql, String columnNames[])
  +        throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public int getResultSetHoldability() throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public void setURL(int parameterIndex, java.net.URL x)
  +        throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public ParameterMetaData getParameterMetaData() throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +JDBC_3_ANT_KEY */
  +
   }
  
  
  
  1.2       +48 -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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TesterResultSet.java	14 Apr 2001 17:16:37 -0000	1.1
  +++ TesterResultSet.java	19 Mar 2002 06:05:34 -0000	1.2
  @@ -622,7 +622,7 @@
           return null;
       }
   
  -    public java.sql.Timestamp getTimestamp(String columnName, Calendar cal)	
  +    public java.sql.Timestamp getTimestamp(String columnName, Calendar cal)
         throws SQLException {
           checkOpen();
           return null;
  @@ -633,14 +633,60 @@
               throw new SQLException("Connection is closed.");
           }
       }
  -}
   
  +    // ------------------- JDBC 3.0 -----------------------------------------
  +    // Will be uncommented by the build process on a JDBC 3.0 system
  +
  +/* JDBC_3_ANT_KEY
  +
  +    public java.net.URL getURL(int columnIndex) throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public java.net.URL getURL(String columnName) throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public void updateRef(int columnIndex, java.sql.Ref x)
  +        throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
   
  +    public void updateRef(String columnName, java.sql.Ref x)
  +        throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
   
  +    public void updateBlob(int columnIndex, java.sql.Blob x)
  +        throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
   
  +    public void updateBlob(String columnName, java.sql.Blob x)
  +        throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
   
  +    public void updateClob(int columnIndex, java.sql.Clob x)
  +        throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
   
  +    public void updateClob(String columnName, java.sql.Clob x)
  +        throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
   
  +    public void updateArray(int columnIndex, java.sql.Array x)
  +        throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
   
  +    public void updateArray(String columnName, java.sql.Array x)
  +        throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
   
  +JDBC_3_ANT_KEY */
   
  +}
  
  
  
  1.2       +53 -2     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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TesterStatement.java	14 Apr 2001 17:16:42 -0000	1.1
  +++ TesterStatement.java	19 Mar 2002 06:05:34 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/dbcp/src/test/org/apache/commons/dbcp/TesterStatement.java,v
1.1 2001/04/14 17:16:42 rwaldhoff Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/04/14 17:16:42 $
  + * $Header: /home/cvs/jakarta-commons/dbcp/src/test/org/apache/commons/dbcp/TesterStatement.java,v
1.2 2002/03/19 06:05:34 craigmcc Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/03/19 06:05:34 $
    *
    * ====================================================================
    *
  @@ -225,4 +225,55 @@
               throw new SQLException("Connection is closed.");
           }
       }
  +
  +    // ------------------- JDBC 3.0 -----------------------------------------
  +    // Will be uncommented by the build process on a JDBC 3.0 system
  +
  +/* JDBC_3_ANT_KEY
  +
  +    public boolean getMoreResults(int current) throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public ResultSet getGeneratedKeys() throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public int executeUpdate(String sql, int autoGeneratedKeys)
  +        throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public int executeUpdate(String sql, int columnIndexes[])
  +        throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public int executeUpdate(String sql, String columnNames[])
  +        throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public boolean execute(String sql, int autoGeneratedKeys)
  +        throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public boolean execute(String sql, int columnIndexes[])
  +        throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public boolean execute(String sql, String columnNames[])
  +        throws SQLException {
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +    public int getResultSetHoldability() throws SQLException {
  +        checkOpen();
  +        throw new SQLException("Not implemented.");
  +    }
  +
  +JDBC_3_ANT_KEY */
  +
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>


Mime
View raw message