2005-02-22 Jeroen Frijters <jeroen@frijters.net>

	* java/io/Externalizable.java,
	java/io/Serializable.java
	(serialVersionUID): Removed.
	* java/rmi/server/RemoteObject.java,
	java/rmi/server/UID.java
	(serialVersionUID): Made private.
	* java/rmi/server/RemoteRef.java,
	java/rmi/server/ServerRef.java
	(serialVersionUID): Set proper value.
	* java/security/interfaces/DSAPrivateKey.java,
	java/security/interfaces/DSAPublicKey.java,
	java/security/interfaces/RSAMultiPrimePrivateCrtKey.java,
	java/security/interfaces/RSAPrivateCrtKey.java,
	java/security/interfaces/RSAPrivateKey.java,
	java/security/interfaces/RSAPublicKey.java,
	javax/crypto/SecretKey.java
	(serialVersionUID): Added.

From-SVN: r95406

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index cb31732b2d4eb20f1acbc6fb1dbcfd85637d325c..d36ba6f38c585478fed954003a0fe820d46116e4 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,23 @@
+2005-02-22  Jeroen Frijters  <jeroen@frijters.net>
+
+       * java/io/Externalizable.java,
+       java/io/Serializable.java
+       (serialVersionUID): Removed.
+       * java/rmi/server/RemoteObject.java,
+       java/rmi/server/UID.java
+       (serialVersionUID): Made private.
+       * java/rmi/server/RemoteRef.java,
+       java/rmi/server/ServerRef.java
+       (serialVersionUID): Set proper value.
+       * java/security/interfaces/DSAPrivateKey.java,
+       java/security/interfaces/DSAPublicKey.java,
+       java/security/interfaces/RSAMultiPrimePrivateCrtKey.java,
+       java/security/interfaces/RSAPrivateCrtKey.java,
+       java/security/interfaces/RSAPrivateKey.java,
+       java/security/interfaces/RSAPublicKey.java,
+       javax/crypto/SecretKey.java
+       (serialVersionUID): Added.
+
 2005-02-22  Tom Tromey  <tromey@redhat.com>
 
        * java/lang/Object.h (_JvObjectPrefix): Declare as extern "Java".

diff --git a/libjava/java/io/Externalizable.java b/libjava/java/io/Externalizable.java
index 09080a0583178fd20e58290cfb0bda8724b89578..71304e24abf9c88db77ea78efa3e08709f1a2534 100644 (file)
--- a/libjava/java/io/Externalizable.java
+++ b/libjava/java/io/Externalizable.java
@@ -60,8 +60,6 @@ package java.io;
  */
 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

diff --git a/libjava/java/io/Serializable.java b/libjava/java/io/Serializable.java
index 065faae80cfb18ee343ccad9bc10d0b93240deec..1ca6638c874cc251c3868e0cd03e9ffd04446cab 100644 (file)
--- a/libjava/java/io/Serializable.java
+++ b/libjava/java/io/Serializable.java
@@ -51,5 +51,4 @@ package java.io;
   */
 public interface Serializable
 {
-  long serialVersionUID = 1196656838076753133L;
 } // interface Serializable

