From 7827c194e70b15f018e13fbf04443cfcf4dd7403 Mon Sep 17 00:00:00 2001 From: Weijun Wang Date: Fri, 17 Jun 2016 09:46:34 +0800 Subject: [PATCH] 8146619: Re-examine supportness of public classes in com.sun.security.auth.** Reviewed-by: xuelei --- .../share/classes/com/sun/security/auth/PolicyFile.java | 3 ++- .../com/sun/security/auth/SolarisNumericGroupPrincipal.java | 3 ++- .../com/sun/security/auth/SolarisNumericUserPrincipal.java | 3 ++- .../share/classes/com/sun/security/auth/SolarisPrincipal.java | 3 ++- .../share/classes/com/sun/security/auth/X500Principal.java | 3 ++- .../com/sun/security/auth/module/SolarisLoginModule.java | 3 ++- .../classes/com/sun/security/auth/module/SolarisSystem.java | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/PolicyFile.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/PolicyFile.java index 38a9709b5e1..06bf55b54b1 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/PolicyFile.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/PolicyFile.java @@ -209,13 +209,14 @@ import javax.security.auth.Subject; * @deprecated As of JDK 1.4, replaced by * {@code sun.security.provider.PolicyFile}. * This class is entirely deprecated. + * This class is subject to removal in a future version of Java SE. * * @see java.security.CodeSource * @see java.security.Permissions * @see java.security.ProtectionDomain * @see java.security.Security security properties */ -@Deprecated +@Deprecated(since="1.4", forRemoval=true) public class PolicyFile extends javax.security.auth.Policy { private final sun.security.provider.AuthPolicyFile apf; diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java index 7bef826eae1..f3183e3ed5f 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java @@ -41,11 +41,12 @@ import java.security.Principal; * @deprecated As of JDK 1.4, replaced by * {@link UnixNumericGroupPrincipal}. * This class is entirely deprecated. + * This class is subject to removal in a future version of Java SE. * * @see java.security.Principal * @see javax.security.auth.Subject */ -@Deprecated +@Deprecated(since="1.4", forRemoval=true) public class SolarisNumericGroupPrincipal implements Principal, java.io.Serializable { diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java index a182cf41ca1..858f9564665 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java @@ -40,11 +40,12 @@ import java.security.Principal; * @deprecated As of JDK 1.4, replaced by * {@link UnixNumericUserPrincipal}. * This class is entirely deprecated. + * This class is subject to removal in a future version of Java SE. * * @see java.security.Principal * @see javax.security.auth.Subject */ -@Deprecated +@Deprecated(since="1.4", forRemoval=true) public class SolarisNumericUserPrincipal implements Principal, java.io.Serializable { diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisPrincipal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisPrincipal.java index 80402c349a6..6cbc103ea81 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisPrincipal.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisPrincipal.java @@ -41,10 +41,11 @@ import java.security.Principal; * @deprecated As of JDK 1.4, replaced by * {@link UnixPrincipal}. * This class is entirely deprecated. + * This class is subject to removal in a future version of Java SE. * @see java.security.Principal * @see javax.security.auth.Subject */ -@Deprecated +@Deprecated(since="1.4", forRemoval=true) public class SolarisPrincipal implements Principal, java.io.Serializable { private static final long serialVersionUID = -7840670002439379038L; diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/X500Principal.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/X500Principal.java index bffbea5f552..1bf2e3e92a8 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/X500Principal.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/X500Principal.java @@ -47,9 +47,10 @@ import sun.security.x509.X500Name; * This X500Principal classs is entirely deprecated and * is here to allow for a smooth transition to the new * class. + * This class is subject to removal in a future version of Java SE. * @see javax.security.auth.x500.X500Principal */ -@Deprecated +@Deprecated(since="1.4", forRemoval=true) public class X500Principal implements Principal, java.io.Serializable { private static final long serialVersionUID = -8222422609431628648L; diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/SolarisLoginModule.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/SolarisLoginModule.java index f5666ff9b5e..9116448e321 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/SolarisLoginModule.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/SolarisLoginModule.java @@ -50,9 +50,10 @@ import com.sun.security.auth.SolarisNumericGroupPrincipal; * This LoginModule is entirely deprecated and * is here to allow for a smooth transition to the new * UnixLoginModule. + * This class is subject to removal in a future version of Java SE. * */ -@Deprecated +@Deprecated(since="1.4", forRemoval=true) public class SolarisLoginModule implements LoginModule { // initial state diff --git a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/SolarisSystem.java b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/SolarisSystem.java index ea4842aa10a..24c87ec2ec0 100644 --- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/SolarisSystem.java +++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/SolarisSystem.java @@ -30,8 +30,9 @@ package com.sun.security.auth.module; * UID/GID/groups information for the current user. * * @deprecated replaced by {@link UnixSystem}. + * This class is subject to removal in a future version of Java SE. */ -@Deprecated +@Deprecated(since="1.4", forRemoval=true) public class SolarisSystem { private native void getSolarisInfo();