+2004-10-21 Michael Koch <konqueror@gmx.de>
+
+ * java/rmi/MarshalledObject.java,
+ java/rmi/Naming.java,
+ java/rmi/activation/Activatable.java,
+ java/rmi/activation/ActivationGroup.java,
+ java/rmi/activation/ActivationGroupDesc.java,
+ java/rmi/activation/ActivationInstantiator.java,
+ java/rmi/activation/ActivationMonitor.java,
+ java/rmi/activation/ActivationSystem.java,
+ java/rmi/activation/Activator.java,
+ java/rmi/registry/LocateRegistry.java,
+ java/rmi/registry/Registry.java,
+ java/rmi/server/LogStream.java,
+ java/rmi/server/ObjID.java,
+ java/rmi/server/RMIClientSocketFactory.java,
+ java/rmi/server/RMIServerSocketFactory.java,
+ java/rmi/server/RMISocketFactory.java,
+ java/rmi/server/RemoteCall.java,
+ java/rmi/server/RemoteServer.java,
+ java/rmi/server/ServerRef.java,
+ java/rmi/server/UID.java,
+ java/rmi/server/UnicastRemoteObject.java:
+ Import cleanup.
+
2004-10-21 Tom Tromey <tromey@redhat.com>
* java/util/zip/InflaterInputStream.java (fill): Don't throw an
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;
/* 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.
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 {
/* 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.
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 {
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 {
/* 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.
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
{
/* 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.
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
/* 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.
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
{
/* 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.
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;
/* 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.
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
/* 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.
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 {
/* 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.
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
{
/* 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.
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
-/* 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.
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;
/* 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.
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
{
/* 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.
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
{
/* 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.
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
{
/* 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.
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;
/**
/* 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.
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() {
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
{
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;
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;