* java/sql/Array.java: Adjusted class signature to match spec.

	* java/sql/BatchUpdateException.java: Ditto.
	* java/sql/Blob.java: Ditto.
	* java/sql/CallableStatement.java: Ditto.
	* java/sql/Clob.java: Ditto.
	* java/sql/DataTruncation.java: Ditto.
	* java/sql/Driver.java: Ditto.
	* java/sql/Ref.java: Ditto.
	* java/sql/ResultSetMetaData.java: Ditto.
	* java/sql/SQLData.java: Ditto.
	* java/sql/SQLException.java: Ditto.
	* java/sql/SQLInput.java: Ditto.
	* java/sql/SQLWarning.java: Ditto.
	* java/sql/Statement.java: Ditto.
	* java/sql/Struct.java: Ditto.
	* java/sql/Connection.java: Ditto.
	(setTransactionIsolation): Renamed to match the spec.
	* java/sql/DatabaseMetaData.java: Ditto on class signature.
	(supportsResultSetType): Renamed to match the spec.
	* java/sql/PreparedStatement.java: Ditto on class signature.
	(addBatch): New abstract method.
	* java/sql/ResultSet.java: Ditto on class signature.
	(first): returns boolean.
	(last): returns boolean.
	* java/sql/SQLOutput.java: Ditto on class signature.
	(writeAsciiStream): New abstract method.
	* java/sql/DriverManager.java (registerDriver): Throws SQLException.
	(deregisterDriver): Throws SQLException.

21 files changed, 74 insertions, 42 deletions

