Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 11200 invoked from network); 30 Jan 2006 22:08:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 30 Jan 2006 22:08:15 -0000 Received: (qmail 86835 invoked by uid 500); 30 Jan 2006 22:08:14 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 86798 invoked by uid 500); 30 Jan 2006 22:08:14 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 86787 invoked by uid 99); 30 Jan 2006 22:08:14 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Jan 2006 14:08:14 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 30 Jan 2006 14:08:13 -0800 Received: (qmail 10984 invoked by uid 65534); 30 Jan 2006 22:07:53 -0000 Message-ID: <20060130220753.10980.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r373606 - in /db/derby/code/trunk/java/client/org/apache/derby/client: ClientPooledConnection40.java am/CallableStatement40.java am/PreparedStatement40.java net/NetConnection40.java Date: Mon, 30 Jan 2006 22:07:50 -0000 To: derby-commits@db.apache.org From: davidvc@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: davidvc Date: Mon Jan 30 14:07:38 2006 New Revision: 373606 URL: http://svn.apache.org/viewcvs?rev=373606&view=rev Log: DERBY-893: Contributed by Rick Hillegas. This fixes the build problems in optional jdbc4 classes introduced by the SQLException rototill. Modified: db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection40.java db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement40.java db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement40.java db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java Modified: db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection40.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection40.java?rev=373606&r1=373605&r2=373606&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection40.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection40.java Mon Jan 30 14:07:38 2006 @@ -19,6 +19,8 @@ */ package org.apache.derby.client; + +import java.sql.SQLException; import org.apache.derby.client.am.SqlException; import org.apache.derby.jdbc.ClientDataSource; import javax.sql.StatementEventListener; @@ -28,7 +30,7 @@ public ClientPooledConnection40(ClientDataSource ds, org.apache.derby.client.am.LogWriter logWriter, String user, - String password) throws SqlException { + String password) throws SQLException { super(ds,logWriter,user,password); } @@ -38,13 +40,13 @@ org.apache.derby.client.am.LogWriter logWriter, String user, String password, - int rmId) throws SqlException { + int rmId) throws SQLException { super(ds,logWriter,user,password,rmId); } public ClientPooledConnection40(ClientDataSource ds, - org.apache.derby.client.am.LogWriter logWriter) throws SqlException { + org.apache.derby.client.am.LogWriter logWriter) throws SQLException { super(ds,logWriter); } Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement40.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement40.java?rev=373606&r1=373605&r2=373606&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement40.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement40.java Mon Jan 30 14:07:38 2006 @@ -38,7 +38,7 @@ public CallableStatement40(Agent agent, Connection connection, String sql, - int type, int concurrency, int holdability) throws SQLException { + int type, int concurrency, int holdability) throws SqlException { super(agent, connection, sql, type, concurrency, holdability); ps = new PreparedStatement40(agent, connection, sql, type, concurrency, holdability, java.sql.Statement.NO_GENERATED_KEYS, null); } Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement40.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement40.java?rev=373606&r1=373605&r2=373606&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement40.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement40.java Mon Jan 30 14:07:38 2006 @@ -33,7 +33,7 @@ public PreparedStatement40(Agent agent, Connection connection, String sql, - Section section) throws SQLException { + Section section) throws SqlException { super(agent, connection,sql,section); } Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java?rev=373606&r1=373605&r2=373606&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java Mon Jan 30 14:07:38 2006 @@ -20,6 +20,7 @@ package org.apache.derby.client.net; +import org.apache.derby.client.am.SqlException; import org.apache.derby.impl.jdbc.Util; import org.apache.derby.jdbc.InternalDriver; import java.sql.Blob; @@ -41,13 +42,13 @@ public NetConnection40(NetLogWriter netLogWriter, String databaseName, - java.util.Properties properties) throws SQLException { + java.util.Properties properties) throws SqlException { super(netLogWriter,databaseName,properties); } public NetConnection40(NetLogWriter netLogWriter, org.apache.derby.jdbc.ClientDataSource dataSource, String user, - String password) throws SQLException { + String password) throws SqlException { super(netLogWriter,dataSource,user,password); } public NetConnection40(NetLogWriter netLogWriter, @@ -55,7 +56,7 @@ String serverName, int portNumber, String databaseName, - java.util.Properties properties) throws SQLException{ + java.util.Properties properties) throws SqlException{ super(netLogWriter,driverManagerLoginTimeout,serverName,portNumber,databaseName,properties); } public NetConnection40(NetLogWriter netLogWriter, @@ -63,14 +64,14 @@ String password, org.apache.derby.jdbc.ClientDataSource dataSource, int rmId, - boolean isXAConn) throws SQLException{ + boolean isXAConn) throws SqlException{ super(netLogWriter,user,password,dataSource,rmId,isXAConn); } public NetConnection40(NetLogWriter netLogWriter, String ipaddr, int portNumber, org.apache.derby.jdbc.ClientDataSource dataSource, - boolean isXAConn) throws SQLException{ + boolean isXAConn) throws SqlException{ super(netLogWriter,ipaddr,portNumber,dataSource,isXAConn); }