From: Michael Koch Date: Sat, 16 Oct 2004 18:27:51 +0000 (+0000) Subject: RMIMarshalledObjectOutputStream.java [...]: File headers and import statements cleane... X-Git-Tag: releases/gcc-4.0.0~3987 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86b28213d4a132eee74b459eaf7352a7c39fbd1a;p=thirdparty%2Fgcc.git RMIMarshalledObjectOutputStream.java [...]: File headers and import statements cleaned up. 2004-10-16 Michael Koch * gnu/java/rmi/RMIMarshalledObjectOutputStream.java gnu/java/rmi/rmic/RMIC.java, gnu/java/rmi/server/RMIHashes.java, gnu/java/rmi/server/RMIObjectInputStream.java, gnu/java/rmi/server/RMIObjectOutputStream.java, gnu/java/rmi/server/UnicastConnection.java, gnu/java/rmi/server/UnicastConnectionManager.java, gnu/java/rmi/server/UnicastRemoteCall.java, gnu/java/rmi/server/UnicastServer.java, gnu/java/rmi/server/UnicastServerRef.java, java/rmi/MarshalledObject.java, java/rmi/Naming.java, java/rmi/RMISecurityManager.java, java/rmi/Remote.java, java/rmi/activation/Activatable.java, java/rmi/activation/ActivationDesc.java, java/rmi/activation/ActivationGroup.java, java/rmi/activation/ActivationGroupDesc.java, java/rmi/activation/ActivationGroupID.java, java/rmi/activation/ActivationID.java, java/rmi/activation/ActivationInstantiator.java, java/rmi/activation/ActivationMonitor.java, java/rmi/activation/ActivationSystem.java, java/rmi/activation/Activator.java, java/rmi/dgc/DGC.java, java/rmi/dgc/Lease.java, java/rmi/dgc/VMID.java, java/rmi/registry/LocateRegistry.java, java/rmi/registry/Registry.java, java/rmi/registry/RegistryHandler.java, java/rmi/server/LoaderHandler.java, java/rmi/server/LogStream.java, java/rmi/server/ObjID.java, java/rmi/server/Operation.java, java/rmi/server/RMIClassLoader.java, java/rmi/server/RMIClassLoaderSpi.java, java/rmi/server/RMIClientSocketFactory.java, java/rmi/server/RMIFailureHandler.java, java/rmi/server/RMIServerSocketFactory.java, java/rmi/server/RMISocketFactory.java, java/rmi/server/RemoteCall.java, java/rmi/server/RemoteObject.java, java/rmi/server/RemoteRef.java, java/rmi/server/RemoteServer.java, java/rmi/server/RemoteStub.java, java/rmi/server/ServerRef.java, java/rmi/server/Skeleton.java, java/rmi/server/SkeletonMismatchException.java, java/rmi/server/UID.java, java/rmi/server/UnicastRemoteObject.java, java/rmi/server/Unreferenced.java: File headers and import statements cleaned up. From-SVN: r89153 --- diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d16ebabd43da..06f2a5cb8871 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,58 @@ +2004-10-16 Michael Koch + + * gnu/java/rmi/RMIMarshalledObjectOutputStream.java + gnu/java/rmi/rmic/RMIC.java, + gnu/java/rmi/server/RMIHashes.java, + gnu/java/rmi/server/RMIObjectInputStream.java, + gnu/java/rmi/server/RMIObjectOutputStream.java, + gnu/java/rmi/server/UnicastConnection.java, + gnu/java/rmi/server/UnicastConnectionManager.java, + gnu/java/rmi/server/UnicastRemoteCall.java, + gnu/java/rmi/server/UnicastServer.java, + gnu/java/rmi/server/UnicastServerRef.java, + java/rmi/MarshalledObject.java, + java/rmi/Naming.java, + java/rmi/RMISecurityManager.java, + java/rmi/Remote.java, + java/rmi/activation/Activatable.java, + java/rmi/activation/ActivationDesc.java, + java/rmi/activation/ActivationGroup.java, + java/rmi/activation/ActivationGroupDesc.java, + java/rmi/activation/ActivationGroupID.java, + java/rmi/activation/ActivationID.java, + java/rmi/activation/ActivationInstantiator.java, + java/rmi/activation/ActivationMonitor.java, + java/rmi/activation/ActivationSystem.java, + java/rmi/activation/Activator.java, + java/rmi/dgc/DGC.java, + java/rmi/dgc/Lease.java, + java/rmi/dgc/VMID.java, + java/rmi/registry/LocateRegistry.java, + java/rmi/registry/Registry.java, + java/rmi/registry/RegistryHandler.java, + java/rmi/server/LoaderHandler.java, + java/rmi/server/LogStream.java, + java/rmi/server/ObjID.java, + java/rmi/server/Operation.java, + java/rmi/server/RMIClassLoader.java, + java/rmi/server/RMIClassLoaderSpi.java, + java/rmi/server/RMIClientSocketFactory.java, + java/rmi/server/RMIFailureHandler.java, + java/rmi/server/RMIServerSocketFactory.java, + java/rmi/server/RMISocketFactory.java, + java/rmi/server/RemoteCall.java, + java/rmi/server/RemoteObject.java, + java/rmi/server/RemoteRef.java, + java/rmi/server/RemoteServer.java, + java/rmi/server/RemoteStub.java, + java/rmi/server/ServerRef.java, + java/rmi/server/Skeleton.java, + java/rmi/server/SkeletonMismatchException.java, + java/rmi/server/UID.java, + java/rmi/server/UnicastRemoteObject.java, + java/rmi/server/Unreferenced.java: + File headers and import statements cleaned up. + 2004-10-16 Michael Koch * libjava/gnu/java/nio/charset/UTF_16.java, diff --git a/libjava/gnu/java/rmi/RMIMarshalledObjectOutputStream.java b/libjava/gnu/java/rmi/RMIMarshalledObjectOutputStream.java index a721fc47194c..53a5bf159dfe 100644 --- a/libjava/gnu/java/rmi/RMIMarshalledObjectOutputStream.java +++ b/libjava/gnu/java/rmi/RMIMarshalledObjectOutputStream.java @@ -1,5 +1,5 @@ /* gnu.java.rmi.RMIMarshalledObjectOutputStream - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,16 +38,12 @@ exception statement from your version. */ package gnu.java.rmi; +import gnu.java.rmi.server.RMIObjectOutputStream; + import java.io.OutputStream; import java.io.ObjectOutputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.rmi.Remote; -import java.rmi.server.ObjID; -import java.rmi.server.RemoteStub; - -import gnu.java.rmi.server.RMIObjectOutputStream; -import gnu.java.rmi.server.UnicastServerRef; /** * This class is only for java.rmi.MarshalledObject to serialize object and diff --git a/libjava/gnu/java/rmi/rmic/RMIC.java b/libjava/gnu/java/rmi/rmic/RMIC.java index a7080f1f9d38..d34a84ce7eb7 100644 --- a/libjava/gnu/java/rmi/rmic/RMIC.java +++ b/libjava/gnu/java/rmi/rmic/RMIC.java @@ -36,15 +36,16 @@ 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 gnu.java.rmi.rmic; import gnu.java.rmi.server.RMIHashes; + import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; import java.lang.reflect.Method; -import java.lang.reflect.Modifier; import java.rmi.RemoteException; import java.util.Arrays; import java.util.HashSet; diff --git a/libjava/gnu/java/rmi/server/RMIHashes.java b/libjava/gnu/java/rmi/server/RMIHashes.java index ee6b0bd9ee9f..bb15733f8cad 100644 --- a/libjava/gnu/java/rmi/server/RMIHashes.java +++ b/libjava/gnu/java/rmi/server/RMIHashes.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* RMIHashes.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,15 +35,15 @@ 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 gnu.java.rmi.server; -import java.lang.reflect.Method; -import gnu.java.io.NullOutputStream; import gnu.java.lang.reflect.TypeSignature; -import java.security.MessageDigest; -import java.security.DigestOutputStream; -import java.io.DataOutputStream; + import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.lang.reflect.Method; +import java.security.MessageDigest; public class RMIHashes { diff --git a/libjava/gnu/java/rmi/server/RMIObjectInputStream.java b/libjava/gnu/java/rmi/server/RMIObjectInputStream.java index 0c484b68547c..ffdccba4f627 100644 --- a/libjava/gnu/java/rmi/server/RMIObjectInputStream.java +++ b/libjava/gnu/java/rmi/server/RMIObjectInputStream.java @@ -1,5 +1,6 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. +/* RMIObjectInputStream.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2004 + Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,14 +36,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 gnu.java.rmi.server; -import java.io.ObjectStreamClass; -import java.io.ObjectInputStream; import java.io.InputStream; import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectStreamClass; import java.lang.reflect.Proxy; -import java.net.URL; import java.net.MalformedURLException; import java.rmi.server.RMIClassLoader; diff --git a/libjava/gnu/java/rmi/server/RMIObjectOutputStream.java b/libjava/gnu/java/rmi/server/RMIObjectOutputStream.java index 97ac88aabc14..1ae2000da083 100644 --- a/libjava/gnu/java/rmi/server/RMIObjectOutputStream.java +++ b/libjava/gnu/java/rmi/server/RMIObjectOutputStream.java @@ -1,5 +1,6 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. +/* RMIObjectOutputStream.java - + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2004 + Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,15 +36,15 @@ 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 gnu.java.rmi.server; +import java.io.IOException; import java.io.ObjectOutputStream; import java.io.OutputStream; -import java.io.IOException; -import java.rmi.server.RMIClassLoader; import java.rmi.Remote; import java.rmi.server.RemoteStub; -import java.rmi.server.ObjID; +import java.rmi.server.RMIClassLoader; public class RMIObjectOutputStream extends ObjectOutputStream { diff --git a/libjava/gnu/java/rmi/server/UnicastConnection.java b/libjava/gnu/java/rmi/server/UnicastConnection.java index 7c592767d449..ce7b75bdab62 100644 --- a/libjava/gnu/java/rmi/server/UnicastConnection.java +++ b/libjava/gnu/java/rmi/server/UnicastConnection.java @@ -1,5 +1,6 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. +/* UnicastConnection.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2004 + Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,19 +36,17 @@ 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 gnu.java.rmi.server; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; import java.io.DataInputStream; import java.io.DataOutputStream; +import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.ObjectOutput; -import java.io.ObjectInput; -import java.io.IOException; import java.net.Socket; -import java.net.ServerSocket; import java.rmi.RemoteException; public class UnicastConnection diff --git a/libjava/gnu/java/rmi/server/UnicastConnectionManager.java b/libjava/gnu/java/rmi/server/UnicastConnectionManager.java index a4c7d5aca06d..2c1f5fc3a024 100644 --- a/libjava/gnu/java/rmi/server/UnicastConnectionManager.java +++ b/libjava/gnu/java/rmi/server/UnicastConnectionManager.java @@ -36,29 +36,29 @@ 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 gnu.java.rmi.server; -import java.rmi.server.RMISocketFactory; -import java.rmi.server.RMIServerSocketFactory; -import java.rmi.server.RMIClientSocketFactory; -import java.rmi.RemoteException; +import gnu.java.rmi.server.RMIIncomingThread; +import gnu.java.rmi.server.UnicastConnection; + import java.io.IOException; import java.io.ObjectOutput; import java.io.ObjectInput; -import java.io.DataInputStream; import java.net.InetAddress; import java.net.Socket; import java.net.ServerSocket; import java.net.UnknownHostException; +import java.rmi.RemoteException; +import java.rmi.server.RMISocketFactory; +import java.rmi.server.RMIServerSocketFactory; +import java.rmi.server.RMIClientSocketFactory; import java.util.ArrayList; import java.util.ConcurrentModificationException; import java.util.Enumeration; import java.util.Hashtable; import java.util.Iterator; -import gnu.java.rmi.server.UnicastConnection; -import gnu.java.rmi.server.RMIIncomingThread; - public class UnicastConnectionManager implements Runnable, ProtocolConstants { diff --git a/libjava/gnu/java/rmi/server/UnicastRemoteCall.java b/libjava/gnu/java/rmi/server/UnicastRemoteCall.java index 64d45bd7d725..78442952ee44 100644 --- a/libjava/gnu/java/rmi/server/UnicastRemoteCall.java +++ b/libjava/gnu/java/rmi/server/UnicastRemoteCall.java @@ -1,5 +1,5 @@ /* UnicastRemoteCall.java - Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,22 +35,21 @@ 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 gnu.java.rmi.server; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import java.io.ObjectOutput; import java.io.ObjectInput; +import java.io.ObjectOutput; import java.io.StreamCorruptedException; -import java.rmi.server.RemoteCall; import java.rmi.RemoteException; import java.rmi.MarshalException; import java.rmi.UnmarshalException; -import java.rmi.server.UID; +import java.rmi.server.RemoteCall; import java.rmi.server.ObjID; -import java.rmi.server.RemoteObject; - +import java.rmi.server.UID; import java.util.Vector; public class UnicastRemoteCall diff --git a/libjava/gnu/java/rmi/server/UnicastServer.java b/libjava/gnu/java/rmi/server/UnicastServer.java index 423095404420..99aef483f9c5 100644 --- a/libjava/gnu/java/rmi/server/UnicastServer.java +++ b/libjava/gnu/java/rmi/server/UnicastServer.java @@ -1,5 +1,6 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. +/* UnicastServer.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2004 + Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,25 +36,22 @@ 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 gnu.java.rmi.server; -import java.io.DataInputStream; +import gnu.java.rmi.dgc.DGCImpl; + import java.io.DataOutputStream; +import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import java.io.IOException; -import java.net.InetAddress; -import java.util.Hashtable; -import java.net.UnknownHostException; +import java.rmi.NoSuchObjectException; import java.rmi.Remote; +import java.rmi.RemoteException; import java.rmi.ServerError; import java.rmi.server.ObjID; -import java.rmi.server.UnicastRemoteObject; import java.rmi.server.UID; -import java.rmi.server.RemoteRef; -import java.rmi.RemoteException; -import java.rmi.NoSuchObjectException; -import gnu.java.rmi.dgc.DGCImpl; +import java.util.Hashtable; public class UnicastServer implements ProtocolConstants { diff --git a/libjava/gnu/java/rmi/server/UnicastServerRef.java b/libjava/gnu/java/rmi/server/UnicastServerRef.java index 67707e363a3d..ce4420c4701b 100644 --- a/libjava/gnu/java/rmi/server/UnicastServerRef.java +++ b/libjava/gnu/java/rmi/server/UnicastServerRef.java @@ -36,12 +36,13 @@ 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 gnu.java.rmi.server; -import java.net.ServerSocket; -import java.net.Socket; -import java.net.InetAddress; -import java.net.UnknownHostException; +import java.io.ObjectInputStream; +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; +import java.lang.reflect.InvocationTargetException; import java.rmi.Remote; import java.rmi.RemoteException; import java.rmi.server.RemoteStub; @@ -50,21 +51,8 @@ import java.rmi.server.ServerRef; import java.rmi.server.RemoteServer; import java.rmi.server.RemoteRef; import java.rmi.server.ServerNotActiveException; -import java.rmi.server.RMIClientSocketFactory; import java.rmi.server.RMIServerSocketFactory; -import java.rmi.server.UID; import java.rmi.server.Skeleton; -import java.rmi.server.RemoteCall; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.lang.reflect.InvocationTargetException; -import java.io.IOException; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Hashtable; public class UnicastServerRef diff --git a/libjava/java/rmi/MarshalledObject.java b/libjava/java/rmi/MarshalledObject.java index ef22310c7b1b..d6c594b8bb0f 100644 --- a/libjava/java/rmi/MarshalledObject.java +++ b/libjava/java/rmi/MarshalledObject.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. +/* MarshalledObject.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,18 +37,16 @@ exception statement from your version. */ package java.rmi; -import java.io.Serializable; -import java.io.ByteArrayOutputStream; -import java.io.IOException; import gnu.java.rmi.RMIMarshalledObjectInputStream; import gnu.java.rmi.RMIMarshalledObjectOutputStream; +import java.io.ByteArrayOutputStream; +import java.io.Serializable; /** * FIXME - doc missing */ public final class MarshalledObject implements Serializable { - //The following fields are from Java API Documentation "Serialized form" private static final long serialVersionUID = 8988374069173025854L; byte[] objBytes; diff --git a/libjava/java/rmi/Naming.java b/libjava/java/rmi/Naming.java index 1a30c1f2c075..3b92020196d8 100644 --- a/libjava/java/rmi/Naming.java +++ b/libjava/java/rmi/Naming.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Naming.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/RMISecurityManager.java b/libjava/java/rmi/RMISecurityManager.java index 5ec70f70a48b..1ddaa04e23ef 100644 --- a/libjava/java/rmi/RMISecurityManager.java +++ b/libjava/java/rmi/RMISecurityManager.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999, 2003 Free Software Foundation, Inc. +/* RMISecurityManager.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/Remote.java b/libjava/java/rmi/Remote.java index 2b1b9634cc69..77bdf3f501b6 100644 --- a/libjava/java/rmi/Remote.java +++ b/libjava/java/rmi/Remote.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Remote.java + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/activation/Activatable.java b/libjava/java/rmi/activation/Activatable.java index 95913199f091..b237e69a40e1 100644 --- a/libjava/java/rmi/activation/Activatable.java +++ b/libjava/java/rmi/activation/Activatable.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Activatable.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/activation/ActivationDesc.java b/libjava/java/rmi/activation/ActivationDesc.java index b0f22aae7606..b8f14baa7d3c 100644 --- a/libjava/java/rmi/activation/ActivationDesc.java +++ b/libjava/java/rmi/activation/ActivationDesc.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* ActivationDecc.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/activation/ActivationGroup.java b/libjava/java/rmi/activation/ActivationGroup.java index e9cd472113b4..69f9d1d094bf 100644 --- a/libjava/java/rmi/activation/ActivationGroup.java +++ b/libjava/java/rmi/activation/ActivationGroup.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* ActivationGroup.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/activation/ActivationGroupDesc.java b/libjava/java/rmi/activation/ActivationGroupDesc.java index 2afb8440b0b2..67d971137dfa 100644 --- a/libjava/java/rmi/activation/ActivationGroupDesc.java +++ b/libjava/java/rmi/activation/ActivationGroupDesc.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* ActivationGroupDesc.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/activation/ActivationGroupID.java b/libjava/java/rmi/activation/ActivationGroupID.java index 9fff53bb7068..bf889be11d60 100644 --- a/libjava/java/rmi/activation/ActivationGroupID.java +++ b/libjava/java/rmi/activation/ActivationGroupID.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* ActivationGroupID.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/activation/ActivationID.java b/libjava/java/rmi/activation/ActivationID.java index 62bd7763b42c..cc32349bdb3d 100644 --- a/libjava/java/rmi/activation/ActivationID.java +++ b/libjava/java/rmi/activation/ActivationID.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* ActivationID.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/activation/ActivationInstantiator.java b/libjava/java/rmi/activation/ActivationInstantiator.java index d47071a22def..7fbcee5b9933 100644 --- a/libjava/java/rmi/activation/ActivationInstantiator.java +++ b/libjava/java/rmi/activation/ActivationInstantiator.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* ActivationInstantiator.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/activation/ActivationMonitor.java b/libjava/java/rmi/activation/ActivationMonitor.java index 67b7755533c6..6ce01f116cbf 100644 --- a/libjava/java/rmi/activation/ActivationMonitor.java +++ b/libjava/java/rmi/activation/ActivationMonitor.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* ActivationMonitor.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/activation/ActivationSystem.java b/libjava/java/rmi/activation/ActivationSystem.java index a4b9a054d300..fd8a9aa78a38 100644 --- a/libjava/java/rmi/activation/ActivationSystem.java +++ b/libjava/java/rmi/activation/ActivationSystem.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* ActivationSystem.java -- +i Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/activation/Activator.java b/libjava/java/rmi/activation/Activator.java index 834f68e28823..c9e6ef75b78a 100644 --- a/libjava/java/rmi/activation/Activator.java +++ b/libjava/java/rmi/activation/Activator.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Activator.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/dgc/DGC.java b/libjava/java/rmi/dgc/DGC.java index b62c7fdbde73..08563a678150 100644 --- a/libjava/java/rmi/dgc/DGC.java +++ b/libjava/java/rmi/dgc/DGC.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* DGC.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/dgc/Lease.java b/libjava/java/rmi/dgc/Lease.java index 14c8fd764437..febe80aec0e4 100644 --- a/libjava/java/rmi/dgc/Lease.java +++ b/libjava/java/rmi/dgc/Lease.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Lease.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.dgc; import java.io.Serializable; -import java.rmi.dgc.VMID; public final class Lease implements Serializable { diff --git a/libjava/java/rmi/dgc/VMID.java b/libjava/java/rmi/dgc/VMID.java index a29a02836eb1..7cdfe1c69b0a 100644 --- a/libjava/java/rmi/dgc/VMID.java +++ b/libjava/java/rmi/dgc/VMID.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* VMID.java + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/registry/LocateRegistry.java b/libjava/java/rmi/registry/LocateRegistry.java index 508596377f9c..d3ccd831309c 100644 --- a/libjava/java/rmi/registry/LocateRegistry.java +++ b/libjava/java/rmi/registry/LocateRegistry.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* LocateRegistry.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,17 +37,14 @@ exception statement from your version. */ package java.rmi.registry; -import java.io.IOException; import java.rmi.RemoteException; import java.rmi.server.RMIClientSocketFactory; import java.rmi.server.RMIServerSocketFactory; import java.rmi.server.RMISocketFactory; import java.rmi.server.RemoteRef; import java.rmi.server.ObjID; -import java.net.Socket; import gnu.java.rmi.server.UnicastRef; -import gnu.java.rmi.server.UnicastServerRef; import gnu.java.rmi.registry.RegistryImpl; import gnu.java.rmi.registry.RegistryImpl_Stub; diff --git a/libjava/java/rmi/registry/Registry.java b/libjava/java/rmi/registry/Registry.java index cbab4e725972..eaf2be997a5d 100644 --- a/libjava/java/rmi/registry/Registry.java +++ b/libjava/java/rmi/registry/Registry.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Registry.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/java/rmi/registry/RegistryHandler.java b/libjava/java/rmi/registry/RegistryHandler.java index 27cedfb54578..fc9c3375a05c 100644 --- a/libjava/java/rmi/registry/RegistryHandler.java +++ b/libjava/java/rmi/registry/RegistryHandler.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* RegistryHandler.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/LoaderHandler.java b/libjava/java/rmi/server/LoaderHandler.java index 3f44142ce047..8ebb56f46fc6 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 5bf0689413b4..3a58f2dd86e3 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 3693bfe6ec6c..6f24057fcfc8 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 477446cbbeb1..3f855dbca520 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 e6af682a4526..4e36bf72c20d 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 2dbb3849c272..ba3bef6b0ea1 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 cbb8dba7b1d1..6c3c4a1d3a13 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 c48f250aaa22..f87321d2058b 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 a5c52ffb6fd3..f0fa59f502e6 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 544b1250660e..3b068db869dd 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 c244d6e94f8a..6596eb3e5a97 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 a1febf2dd627..1bc7648c8fc6 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 10168690dc08..a3f22c27a66e 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 85a2d9551249..5eef3c8d8659 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 07b61d64a007..0266aceb82a3 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 e347de974bd1..b26253cec519 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 96c421456f5e..3d4455cacffb 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 5a4b6ae96df9..dc0fcf87d591 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 4c8a04110a8e..40ff3770b261 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 8e010e7e5e80..d8e1a0227d22 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 8602ce16e2de..057a8b2dae26 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.