diff --git a/java/sql/Array.java b/java/sql/Array.java
index 4c6cfbb53..0043f934a 100644
--- a/java/sql/Array.java
+++ b/java/sql/Array.java
@@ -1,5 +1,5 @@
 /* Array.java -- Interface for accessing SQL array object
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -34,7 +34,7 @@ import java.util.Map;
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   */
-public abstract interface Array
+public interface Array
 {
 
 /**
diff --git a/java/sql/BatchUpdateException.java b/java/sql/BatchUpdateException.java
index fb0e7e1c2..ff325b48a 100644
--- a/java/sql/BatchUpdateException.java
+++ b/java/sql/BatchUpdateException.java
@@ -1,5 +1,5 @@
 /* BatchUpdateException.java -- Exception for batch oriented SQL errors
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,7 +35,6 @@ package java.sql;
   * @author Aaron M. Renn (arenn@urbanophile.com)
   */
 public class BatchUpdateException extends SQLException 
-                                  implements java.io.Serializable
 {
 
 /*************************************************************************/
diff --git a/java/sql/Blob.java b/java/sql/Blob.java
index 8cfa9d06a..79a4504d8 100644
--- a/java/sql/Blob.java
+++ b/java/sql/Blob.java
@@ -1,5 +1,5 @@
 /* Blob.java -- Access a SQL Binary Large OBject.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,7 +35,7 @@ import java.io.InputStream;
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   */
-public abstract interface Blob
+public interface Blob
 {
 
 /*************************************************************************/
diff --git a/java/sql/CallableStatement.java b/java/sql/CallableStatement.java
index bc7720215..9a1547e94 100644
--- a/java/sql/CallableStatement.java
+++ b/java/sql/CallableStatement.java
@@ -1,5 +1,5 @@
 /* CallableStatement.java -- A statement for calling stored procedures.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,7 @@ import java.util.Map;
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   */
-public abstract interface CallableStatement
+public interface CallableStatement extends PreparedStatement
 {
 
 /*************************************************************************/
diff --git a/java/sql/Clob.java b/java/sql/Clob.java
index 9dc1156f0..a3298febb 100644
--- a/java/sql/Clob.java
+++ b/java/sql/Clob.java
@@ -1,5 +1,5 @@
 /* Clob.java -- Access Character Large OBjects
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -36,7 +36,7 @@ import java.io.Reader;
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   */
-public abstract interface Clob
+public interface Clob
 {
 
 /**
diff --git a/java/sql/Connection.java b/java/sql/Connection.java
index 993c1f66f..8d986aa1b 100644
--- a/java/sql/Connection.java
+++ b/java/sql/Connection.java
@@ -34,7 +34,7 @@ import java.util.Map;
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   */
-public abstract interface Connection
+public interface Connection
 {
 
 /**
@@ -385,7 +385,7 @@ getTransactionIsolation() throws SQLException;
 /*************************************************************************/
 
 /**
-  * This method returns the current transaction isolation mode.  This must
+  * This method sets the current transaction isolation mode.  This must
   * be one of the constants defined in this interface.
   *
   * @param level The transaction isolation level.
@@ -393,7 +393,7 @@ getTransactionIsolation() throws SQLException;
   * @exception SQLException If an error occurs.
   */
 public abstract void
-getTransactionIsolation(int level) throws SQLException;
+setTransactionIsolation(int level) throws SQLException;
 
 /*************************************************************************/
 
diff --git a/java/sql/DataTruncation.java b/java/sql/DataTruncation.java
index 218defb1f..344991387 100644
--- a/java/sql/DataTruncation.java
+++ b/java/sql/DataTruncation.java
@@ -33,7 +33,7 @@ package java.sql;
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   */
-public class DataTruncation extends SQLWarning implements java.io.Serializable
+public class DataTruncation extends SQLWarning
 {
 
 /*************************************************************************/
diff --git a/java/sql/DatabaseMetaData.java b/java/sql/DatabaseMetaData.java
index 59273f29d..a643c81e9 100644
--- a/java/sql/DatabaseMetaData.java
+++ b/java/sql/DatabaseMetaData.java
@@ -33,7 +33,7 @@ package java.sql;
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   */
-public abstract interface DatabaseMetaData
+public interface DatabaseMetaData
 {
 
 /**
@@ -2473,7 +2473,7 @@ getIndexInfo(String catalog, String schema, String table, boolean unique,
   * @see ResultSet
   */
 public abstract boolean
-supportsResultType(int type) throws SQLException;
+supportsResultSetType(int type) throws SQLException;
 
 /*************************************************************************/
 
diff --git a/java/sql/Driver.java b/java/sql/Driver.java
index 0ae0da7fd..61e03e1a1 100644
--- a/java/sql/Driver.java
+++ b/java/sql/Driver.java
@@ -43,7 +43,7 @@ import java.util.Properties;
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   */
-public abstract interface Driver
+public interface Driver
 {
 
 /**
diff --git a/java/sql/DriverManager.java b/java/sql/DriverManager.java
index 59c4156e7..19d4e9ded 100644
--- a/java/sql/DriverManager.java
+++ b/java/sql/DriverManager.java
@@ -1,5 +1,5 @@
 /* DriverManager.java -- Manage JDBC drivers
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -218,9 +218,11 @@ println(String str)
   * called by the driver itself in a static initializer.
   *
   * @param driver The new <code>Driver</code> to add.
+  *
+  * @exception SQLException If an error occurs.
   */
 public static void
-registerDriver(Driver driver)
+registerDriver(Driver driver) throws SQLException
 {
   if (!drivers.contains(driver))
     drivers.addElement(driver);
@@ -232,9 +234,11 @@ registerDriver(Driver driver)
   * This method de-registers a driver from the manager.
   *
   * @param driver The <code>Driver</code> to unregister.
+  *
+  * @exception SQLException If an error occurs.
   */
 public static void
-deregisterDriver(Driver driver)
+deregisterDriver(Driver driver) throws SQLException
 {
   if (drivers.contains(driver))
     drivers.removeElement(driver);
diff --git a/java/sql/PreparedStatement.java b/java/sql/PreparedStatement.java
index bce94d280..dc8b1c4de 100644
--- a/java/sql/PreparedStatement.java
+++ b/java/sql/PreparedStatement.java
@@ -40,7 +40,7 @@ import java.util.Calendar;
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   */
-public abstract interface PreparedStatement extends Statement
+public interface PreparedStatement extends Statement
 {
 
 /**
@@ -471,6 +471,16 @@ setObject(int index, Object value, int type, int scale) throws SQLException;
 /*************************************************************************/
 
 /**
+  * This method adds a set of parameters to the batch for JDBC 2.0.
+  *
+  * @exception SQLException If an error occurs.
+  */
+public abstract void
+addBatch() throws SQLException;
+  
+/*************************************************************************/
+
+/**
   * This method clears all of the input parameter that have been
   * set on this statement.
   *
diff --git a/java/sql/Ref.java b/java/sql/Ref.java
index bfb467864..2aaecfc8c 100644
--- a/java/sql/Ref.java
+++ b/java/sql/Ref.java
@@ -1,5 +1,5 @@
 /* Ref.java -- Reference to a SQL structured type.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -33,7 +33,7 @@ package java.sql;
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   */
-public abstract interface Ref
+public interface Ref
 {
 
 /**
diff --git a/java/sql/ResultSet.java b/java/sql/ResultSet.java
index 0b65b24a0..536254fb8 100644
--- a/java/sql/ResultSet.java
+++ b/java/sql/ResultSet.java
@@ -1,5 +1,5 @@
 /* ResultSet.java -- A SQL statement result set.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -47,7 +47,7 @@ import java.util.Map;
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   */
-public abstract interface ResultSet
+public interface ResultSet
 {
 
 /**
@@ -887,10 +887,13 @@ afterLast() throws SQLException;
 /**
   * This method repositions the cursor on the first row in the
   * result set.
+  *
+  * @return <code>true</code> if the cursor is on a valid row;
+  * <code>false</code> if there are no rows in the result set.
   * 
   * @exception SQLException If an error occurs.
   */
-public abstract void
+public abstract boolean
 first() throws SQLException;
 
 /*************************************************************************/
@@ -899,9 +902,12 @@ first() throws SQLException;
   * This method repositions the cursor on the last row in the result
   * set.
   * 
+  * @return <code>true</code> if the cursor is on a valid row;
+  * <code>false</code> if there are no rows in the result set.
+  * 
   * @exception SQLException If an error occurs.
   */
-public abstract void
+public abstract boolean
 last() throws SQLException;
 
 /*************************************************************************/
diff --git a/java/sql/ResultSetMetaData.java b/java/sql/ResultSetMetaData.java
index 18353f435..edb89dad8 100644
--- a/java/sql/ResultSetMetaData.java
+++ b/java/sql/ResultSetMetaData.java
@@ -1,5 +1,5 @@
 /* ResultSetMetaData.java -- Returns information about the ResultSet
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,7 +35,7 @@ package java.sql;
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   */
-public abstract interface ResultSetMetaData
+public interface ResultSetMetaData
 {
 
 /**
diff --git a/java/sql/SQLData.java b/java/sql/SQLData.java
index 9979f29d0..8340069a1 100644
--- a/java/sql/SQLData.java
+++ b/java/sql/SQLData.java
@@ -1,5 +1,5 @@
 /* SQLData.java -- Custom mapping for a user defined datatype
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -32,7 +32,7 @@ package java.sql;
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   */
-public abstract interface SQLData
+public interface SQLData
 {
 
 /**
diff --git a/java/sql/SQLException.java b/java/sql/SQLException.java
index 2bb91e8fa..a65d94740 100644
--- a/java/sql/SQLException.java
+++ b/java/sql/SQLException.java
@@ -32,7 +32,7 @@ package java.sql;
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   */
-public class SQLException extends Exception implements java.io.Serializable
+public class SQLException extends Exception
 {
 
 /*************************************************************************/
diff --git a/java/sql/SQLInput.java b/java/sql/SQLInput.java
index 5453d22b4..2f9fd07e3 100644
--- a/java/sql/SQLInput.java
+++ b/java/sql/SQLInput.java
@@ -1,5 +1,5 @@
 /* SQLInput.java -- Read SQL values from a stream
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,7 @@ import java.math.BigDecimal;
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   */
-public abstract interface SQLInput
+public interface SQLInput
 {
 
 /*************************************************************************/
diff --git a/java/sql/SQLOutput.java b/java/sql/SQLOutput.java
index 21717f899..c73e19455 100644
--- a/java/sql/SQLOutput.java
+++ b/java/sql/SQLOutput.java
@@ -1,5 +1,5 @@
 /* SQLOutput.java -- Write SQL values to a stream
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,7 @@ import java.math.BigDecimal;
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   */
-public abstract interface SQLOutput
+public interface SQLOutput
 {
 
 /*************************************************************************/
@@ -226,7 +226,7 @@ writeCharacterStream(Reader value) throws SQLException;
 /*************************************************************************/
 
 /**
-  * This method writes the specified ASCII text stream
+  * This method writes the specified uninterpreted binary byte stream
   * to the SQL stream.
   *
   * @param value The value to write to the stream.
@@ -239,6 +239,19 @@ writeBinaryStream(InputStream value) throws SQLException;
 /*************************************************************************/
 
 /**
+  * This method writes the specified ASCII text stream
+  * to the SQL stream.
+  *
+  * @param value The value to write to the stream.
+  * 
+  * @exception SQLException If an error occurs.
+  */
+public abstract void
+writeAsciiStream(InputStream value) throws SQLException;
+
+/*************************************************************************/
+
+/**
   * This method writes the specified Java <code>SQLData</code> object
   * to the SQL stream.
   *
diff --git a/java/sql/SQLWarning.java b/java/sql/SQLWarning.java
index 6431a6f96..4f9c736ef 100644
--- a/java/sql/SQLWarning.java
+++ b/java/sql/SQLWarning.java
@@ -32,7 +32,7 @@ package java.sql;
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   */
-public class SQLWarning extends SQLException implements java.io.Serializable
+public class SQLWarning extends SQLException
 {
 
 /*************************************************************************/
diff --git a/java/sql/Statement.java b/java/sql/Statement.java
index 7a192b893..30eeeebaa 100644
--- a/java/sql/Statement.java
+++ b/java/sql/Statement.java
@@ -1,5 +1,5 @@
 /* Statement.java -- Interface for executing SQL statements.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -32,7 +32,7 @@ package java.sql;
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   */
-public abstract interface Statement
+public interface Statement
 {
 
 /**
diff --git a/java/sql/Struct.java b/java/sql/Struct.java
index efecb1363..779b5bcb3 100644
--- a/java/sql/Struct.java
+++ b/java/sql/Struct.java
@@ -1,5 +1,5 @@
 /* Struct.java -- Mapping for a SQL structured type.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,7 +35,7 @@ import java.util.Map;
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   */
-public abstract interface Struct
+public interface Struct
 {
 
 /**