8245068: Implement Deprecation of RMI Activation

Reviewed-by: lancea, rriggs
This commit is contained in:
Stuart Marks 2020-06-05 10:14:10 -07:00
parent 8d19eca78c
commit a46a94c431
28 changed files with 147 additions and 44 deletions

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2020, 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,7 +36,11 @@ import java.util.*;
* @author Ann Wollrath
*
* @serial exclude
* @deprecated See the
* <a href="{@docRoot}/java.rmi/java/rmi/activation/package-summary.html">
* {@code java.rmi.activation}</a> package specification for further information.
*/
@Deprecated(forRemoval=true, since="15")
public final class ExecOptionPermission extends Permission
{
/**

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2020, 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,7 +52,11 @@ import java.util.*;
* @author Ann Wollrath
*
* @serial exclude
* @deprecated See the
* <a href="{@docRoot}/java.rmi/java/rmi/activation/package-summary.html">
* {@code java.rmi.activation}</a> package specification for further information.
*/
@Deprecated(forRemoval=true, since="15")
public final class ExecPermission extends Permission
{
/**

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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
@ -51,7 +51,12 @@ import sun.rmi.server.ActivatableServerRef;
* @author Ann Wollrath
* @since 1.2
* @serial exclude
* @deprecated
* See the <a href="{@docRoot}/java.rmi/java/rmi/activation/package-summary.html">
* {@code java.rmi.activation}</a> package specification for further information.
*/
@Deprecated(forRemoval=true, since="15")
@SuppressWarnings("removal")
public abstract class Activatable extends RemoteServer {
private ActivationID id;

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 1999, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2020, 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,7 +31,11 @@ package java.rmi.activation;
*
* @author Ann Wollrath
* @since 1.2
* @deprecated
* See the <a href="{@docRoot}/java.rmi/java/rmi/activation/package-summary.html">
* {@code java.rmi.activation}</a> package specification for further information.
*/
@Deprecated(forRemoval=true, since="15")
public class ActivateFailedException extends java.rmi.RemoteException {
/** indicate compatibility with the Java 2 SDK v1.2 version of class */

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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
@ -48,7 +48,12 @@ import java.rmi.MarshalledObject;
* @author Ann Wollrath
* @since 1.2
* @see java.rmi.activation.Activatable
* @deprecated
* See the <a href="{@docRoot}/java.rmi/java/rmi/activation/package-summary.html">
* {@code java.rmi.activation}</a> package specification for further information.
*/
@Deprecated(forRemoval=true, since="15")
@SuppressWarnings("removal")
public final class ActivationDesc implements Serializable {
/**

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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,7 +41,11 @@ package java.rmi.activation;
*
* @author Ann Wollrath
* @since 1.2
* @deprecated
* See the <a href="{@docRoot}/java.rmi/java/rmi/activation/package-summary.html">
* {@code java.rmi.activation}</a> package specification for further information.
*/
@Deprecated(forRemoval=true, since="15")
public class ActivationException extends Exception {
/**

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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
@ -94,7 +94,12 @@ import java.security.PrivilegedAction;
* @see ActivationGroupDesc
* @see ActivationGroupID
* @since 1.2
* @deprecated
* See the <a href="{@docRoot}/java.rmi/java/rmi/activation/package-summary.html">
* {@code java.rmi.activation}</a> package specification for further information.
*/
@Deprecated(forRemoval=true, since="15")
@SuppressWarnings("removal")
public abstract class ActivationGroup
extends UnicastRemoteObject
implements ActivationInstantiator

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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
@ -55,7 +55,11 @@ import java.util.Properties;
* @since 1.2
* @see ActivationGroup
* @see ActivationGroupID
* @deprecated
* See the <a href="{@docRoot}/java.rmi/java/rmi/activation/package-summary.html">
* {@code java.rmi.activation}</a> package specification for further information.
*/
@Deprecated(forRemoval=true, since="15")
public final class ActivationGroupDesc implements Serializable {
/**

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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,7 +44,12 @@ import java.rmi.server.UID;
* @see ActivationGroup
* @see ActivationGroupDesc
* @since 1.2
* @deprecated
* See the <a href="{@docRoot}/java.rmi/java/rmi/activation/package-summary.html">
* {@code java.rmi.activation}</a> package specification for further information.
*/
@Deprecated(forRemoval=true, since="15")
@SuppressWarnings("removal")
public class ActivationGroupID implements java.io.Serializable {
/**
* @serial The group's activation system.

View File

@ -38,8 +38,12 @@ import java.rmi.server.RemoteStub;
* that are exported as a {@code java.rmi.server.UnicastRemoteObject}.
*
* @since 1.2
* @deprecated
* See the <a href="{@docRoot}/java.rmi/java/rmi/activation/package-summary.html">
* {@code java.rmi.activation}</a> package specification for further information.
*/
@SuppressWarnings({"rawtypes", "unchecked", "deprecation"})
@Deprecated(forRemoval=true, since="15")
@SuppressWarnings({"rawtypes", "removal", "unchecked"})
public final class ActivationGroup_Stub
extends RemoteStub
implements ActivationInstantiator, Remote {

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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
@ -72,7 +72,12 @@ import java.security.ProtectionDomain;
* @author Ann Wollrath
* @see Activatable
* @since 1.2
* @deprecated
* See the <a href="{@docRoot}/java.rmi/java/rmi/activation/package-summary.html">
* {@code java.rmi.activation}</a> package specification for further information.
*/
@Deprecated(forRemoval=true, since="15")
@SuppressWarnings("removal")
public class ActivationID implements Serializable {
/**
* the object's activator

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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,7 +38,12 @@ import java.rmi.RemoteException;
* @author Ann Wollrath
* @see ActivationGroup
* @since 1.2
* @deprecated
* See the <a href="{@docRoot}/java.rmi/java/rmi/activation/package-summary.html">
* {@code java.rmi.activation}</a> package specification for further information.
*/
@Deprecated(forRemoval=true, since="15")
@SuppressWarnings("removal")
public interface ActivationInstantiator extends Remote {
/**

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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
@ -45,7 +45,12 @@ import java.rmi.activation.UnknownObjectException;
* @see ActivationSystem
* @see ActivationGroup
* @since 1.2
* @deprecated
* See the <a href="{@docRoot}/java.rmi/java/rmi/activation/package-summary.html">
* {@code java.rmi.activation}</a> package specification for further information.
*/
@Deprecated(forRemoval=true, since="15")
@SuppressWarnings("removal")
public interface ActivationMonitor extends Remote {
/**

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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,7 +43,12 @@ import java.rmi.activation.UnknownObjectException;
* @see Activator
* @see ActivationMonitor
* @since 1.2
* @deprecated
* See the <a href="{@docRoot}/java.rmi/java/rmi/activation/package-summary.html">
* {@code java.rmi.activation}</a> package specification for further information.
*/
@Deprecated(forRemoval=true, since="15")
@SuppressWarnings("removal")
public interface ActivationSystem extends Remote {
/** The port to lookup the activation system. */

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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,7 +60,12 @@ import java.rmi.activation.UnknownObjectException;
* @see ActivationGroupDesc
* @see ActivationGroupID
* @since 1.2
* @deprecated
* See the <a href="{@docRoot}/java.rmi/java/rmi/activation/package-summary.html">
* {@code java.rmi.activation}</a> package specification for further information.
*/
@Deprecated(forRemoval=true, since="15")
@SuppressWarnings("removal")
public interface Activator extends Remote {
/**
* Activate the object associated with the activation identifier,

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 1999, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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,14 +34,19 @@ package java.rmi.activation;
* <code>ActivationGroupID</code> in an <code>ActivationDesc</code> refers to
* a group that is not registered with the <code>ActivationSystem</code>
*
* @author Ann Wollrath
* @since 1.2
* @see java.rmi.activation.Activatable
* @see java.rmi.activation.ActivationGroup
* @see java.rmi.activation.ActivationGroupID
* @see java.rmi.activation.ActivationMonitor
* @see java.rmi.activation.ActivationSystem
* @author Ann Wollrath
* @since 1.2
* @see java.rmi.activation.Activatable
* @see java.rmi.activation.ActivationGroup
* @see java.rmi.activation.ActivationGroupID
* @see java.rmi.activation.ActivationMonitor
* @see java.rmi.activation.ActivationSystem
* @deprecated
* See the <a href="{@docRoot}/java.rmi/java/rmi/activation/package-summary.html">
* {@code java.rmi.activation}</a> package specification for further information.
*/
@Deprecated(forRemoval=true, since="15")
@SuppressWarnings("removal")
public class UnknownGroupException extends ActivationException {
/** indicate compatibility with the Java 2 SDK v1.2 version of class */

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 1999, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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,15 +35,20 @@ package java.rmi.activation;
* An <code>ActivationID</code> is also obtained during the
* <code>Activatable.register</code> call.
*
* @author Ann Wollrath
* @since 1.2
* @see java.rmi.activation.Activatable
* @see java.rmi.activation.ActivationGroup
* @see java.rmi.activation.ActivationID
* @see java.rmi.activation.ActivationMonitor
* @see java.rmi.activation.ActivationSystem
* @see java.rmi.activation.Activator
* @author Ann Wollrath
* @since 1.2
* @see java.rmi.activation.Activatable
* @see java.rmi.activation.ActivationGroup
* @see java.rmi.activation.ActivationID
* @see java.rmi.activation.ActivationMonitor
* @see java.rmi.activation.ActivationSystem
* @see java.rmi.activation.Activator
* @deprecated
* See the <a href="{@docRoot}/java.rmi/java/rmi/activation/package-summary.html">
* {@code java.rmi.activation}</a> package specification for further information.
*/
@Deprecated(forRemoval=true, since="15")
@SuppressWarnings("removal")
public class UnknownObjectException extends ActivationException {
/** indicate compatibility with the Java 2 SDK v1.2 version of class */

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2020, 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,5 +38,11 @@
* <strong>Throws</strong> section of each method's specification.
*
* @since 1.2
* @deprecated The RMI Activation mechanism has been deprecated and may
* be removed from a future version of the Java Platform. All of the classes
* and interfaces in this package have been terminally deprecated. The
* {@code rmid} tool has also been terminally deprecated. There is no
* replacement for the RMI Activation mechanism in the Java Platform. Users of
* RMI Activation are advised to migrate their applications to other technologies.
*/
package java.rmi.activation;

View File

@ -31,6 +31,11 @@
* object registry, and the <em>{@index rmid rmid tool}</em> tool to start
* the activation system daemon.
*
* <p> <strong>Deprecation Notice:</strong> The RMI Activation mechanism has been
* deprecated and may be removed from a future version of the Java Platform. See the
* <a href="{@docRoot}/java.rmi/java/rmi/activation/package-summary.html">
* {@code java.rmi.activation}</a> package specification for further information.
*
* @toolGuide rmiregistry
* @toolGuide rmid
*

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2020, 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
@ -436,6 +436,7 @@ public class RegistryImpl extends java.rmi.server.RemoteServer
* {@link ObjectInputFilter.Status#REJECTED} if rejected,
* otherwise {@link ObjectInputFilter.Status#UNDECIDED}
*/
@SuppressWarnings("removal")
private static ObjectInputFilter.Status registryFilter(ObjectInputFilter.FilterInfo filterInfo) {
if (registryFilter != null) {
ObjectInputFilter.Status status = registryFilter.checkInput(filterInfo);

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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,7 +41,7 @@ import java.rmi.server.RemoteObjectInvocationHandler;
import java.rmi.server.RemoteRef;
import java.rmi.server.RemoteStub;
@SuppressWarnings("deprecation")
@SuppressWarnings({"deprecation", "removal"})
public class ActivatableRef implements RemoteRef {
private static final long serialVersionUID = 7579060052569229166L;

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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,7 +38,7 @@ import sun.rmi.transport.LiveRef;
*
* @author Ann Wollrath
*/
@SuppressWarnings("serial") // Externalizable class w/o no-arg c'tor
@SuppressWarnings({"removal", "serial"}) // Externalizable class w/o no-arg c'tor
public class ActivatableServerRef extends UnicastServerRef2 {
private static final long serialVersionUID = 2002967993223003793L;

View File

@ -30,7 +30,7 @@ package sun.rmi.server;
/**
* Activation$ActivationSystemImpl_Stub.
*/
@SuppressWarnings({"deprecation", "rawtypes", "unchecked"})
@SuppressWarnings({"deprecation", "rawtypes", "removal", "unchecked"})
public final class Activation$ActivationSystemImpl_Stub
extends java.rmi.server.RemoteStub
implements java.rmi.activation.ActivationSystem, java.rmi.Remote {

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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
@ -132,6 +132,7 @@ import com.sun.rmi.rmid.ExecOptionPermission;
* @author Ann Wollrath
* @since 1.2
*/
@SuppressWarnings("removal")
public class Activation implements Serializable {
/** indicate compatibility with JDK 1.2 version of class */
@ -2146,6 +2147,8 @@ public class Activation implements Serializable {
System.exit(0);
}
System.err.println(getTextResource("rmid.deprecation.warning"));
/*
* Fix for 4173960: Create and initialize activation using
* a static method, startActivation, which will build the

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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
@ -59,6 +59,7 @@ import sun.rmi.registry.RegistryImpl;
* @since 1.2
* @see java.rmi.activation.ActivationGroup
*/
@SuppressWarnings("removal")
public class ActivationGroupImpl extends ActivationGroup {
// use serialVersionUID from JDK 1.2.2 for interoperability

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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
@ -50,6 +50,7 @@ import java.rmi.activation.ActivationGroup;
*
* @author Ann Wollrath
*/
@SuppressWarnings("removal")
public abstract class ActivationGroupInit
{
/**

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2020, 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,6 +35,7 @@ import java.rmi.activation.ActivationException;
*
* @since 1.6
*/
@SuppressWarnings("removal")
public class InactiveGroupException extends ActivationException {
private static final long serialVersionUID = -7491041778450214975L;

View File

@ -1,6 +1,6 @@
#
#
# Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 1998, 2020, 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
@ -128,3 +128,9 @@ rmid.log.snapshot.warning=\
# "rmid" should not be translated
rmid.log.recover.warning=\
\nrmid: (WARNING) {0}: skipping log record during recovery:
# "rmid" should not be translated
rmid.deprecation.warning=\
rmid: (WARNING) The RMI Activation mechanism and the rmid tool\n\
have been deprecated for removal. They may be removed from a future\n\
version of the Java Platform.