Index: java/rmi/MarshalledObject.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/MarshalledObject.java,v
retrieving revision 1.6
diff -u -r1.6 MarshalledObject.java
--- java/rmi/MarshalledObject.java	2 Apr 2004 21:29:34 -0000	1.6
+++ java/rmi/MarshalledObject.java	15 Oct 2004 10:42:39 -0000
@@ -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 @@
 
 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;
Index: java/rmi/Naming.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/Naming.java,v
retrieving revision 1.5
diff -u -r1.5 Naming.java
--- java/rmi/Naming.java	18 Apr 2004 11:21:25 -0000	1.5
+++ java/rmi/Naming.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/RMISecurityManager.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/RMISecurityManager.java,v
retrieving revision 1.3
diff -u -r1.3 RMISecurityManager.java
--- java/rmi/RMISecurityManager.java	23 Mar 2003 09:15:07 -0000	1.3
+++ java/rmi/RMISecurityManager.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/Remote.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/Remote.java,v
retrieving revision 1.2
diff -u -r1.2 Remote.java
--- java/rmi/Remote.java	22 Jan 2002 22:27:00 -0000	1.2
+++ java/rmi/Remote.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/activation/Activatable.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/activation/Activatable.java,v
retrieving revision 1.3
diff -u -r1.3 Activatable.java
--- java/rmi/activation/Activatable.java	23 Mar 2003 09:15:08 -0000	1.3
+++ java/rmi/activation/Activatable.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/activation/ActivationDesc.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/activation/ActivationDesc.java,v
retrieving revision 1.3
diff -u -r1.3 ActivationDesc.java
--- java/rmi/activation/ActivationDesc.java	2 Oct 2002 12:58:39 -0000	1.3
+++ java/rmi/activation/ActivationDesc.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/activation/ActivationGroup.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/activation/ActivationGroup.java,v
retrieving revision 1.3
diff -u -r1.3 ActivationGroup.java
--- java/rmi/activation/ActivationGroup.java	23 Mar 2003 09:15:08 -0000	1.3
+++ java/rmi/activation/ActivationGroup.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/activation/ActivationGroupDesc.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/activation/ActivationGroupDesc.java,v
retrieving revision 1.4
diff -u -r1.4 ActivationGroupDesc.java
--- java/rmi/activation/ActivationGroupDesc.java	23 Mar 2003 09:15:08 -0000	1.4
+++ java/rmi/activation/ActivationGroupDesc.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/activation/ActivationGroupID.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/activation/ActivationGroupID.java,v
retrieving revision 1.3
diff -u -r1.3 ActivationGroupID.java
--- java/rmi/activation/ActivationGroupID.java	2 Oct 2002 12:58:40 -0000	1.3
+++ java/rmi/activation/ActivationGroupID.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/activation/ActivationID.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/activation/ActivationID.java,v
retrieving revision 1.3
diff -u -r1.3 ActivationID.java
--- java/rmi/activation/ActivationID.java	2 Oct 2002 12:58:40 -0000	1.3
+++ java/rmi/activation/ActivationID.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/activation/ActivationInstantiator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/activation/ActivationInstantiator.java,v
retrieving revision 1.4
diff -u -r1.4 ActivationInstantiator.java
--- java/rmi/activation/ActivationInstantiator.java	13 Oct 2003 06:29:48 -0000	1.4
+++ java/rmi/activation/ActivationInstantiator.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/activation/ActivationMonitor.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/activation/ActivationMonitor.java,v
retrieving revision 1.3
diff -u -r1.3 ActivationMonitor.java
--- java/rmi/activation/ActivationMonitor.java	13 Oct 2003 06:29:48 -0000	1.3
+++ java/rmi/activation/ActivationMonitor.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/activation/ActivationSystem.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/activation/ActivationSystem.java,v
retrieving revision 1.3
diff -u -r1.3 ActivationSystem.java
--- java/rmi/activation/ActivationSystem.java	13 Oct 2003 06:29:48 -0000	1.3
+++ java/rmi/activation/ActivationSystem.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/activation/Activator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/activation/Activator.java,v
retrieving revision 1.4
diff -u -r1.4 Activator.java
--- java/rmi/activation/Activator.java	13 Oct 2003 06:29:48 -0000	1.4
+++ java/rmi/activation/Activator.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/dgc/DGC.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/dgc/DGC.java,v
retrieving revision 1.3
diff -u -r1.3 DGC.java
--- java/rmi/dgc/DGC.java	12 Oct 2003 15:32:01 -0000	1.3
+++ java/rmi/dgc/DGC.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/dgc/Lease.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/dgc/Lease.java,v
retrieving revision 1.2
diff -u -r1.2 Lease.java
--- java/rmi/dgc/Lease.java	22 Jan 2002 22:27:00 -0000	1.2
+++ java/rmi/dgc/Lease.java	15 Oct 2004 10:42:39 -0000
@@ -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 @@
 package java.rmi.dgc;
 
 import java.io.Serializable;
