Index: java/io/Externalizable.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/Externalizable.java,v
retrieving revision 1.12
diff -u -r1.12 Externalizable.java
--- java/io/Externalizable.java	12 Oct 2003 15:49:19 -0000	1.12
+++ java/io/Externalizable.java	18 Jan 2005 09:42:02 -0000
@@ -60,8 +60,6 @@
  */
 public interface Externalizable extends Serializable
 {
-  long serialVersionUID = -282491828744381764L;
-
   /**
    * This method restores an object's state by reading in the instance data
    * for the object from the passed in stream.  Note that this stream is not
Index: java/io/Serializable.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/Serializable.java,v
retrieving revision 1.9
diff -u -r1.9 Serializable.java
--- java/io/Serializable.java	12 Oct 2003 15:49:20 -0000	1.9
+++ java/io/Serializable.java	18 Jan 2005 09:42:02 -0000
@@ -51,5 +51,4 @@
   */
 public interface Serializable
 {
-  long serialVersionUID = 1196656838076753133L;
 } // interface Serializable
Index: java/rmi/server/RemoteObject.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/RemoteObject.java,v
retrieving revision 1.5
diff -u -r1.5 RemoteObject.java
--- java/rmi/server/RemoteObject.java	15 Oct 2004 10:43:50 -0000	1.5
+++ java/rmi/server/RemoteObject.java	18 Jan 2005 09:42:05 -0000
@@ -49,7 +49,7 @@
 public abstract class RemoteObject
 	implements Remote, Serializable {
 
-public static final long serialVersionUID = -3215090123894869218l;
+private static final long serialVersionUID = -3215090123894869218l;
 
 protected transient RemoteRef ref;
 
Index: java/rmi/server/RemoteRef.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/RemoteRef.java,v
retrieving revision 1.6
diff -u -r1.6 RemoteRef.java
--- java/rmi/server/RemoteRef.java	15 Oct 2004 14:40:18 -0000	1.6
+++ java/rmi/server/RemoteRef.java	18 Jan 2005 09:42:05 -0000
@@ -46,7 +46,7 @@
 
 public interface RemoteRef extends Externalizable
 {
-  long serialVersionUID = 0;
+  long serialVersionUID = 3632638527362204081L;
   
   String packagePrefix = "gnu.java.rmi.server";
 
Index: java/rmi/server/ServerRef.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/ServerRef.java,v
retrieving revision 1.6
diff -u -r1.6 ServerRef.java
--- java/rmi/server/ServerRef.java	21 Oct 2004 20:14:51 -0000	1.6
+++ java/rmi/server/ServerRef.java	18 Jan 2005 09:42:05 -0000
@@ -43,7 +43,7 @@
 
 public interface ServerRef extends RemoteRef
 {
-  long serialVersionUID = 0;
+  long serialVersionUID = -4557750989390278438L;
 
   RemoteStub exportObject(Remote obj, Object data) throws RemoteException;
 
Index: java/rmi/server/UID.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/UID.java,v
retrieving revision 1.5
diff -u -r1.5 UID.java
--- java/rmi/server/UID.java	21 Oct 2004 20:14:51 -0000	1.5
+++ java/rmi/server/UID.java	18 Jan 2005 09:42:05 -0000
@@ -45,7 +45,7 @@
 
 public final class UID implements Serializable
 {
-public static final long serialVersionUID = 1086053664494604050L;
+private static final long serialVersionUID = 1086053664494604050L;
 
 private static final Object lock = UID.class;
 private static long baseTime = System.currentTimeMillis();
Index: java/security/interfaces/DSAPrivateKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/interfaces/DSAPrivateKey.java,v
retrieving revision 1.6
diff -u -r1.6 DSAPrivateKey.java
--- java/security/interfaces/DSAPrivateKey.java	23 Apr 2004 18:14:04 -0000	1.6
+++ java/security/interfaces/DSAPrivateKey.java	18 Jan 2005 09:42:06 -0000
@@ -50,6 +50,11 @@
 public interface DSAPrivateKey extends DSAKey, PrivateKey
 {
   /**
+   * The version identifier used for serialization.
+   */
+  long serialVersionUID = 7776497482533790279L;
+
+  /**
    * This method returns the value of the DSA private key
    */
   BigInteger getX();
Index: java/security/interfaces/DSAPublicKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/interfaces/DSAPublicKey.java,v
retrieving revision 1.6
diff -u -r1.6 DSAPublicKey.java
--- java/security/interfaces/DSAPublicKey.java	23 Apr 2004 18:14:04 -0000	1.6
+++ java/security/interfaces/DSAPublicKey.java	18 Jan 2005 09:42:06 -0000
@@ -50,6 +50,11 @@
 public interface DSAPublicKey extends DSAKey, PublicKey
 {
   /**
+   * The version identifier used for serialization.
+   */
+  long serialVersionUID = 1234526332779022332L;
+
+  /**
    * This method returns the value of the DSA public key
    */
   BigInteger getY();
Index: java/security/interfaces/RSAMultiPrimePrivateCrtKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java,v
retrieving revision 1.1
diff -u -r1.1 RSAMultiPrimePrivateCrtKey.java
--- java/security/interfaces/RSAMultiPrimePrivateCrtKey.java	9 Mar 2003 07:00:46 -0000	1.1
+++ java/security/interfaces/RSAMultiPrimePrivateCrtKey.java	18 Jan 2005 09:42:06 -0000
@@ -54,6 +54,7 @@
 {
   // Constants
   // --------------------------------------------------------------------------
+  long serialVersionUID = 618058533534628008L;
 
   // Methods
   // --------------------------------------------------------------------------
Index: java/security/interfaces/RSAPrivateCrtKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/interfaces/RSAPrivateCrtKey.java,v
retrieving revision 1.5
diff -u -r1.5 RSAPrivateCrtKey.java
--- java/security/interfaces/RSAPrivateCrtKey.java	12 Oct 2003 15:53:15 -0000	1.5
+++ java/security/interfaces/RSAPrivateCrtKey.java	18 Jan 2005 09:42:06 -0000
@@ -49,6 +49,8 @@
  */
 public interface RSAPrivateCrtKey extends RSAPrivateKey
 {
+  long serialVersionUID = -5682214253527700368L;
+
   /**
    * Returns the public exponent for this key
    *
Index: java/security/interfaces/RSAPrivateKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/interfaces/RSAPrivateKey.java,v
retrieving revision 1.7
diff -u -r1.7 RSAPrivateKey.java
--- java/security/interfaces/RSAPrivateKey.java	23 Apr 2004 18:14:04 -0000	1.7
+++ java/security/interfaces/RSAPrivateKey.java	18 Jan 2005 09:42:06 -0000
@@ -49,6 +49,8 @@
  */
 public interface RSAPrivateKey extends PrivateKey, RSAKey
 {
+  long serialVersionUID = 5187144804936595022L;
+
   /**
    * Returns the private exponent value for this key
    *
Index: java/security/interfaces/RSAPublicKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/interfaces/RSAPublicKey.java,v
retrieving revision 1.7
diff -u -r1.7 RSAPublicKey.java
--- java/security/interfaces/RSAPublicKey.java	23 Apr 2004 18:14:04 -0000	1.7
+++ java/security/interfaces/RSAPublicKey.java	18 Jan 2005 09:42:06 -0000
@@ -49,6 +49,8 @@
  */
 public interface RSAPublicKey extends PublicKey, RSAKey
 {
+  long serialVersionUID = -8727434096241101194L;
+
   /**
    * Returns the public exponent value for this key
    *
Index: javax/crypto/SecretKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/crypto/SecretKey.java,v
retrieving revision 1.2
diff -u -r1.2 SecretKey.java
--- javax/crypto/SecretKey.java	20 Oct 2004 08:08:52 -0000	1.2
+++ javax/crypto/SecretKey.java	18 Jan 2005 09:42:08 -0000
@@ -61,4 +61,5 @@
  */
 public interface SecretKey extends Key
 {
+  long serialVersionUID = -4795878709595146952L;
 }