diff --git a/libjava/java/rmi/server/RemoteRef.java b/libjava/java/rmi/server/RemoteRef.java
index a3f22c27a66eb46f666f771df27a4a6b41ad9228..89cee1256b2a4f494095d1e75fc8784aab2fe689 100644 (file)
--- a/libjava/java/rmi/server/RemoteRef.java
+++ b/libjava/java/rmi/server/RemoteRef.java
@@ -46,7 +46,7 @@ import java.rmi.RemoteException;
 
 public interface RemoteRef extends Externalizable
 {
-  long serialVersionUID = 0;
+  long serialVersionUID = 3632638527362204081L;
   
   String packagePrefix = "gnu.java.rmi.server";
 

diff --git a/libjava/java/rmi/server/ServerRef.java b/libjava/java/rmi/server/ServerRef.java
index a6e986750ba3e0596cbade6fde56acdeb2fed77f..906b126988964686d3edeeb60d9b89fb16190bdc 100644 (file)
--- a/libjava/java/rmi/server/ServerRef.java
+++ b/libjava/java/rmi/server/ServerRef.java
@@ -43,7 +43,7 @@ import java.rmi.RemoteException;
 
 public interface ServerRef extends RemoteRef
 {
-  long serialVersionUID = 0;
+  long serialVersionUID = -4557750989390278438L;
 
   RemoteStub exportObject(Remote obj, Object data) throws RemoteException;
 

diff --git a/libjava/java/security/interfaces/DSAPrivateKey.java b/libjava/java/security/interfaces/DSAPrivateKey.java
index 4e6f13ddbe5275c8a31092241331875fc1637b07..223db91e806888825d5a36db1af10aee697c1714 100644 (file)
--- a/libjava/java/security/interfaces/DSAPrivateKey.java
+++ b/libjava/java/security/interfaces/DSAPrivateKey.java
@@ -49,6 +49,11 @@ import java.security.PrivateKey;
  */
 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
    */

diff --git a/libjava/java/security/interfaces/DSAPublicKey.java b/libjava/java/security/interfaces/DSAPublicKey.java
index aec1c606dcdeaf9b72746da9ac27ee1a1c981621..3f8d211d295274f26c4701308d0238de205fc8f1 100644 (file)
--- a/libjava/java/security/interfaces/DSAPublicKey.java
+++ b/libjava/java/security/interfaces/DSAPublicKey.java
@@ -49,6 +49,11 @@ import java.security.PublicKey;
  */
 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
    */

diff --git a/libjava/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java b/libjava/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java
index 7e115fabcd17501abc5e4d61afd7b53f1daeb666..68a5e448877bf0cbeb3ed6d00caf36860f068afc 100644 (file)
--- a/libjava/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java
+++ b/libjava/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java
@@ -54,6 +54,7 @@ public interface RSAMultiPrimePrivateCrtKey extends RSAPrivateKey
 {
   // Constants
   // --------------------------------------------------------------------------
+  long serialVersionUID = 618058533534628008L;
 
   // Methods
   // --------------------------------------------------------------------------

diff --git a/libjava/java/security/interfaces/RSAPrivateCrtKey.java b/libjava/java/security/interfaces/RSAPrivateCrtKey.java
index 8af1bb9168ef37c9c087e19bb63050dedb46dc00..1fb2881ed503cb4f2d50564f35fa141320a81fac 100644 (file)
--- a/libjava/java/security/interfaces/RSAPrivateCrtKey.java
+++ b/libjava/java/security/interfaces/RSAPrivateCrtKey.java
@@ -49,6 +49,8 @@ import java.math.BigInteger;
  */
 public interface RSAPrivateCrtKey extends RSAPrivateKey
 {
+  long serialVersionUID = -5682214253527700368L;
+
   /**
    * Returns the public exponent for this key
    *

diff --git a/libjava/java/security/interfaces/RSAPrivateKey.java b/libjava/java/security/interfaces/RSAPrivateKey.java
index d287d67327ad462e790d5b251b5706cc1f1cdae2..b4e34292340debfd258a3813d0454012bce8d87f 100644 (file)
--- a/libjava/java/security/interfaces/RSAPrivateKey.java
+++ b/libjava/java/security/interfaces/RSAPrivateKey.java
@@ -49,6 +49,8 @@ import java.security.PrivateKey;
  */
 public interface RSAPrivateKey extends PrivateKey, RSAKey
 {
+  long serialVersionUID = 5187144804936595022L;
+
   /**
    * Returns the private exponent value for this key
    *

diff --git a/libjava/java/security/interfaces/RSAPublicKey.java b/libjava/java/security/interfaces/RSAPublicKey.java
index 22d64b1bb7ad122ad1030ed64f5f4c9d6cbe7d99..9847ae9d2577e66b13bd695cb60a87b455a83a04 100644 (file)
--- a/libjava/java/security/interfaces/RSAPublicKey.java
+++ b/libjava/java/security/interfaces/RSAPublicKey.java
@@ -49,6 +49,8 @@ import java.security.PublicKey;
  */
 public interface RSAPublicKey extends PublicKey, RSAKey
 {
+  long serialVersionUID = -8727434096241101194L;
+
   /**
    * Returns the public exponent value for this key
    *

diff --git a/libjava/javax/crypto/SecretKey.java b/libjava/javax/crypto/SecretKey.java
index ce7057e7092d91fa6d735674c61c5f4f5b6b39ad..3865db4a6d147a4e6c66427522e36567c19967f7 100644 (file)
--- a/libjava/javax/crypto/SecretKey.java
+++ b/libjava/javax/crypto/SecretKey.java
@@ -61,4 +61,5 @@ import java.security.Key;
  */
 public interface SecretKey extends Key
 {
+  long serialVersionUID = -4795878709595146952L;
 }