2003-03-21 Michael Koch <konqueror@gmx.de>
* java/rmi/activation/Activatable.java (serialVersionUID): New member variable. * java/rmi/activation/ActivationGroup.java (serialVersionUID): New member variable. * java/rmi/activation/ActivationGroupDesc.java (serialVersionUID): New member variable. * java/rmi/registry/Registry.java: Reformated. (Registry): Deprecated. * java/rmi/server/LoaderHandler.java Reformated. (LoaderHandler): Deprecated. * java/rmi/server/LogStream.java Reformated. (LogStream): Deprecated. * java/rmi/server/Operation.java (Operation): Deprecated. * java/rmi/server/RMIFailureHandler.java: Reformated. * java/rmi/server/RMISocketFactory.java: Reformated. * java/rmi/server/RemoteCall.java (RemoteCall): Deprecated. * java/rmi/server/RemoteStub.java: Reformated. * java/rmi/server/Skeleton.java Reformated. (Skeleton): Deprecated. From-SVN: r64655
This commit is contained in:
parent
ae429eabd8
commit
15596d409e
15 changed files with 223 additions and 122 deletions
|
@ -48,6 +48,8 @@ import java.rmi.MarshalledObject;
|
|||
public abstract class Activatable
|
||||
extends RemoteServer {
|
||||
|
||||
static final long serialVersionUID = -3120617863591563455L;
|
||||
|
||||
protected Activatable(String location, MarshalledObject data, boolean restart, int port) throws ActivationException, RemoteException {
|
||||
throw new Error("Not implemented");
|
||||
}
|
||||
|
|
|
@ -46,6 +46,8 @@ public abstract class ActivationGroup
|
|||
extends UnicastRemoteObject
|
||||
implements ActivationInstantiator {
|
||||
|
||||
static final long serialVersionUID = -7696947875314805420L;
|
||||
|
||||
protected ActivationGroup(ActivationGroupID groupID) throws RemoteException {
|
||||
throw new Error("Not implemented");
|
||||
}
|
||||
|
|
|
@ -48,6 +48,8 @@ public final class ActivationGroupDesc implements Serializable
|
|||
public static class CommandEnvironment
|
||||
implements Serializable {
|
||||
|
||||
static final long serialVersionUID = 6165754737887770191L;
|
||||
|
||||
private String cmdpath;
|
||||
private String[] argv;
|
||||
|
||||
|
|
|
@ -43,19 +43,22 @@ import java.rmi.AccessException;
|
|||
import java.rmi.AlreadyBoundException;
|
||||
import java.rmi.Remote;
|
||||
|
||||
public interface Registry
|
||||
extends Remote {
|
||||
public interface Registry extends Remote
|
||||
{
|
||||
public static final int REGISTRY_PORT = 1099;
|
||||
|
||||
public static int REGISTRY_PORT = 1099;
|
||||
public Remote lookup(String name)
|
||||
throws RemoteException, NotBoundException, AccessException;
|
||||
|
||||
public Remote lookup(String name) throws RemoteException, NotBoundException, AccessException;
|
||||
public void bind(String name, Remote obj)
|
||||
throws RemoteException, AlreadyBoundException, AccessException;
|
||||
|
||||
public void bind(String name, Remote obj) throws RemoteException, AlreadyBoundException, AccessException;
|
||||
public void unbind(String name)
|
||||
throws RemoteException, NotBoundException, AccessException;
|
||||
|
||||
public void unbind(String name) throws RemoteException, NotBoundException, AccessException;
|
||||
|
||||
public void rebind(String name, Remote obj) throws RemoteException, AccessException;
|
||||
|
||||
public String[] list() throws RemoteException, AccessException;
|
||||
public void rebind(String name, Remote obj)
|
||||
throws RemoteException, AccessException;
|
||||
|
||||
public String[] list()
|
||||
throws RemoteException, AccessException;
|
||||
}
|
||||
|
|
|
@ -40,15 +40,18 @@ package java.rmi.server;
|
|||
import java.net.MalformedURLException;
|
||||
import java.net.URL;
|
||||
|
||||
/**
|
||||
* @deprecated
|
||||
*/
|
||||
public interface LoaderHandler
|
||||
{
|
||||
public static final String packagePrefix = "";
|
||||
|
||||
public interface LoaderHandler {
|
||||
public Class loadClass(String name)
|
||||
throws MalformedURLException, ClassNotFoundException;
|
||||
|
||||
public static final String packagePrefix = "";
|
||||
|
||||
public Class loadClass(String name) throws MalformedURLException, ClassNotFoundException;
|
||||
|
||||
public Class loadClass(URL codebase, String name) throws MalformedURLException, ClassNotFoundException;
|
||||
|
||||
public Object getSecurityContext(ClassLoader loader);
|
||||
public Class loadClass(URL codebase, String name)
|
||||
throws MalformedURLException, ClassNotFoundException;
|
||||
|
||||
public Object getSecurityContext(ClassLoader loader);
|
||||
}
|
||||
|
|
|
@ -41,62 +41,80 @@ import java.io.PrintStream;
|
|||
import java.io.OutputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
/**
|
||||
* @deprecated
|
||||
*/
|
||||
public class LogStream
|
||||
extends PrintStream {
|
||||
extends PrintStream
|
||||
{
|
||||
public static final int SILENT = 0;
|
||||
public static final int BRIEF = 10;
|
||||
public static final int VERBOSE = 20;
|
||||
|
||||
public static final int SILENT = 0;
|
||||
public static final int BRIEF = 10;
|
||||
public static final int VERBOSE = 20;
|
||||
private static PrintStream defStream;
|
||||
|
||||
private static PrintStream defStream;
|
||||
private LogStream(OutputStream s)
|
||||
{
|
||||
super(s);
|
||||
}
|
||||
|
||||
private LogStream(OutputStream s) {
|
||||
super(s);
|
||||
}
|
||||
public static LogStream log(String name)
|
||||
{
|
||||
throw new Error("Not implemented");
|
||||
}
|
||||
|
||||
public static LogStream log(String name) {
|
||||
throw new Error("Not implemented");
|
||||
}
|
||||
public static PrintStream getDefaultStream()
|
||||
{
|
||||
return (defStream);
|
||||
}
|
||||
|
||||
public static void setDefaultStream(PrintStream s)
|
||||
{
|
||||
defStream = s;
|
||||
}
|
||||
|
||||
public static PrintStream getDefaultStream() {
|
||||
return (defStream);
|
||||
}
|
||||
public OutputStream getOutputStream()
|
||||
{
|
||||
return (out);
|
||||
}
|
||||
|
||||
public static void setDefaultStream(PrintStream s) {
|
||||
defStream = s;
|
||||
}
|
||||
public void setOutputStream(OutputStream s)
|
||||
{
|
||||
out = s;
|
||||
}
|
||||
|
||||
public OutputStream getOutputStream() {
|
||||
return (out);
|
||||
}
|
||||
public void write(int b)
|
||||
{
|
||||
super.write(b);
|
||||
}
|
||||
|
||||
public void setOutputStream(OutputStream s) {
|
||||
out = s;
|
||||
}
|
||||
public void write(byte[] b, int off, int len)
|
||||
{
|
||||
super.write(b, off, len);
|
||||
}
|
||||
|
||||
public void write(int b) {
|
||||
super.write(b);
|
||||
}
|
||||
public String toString()
|
||||
{
|
||||
throw new Error("Not implemented");
|
||||
}
|
||||
|
||||
public void write(byte[] b, int off, int len) {
|
||||
super.write(b, off, len);
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
throw new Error("Not implemented");
|
||||
}
|
||||
|
||||
public static int parseLevel(String s) {
|
||||
if (s.equalsIgnoreCase("silent")) {
|
||||
return (SILENT);
|
||||
}
|
||||
if (s.equalsIgnoreCase("brief")) {
|
||||
return (BRIEF);
|
||||
}
|
||||
if (s.equalsIgnoreCase("verbose")) {
|
||||
return (VERBOSE);
|
||||
}
|
||||
return (SILENT);
|
||||
public static int parseLevel(String s) {
|
||||
if (s.equalsIgnoreCase("silent"))
|
||||
{
|
||||
return (SILENT);
|
||||
}
|
||||
|
||||
if (s.equalsIgnoreCase("brief"))
|
||||
{
|
||||
return (BRIEF);
|
||||
}
|
||||
|
||||
if (s.equalsIgnoreCase("verbose"))
|
||||
{
|
||||
return (VERBOSE);
|
||||
}
|
||||
|
||||
return (SILENT);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -37,6 +37,9 @@ exception statement from your version. */
|
|||
|
||||
package java.rmi.server;
|
||||
|
||||
/**
|
||||
* @deprecated
|
||||
*/
|
||||
public class Operation {
|
||||
|
||||
private String operation;
|
||||
|
|
|
@ -37,8 +37,10 @@ exception statement from your version. */
|
|||
|
||||
package java.rmi.server;
|
||||
|
||||
public interface RMIFailureHandler {
|
||||
|
||||
public boolean failure(Exception ex);
|
||||
|
||||
public interface RMIFailureHandler
|
||||
{
|
||||
/**
|
||||
* @exception IOException If an error occurs
|
||||
*/
|
||||
public boolean failure (Exception ex);
|
||||
}
|
||||
|
|
|
@ -43,42 +43,64 @@ import java.io.IOException;
|
|||
import gnu.java.rmi.server.RMIDefaultSocketFactory;
|
||||
|
||||
public abstract class RMISocketFactory
|
||||
implements RMIClientSocketFactory, RMIServerSocketFactory {
|
||||
implements RMIClientSocketFactory, RMIServerSocketFactory
|
||||
{
|
||||
static private RMISocketFactory defaultFactory;
|
||||
static private RMISocketFactory currentFactory;
|
||||
static private RMIFailureHandler currentHandler;
|
||||
|
||||
static private RMISocketFactory defaultFactory;
|
||||
static private RMISocketFactory currentFactory;
|
||||
static private RMIFailureHandler currentHandler;
|
||||
|
||||
static {
|
||||
defaultFactory = new RMIDefaultSocketFactory();
|
||||
currentFactory = defaultFactory;
|
||||
}
|
||||
|
||||
public RMISocketFactory() {
|
||||
}
|
||||
|
||||
public abstract Socket createSocket(String host, int port) throws IOException;
|
||||
|
||||
public abstract ServerSocket createServerSocket(int port) throws IOException;
|
||||
|
||||
public static void setSocketFactory(RMISocketFactory fac) throws IOException {
|
||||
currentFactory = fac;
|
||||
}
|
||||
|
||||
public static RMISocketFactory getSocketFactory() {
|
||||
return (currentFactory);
|
||||
}
|
||||
|
||||
public static RMISocketFactory getDefaultSocketFactory() {
|
||||
return (defaultFactory);
|
||||
}
|
||||
|
||||
public static void setFailureHandler(RMIFailureHandler fh) {
|
||||
currentHandler = fh;
|
||||
}
|
||||
|
||||
public static RMIFailureHandler getFailureHandler() {
|
||||
return (currentHandler);
|
||||
}
|
||||
static
|
||||
{
|
||||
defaultFactory = new RMIDefaultSocketFactory();
|
||||
currentFactory = defaultFactory;
|
||||
}
|
||||
|
||||
public RMISocketFactory ()
|
||||
{
|
||||
}
|
||||
|
||||
/**
|
||||
* @exception IOException If an error occurs
|
||||
*/
|
||||
public abstract Socket createSocket (String host, int port)
|
||||
throws IOException;
|
||||
|
||||
/**
|
||||
* @exception IOException If an error occurs
|
||||
*/
|
||||
public abstract ServerSocket createServerSocket (int port)
|
||||
throws IOException;
|
||||
|
||||
/**
|
||||
* @exception IOException If an error occurs
|
||||
* @exception SecurityException FIXME
|
||||
*/
|
||||
public static void setSocketFactory (RMISocketFactory fac)
|
||||
throws IOException
|
||||
{
|
||||
currentFactory = fac;
|
||||
}
|
||||
|
||||
public static RMISocketFactory getSocketFactory ()
|
||||
{
|
||||
return currentFactory;
|
||||
}
|
||||
|
||||
public static RMISocketFactory getDefaultSocketFactory ()
|
||||
{
|
||||
return defaultFactory;
|
||||
}
|
||||
|
||||
/**
|
||||
* @exception SecurityException FIXME
|
||||
*/
|
||||
public static void setFailureHandler (RMIFailureHandler fh)
|
||||
{
|
||||
currentHandler = fh;
|
||||
}
|
||||
|
||||
public static RMIFailureHandler getFailureHandler ()
|
||||
{
|
||||
return currentHandler;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -43,6 +43,9 @@ import java.io.ObjectOutput;
|
|||
import java.io.ObjectInput;
|
||||
import java.io.StreamCorruptedException;
|
||||
|
||||
/**
|
||||
* @deprecated
|
||||
*/
|
||||
public interface RemoteCall {
|
||||
|
||||
public ObjectOutput getOutputStream() throws IOException;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
|
||||
Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Classpath.
|
||||
|
||||
|
@ -38,20 +38,22 @@ exception statement from your version. */
|
|||
package java.rmi.server;
|
||||
|
||||
public abstract class RemoteStub
|
||||
extends RemoteObject {
|
||||
extends RemoteObject
|
||||
{
|
||||
static final long serialVersionUID = -1585587260594494182l;
|
||||
|
||||
public static final long serialVersionUID = -1585587260594494182l;
|
||||
protected RemoteStub ()
|
||||
{
|
||||
super ();
|
||||
}
|
||||
|
||||
protected RemoteStub() {
|
||||
super();
|
||||
}
|
||||
protected RemoteStub (RemoteRef ref)
|
||||
{
|
||||
super (ref);
|
||||
}
|
||||
|
||||
protected RemoteStub(RemoteRef ref) {
|
||||
super(ref);
|
||||
}
|
||||
|
||||
protected static void setRef(RemoteStub stub, RemoteRef ref) {
|
||||
stub.ref = ref;
|
||||
}
|
||||
|
||||
}
|
||||
protected static void setRef (RemoteStub stub, RemoteRef ref)
|
||||
{
|
||||
stub.ref = ref;
|
||||
}
|
||||
} // class RemoteSub
|
||||
|
|
|
@ -41,9 +41,13 @@ import java.rmi.Remote;
|
|||
import java.lang.Exception;
|
||||
import java.rmi.server.RemoteCall;
|
||||
|
||||
public interface Skeleton {
|
||||
|
||||
public void dispatch(Remote obj, RemoteCall theCall, int opnum, long hash) throws Exception;
|
||||
public Operation[] getOperations();
|
||||
/**
|
||||
* @deprecated
|
||||
*/
|
||||
public interface Skeleton
|
||||
{
|
||||
public void dispatch (Remote obj, RemoteCall theCall, int opnum, long hash)
|
||||
throws Exception;
|
||||
|
||||
public Operation[] getOperations();
|
||||
}
|
||||
|
|
|
@ -70,6 +70,8 @@ public interface AttributedCharacterIterator extends CharacterIterator
|
|||
public static class Attribute implements Serializable
|
||||
{
|
||||
|
||||
private static final long serialVersionUID = -9142742483513960612L;
|
||||
|
||||
/*************************************************************************/
|
||||
|
||||
/*
|
||||
|
|
|
@ -143,6 +143,8 @@ final class MessageFormatElement
|
|||
|
||||
public class MessageFormat extends Format
|
||||
{
|
||||
private static final long serialVersionUID = 6479157306784022952L;
|
||||
|
||||
// Helper that returns the text up to the next format opener. The
|
||||
// text is put into BUFFER. Returns index of character after end of
|
||||
// string. Throws IllegalArgumentException on error.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue