diff --git a/src/java.rmi/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java b/src/java.rmi/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java index d1be71107c2..2d11c630594 100644 --- a/src/java.rmi/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java +++ b/src/java.rmi/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java @@ -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 @@ * @author Ann Wollrath * * @serial exclude + * @deprecated See the + * + * {@code java.rmi.activation} package specification for further information. */ +@Deprecated(forRemoval=true, since="15") public final class ExecOptionPermission extends Permission { /** diff --git a/src/java.rmi/share/classes/com/sun/rmi/rmid/ExecPermission.java b/src/java.rmi/share/classes/com/sun/rmi/rmid/ExecPermission.java index e445542f9a8..aca8e5597a4 100644 --- a/src/java.rmi/share/classes/com/sun/rmi/rmid/ExecPermission.java +++ b/src/java.rmi/share/classes/com/sun/rmi/rmid/ExecPermission.java @@ -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 @@ * @author Ann Wollrath * * @serial exclude + * @deprecated See the + * + * {@code java.rmi.activation} package specification for further information. */ +@Deprecated(forRemoval=true, since="15") public final class ExecPermission extends Permission { /** diff --git a/src/java.rmi/share/classes/java/rmi/activation/Activatable.java b/src/java.rmi/share/classes/java/rmi/activation/Activatable.java index 6ab4ba22481..78c3f097727 100644 --- a/src/java.rmi/share/classes/java/rmi/activation/Activatable.java +++ b/src/java.rmi/share/classes/java/rmi/activation/Activatable.java @@ -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 @@ * @author Ann Wollrath * @since 1.2 * @serial exclude + * @deprecated + * See the + * {@code java.rmi.activation} package specification for further information. */ +@Deprecated(forRemoval=true, since="15") +@SuppressWarnings("removal") public abstract class Activatable extends RemoteServer { private ActivationID id; diff --git a/src/java.rmi/share/classes/java/rmi/activation/ActivateFailedException.java b/src/java.rmi/share/classes/java/rmi/activation/ActivateFailedException.java index e1f3a30fa32..654b716265e 100644 --- a/src/java.rmi/share/classes/java/rmi/activation/ActivateFailedException.java +++ b/src/java.rmi/share/classes/java/rmi/activation/ActivateFailedException.java @@ -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 @@ * * @author Ann Wollrath * @since 1.2 + * @deprecated + * See the + * {@code java.rmi.activation} 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 */ diff --git a/src/java.rmi/share/classes/java/rmi/activation/ActivationDesc.java b/src/java.rmi/share/classes/java/rmi/activation/ActivationDesc.java index e9170294d05..31922cb17f9 100644 --- a/src/java.rmi/share/classes/java/rmi/activation/ActivationDesc.java +++ b/src/java.rmi/share/classes/java/rmi/activation/ActivationDesc.java @@ -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 @@ * @author Ann Wollrath * @since 1.2 * @see java.rmi.activation.Activatable + * @deprecated + * See the + * {@code java.rmi.activation} package specification for further information. */ +@Deprecated(forRemoval=true, since="15") +@SuppressWarnings("removal") public final class ActivationDesc implements Serializable { /** diff --git a/src/java.rmi/share/classes/java/rmi/activation/ActivationException.java b/src/java.rmi/share/classes/java/rmi/activation/ActivationException.java index 5fc7323f529..645a5e7bd86 100644 --- a/src/java.rmi/share/classes/java/rmi/activation/ActivationException.java +++ b/src/java.rmi/share/classes/java/rmi/activation/ActivationException.java @@ -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 @@ * * @author Ann Wollrath * @since 1.2 + * @deprecated + * See the + * {@code java.rmi.activation} package specification for further information. */ +@Deprecated(forRemoval=true, since="15") public class ActivationException extends Exception { /** diff --git a/src/java.rmi/share/classes/java/rmi/activation/ActivationGroup.java b/src/java.rmi/share/classes/java/rmi/activation/ActivationGroup.java index 77669b2d9d6..dc8e1aacf19 100644 --- a/src/java.rmi/share/classes/java/rmi/activation/ActivationGroup.java +++ b/src/java.rmi/share/classes/java/rmi/activation/ActivationGroup.java @@ -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 @@ * @see ActivationGroupDesc * @see ActivationGroupID * @since 1.2 + * @deprecated + * See the + * {@code java.rmi.activation} package specification for further information. */ +@Deprecated(forRemoval=true, since="15") +@SuppressWarnings("removal") public abstract class ActivationGroup extends UnicastRemoteObject implements ActivationInstantiator diff --git a/src/java.rmi/share/classes/java/rmi/activation/ActivationGroupDesc.java b/src/java.rmi/share/classes/java/rmi/activation/ActivationGroupDesc.java index af9df9ef7da..f46ade7c5f6 100644 --- a/src/java.rmi/share/classes/java/rmi/activation/ActivationGroupDesc.java +++ b/src/java.rmi/share/classes/java/rmi/activation/ActivationGroupDesc.java @@ -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 @@ * @since 1.2 * @see ActivationGroup * @see ActivationGroupID + * @deprecated + * See the + * {@code java.rmi.activation} package specification for further information. */ +@Deprecated(forRemoval=true, since="15") public final class ActivationGroupDesc implements Serializable { /** diff --git a/src/java.rmi/share/classes/java/rmi/activation/ActivationGroupID.java b/src/java.rmi/share/classes/java/rmi/activation/ActivationGroupID.java index 23845cba7df..0ef0fc958c9 100644 --- a/src/java.rmi/share/classes/java/rmi/activation/ActivationGroupID.java +++ b/src/java.rmi/share/classes/java/rmi/activation/ActivationGroupID.java @@ -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 @@ * @see ActivationGroup * @see ActivationGroupDesc * @since 1.2 + * @deprecated + * See the + * {@code java.rmi.activation} 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. diff --git a/src/java.rmi/share/classes/java/rmi/activation/ActivationGroup_Stub.java b/src/java.rmi/share/classes/java/rmi/activation/ActivationGroup_Stub.java index 2fd2fcc6db3..f378437b92d 100644 --- a/src/java.rmi/share/classes/java/rmi/activation/ActivationGroup_Stub.java +++ b/src/java.rmi/share/classes/java/rmi/activation/ActivationGroup_Stub.java @@ -38,8 +38,12 @@ * that are exported as a {@code java.rmi.server.UnicastRemoteObject}. * * @since 1.2 + * @deprecated + * See the + * {@code java.rmi.activation} 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 { diff --git a/src/java.rmi/share/classes/java/rmi/activation/ActivationID.java b/src/java.rmi/share/classes/java/rmi/activation/ActivationID.java index b80327323fd..5770b69aec8 100644 --- a/src/java.rmi/share/classes/java/rmi/activation/ActivationID.java +++ b/src/java.rmi/share/classes/java/rmi/activation/ActivationID.java @@ -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 @@ * @author Ann Wollrath * @see Activatable * @since 1.2 + * @deprecated + * See the + * {@code java.rmi.activation} package specification for further information. */ +@Deprecated(forRemoval=true, since="15") +@SuppressWarnings("removal") public class ActivationID implements Serializable { /** * the object's activator diff --git a/src/java.rmi/share/classes/java/rmi/activation/ActivationInstantiator.java b/src/java.rmi/share/classes/java/rmi/activation/ActivationInstantiator.java index 2cd4733fb25..33741cc0278 100644 --- a/src/java.rmi/share/classes/java/rmi/activation/ActivationInstantiator.java +++ b/src/java.rmi/share/classes/java/rmi/activation/ActivationInstantiator.java @@ -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 @@ * @author Ann Wollrath * @see ActivationGroup * @since 1.2 + * @deprecated + * See the + * {@code java.rmi.activation} package specification for further information. */ +@Deprecated(forRemoval=true, since="15") +@SuppressWarnings("removal") public interface ActivationInstantiator extends Remote { /** diff --git a/src/java.rmi/share/classes/java/rmi/activation/ActivationMonitor.java b/src/java.rmi/share/classes/java/rmi/activation/ActivationMonitor.java index 81fdec02c5e..4b00e3606d1 100644 --- a/src/java.rmi/share/classes/java/rmi/activation/ActivationMonitor.java +++ b/src/java.rmi/share/classes/java/rmi/activation/ActivationMonitor.java @@ -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 @@ * @see ActivationSystem * @see ActivationGroup * @since 1.2 + * @deprecated + * See the + * {@code java.rmi.activation} package specification for further information. */ +@Deprecated(forRemoval=true, since="15") +@SuppressWarnings("removal") public interface ActivationMonitor extends Remote { /** diff --git a/src/java.rmi/share/classes/java/rmi/activation/ActivationSystem.java b/src/java.rmi/share/classes/java/rmi/activation/ActivationSystem.java index ddcb4da1d5d..96cf0c43ed1 100644 --- a/src/java.rmi/share/classes/java/rmi/activation/ActivationSystem.java +++ b/src/java.rmi/share/classes/java/rmi/activation/ActivationSystem.java @@ -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 @@ * @see Activator * @see ActivationMonitor * @since 1.2 + * @deprecated + * See the + * {@code java.rmi.activation} package specification for further information. */ +@Deprecated(forRemoval=true, since="15") +@SuppressWarnings("removal") public interface ActivationSystem extends Remote { /** The port to lookup the activation system. */ diff --git a/src/java.rmi/share/classes/java/rmi/activation/Activator.java b/src/java.rmi/share/classes/java/rmi/activation/Activator.java index dca2b69b089..78cd5ac839e 100644 --- a/src/java.rmi/share/classes/java/rmi/activation/Activator.java +++ b/src/java.rmi/share/classes/java/rmi/activation/Activator.java @@ -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 @@ * @see ActivationGroupDesc * @see ActivationGroupID * @since 1.2 + * @deprecated + * See the + * {@code java.rmi.activation} 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, diff --git a/src/java.rmi/share/classes/java/rmi/activation/UnknownGroupException.java b/src/java.rmi/share/classes/java/rmi/activation/UnknownGroupException.java index c2ee29c4603..09579abcbc9 100644 --- a/src/java.rmi/share/classes/java/rmi/activation/UnknownGroupException.java +++ b/src/java.rmi/share/classes/java/rmi/activation/UnknownGroupException.java @@ -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 @@ * ActivationGroupID in an ActivationDesc refers to * a group that is not registered with the 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 + * @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 + * {@code java.rmi.activation} 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 */ diff --git a/src/java.rmi/share/classes/java/rmi/activation/UnknownObjectException.java b/src/java.rmi/share/classes/java/rmi/activation/UnknownObjectException.java index 01639000763..b3da527259b 100644 --- a/src/java.rmi/share/classes/java/rmi/activation/UnknownObjectException.java +++ b/src/java.rmi/share/classes/java/rmi/activation/UnknownObjectException.java @@ -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 @@ * An ActivationID is also obtained during the * Activatable.register 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 + * {@code java.rmi.activation} 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 */ diff --git a/src/java.rmi/share/classes/java/rmi/activation/package-info.java b/src/java.rmi/share/classes/java/rmi/activation/package-info.java index ccb17bf8db3..1c5a862fbf4 100644 --- a/src/java.rmi/share/classes/java/rmi/activation/package-info.java +++ b/src/java.rmi/share/classes/java/rmi/activation/package-info.java @@ -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 @@ * Throws 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; diff --git a/src/java.rmi/share/classes/module-info.java b/src/java.rmi/share/classes/module-info.java index 5c2aad1255b..99da4f73c5c 100644 --- a/src/java.rmi/share/classes/module-info.java +++ b/src/java.rmi/share/classes/module-info.java @@ -31,6 +31,11 @@ * object registry, and the {@index rmid rmid tool} tool to start * the activation system daemon. * + *

Deprecation Notice: The RMI Activation mechanism has been + * deprecated and may be removed from a future version of the Java Platform. See the + * + * {@code java.rmi.activation} package specification for further information. + * * @toolGuide rmiregistry * @toolGuide rmid * diff --git a/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl.java b/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl.java index 0dd0471e3f7..5dacaf3d8f6 100644 --- a/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl.java +++ b/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl.java @@ -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 @@ private static URL[] pathToURLs(String path) { * {@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); diff --git a/src/java.rmi/share/classes/sun/rmi/server/ActivatableRef.java b/src/java.rmi/share/classes/sun/rmi/server/ActivatableRef.java index 6a2ccf0b311..14f4c211800 100644 --- a/src/java.rmi/share/classes/sun/rmi/server/ActivatableRef.java +++ b/src/java.rmi/share/classes/sun/rmi/server/ActivatableRef.java @@ -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.RemoteRef; import java.rmi.server.RemoteStub; -@SuppressWarnings("deprecation") +@SuppressWarnings({"deprecation", "removal"}) public class ActivatableRef implements RemoteRef { private static final long serialVersionUID = 7579060052569229166L; diff --git a/src/java.rmi/share/classes/sun/rmi/server/ActivatableServerRef.java b/src/java.rmi/share/classes/sun/rmi/server/ActivatableServerRef.java index e81e0c5190a..4640994f0a9 100644 --- a/src/java.rmi/share/classes/sun/rmi/server/ActivatableServerRef.java +++ b/src/java.rmi/share/classes/sun/rmi/server/ActivatableServerRef.java @@ -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 @@ * * @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; diff --git a/src/java.rmi/share/classes/sun/rmi/server/Activation$ActivationSystemImpl_Stub.java b/src/java.rmi/share/classes/sun/rmi/server/Activation$ActivationSystemImpl_Stub.java index 2ed11754bdb..5b988ee963f 100644 --- a/src/java.rmi/share/classes/sun/rmi/server/Activation$ActivationSystemImpl_Stub.java +++ b/src/java.rmi/share/classes/sun/rmi/server/Activation$ActivationSystemImpl_Stub.java @@ -30,7 +30,7 @@ /** * 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 { diff --git a/src/java.rmi/share/classes/sun/rmi/server/Activation.java b/src/java.rmi/share/classes/sun/rmi/server/Activation.java index caea925c2ac..f91386843fe 100644 --- a/src/java.rmi/share/classes/sun/rmi/server/Activation.java +++ b/src/java.rmi/share/classes/sun/rmi/server/Activation.java @@ -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 @@ * @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 Void run() { 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 diff --git a/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupImpl.java b/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupImpl.java index 1e245bb2d56..3456b7824ef 100644 --- a/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupImpl.java +++ b/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupImpl.java @@ -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 @@ * @since 1.2 * @see java.rmi.activation.ActivationGroup */ +@SuppressWarnings("removal") public class ActivationGroupImpl extends ActivationGroup { // use serialVersionUID from JDK 1.2.2 for interoperability diff --git a/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupInit.java b/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupInit.java index 2947069fda3..24257772112 100644 --- a/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupInit.java +++ b/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupInit.java @@ -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 @@ * * @author Ann Wollrath */ +@SuppressWarnings("removal") public abstract class ActivationGroupInit { /** diff --git a/src/java.rmi/share/classes/sun/rmi/server/InactiveGroupException.java b/src/java.rmi/share/classes/sun/rmi/server/InactiveGroupException.java index 9a2155500a8..71cd793b92a 100644 --- a/src/java.rmi/share/classes/sun/rmi/server/InactiveGroupException.java +++ b/src/java.rmi/share/classes/sun/rmi/server/InactiveGroupException.java @@ -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 @@ * * @since 1.6 */ +@SuppressWarnings("removal") public class InactiveGroupException extends ActivationException { private static final long serialVersionUID = -7491041778450214975L; diff --git a/src/java.rmi/share/classes/sun/rmi/server/resources/rmid.properties b/src/java.rmi/share/classes/sun/rmi/server/resources/rmid.properties index 8d76a2a3726..54d6fc9a774 100644 --- a/src/java.rmi/share/classes/sun/rmi/server/resources/rmid.properties +++ b/src/java.rmi/share/classes/sun/rmi/server/resources/rmid.properties @@ -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.