-import java.rmi.dgc.VMID;
 
 public final class Lease
 	implements Serializable {
Index: java/rmi/dgc/VMID.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/dgc/VMID.java,v
retrieving revision 1.3
diff -u -r1.3 VMID.java
--- java/rmi/dgc/VMID.java	31 Mar 2003 11:23:57 -0000	1.3
+++ java/rmi/dgc/VMID.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/registry/LocateRegistry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/registry/LocateRegistry.java,v
retrieving revision 1.2
diff -u -r1.2 LocateRegistry.java
--- java/rmi/registry/LocateRegistry.java	22 Jan 2002 22:27:00 -0000	1.2
+++ java/rmi/registry/LocateRegistry.java	15 Oct 2004 10:42:39 -0000
@@ -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 @@
 
 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;
 
Index: java/rmi/registry/Registry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/registry/Registry.java,v
retrieving revision 1.4
diff -u -r1.4 Registry.java
--- java/rmi/registry/Registry.java	12 Oct 2003 15:32:01 -0000	1.4
+++ java/rmi/registry/Registry.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/registry/RegistryHandler.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/registry/RegistryHandler.java,v
retrieving revision 1.6
diff -u -r1.6 RegistryHandler.java
--- java/rmi/registry/RegistryHandler.java	12 Oct 2003 15:32:01 -0000	1.6
+++ java/rmi/registry/RegistryHandler.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/server/LoaderHandler.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/LoaderHandler.java,v
retrieving revision 1.5
diff -u -r1.5 LoaderHandler.java
--- java/rmi/server/LoaderHandler.java	12 Oct 2003 15:32:01 -0000	1.5
+++ java/rmi/server/LoaderHandler.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/server/LogStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/LogStream.java,v
retrieving revision 1.5
diff -u -r1.5 LogStream.java
--- java/rmi/server/LogStream.java	31 Mar 2003 11:23:57 -0000	1.5
+++ java/rmi/server/LogStream.java	15 Oct 2004 10:42:39 -0000
@@ -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 @@
 
 import java.io.PrintStream;
 import java.io.OutputStream;
-import java.io.IOException;
 
 /**
  * @deprecated
Index: java/rmi/server/ObjID.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/ObjID.java,v
retrieving revision 1.2
diff -u -r1.2 ObjID.java
--- java/rmi/server/ObjID.java	22 Jan 2002 22:27:00 -0000	1.2
+++ java/rmi/server/ObjID.java	15 Oct 2004 10:42:39 -0000
@@ -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.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 {
Index: java/rmi/server/Operation.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/Operation.java,v
retrieving revision 1.4
diff -u -r1.4 Operation.java
--- java/rmi/server/Operation.java	31 Mar 2003 11:23:57 -0000	1.4
+++ java/rmi/server/Operation.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/server/RMIClassLoader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/RMIClassLoader.java,v
retrieving revision 1.10
diff -u -r1.10 RMIClassLoader.java
--- java/rmi/server/RMIClassLoader.java	15 Nov 2003 22:42:00 -0000	1.10
+++ java/rmi/server/RMIClassLoader.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/server/RMIClassLoaderSpi.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/RMIClassLoaderSpi.java,v
retrieving revision 1.1
diff -u -r1.1 RMIClassLoaderSpi.java
--- java/rmi/server/RMIClassLoaderSpi.java	23 Dec 2002 11:04:59 -0000	1.1
+++ java/rmi/server/RMIClassLoaderSpi.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/server/RMIClientSocketFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/RMIClientSocketFactory.java,v
retrieving revision 1.3
diff -u -r1.3 RMIClientSocketFactory.java
--- java/rmi/server/RMIClientSocketFactory.java	12 Oct 2003 15:32:01 -0000	1.3
+++ java/rmi/server/RMIClientSocketFactory.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/server/RMIFailureHandler.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/RMIFailureHandler.java,v
retrieving revision 1.4
diff -u -r1.4 RMIFailureHandler.java
--- java/rmi/server/RMIFailureHandler.java	12 Oct 2003 15:32:01 -0000	1.4
+++ java/rmi/server/RMIFailureHandler.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/server/RMIServerSocketFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/RMIServerSocketFactory.java,v
retrieving revision 1.3
diff -u -r1.3 RMIServerSocketFactory.java
--- java/rmi/server/RMIServerSocketFactory.java	12 Oct 2003 15:32:01 -0000	1.3
+++ java/rmi/server/RMIServerSocketFactory.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/server/RMISocketFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/RMISocketFactory.java,v
retrieving revision 1.3
diff -u -r1.3 RMISocketFactory.java
--- java/rmi/server/RMISocketFactory.java	23 Mar 2003 09:15:08 -0000	1.3
+++ java/rmi/server/RMISocketFactory.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/server/RemoteCall.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/RemoteCall.java,v
retrieving revision 1.5
diff -u -r1.5 RemoteCall.java
--- java/rmi/server/RemoteCall.java	12 Oct 2003 15:32:01 -0000	1.5
+++ java/rmi/server/RemoteCall.java	15 Oct 2004 10:42:39 -0000
@@ -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 @@
 
 package java.rmi.server;
 
-import java.lang.Exception;
 import java.io.IOException;
 import java.io.ObjectOutput;
 import java.io.ObjectInput;
Index: java/rmi/server/RemoteObject.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/RemoteObject.java,v
retrieving revision 1.4
diff -u -r1.4 RemoteObject.java
--- java/rmi/server/RemoteObject.java	7 Nov 2002 10:24:34 -0000	1.4
+++ java/rmi/server/RemoteObject.java	15 Oct 2004 10:42:39 -0000
@@ -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 @@
 
 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 {
Index: java/rmi/server/RemoteRef.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/RemoteRef.java,v
retrieving revision 1.4
diff -u -r1.4 RemoteRef.java
--- java/rmi/server/RemoteRef.java	12 Oct 2003 15:32:01 -0000	1.4
+++ java/rmi/server/RemoteRef.java	15 Oct 2004 10:42:39 -0000
@@ -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,17 +35,18 @@
 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
 {
-  long serialVersionUID = 0;
+  long serialVersionUID = 3632638527362204081L;
   
   String packagePrefix = "gnu.java.rmi.server";
 
Index: java/rmi/server/RemoteServer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/RemoteServer.java,v
retrieving revision 1.4
diff -u -r1.4 RemoteServer.java
--- java/rmi/server/RemoteServer.java	21 Mar 2004 10:10:14 -0000	1.4
+++ java/rmi/server/RemoteServer.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/server/RemoteStub.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/RemoteStub.java,v
retrieving revision 1.4
diff -u -r1.4 RemoteStub.java
--- java/rmi/server/RemoteStub.java	31 Mar 2003 11:23:57 -0000	1.4
+++ java/rmi/server/RemoteStub.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/server/ServerRef.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/ServerRef.java,v
retrieving revision 1.3
diff -u -r1.3 ServerRef.java
--- java/rmi/server/ServerRef.java	12 Oct 2003 15:32:01 -0000	1.3
+++ java/rmi/server/ServerRef.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
@@ -44,7 +44,7 @@
 
 public interface ServerRef extends RemoteRef
 {
-  long serialVersionUID = 0;
+  long serialVersionUID = -4557750989390278438L;
 
   RemoteStub exportObject(Remote obj, Object data) throws RemoteException;
 
Index: java/rmi/server/Skeleton.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/Skeleton.java,v
retrieving revision 1.5
diff -u -r1.5 Skeleton.java
--- java/rmi/server/Skeleton.java	12 Oct 2003 15:32:01 -0000	1.5
+++ java/rmi/server/Skeleton.java	15 Oct 2004 10:42:39 -0000
@@ -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 @@
 package java.rmi.server;
 
 import java.rmi.Remote;
-import java.rmi.server.RemoteCall;
 
 /**
  * @deprecated
Index: java/rmi/server/SkeletonMismatchException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/SkeletonMismatchException.java,v
retrieving revision 1.3
diff -u -r1.3 SkeletonMismatchException.java
--- java/rmi/server/SkeletonMismatchException.java	24 Feb 2002 04:25:17 -0000	1.3
+++ java/rmi/server/SkeletonMismatchException.java	15 Oct 2004 10:42:39 -0000
@@ -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.
 
Index: java/rmi/server/UID.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/UID.java,v
retrieving revision 1.3
diff -u -r1.3 UID.java
--- java/rmi/server/UID.java	17 Aug 2004 02:58:16 -0000	1.3
+++ java/rmi/server/UID.java	15 Oct 2004 10:42:39 -0000
@@ -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 @@
 
 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;
Index: java/rmi/server/UnicastRemoteObject.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/UnicastRemoteObject.java,v
retrieving revision 1.6
diff -u -r1.6 UnicastRemoteObject.java
--- java/rmi/server/UnicastRemoteObject.java	27 Jun 2003 21:03:52 -0000	1.6
+++ java/rmi/server/UnicastRemoteObject.java	15 Oct 2004 10:42:39 -0000
@@ -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 @@
 
 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;
Index: java/rmi/server/Unreferenced.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/Unreferenced.java,v
retrieving revision 1.3
diff -u -r1.3 Unreferenced.java
--- java/rmi/server/Unreferenced.java	12 Oct 2003 15:32:01 -0000	1.3
+++ java/rmi/server/Unreferenced.java	15 Oct 2004 10:42:39 -0000
@@ -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.