From 560d4c592f6f414f6a17a9902b664933930c75fd Mon Sep 17 00:00:00 2001
From: Michael Koch <konqueror@gmx.de>
Date: Fri, 27 Jun 2003 16:11:27 +0000
Subject: [PATCH] 2003-06-27  Michael Koch  <konqueror@gmx.de>

	* java/security/Certificate.java
	(getGuarantor): Removed wrong @deprecated tag.
	(getPrincipal): Likewise.
	(getPublicKey): Likewise.
	(encode): Likewise.
	(decode): Likewise.
	(getFormat): Likewise.
	(toString): Likewise.
	* java/security/cert/PolicyQualifierInfo.java
	(PolicyQualifierInfo): Made final.
	* javax/security/auth/x500/X500Principal.java
	(serialVersionUID): New member variable.

From-SVN: r68579
---
 libjava/ChangeLog                                | 16 ++++++++++++----
 libjava/java/security/Certificate.java           |  8 +-------
 .../java/security/cert/PolicyQualifierInfo.java  |  2 +-
 .../javax/security/auth/x500/X500Principal.java  |  1 +
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7a861024cb9..571bc2a8663 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,9 +1,17 @@
 2003-06-27  Michael Koch  <konqueror@gmx.de>
 
-	* java/rmi/server/SkeletonNotFoundException.java
-	(SkeletonNotFoundException): Removed wrong @deprecated tag.
-	* java/rmi/server/UnicastRemoteObject.java
-	(exportObject): Made package-private.
+	* java/security/Certificate.java
+	(getGuarantor): Removed wrong @deprecated tag.
+	(getPrincipal): Likewise.
+	(getPublicKey): Likewise.
+	(encode): Likewise.
+	(decode): Likewise.
+	(getFormat): Likewise.
+	(toString): Likewise.
+	* java/security/cert/PolicyQualifierInfo.java
+	(PolicyQualifierInfo): Made final.
+	* javax/security/auth/x500/X500Principal.java
+	(serialVersionUID): New member variable.
 
 2003-06-27  Michael Koch  <konqueror@gmx.de>
 
diff --git a/libjava/java/security/Certificate.java b/libjava/java/security/Certificate.java
index f37d919a733..5b0f9ae8d21 100644
--- a/libjava/java/security/Certificate.java
+++ b/libjava/java/security/Certificate.java
@@ -35,6 +35,7 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package java.security;
 
 import java.io.InputStream;
@@ -62,7 +63,6 @@ public interface Certificate
    * this certificate.
    *
    * @return the <code>Principal</code> guaranteeing the certificate
-   * @deprecated this entire interface is deprecated
    */
   Principal getGuarantor();
 
@@ -71,7 +71,6 @@ public interface Certificate
    * this certificate.
    *
    * @return the <code>Principal</code> guaranteed by this certificate
-   * @deprecated this entire interface is deprecated
    */
   Principal getPrincipal();
 
@@ -80,7 +79,6 @@ public interface Certificate
    * is being guaranteed.
    *
    * @return the <code>PublicKey</code> of the Principal being guaranteed
-   * @deprecated this entire interface is deprecated
    */
   PublicKey getPublicKey();
 
@@ -93,7 +91,6 @@ public interface Certificate
    * @throws IOException if an error occurs writing to the stream
    * @see #decode(InputStream)
    * @see #getFormat()
-   * @deprecated this entire interface is deprecated
    */
   void encode(OutputStream out) throws KeyException, IOException;
 
@@ -105,7 +102,6 @@ public interface Certificate
    * @throws IOException if an error occurs reading from the stream
    * @see #encode(OutputStream)
    * @see #getFormat()
-   * @deprecated this entire interface is deprecated
    */
   void decode(InputStream in) throws KeyException, IOException;
 
@@ -115,7 +111,6 @@ public interface Certificate
    * <code>decode</code> methods.
    *
    * @return the encoding format being used
-   * @deprecated this entire interface is deprecated
    */
   String getFormat();
 
@@ -125,7 +120,6 @@ public interface Certificate
    *
    * @param detail true to provided more detailed information
    * @return the string representation
-   * @deprecated this entire interface is deprecated
    */
   String toString(boolean detail);
 } // interface Certificate
diff --git a/libjava/java/security/cert/PolicyQualifierInfo.java b/libjava/java/security/cert/PolicyQualifierInfo.java
index a46b6ba89be..8dede47fcb8 100644
--- a/libjava/java/security/cert/PolicyQualifierInfo.java
+++ b/libjava/java/security/cert/PolicyQualifierInfo.java
@@ -65,7 +65,7 @@ import gnu.java.security.der.DERWriter;
  *
  * @since JDK 1.4
  */
-public class PolicyQualifierInfo
+public final class PolicyQualifierInfo
 {
 
   // Fields.
diff --git a/libjava/javax/security/auth/x500/X500Principal.java b/libjava/javax/security/auth/x500/X500Principal.java
index fc72e7b268e..036cab7f91a 100644
--- a/libjava/javax/security/auth/x500/X500Principal.java
+++ b/libjava/javax/security/auth/x500/X500Principal.java
@@ -55,6 +55,7 @@ import gnu.java.security.x509.X500DistinguishedName;
 
 public final class X500Principal implements Principal, Serializable
 {
+  private static final long serialVersionUID = -500463348111345721L;
 
   // Constants and fields.
   // ------------------------------------------------------------------------