Index: java/rmi/MarshalledObject.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/rmi/MarshalledObject.java,v retrieving revision 1.7 diff -u -r1.7 MarshalledObject.java --- java/rmi/MarshalledObject.java 16 Oct 2004 18:27:50 -0000 1.7 +++ java/rmi/MarshalledObject.java 21 Oct 2004 20:11:10 -0000 @@ -35,10 +35,12 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package java.rmi; import gnu.java.rmi.RMIMarshalledObjectInputStream; import gnu.java.rmi.RMIMarshalledObjectOutputStream; + import java.io.ByteArrayOutputStream; import java.io.Serializable; Index: java/rmi/Naming.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/rmi/Naming.java,v retrieving revision 1.6 diff -u -r1.6 Naming.java --- java/rmi/Naming.java 16 Oct 2004 18:27:50 -0000 1.6 +++ java/rmi/Naming.java 21 Oct 2004 20:11:10 -0000 @@ -1,5 +1,5 @@ /* Naming.java -- - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,12 +35,13 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package java.rmi; import java.net.MalformedURLException; import java.net.URL; -import java.rmi.registry.Registry; import java.rmi.registry.LocateRegistry; +import java.rmi.registry.Registry; public final class Naming { Index: java/rmi/activation/Activatable.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/rmi/activation/Activatable.java,v retrieving revision 1.4 diff -u -r1.4 Activatable.java --- java/rmi/activation/Activatable.java 16 Oct 2004 18:27:50 -0000 1.4 +++ java/rmi/activation/Activatable.java 21 Oct 2004 20:11:10 -0000 @@ -1,5 +1,5 @@ /* Activatable.java -- - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,19 +35,19 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package java.rmi.activation; -import java.rmi.server.RemoteServer; +import java.rmi.MarshalledObject; +import java.rmi.NoSuchObjectException; +import java.rmi.Remote; +import java.rmi.RemoteException; import java.rmi.server.RMIClientSocketFactory; import java.rmi.server.RMIServerSocketFactory; -import java.rmi.RemoteException; -import java.rmi.Remote; -import java.rmi.NoSuchObjectException; -import java.rmi.MarshalledObject; - -public abstract class Activatable - extends RemoteServer { +import java.rmi.server.RemoteServer; +public abstract class Activatable extends RemoteServer +{ static final long serialVersionUID = -3120617863591563455L; protected Activatable(String location, MarshalledObject data, boolean restart, int port) throws ActivationException, RemoteException { Index: java/rmi/activation/ActivationGroup.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/rmi/activation/ActivationGroup.java,v retrieving revision 1.4 diff -u -r1.4 ActivationGroup.java --- java/rmi/activation/ActivationGroup.java 16 Oct 2004 18:27:50 -0000 1.4 +++ java/rmi/activation/ActivationGroup.java 21 Oct 2004 20:11:10 -0000 @@ -35,17 +35,17 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package java.rmi.activation; -import java.rmi.server.UnicastRemoteObject; -import java.rmi.RemoteException; -import java.rmi.Remote; import java.rmi.MarshalledObject; +import java.rmi.Remote; +import java.rmi.RemoteException; +import java.rmi.server.UnicastRemoteObject; -public abstract class ActivationGroup - extends UnicastRemoteObject - implements ActivationInstantiator { - +public abstract class ActivationGroup extends UnicastRemoteObject + implements ActivationInstantiator +{ static final long serialVersionUID = -7696947875314805420L; protected ActivationGroup(ActivationGroupID groupID) throws RemoteException { Index: java/rmi/activation/ActivationGroupDesc.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/rmi/activation/ActivationGroupDesc.java,v retrieving revision 1.5 diff -u -r1.5 ActivationGroupDesc.java --- java/rmi/activation/ActivationGroupDesc.java 16 Oct 2004 18:27:50 -0000 1.5 +++ java/rmi/activation/ActivationGroupDesc.java 21 Oct 2004 20:11:10 -0000 @@ -1,5 +1,5 @@ /* ActivationGroupDesc.java -- - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,11 +35,12 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package java.rmi.activation; import java.io.Serializable; -import java.util.Properties; import java.rmi.MarshalledObject; +import java.util.Properties; public final class ActivationGroupDesc implements Serializable { Index: java/rmi/activation/ActivationInstantiator.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/rmi/activation/ActivationInstantiator.java,v retrieving revision 1.5 diff -u -r1.5 ActivationInstantiator.java --- java/rmi/activation/ActivationInstantiator.java 16 Oct 2004 18:27:50 -0000 1.5 +++ java/rmi/activation/ActivationInstantiator.java 21 Oct 2004 20:11:10 -0000 @@ -1,5 +1,5 @@ /* ActivationInstantiator.java -- - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,11 +35,12 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package java.rmi.activation; +import java.rmi.MarshalledObject; import java.rmi.Remote; import java.rmi.RemoteException; -import java.rmi.MarshalledObject; public interface ActivationInstantiator extends Remote Index: java/rmi/activation/ActivationMonitor.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/rmi/activation/ActivationMonitor.java,v retrieving revision 1.4 diff -u -r1.4 ActivationMonitor.java --- java/rmi/activation/ActivationMonitor.java 16 Oct 2004 18:27:50 -0000 1.4 +++ java/rmi/activation/ActivationMonitor.java 21 Oct 2004 20:11:10 -0000 @@ -1,5 +1,5 @@ /* ActivationMonitor.java -- - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,11 +35,12 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package java.rmi.activation; +import java.rmi.MarshalledObject; import java.rmi.Remote; import java.rmi.RemoteException; -import java.rmi.MarshalledObject; public interface ActivationMonitor extends Remote { Index: java/rmi/activation/ActivationSystem.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/rmi/activation/ActivationSystem.java,v retrieving revision 1.5 diff -u -r1.5 ActivationSystem.java --- java/rmi/activation/ActivationSystem.java 18 Oct 2004 09:49:16 -0000 1.5 +++ java/rmi/activation/ActivationSystem.java 21 Oct 2004 20:11:10 -0000 @@ -1,5 +1,5 @@ /* ActivationSystem.java -- -i Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. + Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,6 +35,7 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package java.rmi.activation; import java.rmi.Remote; Index: java/rmi/activation/Activator.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/rmi/activation/Activator.java,v retrieving revision 1.5 diff -u -r1.5 Activator.java --- java/rmi/activation/Activator.java 16 Oct 2004 18:27:50 -0000 1.5 +++ java/rmi/activation/Activator.java 21 Oct 2004 20:11:10 -0000 @@ -1,5 +1,5 @@ /* Activator.java -- - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,11 +35,12 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package java.rmi.activation; +import java.rmi.MarshalledObject; import java.rmi.Remote; import java.rmi.RemoteException; -import java.rmi.MarshalledObject; public interface Activator extends Remote Index: java/rmi/registry/LocateRegistry.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/rmi/registry/LocateRegistry.java,v retrieving revision 1.3 diff -u -r1.3 LocateRegistry.java --- java/rmi/registry/LocateRegistry.java 16 Oct 2004 18:27:51 -0000 1.3 +++ java/rmi/registry/LocateRegistry.java 21 Oct 2004 20:11:10 -0000 @@ -1,5 +1,5 @@ /* LocateRegistry.java -- - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,18 +35,19 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package java.rmi.registry; +import gnu.java.rmi.registry.RegistryImpl; +import gnu.java.rmi.registry.RegistryImpl_Stub; +import gnu.java.rmi.server.UnicastRef; + import java.rmi.RemoteException; +import java.rmi.server.ObjID; 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 gnu.java.rmi.server.UnicastRef; -import gnu.java.rmi.registry.RegistryImpl; -import gnu.java.rmi.registry.RegistryImpl_Stub; public final class LocateRegistry { Index: java/rmi/registry/Registry.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/rmi/registry/Registry.java,v retrieving revision 1.5 diff -u -r1.5 Registry.java --- java/rmi/registry/Registry.java 16 Oct 2004 18:27:51 -0000 1.5 +++ java/rmi/registry/Registry.java 21 Oct 2004 20:11:10 -0000 @@ -1,5 +1,5 @@ /* Registry.java -- - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,13 +35,14 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package java.rmi.registry; -import java.rmi.RemoteException; -import java.rmi.NotBoundException; import java.rmi.AccessException; import java.rmi.AlreadyBoundException; +import java.rmi.NotBoundException; import java.rmi.Remote; +import java.rmi.RemoteException; public interface Registry extends Remote { Index: java/rmi/server/LogStream.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/rmi/server/LogStream.java,v retrieving revision 1.7 diff -u -r1.7 LogStream.java --- java/rmi/server/LogStream.java 16 Oct 2004 18:27:51 -0000 1.7 +++ java/rmi/server/LogStream.java 21 Oct 2004 20:11:10 -0000 @@ -1,5 +1,5 @@ /* LogStream.java -- - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,10 +35,11 @@ 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.io.PrintStream; import java.io.OutputStream; +import java.io.PrintStream; /** * @deprecated Index: java/rmi/server/ObjID.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/rmi/server/ObjID.java,v retrieving revision 1.3 diff -u -r1.3 ObjID.java --- java/rmi/server/ObjID.java 16 Oct 2004 18:27:51 -0000 1.3 +++ java/rmi/server/ObjID.java 21 Oct 2004 20:11:10 -0000 @@ -1,5 +1,5 @@ -/* ObjID.java - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* ObjID.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,18 +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.io.Serializable; -import java.io.ObjectOutput; -import java.io.ObjectInput; -import java.io.IOException; import java.io.DataInput; import java.io.DataOutput; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.io.Serializable; -public final class ObjID - implements Serializable { - +public final class ObjID implements Serializable +{ static final long serialVersionUID = -6386392263968365220L; private static long next = 0x8000000000000000L; Index: java/rmi/server/RMIClientSocketFactory.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/rmi/server/RMIClientSocketFactory.java,v retrieving revision 1.4 diff -u -r1.4 RMIClientSocketFactory.java --- java/rmi/server/RMIClientSocketFactory.java 16 Oct 2004 18:27:51 -0000 1.4 +++ java/rmi/server/RMIClientSocketFactory.java 21 Oct 2004 20:11:10 -0000 @@ -1,5 +1,5 @@ /* RMIClientSocketFactory.java -- - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,10 +35,11 @@ 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.net.Socket; import java.io.IOException; +import java.net.Socket; public interface RMIClientSocketFactory { Index: java/rmi/server/RMIServerSocketFactory.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/rmi/server/RMIServerSocketFactory.java,v retrieving revision 1.4 diff -u -r1.4 RMIServerSocketFactory.java --- java/rmi/server/RMIServerSocketFactory.java 16 Oct 2004 18:27:51 -0000 1.4 +++ java/rmi/server/RMIServerSocketFactory.java 21 Oct 2004 20:11:10 -0000 @@ -1,5 +1,5 @@ /* RMIServerSocketFactory.java -- - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,10 +35,11 @@ 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.net.ServerSocket; import java.io.IOException; +import java.net.ServerSocket; public interface RMIServerSocketFactory { Index: java/rmi/server/RMISocketFactory.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/rmi/server/RMISocketFactory.java,v retrieving revision 1.4 diff -u -r1.4 RMISocketFactory.java --- java/rmi/server/RMISocketFactory.java 16 Oct 2004 18:27:51 -0000 1.4 +++ java/rmi/server/RMISocketFactory.java 21 Oct 2004 20:11:10 -0000 @@ -1,5 +1,5 @@ /* RMISocketFactory.java -- - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,13 +35,15 @@ 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.net.Socket; -import java.net.ServerSocket; -import java.io.IOException; import gnu.java.rmi.server.RMIDefaultSocketFactory; +import java.io.IOException; +import java.net.ServerSocket; +import java.net.Socket; + public abstract class RMISocketFactory implements RMIClientSocketFactory, RMIServerSocketFactory { Index: java/rmi/server/RemoteCall.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/rmi/server/RemoteCall.java,v retrieving revision 1.7 diff -u -r1.7 RemoteCall.java --- java/rmi/server/RemoteCall.java 16 Oct 2004 18:27:51 -0000 1.7 +++ java/rmi/server/RemoteCall.java 21 Oct 2004 20:11:10 -0000 @@ -1,5 +1,5 @@ /* RemoteCall.java -- - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,11 +35,12 @@ 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.io.IOException; -import java.io.ObjectOutput; import java.io.ObjectInput; +import java.io.ObjectOutput; import java.io.StreamCorruptedException; /** Index: java/rmi/server/RemoteServer.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/rmi/server/RemoteServer.java,v retrieving revision 1.5 diff -u -r1.5 RemoteServer.java --- java/rmi/server/RemoteServer.java 16 Oct 2004 18:27:51 -0000 1.5 +++ java/rmi/server/RemoteServer.java 21 Oct 2004 20:11:10 -0000 @@ -1,5 +1,5 @@ /* RemoteServer.java -- - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,13 +37,13 @@ package java.rmi.server; -import java.io.OutputStream; -import java.io.PrintStream; import gnu.java.rmi.server.RMIIncomingThread; -public abstract class RemoteServer - extends RemoteObject { +import java.io.OutputStream; +import java.io.PrintStream; +public abstract class RemoteServer extends RemoteObject +{ private static final long serialVersionUID = -4100238210092549637L; protected RemoteServer() { Index: java/rmi/server/ServerRef.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/rmi/server/ServerRef.java,v retrieving revision 1.4 diff -u -r1.4 ServerRef.java --- java/rmi/server/ServerRef.java 16 Oct 2004 18:27:51 -0000 1.4 +++ java/rmi/server/ServerRef.java 21 Oct 2004 20:11:10 -0000 @@ -35,12 +35,11 @@ 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.rmi.Remote; import java.rmi.RemoteException; -import java.rmi.server.RemoteStub; -import java.rmi.server.ServerNotActiveException; public interface ServerRef extends RemoteRef { Index: java/rmi/server/UID.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/rmi/server/UID.java,v retrieving revision 1.4 diff -u -r1.4 UID.java --- java/rmi/server/UID.java 16 Oct 2004 18:27:51 -0000 1.4 +++ java/rmi/server/UID.java 21 Oct 2004 20:11:10 -0000 @@ -35,10 +35,11 @@ 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.io.DataOutput; import java.io.DataInput; +import java.io.DataOutput; import java.io.IOException; import java.io.Serializable; Index: java/rmi/server/UnicastRemoteObject.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/java/rmi/server/UnicastRemoteObject.java,v retrieving revision 1.7 diff -u -r1.7 UnicastRemoteObject.java --- java/rmi/server/UnicastRemoteObject.java 16 Oct 2004 18:27:51 -0000 1.7 +++ java/rmi/server/UnicastRemoteObject.java 21 Oct 2004 20:11:10 -0000 @@ -38,11 +38,12 @@ package java.rmi.server; -import java.rmi.RemoteException; -import java.rmi.Remote; -import java.rmi.NoSuchObjectException; import gnu.java.rmi.server.UnicastServerRef; +import java.rmi.NoSuchObjectException; +import java.rmi.Remote; +import java.rmi.RemoteException; + public class UnicastRemoteObject extends RemoteServer { private static final long serialVersionUID = 4974527148936298033L;