stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8173827: Remove forRemoval=true from several deprecated security APIs

Browse Source 
Reviewed-by: redestad, xuelei
This commit is contained in:
Sean Mullan 2017-02-06 08:59:00 -05:00
parent 996177e4f0
commit 779401fbbf
41 changed files with 95 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jdk/src/java.base/share/classes/com/sun/net/ssl/HostnameVerifier.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -38,9 +38,8 @@ package com.sun.net.ssl;
* @deprecated As of JDK 1.4, this implementation-specific class was
* replaced by {@link javax.net.ssl.HostnameVerifier} and
* {@link javax.net.ssl.CertificateHostnameVerifier}.
* This class is subject to removal in a future version of JDK.
*/
@Deprecated(since="1.4", forRemoval=true)
@Deprecated(since="1.4")
public interface HostnameVerifier {
/**
* Verify that the hostname from the URL is an acceptable

5
jdk/src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -44,9 +44,8 @@ import javax.net.ssl.SSLPeerUnverifiedException;
*
* @deprecated As of JDK 1.4, this implementation-specific class was
* replaced by {@link javax.net.ssl.HttpsURLConnection}.
* This class is subject to removal in a future version of JDK.
*/
@Deprecated(since="1.4", forRemoval=true)
@Deprecated(since="1.4")
public abstract
class HttpsURLConnection extends HttpURLConnection
{

5
jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManager.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -36,8 +36,7 @@ package com.sun.net.ssl;
*
* @deprecated As of JDK 1.4, this implementation-specific class was
* replaced by {@link javax.net.ssl.KeyManager}.
* This class is subject to removal in a future version of JDK.
*/
@Deprecated(since="1.4", forRemoval=true)
@Deprecated(since="1.4")
public interface KeyManager {
}

5
jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -39,9 +39,8 @@ import java.security.*;
*
* @deprecated As of JDK 1.4, this implementation-specific class was
* replaced by {@link javax.net.ssl.KeyManagerFactory}.
* This class is subject to removal in a future version of JDK.
*/
@Deprecated(since="1.4", forRemoval=true)
@Deprecated(since="1.4")
public class KeyManagerFactory {
// The provider
private Provider provider;

5
jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactorySpi.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -41,9 +41,8 @@ import java.security.*;
*
* @deprecated As of JDK 1.4, this implementation-specific class was
* replaced by {@link javax.net.ssl.KeyManagerFactorySpi}.
* This class is subject to removal in a future version of JDK.
*/
@Deprecated(since="1.4", forRemoval=true)
@Deprecated(since="1.4")
public abstract class KeyManagerFactorySpi {
/**
* Initializes this factory with a source of key material. The

5
jdk/src/java.base/share/classes/com/sun/net/ssl/SSLContext.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -44,9 +44,8 @@ import sun.security.ssl.SSLServerSocketFactoryImpl;
*
* @deprecated As of JDK 1.4, this implementation-specific class was
* replaced by {@link javax.net.ssl.SSLContext}.
* This class is subject to removal in a future version of JDK.
*/
@Deprecated(since="1.4", forRemoval=true)
@Deprecated(since="1.4")
public class SSLContext {
private Provider provider;

5
jdk/src/java.base/share/classes/com/sun/net/ssl/SSLContextSpi.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -43,9 +43,8 @@ import javax.net.ssl.*;
*
* @deprecated As of JDK 1.4, this implementation-specific class was
* replaced by {@link javax.net.ssl.SSLContextSpi}.
* This class is subject to removal in a future version of JDK.
*/
@Deprecated(since="1.4", forRemoval=true)
@Deprecated(since="1.4")
public abstract class SSLContextSpi {
/**
* Initializes this context.

5
jdk/src/java.base/share/classes/com/sun/net/ssl/SSLPermission.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -97,9 +97,8 @@ import java.lang.SecurityManager;
*
* @deprecated As of JDK 1.4, this implementation-specific class was
* replaced by {@link javax.net.ssl.SSLPermission}.
* This class is subject to removal in a future version of JDK.
*/
@Deprecated(since="1.4", forRemoval=true)
@Deprecated(since="1.4")
public final class SSLPermission extends BasicPermission {
private static final long serialVersionUID = -2583684302506167542L;

5
jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManager.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -36,8 +36,7 @@ package com.sun.net.ssl;
*
* @deprecated As of JDK 1.4, this implementation-specific class was
* replaced by {@link javax.net.ssl.TrustManager}.
* This class is subject to removal in a future version of JDK.
*/
@Deprecated(since="1.4", forRemoval=true)
@Deprecated(since="1.4")
public interface TrustManager {
}

5
jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -39,9 +39,8 @@ import java.security.*;
*
* @deprecated As of JDK 1.4, this implementation-specific class was
* replaced by {@link javax.net.ssl.TrustManagerFactory}.
* This class is subject to removal in a future version of JDK.
*/
@Deprecated(since="1.4", forRemoval=true)
@Deprecated(since="1.4")
public class TrustManagerFactory {
// The provider
private Provider provider;

5
jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactorySpi.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -41,9 +41,8 @@ import java.security.*;
*
* @deprecated As of JDK 1.4, this implementation-specific class was
* replaced by {@link javax.net.ssl.TrustManagerFactorySpi}.
* This class is subject to removal in a future version of JDK.
*/
@Deprecated(since="1.4", forRemoval=true)
@Deprecated(since="1.4")
public abstract class TrustManagerFactorySpi {
/**
* Initializes this factory with a source of certificate

5
jdk/src/java.base/share/classes/com/sun/net/ssl/X509KeyManager.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -41,9 +41,8 @@ import java.security.cert.X509Certificate;
*
* @deprecated As of JDK 1.4, this implementation-specific class was
* replaced by {@link javax.net.ssl.X509KeyManager}.
* This class is subject to removal in a future version of JDK.
*/
@Deprecated(since="1.4", forRemoval=true)
@Deprecated(since="1.4")
public interface X509KeyManager extends KeyManager {
/**
* Get the matching aliases for authenticating the client side of a secure

5
jdk/src/java.base/share/classes/com/sun/net/ssl/X509TrustManager.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -40,9 +40,8 @@ import java.security.cert.X509Certificate;
*
* @deprecated As of JDK 1.4, this implementation-specific class was
* replaced by {@link javax.net.ssl.X509TrustManager}.
* This class is subject to removal in a future version of JDK.
*/
@Deprecated(since="1.4", forRemoval=true)
@Deprecated(since="1.4")
public interface X509TrustManager extends TrustManager {
/**
* Given the partial or complete certificate chain

6
jdk/src/java.base/share/classes/com/sun/net/ssl/internal/ssl/Provider.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -31,10 +31,8 @@ import sun.security.ssl.SunJSSE;
* Main class for the SunJSSE provider. The actual code was moved to the
* class sun.security.ssl.SunJSSE, but for backward compatibility we
* continue to use this class as the main Provider class.
*
* @deprecated This class is subject to removal in a future version of JDK.
*/
@Deprecated(since="9", forRemoval=true)
@Deprecated(since="9")
public final class Provider extends SunJSSE {
private static final long serialVersionUID = 3231825739635378733L;

5
jdk/src/java.base/share/classes/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -54,9 +54,8 @@ import java.security.cert.CertificateException;
*
* @since 1.6
* @author Xuelei Fan
* @deprecated This class is subject to removal in a future version of JDK.
*/
@Deprecated(since="9", forRemoval=true)
@Deprecated(since="9")
public abstract class X509ExtendedTrustManager implements X509TrustManager {
/**
* Constructor used by subclasses only.

5
jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/DelegateHttpsURLConnection.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -52,9 +52,8 @@ import sun.net.www.protocol.https.AbstractDelegateHttpsURLConnection;
* of protocol implementation (this one)
* com.sun.net.ssl.HttpURLConnection is used in the com.sun version.
*
* @deprecated This class is subject to removal in a future version of JDK.
*/
@Deprecated(since="9", forRemoval=true)
@Deprecated(since="9")
@SuppressWarnings("deprecation") // HttpsURLConnection is deprecated
public class DelegateHttpsURLConnection extends AbstractDelegateHttpsURLConnection {

5
jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/Handler.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -34,9 +34,8 @@ import java.net.Proxy;
* only. The HTTPS implementation can now be found in
* sun.net.www.protocol.https.
*
* @deprecated This class is subject to removal in a future version of JDK.
*/
@Deprecated(since="9", forRemoval=true)
@Deprecated(since="9")
public class Handler extends sun.net.www.protocol.https.Handler {
public Handler() {

5
jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -60,13 +60,12 @@ import sun.net.www.http.HttpClient;
* needs to implement all public methods in it's super class and all
* the way to Object.
*
* @deprecated This class is subject to removal in a future version of JDK.
*/
// For both copies of the file, uncomment one line and comment the other
// public class HttpsURLConnectionImpl
// extends javax.net.ssl.HttpsURLConnection {
@Deprecated(since="9", forRemoval=true)
@Deprecated(since="9")
@SuppressWarnings("deprecation") // HttpsURLConnection is deprecated
public class HttpsURLConnectionOldImpl
extends com.sun.net.ssl.HttpsURLConnection {

5
jdk/src/java.base/share/classes/java/security/Certificate.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -60,10 +60,9 @@ import java.util.Date;
* This Certificate interface is entirely deprecated and
* is here to allow for a smooth transition to the new
* package.
* This class is subject to removal in a future version of Java SE.
* @see java.security.cert.Certificate
*/
@Deprecated(since="1.2", forRemoval=true)
@Deprecated(since="1.2")
public interface Certificate {
/**

11
jdk/src/java.base/share/classes/java/security/Identity.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -52,12 +52,11 @@ import java.util.*;
*
* @author Benjamin Renaud
* @deprecated This class is no longer used. Its functionality has been
* replaced by {@link java.security.KeyStore}, the
* {@link java.security.cert} package, and
* {@link java.security.Principal}.
* This class is subject to removal in a future version of Java SE.
* replaced by {@code java.security.KeyStore}, the
* {@code java.security.cert} package, and
* {@code java.security.Principal}.
*/
@Deprecated(since="1.2", forRemoval=true)
@Deprecated(since="1.2")
public abstract class Identity implements Principal, Serializable {
/** use serialVersionUID from JDK 1.1.x for interoperability */

14
jdk/src/java.base/share/classes/java/security/IdentityScope.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -57,15 +57,11 @@ import java.util.Properties;
* @author Benjamin Renaud
*
* @deprecated This class is no longer used. Its functionality has been
* replaced by {@link java.security.KeyStore}, the
* {@link java.security.cert} package, and
* {@link java.security.Principal}.
* This class is subject to removal in a future version of Java SE.
*
* Note that the security property {@code policy.ignoreIdentityScope}
* is only applicable to these APIs and is also a candidate for removal.
* replaced by {@code java.security.KeyStore}, the
* {@code java.security.cert} package, and
* {@code java.security.Principal}.
*/
@Deprecated(since="1.2", forRemoval=true)
@Deprecated(since="1.2")
public abstract
class IdentityScope extends Identity {

11
jdk/src/java.base/share/classes/java/security/Signer.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -40,12 +40,11 @@ import java.io.*;
* @author Benjamin Renaud
*
* @deprecated This class is no longer used. Its functionality has been
* replaced by {@link java.security.KeyStore}, the
* {@link java.security.cert} package, and
* {@link java.security.Principal}.
* This class is subject to removal in a future version of Java SE.
* replaced by {@code java.security.KeyStore}, the
* {@code java.security.cert} package, and
* {@code java.security.Principal}.
*/
@Deprecated(since="1.2", forRemoval=true)
@Deprecated(since="1.2")
public abstract class Signer extends Identity {
private static final long serialVersionUID = -1763464102261361480L;

5
jdk/src/java.base/share/classes/java/security/acl/Acl.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -85,10 +85,9 @@ import java.security.Principal;
*
* @deprecated This package has been replaced by {@code java.security.Policy}
* and related classes since 1.2.
* This class is subject to removal in a future version of Java SE.
*/
@Deprecated(since="9", forRemoval=true)
@Deprecated(since="9")
public interface Acl extends Owner {
/**

5
jdk/src/java.base/share/classes/java/security/acl/AclEntry.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -53,9 +53,8 @@ import java.security.Principal;
*
* @deprecated This package has been replaced by {@code java.security.Policy}
* and related classes since 1.2.
* This class is subject to removal in a future version of Java SE.
*/
@Deprecated(since="9", forRemoval=true)
@Deprecated(since="9")
public interface AclEntry extends Cloneable {
/**

5
jdk/src/java.base/share/classes/java/security/acl/AclNotFoundException.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -33,9 +33,8 @@ package java.security.acl;
*
* @deprecated This package has been replaced by {@code java.security.Policy}
* and related classes since 1.2.
* This class is subject to removal in a future version of Java SE.
*/
@Deprecated(since="9", forRemoval=true)
@Deprecated(since="9")
public class AclNotFoundException extends Exception {
private static final long serialVersionUID = 5684295034092681791L;

5
jdk/src/java.base/share/classes/java/security/acl/Group.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -42,9 +42,8 @@ import java.security.Principal;
*
* @deprecated This package has been replaced by {@code java.security.Policy}
* and related classes since 1.2.
* This class is subject to removal in a future version of Java SE.
*/
@Deprecated(since="9", forRemoval=true)
@Deprecated(since="9")
public interface Group extends Principal {
/**

5
jdk/src/java.base/share/classes/java/security/acl/LastOwnerException.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -35,9 +35,8 @@ package java.security.acl;
*
* @deprecated This package has been replaced by {@code java.security.Policy}
* and related classes since 1.2.
* This class is subject to removal in a future version of Java SE.
*/
@Deprecated(since="9", forRemoval=true)
@Deprecated(since="9")
public class LastOwnerException extends Exception {
private static final long serialVersionUID = -5141997548211140359L;

5
jdk/src/java.base/share/classes/java/security/acl/NotOwnerException.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -34,9 +34,8 @@ package java.security.acl;
*
* @deprecated This package has been replaced by {@code java.security.Policy}
* and related classes since 1.2.
* This class is subject to removal in a future version of Java SE.
*/
@Deprecated(since="9", forRemoval=true)
@Deprecated(since="9")
public class NotOwnerException extends Exception {
private static final long serialVersionUID = -5555597911163362399L;

5
jdk/src/java.base/share/classes/java/security/acl/Owner.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -38,9 +38,8 @@ import java.security.Principal;
*
* @deprecated This package has been replaced by {@code java.security.Policy}
* and related classes since 1.2.
* This class is subject to removal in a future version of Java SE.
*/
@Deprecated(since="9", forRemoval=true)
@Deprecated(since="9")
public interface Owner {
/**

5
jdk/src/java.base/share/classes/java/security/acl/Permission.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -34,9 +34,8 @@ package java.security.acl;
*
* @deprecated This package has been replaced by {@code java.security.Policy}
* and related classes since 1.2.
* This class is subject to removal in a future version of Java SE.
*/
@Deprecated(since="9", forRemoval=true)
@Deprecated(since="9")
public interface Permission {
/**

5
jdk/src/java.base/share/classes/java/security/acl/package-info.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -27,8 +27,7 @@
* The classes and interfaces in this package have been deprecated. New
* classes should not be added to this package. The {@code java.security}
* package contains suitable replacements. See {@link java.security.Policy}
* and related classes for details. This package is subject to removal in a
* future version of Java SE.
* and related classes for details.
*
* @since 1.1
*/

9
jdk/src/java.base/share/classes/javax/net/ssl/HandshakeCompletedEvent.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -159,11 +159,10 @@ public class HandshakeCompletedEvent extends EventObject
* @exception SSLPeerUnverifiedException if the peer is not verified.
* @see #getPeerPrincipal()
* @deprecated The {@link #getPeerCertificates()} method that returns an
* array of {@code java.security.cert.Certificate} should
* be used instead. This method is subject to removal in
* a future version of Java SE.
* array of {@code java.security.cert.Certificate} should
* be used instead.
*/
@Deprecated(since="9", forRemoval=true)
@Deprecated(since="9")
public javax.security.cert.X509Certificate [] getPeerCertificateChain()
throws SSLPeerUnverifiedException
{

9
jdk/src/java.base/share/classes/javax/net/ssl/SSLSession.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -279,11 +279,10 @@ public interface SSLSession {
* has not been verified
* @see #getPeerPrincipal()
* @deprecated The {@link #getPeerCertificates()} method that returns an
* array of {@code java.security.cert.Certificate} should
* be used instead. This method is subject to removal in
* a future version of Java SE.
* array of {@code java.security.cert.Certificate} should
* be used instead.
*/
@Deprecated(since="9", forRemoval=true)
@Deprecated(since="9")
public javax.security.cert.X509Certificate [] getPeerCertificateChain()
throws SSLPeerUnverifiedException;

5
jdk/src/java.base/share/classes/javax/security/auth/Policy.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -152,11 +152,10 @@ import sun.security.util.Debug;
*
* These two APIs provide callers the means to query the
* Policy for Principal-based Permission entries.
* This class is subject to removal in a future version of Java SE.
*
* @see java.security.Security security properties
*/
@Deprecated(since="1.4", forRemoval=true)
@Deprecated(since="1.4")
public abstract class Policy {
private static Policy policy;

5
jdk/src/java.base/share/classes/javax/security/cert/Certificate.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -58,11 +58,10 @@ import java.security.SignatureException;
* @since 1.4
* @see X509Certificate
* @deprecated Use the classes in {@code java.security.cert} instead.
* This class is subject to removal in a future version of Java SE.
*
* @author Hemma Prafullchandra
*/
@Deprecated(since="9", forRemoval=true)
@Deprecated(since="9")
public abstract class Certificate {
/**

5
jdk/src/java.base/share/classes/javax/security/cert/CertificateEncodingException.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -39,9 +39,8 @@ package javax.security.cert;
* @since 1.4
* @author Hemma Prafullchandra
* @deprecated Use the classes in {@code java.security.cert} instead.
* This class is subject to removal in a future version of Java SE.
*/
@Deprecated(since="9", forRemoval=true)
@Deprecated(since="9")
public class CertificateEncodingException extends CertificateException {
private static final long serialVersionUID = -8187642723048403470L;

5
jdk/src/java.base/share/classes/javax/security/cert/CertificateException.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -39,9 +39,8 @@ package javax.security.cert;
* @since 1.4
* @see Certificate
* @deprecated Use the classes in {@code java.security.cert} instead.
* This class is subject to removal in a future version of Java SE.
*/
@Deprecated(since="9", forRemoval=true)
@Deprecated(since="9")
public class CertificateException extends Exception {
private static final long serialVersionUID = -5757213374030785290L;

5
jdk/src/java.base/share/classes/javax/security/cert/CertificateExpiredException.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -41,9 +41,8 @@ package javax.security.cert;
* @since 1.4
* @author Hemma Prafullchandra
* @deprecated Use the classes in {@code java.security.cert} instead.
* This class is subject to removal in a future version of Java SE.
*/
@Deprecated(since="9", forRemoval=true)
@Deprecated(since="9")
public class CertificateExpiredException extends CertificateException {
private static final long serialVersionUID = 5091601212177261883L;

5
jdk/src/java.base/share/classes/javax/security/cert/CertificateNotYetValidException.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -41,9 +41,8 @@ package javax.security.cert;
* @since 1.4
* @author Hemma Prafullchandra
* @deprecated Use the classes in {@code java.security.cert} instead.
* This class is subject to removal in a future version of Java SE.
*/
@Deprecated(since="9", forRemoval=true)
@Deprecated(since="9")
public class CertificateNotYetValidException extends CertificateException {
private static final long serialVersionUID = -8976172474266822818L;

5
jdk/src/java.base/share/classes/javax/security/cert/CertificateParsingException.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -40,9 +40,8 @@ package javax.security.cert;
* @since 1.4
* @author Hemma Prafullchandra
* @deprecated Use the classes in {@code java.security.cert} instead.
* This class is subject to removal in a future version of Java SE.
*/
@Deprecated(since="9", forRemoval=true)
@Deprecated(since="9")
public class CertificateParsingException extends CertificateException {
private static final long serialVersionUID = -8449352422951136229L;

5
jdk/src/java.base/share/classes/javax/security/cert/X509Certificate.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -125,9 +125,8 @@ import java.util.Date;
* @see java.security.cert.X509Extension
* @see java.security.Security security properties
* @deprecated Use the classes in {@code java.security.cert} instead.
* This class is subject to removal in a future version of Java SE.
*/
@Deprecated(since="9", forRemoval=true)
@Deprecated(since="9")
public abstract class X509Certificate extends Certificate {
/*