diff options
Diffstat (limited to 'libjava/java/rmi/server')
21 files changed, 55 insertions, 70 deletions
diff --git a/libjava/java/rmi/server/LoaderHandler.java b/libjava/java/rmi/server/LoaderHandler.java index 3f44142ce04..8ebb56f46fc 100644 --- a/libjava/java/rmi/server/LoaderHandler.java +++ b/libjava/java/rmi/server/LoaderHandler.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* LoaderHandler.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/server/LogStream.java b/libjava/java/rmi/server/LogStream.java index 5bf0689413b..3a58f2dd86e 100644 --- a/libjava/java/rmi/server/LogStream.java +++ b/libjava/java/rmi/server/LogStream.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* LogStream.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -39,7 +39,6 @@ package java.rmi.server; import java.io.PrintStream; import java.io.OutputStream; -import java.io.IOException; /** * @deprecated diff --git a/libjava/java/rmi/server/ObjID.java b/libjava/java/rmi/server/ObjID.java index 3693bfe6ec6..6f24057fcfc 100644 --- a/libjava/java/rmi/server/ObjID.java +++ b/libjava/java/rmi/server/ObjID.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* ObjID.java + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,10 +41,8 @@ import java.io.Serializable; import java.io.ObjectOutput; import java.io.ObjectInput; import java.io.IOException; -import java.lang.Math; import java.io.DataInput; import java.io.DataOutput; -import java.util.Random; public final class ObjID implements Serializable { diff --git a/libjava/java/rmi/server/Operation.java b/libjava/java/rmi/server/Operation.java index 477446cbbeb..3f855dbca52 100644 --- a/libjava/java/rmi/server/Operation.java +++ b/libjava/java/rmi/server/Operation.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Operation.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/server/RMIClassLoader.java b/libjava/java/rmi/server/RMIClassLoader.java index e6af682a452..4e36bf72c20 100644 --- a/libjava/java/rmi/server/RMIClassLoader.java +++ b/libjava/java/rmi/server/RMIClassLoader.java @@ -1,6 +1,6 @@ -/* RMIClassLoader.java - Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003 - Free Software Foundation, Inc. +/* RMIClassLoader.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003 + Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/server/RMIClassLoaderSpi.java b/libjava/java/rmi/server/RMIClassLoaderSpi.java index 2dbb3849c27..ba3bef6b0ea 100644 --- a/libjava/java/rmi/server/RMIClassLoaderSpi.java +++ b/libjava/java/rmi/server/RMIClassLoaderSpi.java @@ -1,5 +1,5 @@ -/* RMIClassLoaderSpi.java - Copyright (c) 2002 Free Software Foundation, Inc. +/* RMIClassLoaderSpi.java -- + Copyright (c) 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/server/RMIClientSocketFactory.java b/libjava/java/rmi/server/RMIClientSocketFactory.java index cbb8dba7b1d..6c3c4a1d3a1 100644 --- a/libjava/java/rmi/server/RMIClientSocketFactory.java +++ b/libjava/java/rmi/server/RMIClientSocketFactory.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* RMIClientSocketFactory.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/server/RMIFailureHandler.java b/libjava/java/rmi/server/RMIFailureHandler.java index c48f250aaa2..f87321d2058 100644 --- a/libjava/java/rmi/server/RMIFailureHandler.java +++ b/libjava/java/rmi/server/RMIFailureHandler.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* RMIFailureHandler.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/server/RMIServerSocketFactory.java b/libjava/java/rmi/server/RMIServerSocketFactory.java index a5c52ffb6fd..f0fa59f502e 100644 --- a/libjava/java/rmi/server/RMIServerSocketFactory.java +++ b/libjava/java/rmi/server/RMIServerSocketFactory.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* RMIServerSocketFactory.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/server/RMISocketFactory.java b/libjava/java/rmi/server/RMISocketFactory.java index 544b1250660..3b068db869d 100644 --- a/libjava/java/rmi/server/RMISocketFactory.java +++ b/libjava/java/rmi/server/RMISocketFactory.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* RMISocketFactory.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/server/RemoteCall.java b/libjava/java/rmi/server/RemoteCall.java index c244d6e94f8..6596eb3e5a9 100644 --- a/libjava/java/rmi/server/RemoteCall.java +++ b/libjava/java/rmi/server/RemoteCall.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* RemoteCall.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,7 +37,6 @@ exception statement from your version. */ package java.rmi.server; -import java.lang.Exception; import java.io.IOException; import java.io.ObjectOutput; import java.io.ObjectInput; diff --git a/libjava/java/rmi/server/RemoteObject.java b/libjava/java/rmi/server/RemoteObject.java index a1febf2dd62..1bc7648c8fc 100644 --- a/libjava/java/rmi/server/RemoteObject.java +++ b/libjava/java/rmi/server/RemoteObject.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* RemoteObject.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,18 +37,14 @@ exception statement from your version. */ package java.rmi.server; -import java.io.Serializable; -import java.rmi.Remote; -import java.rmi.NoSuchObjectException; -import java.rmi.UnmarshalException; -import java.rmi.server.RemoteRef; +import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import java.io.IOException; -import java.lang.ClassNotFoundException; -import java.lang.InstantiationException; -import java.lang.IllegalAccessException; +import java.io.Serializable; import java.lang.reflect.Constructor; +import java.rmi.NoSuchObjectException; +import java.rmi.Remote; +import java.rmi.UnmarshalException; public abstract class RemoteObject implements Remote, Serializable { diff --git a/libjava/java/rmi/server/RemoteRef.java b/libjava/java/rmi/server/RemoteRef.java index 10168690dc0..a3f22c27a66 100644 --- a/libjava/java/rmi/server/RemoteRef.java +++ b/libjava/java/rmi/server/RemoteRef.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* RemoteRef.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,13 +35,14 @@ 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.rmi.server; -import java.lang.reflect.Method; import java.io.Externalizable; +import java.io.ObjectOutput; +import java.lang.reflect.Method; import java.rmi.Remote; import java.rmi.RemoteException; -import java.io.ObjectOutput; public interface RemoteRef extends Externalizable { diff --git a/libjava/java/rmi/server/RemoteServer.java b/libjava/java/rmi/server/RemoteServer.java index 85a2d955124..5eef3c8d865 100644 --- a/libjava/java/rmi/server/RemoteServer.java +++ b/libjava/java/rmi/server/RemoteServer.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* RemoteServer.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/server/RemoteStub.java b/libjava/java/rmi/server/RemoteStub.java index 07b61d64a00..0266aceb82a 100644 --- a/libjava/java/rmi/server/RemoteStub.java +++ b/libjava/java/rmi/server/RemoteStub.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. +/* RemoteStub.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/server/ServerRef.java b/libjava/java/rmi/server/ServerRef.java index e347de974bd..b26253cec51 100644 --- a/libjava/java/rmi/server/ServerRef.java +++ b/libjava/java/rmi/server/ServerRef.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* ServerRef.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/server/Skeleton.java b/libjava/java/rmi/server/Skeleton.java index 96c421456f5..3d4455cacff 100644 --- a/libjava/java/rmi/server/Skeleton.java +++ b/libjava/java/rmi/server/Skeleton.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Skeleton.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,7 +38,6 @@ exception statement from your version. */ package java.rmi.server; import java.rmi.Remote; -import java.rmi.server.RemoteCall; /** * @deprecated diff --git a/libjava/java/rmi/server/SkeletonMismatchException.java b/libjava/java/rmi/server/SkeletonMismatchException.java index 5a4b6ae96df..dc0fcf87d59 100644 --- a/libjava/java/rmi/server/SkeletonMismatchException.java +++ b/libjava/java/rmi/server/SkeletonMismatchException.java @@ -1,5 +1,5 @@ /* SkeletonMismatchException.java -- thrown when stub class versions mismatch - Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. + Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/server/UID.java b/libjava/java/rmi/server/UID.java index 4c8a04110a8..40ff3770b26 100644 --- a/libjava/java/rmi/server/UID.java +++ b/libjava/java/rmi/server/UID.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. +/* UID.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,17 +37,13 @@ exception statement from your version. */ package java.rmi.server; -import java.io.Serializable; import java.io.DataOutput; import java.io.DataInput; import java.io.IOException; -import java.util.Random; -import java.lang.Thread; -import java.lang.InterruptedException; - -public final class UID - implements Serializable { +import java.io.Serializable; +public final class UID implements Serializable +{ public static final long serialVersionUID = 1086053664494604050L; private static final Object lock = UID.class; diff --git a/libjava/java/rmi/server/UnicastRemoteObject.java b/libjava/java/rmi/server/UnicastRemoteObject.java index 8e010e7e5e8..d8e1a0227d2 100644 --- a/libjava/java/rmi/server/UnicastRemoteObject.java +++ b/libjava/java/rmi/server/UnicastRemoteObject.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003 Free Software Foundation, Inc. +/* UnicastRemoteObject.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,14 +40,11 @@ package java.rmi.server; import java.rmi.RemoteException; import java.rmi.Remote; -import java.rmi.server.RemoteRef; import java.rmi.NoSuchObjectException; import gnu.java.rmi.server.UnicastServerRef; -import gnu.java.rmi.server.UnicastServer; - -public class UnicastRemoteObject - extends RemoteServer { +public class UnicastRemoteObject extends RemoteServer +{ private static final long serialVersionUID = 4974527148936298033L; //The following serialized fields are from Java API Documentation "Serialized form" private int port = 0; diff --git a/libjava/java/rmi/server/Unreferenced.java b/libjava/java/rmi/server/Unreferenced.java index 8602ce16e2d..057a8b2dae2 100644 --- a/libjava/java/rmi/server/Unreferenced.java +++ b/libjava/java/rmi/server/Unreferenced.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Unreferenced.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. |
