* Makefile.am: Removed java/io/Replaceable.java and

	java/io/Resolvable.java.
	* Makefile.in: Rebuilt.
	* gcj/javaprims.h: Removed Replaceable and Resolvable from java.io
	namespace.
	* java/io/ObjectInputStream.java (processResolution): Fixed typo
	in method name.
	(processResolution): Handle readResolve method via reflection with
	removal of Resolvable interface.
	* java/io/ObjectOutputStream.java (writeObject): Handle writeReplace
	method via reflection with removal of Replaceable interface.
	* java/io/Replaceable.java: Removed.
	* java/io/Resolvable.java: Removed.
	* java/security/Key.java (serialVersionUID): New field.
	* java/security/Provider.java (serialVersionUID): New field.
	* java/security/interfaces/DSAPrivateKey.java (serialVersionUID):
	New field.
	* java/security/interfaces/DSAPublicKey.java (serialVersionUID):
        New field.
	* java/sql/DataTruncation.java (serialVersionUID): New field.
	* java/sql/SQLException.java (serialVersionUID): New field.
	* java/sql/SQLWarning.java (serialVersionUID): New field.
	* java/util/Date.java (serialVersionUID): New field.
	(millis): Made transient.
	(readObject): New method.
	(writeObject): New method.

Serialization mods.
Note:  The interfaces java.io.Replaceable and java.io.Resolvable were only
temporary additions to JDK 1.2 beta versions and were not included
in the JDK 1.2 final.  The Serialization spec instructs how to deal
with their methods (via reflection).


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36736 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 6 insertions, 7 deletions

diff --git a/libjava/java/security/Key.java b/libjava/java/security/Key.java
index b3f2bef0432..ae73bf691b0 100644
--- a/libjava/java/security/Key.java
+++ b/libjava/java/security/Key.java
@@ -20,8 +20,7 @@ import java.io.Serializable;
  
 public interface Key extends Serializable
 {
-  // FIXME: need to set this at some point when serialization is implemented.
-  // public static final long serialVersionUID = 0L;
+  public static final long serialVersionUID = 6603384152749567654L;
 
   public String getAlgorithm();
   public String getFormat();
diff --git a/libjava/java/security/Provider.java b/libjava/java/security/Provider.java
index d0a969f8c5e..fbaa3c013d0 100644
--- a/libjava/java/security/Provider.java
+++ b/libjava/java/security/Provider.java
@@ -1,5 +1,5 @@
 /* Provider.java -- Security provider information
-   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -68,6 +68,8 @@ private String name;
   */
 private double version;
 
+private static final long serialVersionUID = -4298000515446427739L;
+
 /*************************************************************************/
 
 /*
diff --git a/libjava/java/security/interfaces/DSAPrivateKey.java b/libjava/java/security/interfaces/DSAPrivateKey.java
index c0efe21b490..5d70136d385 100644
--- a/libjava/java/security/interfaces/DSAPrivateKey.java
+++ b/libjava/java/security/interfaces/DSAPrivateKey.java
@@ -21,8 +21,7 @@ import java.math.BigInteger;
  
 public interface DSAPrivateKey extends DSAKey, PrivateKey
 {
-  // FIXME: need to set this at some point when serialization is implemented.
-  // public static final long serialVersionUID = 0L;
+  public static final long serialVersionUID = 7776497482533790279L;
 
   public BigInteger getX();
 }
diff --git a/libjava/java/security/interfaces/DSAPublicKey.java b/libjava/java/security/interfaces/DSAPublicKey.java
index 43eedaf1e84..a8bb88544ee 100644
--- a/libjava/java/security/interfaces/DSAPublicKey.java
+++ b/libjava/java/security/interfaces/DSAPublicKey.java
@@ -21,8 +21,7 @@ import java.math.BigInteger;
  
 public interface DSAPublicKey extends DSAKey, PublicKey
 {
-  // FIXME: need to set this at some point when serialization is implemented.
-  // public static final long serialVersionUID = 0L;
+  public static final long serialVersionUID = 1234526332779022332L;
 
   public BigInteger getY();
 }