[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: RMI fixes & cleanups
Kaffe CVS
cvs-commits at kaffe.org
Sat Oct 16 09:10:53 PDT 2004
PatchSet 5302
Date: 2004/10/16 16:06:49
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: RMI fixes & cleanups
2004-10-16 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/java/rmi/RMISecurityManager.java:
Replaced by implementation from GNU Classpath.
* libraries/javalib/java/rmi/MarshalledObject.java,
libraries/javalib/java/rmi/Naming.java,
libraries/javalib/java/rmi/Remote.java,
libraries/javalib/java/rmi/activation/Activatable.java,
libraries/javalib/java/rmi/activation/ActivationDesc.java,
libraries/javalib/java/rmi/activation/ActivationGroup.java,
libraries/javalib/java/rmi/activation/ActivationGroupDesc.java,
libraries/javalib/java/rmi/activation/ActivationGroupID.java,
libraries/javalib/java/rmi/activation/ActivationID.java,
libraries/javalib/java/rmi/activation/ActivationInstantiator.java,
libraries/javalib/java/rmi/activation/ActivationMonitor.java,
libraries/javalib/java/rmi/activation/ActivationSystem.java,
libraries/javalib/java/rmi/activation/Activator.java,
libraries/javalib/java/rmi/dgc/DGC.java,
libraries/javalib/java/rmi/dgc/Lease.java,
libraries/javalib/java/rmi/dgc/VMID.java,
libraries/javalib/java/rmi/registry/LocateRegistry.java,
libraries/javalib/java/rmi/registry/Registry.java,
libraries/javalib/java/rmi/registry/RegistryHandler.java,
libraries/javalib/java/rmi/server/LoaderHandler.java,
libraries/javalib/java/rmi/server/LogStream.java,
libraries/javalib/java/rmi/server/ObjID.java,
libraries/javalib/java/rmi/server/Operation.java,
libraries/javalib/java/rmi/server/RMIClassLoader.java,
libraries/javalib/java/rmi/server/RMIClassLoaderSpi.java,
libraries/javalib/java/rmi/server/RMIClientSocketFactory.java,
libraries/javalib/java/rmi/server/RMIFailureHandler.java,
libraries/javalib/java/rmi/server/RMIServerSocketFactory.java,
libraries/javalib/java/rmi/server/RMISocketFactory.java,
libraries/javalib/java/rmi/server/RemoteCall.java,
libraries/javalib/java/rmi/server/RemoteObject.java,
libraries/javalib/java/rmi/server/RemoteRef.java,
libraries/javalib/java/rmi/server/RemoteServer.java,
libraries/javalib/java/rmi/server/RemoteStub.java,
libraries/javalib/java/rmi/server/ServerRef.java,
libraries/javalib/java/rmi/server/Skeleton.java,
libraries/javalib/java/rmi/server/SkeletonMismatchException.java,
libraries/javalib/java/rmi/server/UID.java,
libraries/javalib/java/rmi/server/UnicastRemoteObject.java,
libraries/javalib/java/rmi/server/Unreferenced.java:
Resynced with GNU Classpath.
2004-10-15 Michael Koch <konqueror at gmx.de>
* java/rmi/activation/ActivationSystem.java
(SYSTEM_PORT): Initialize with correct port number.
2004-10-15 Michael Koch <konqueror at gmx.de>
* java/rmi/server/RemoteRef.java
(serialVersionUID): Revert latest change to it.
* java/rmi/server/ServerRef.java
(serialVersionUID): Revert latest change to it.
2004-10-15 Michael Koch <konqueror at gmx.de>
* 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:
Fixed file headers and import statements.
Members:
ChangeLog:1.2854->1.2855
libraries/javalib/java/rmi/MarshalledObject.java:1.5->1.6
libraries/javalib/java/rmi/Naming.java:1.5->1.6
libraries/javalib/java/rmi/RMISecurityManager.java:1.1->1.2
libraries/javalib/java/rmi/Remote.java:1.2->1.3
libraries/javalib/java/rmi/activation/Activatable.java:1.3->1.4
libraries/javalib/java/rmi/activation/ActivationDesc.java:1.2->1.3
libraries/javalib/java/rmi/activation/ActivationGroup.java:1.3->1.4
libraries/javalib/java/rmi/activation/ActivationGroupDesc.java:1.3->1.4
libraries/javalib/java/rmi/activation/ActivationGroupID.java:1.2->1.3
libraries/javalib/java/rmi/activation/ActivationID.java:1.2->1.3
libraries/javalib/java/rmi/activation/ActivationInstantiator.java:1.4->1.5
libraries/javalib/java/rmi/activation/ActivationMonitor.java:1.4->1.5
libraries/javalib/java/rmi/activation/ActivationSystem.java:1.3->1.4
libraries/javalib/java/rmi/activation/Activator.java:1.4->1.5
libraries/javalib/java/rmi/dgc/DGC.java:1.3->1.4
libraries/javalib/java/rmi/dgc/Lease.java:1.3->1.4
libraries/javalib/java/rmi/dgc/VMID.java:1.2->1.3
libraries/javalib/java/rmi/registry/LocateRegistry.java:1.3->1.4
libraries/javalib/java/rmi/registry/Registry.java:1.4->1.5
libraries/javalib/java/rmi/registry/RegistryHandler.java:1.3->1.4
libraries/javalib/java/rmi/server/LoaderHandler.java:1.3->1.4
libraries/javalib/java/rmi/server/LogStream.java:1.3->1.4
libraries/javalib/java/rmi/server/ObjID.java:1.3->1.4
libraries/javalib/java/rmi/server/Operation.java:1.2->1.3
libraries/javalib/java/rmi/server/RMIClassLoader.java:1.5->1.6
libraries/javalib/java/rmi/server/RMIClassLoaderSpi.java:1.1->1.2
libraries/javalib/java/rmi/server/RMIClientSocketFactory.java:1.4->1.5
libraries/javalib/java/rmi/server/RMIFailureHandler.java:1.3->1.4
libraries/javalib/java/rmi/server/RMIServerSocketFactory.java:1.4->1.5
libraries/javalib/java/rmi/server/RMISocketFactory.java:1.3->1.4
libraries/javalib/java/rmi/server/RemoteCall.java:1.4->1.5
libraries/javalib/java/rmi/server/RemoteObject.java:1.3->1.4
libraries/javalib/java/rmi/server/RemoteRef.java:1.4->1.5
libraries/javalib/java/rmi/server/RemoteServer.java:1.4->1.5
libraries/javalib/java/rmi/server/RemoteStub.java:1.2->1.3
libraries/javalib/java/rmi/server/ServerRef.java:1.4->1.5
libraries/javalib/java/rmi/server/Skeleton.java:1.4->1.5
libraries/javalib/java/rmi/server/SkeletonMismatchException.java:1.2->1.3
libraries/javalib/java/rmi/server/UID.java:1.4->1.5
libraries/javalib/java/rmi/server/UnicastRemoteObject.java:1.3->1.4
libraries/javalib/java/rmi/server/Unreferenced.java:1.3->1.4
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2854 kaffe/ChangeLog:1.2855
--- kaffe/ChangeLog:1.2854 Sat Oct 16 14:48:46 2004
+++ kaffe/ChangeLog Sat Oct 16 16:06:49 2004
@@ -1,5 +1,109 @@
2004-10-16 Dalibor Topic <robilad at kaffe.org>
+ * libraries/javalib/java/rmi/RMISecurityManager.java:
+ Replaced by implementation from GNU Classpath.
+
+ * libraries/javalib/java/rmi/MarshalledObject.java,
+ libraries/javalib/java/rmi/Naming.java,
+ libraries/javalib/java/rmi/Remote.java,
+ libraries/javalib/java/rmi/activation/Activatable.java,
+ libraries/javalib/java/rmi/activation/ActivationDesc.java,
+ libraries/javalib/java/rmi/activation/ActivationGroup.java,
+ libraries/javalib/java/rmi/activation/ActivationGroupDesc.java,
+ libraries/javalib/java/rmi/activation/ActivationGroupID.java,
+ libraries/javalib/java/rmi/activation/ActivationID.java,
+ libraries/javalib/java/rmi/activation/ActivationInstantiator.java,
+ libraries/javalib/java/rmi/activation/ActivationMonitor.java,
+ libraries/javalib/java/rmi/activation/ActivationSystem.java,
+ libraries/javalib/java/rmi/activation/Activator.java,
+ libraries/javalib/java/rmi/dgc/DGC.java,
+ libraries/javalib/java/rmi/dgc/Lease.java,
+ libraries/javalib/java/rmi/dgc/VMID.java,
+ libraries/javalib/java/rmi/registry/LocateRegistry.java,
+ libraries/javalib/java/rmi/registry/Registry.java,
+ libraries/javalib/java/rmi/registry/RegistryHandler.java,
+ libraries/javalib/java/rmi/server/LoaderHandler.java,
+ libraries/javalib/java/rmi/server/LogStream.java,
+ libraries/javalib/java/rmi/server/ObjID.java,
+ libraries/javalib/java/rmi/server/Operation.java,
+ libraries/javalib/java/rmi/server/RMIClassLoader.java,
+ libraries/javalib/java/rmi/server/RMIClassLoaderSpi.java,
+ libraries/javalib/java/rmi/server/RMIClientSocketFactory.java,
+ libraries/javalib/java/rmi/server/RMIFailureHandler.java,
+ libraries/javalib/java/rmi/server/RMIServerSocketFactory.java,
+ libraries/javalib/java/rmi/server/RMISocketFactory.java,
+ libraries/javalib/java/rmi/server/RemoteCall.java,
+ libraries/javalib/java/rmi/server/RemoteObject.java,
+ libraries/javalib/java/rmi/server/RemoteRef.java,
+ libraries/javalib/java/rmi/server/RemoteServer.java,
+ libraries/javalib/java/rmi/server/RemoteStub.java,
+ libraries/javalib/java/rmi/server/ServerRef.java,
+ libraries/javalib/java/rmi/server/Skeleton.java,
+ libraries/javalib/java/rmi/server/SkeletonMismatchException.java,
+ libraries/javalib/java/rmi/server/UID.java,
+ libraries/javalib/java/rmi/server/UnicastRemoteObject.java,
+ libraries/javalib/java/rmi/server/Unreferenced.java:
+ Resynced with GNU Classpath.
+
+ 2004-10-15 Michael Koch <konqueror at gmx.de>
+
+ * java/rmi/activation/ActivationSystem.java
+ (SYSTEM_PORT): Initialize with correct port number.
+
+ 2004-10-15 Michael Koch <konqueror at gmx.de>
+
+ * java/rmi/server/RemoteRef.java
+ (serialVersionUID): Revert latest change to it.
+ * java/rmi/server/ServerRef.java
+ (serialVersionUID): Revert latest change to it.
+
+ 2004-10-15 Michael Koch <konqueror at gmx.de>
+
+ * 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:
+ Fixed file headers and import statements.
+
+2004-10-16 Dalibor Topic <robilad at kaffe.org>
+
* libraries/javalib/java/net/InetAddress.java:
Resynced with GNU Classpath.
Index: kaffe/libraries/javalib/java/rmi/MarshalledObject.java
diff -u kaffe/libraries/javalib/java/rmi/MarshalledObject.java:1.5 kaffe/libraries/javalib/java/rmi/MarshalledObject.java:1.6
--- kaffe/libraries/javalib/java/rmi/MarshalledObject.java:1.5 Mon May 17 14:36:17 2004
+++ kaffe/libraries/javalib/java/rmi/MarshalledObject.java Sat Oct 16 16:06:52 2004
@@ -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: kaffe/libraries/javalib/java/rmi/Naming.java
diff -u kaffe/libraries/javalib/java/rmi/Naming.java:1.5 kaffe/libraries/javalib/java/rmi/Naming.java:1.6
--- kaffe/libraries/javalib/java/rmi/Naming.java:1.5 Mon May 17 14:36:17 2004
+++ kaffe/libraries/javalib/java/rmi/Naming.java Sat Oct 16 16:06:52 2004
@@ -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: kaffe/libraries/javalib/java/rmi/RMISecurityManager.java
diff -u kaffe/libraries/javalib/java/rmi/RMISecurityManager.java:1.1 kaffe/libraries/javalib/java/rmi/RMISecurityManager.java:1.2
--- kaffe/libraries/javalib/java/rmi/RMISecurityManager.java:1.1 Wed Nov 27 06:57:38 2002
+++ kaffe/libraries/javalib/java/rmi/RMISecurityManager.java Sat Oct 16 16:06:52 2004
@@ -1,117 +1,48 @@
-/*
- * Copyright (c) 1996, 1997, 1998, 1999
- * Transvirtual Technologies, Inc. All rights reserved.
- *
- * See the file "license-lesser.terms" for information on usage and
- * redistribution of this file.
- */
-
-package java.rmi;
-
-import java.io.FileDescriptor;
-import java.net.InetAddress;
-import java.security.Permission;
-
-public class RMISecurityManager extends SecurityManager {
-
-public RMISecurityManager() {
-}
-
-public void checkAccept(String host, int port) {
-}
-
-public void checkAccess(Thread g) {
-}
-
-public void checkAccess(ThreadGroup g) {
-}
-
-public void checkAwtEventQueueAccess() {
-}
-
-public void checkConnect(String host, int port) {
-}
-
-public void checkConnect(String host, int port, Object context) {
-}
-
-public void checkCreateClassLoader() {
-}
-
-public void checkDelete(String file) {
-}
-
-public void checkExec(String cmd) {
-}
-
-public void checkExit(int status) {
-}
-
-public void checkLink(String lib) {
-}
-
-public void checkListen(int port) {
-}
-
-public void checkMemberAccess ( Class clazz, int which ) {
-}
+/* RMISecurityManager.java --
+ Copyright (c) 1996, 1997, 1998, 1999, 2003 Free Software Foundation, Inc.
-public void checkMulticast(InetAddress maddr) {
-}
+This file is part of GNU Classpath.
-public void checkMulticast(InetAddress maddr, byte ttl) {
-}
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+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. */
-public void checkPackageAccess(String pkg) {
-}
-
-public void checkPackageDefinition(String pkg) {
-}
-
-public void checkPermission(Permission perm) {
-}
-
-public void checkPermission(Permission perm, Object context) {
-}
-
-public void checkPrintJobAccess() {
-}
-
-public void checkPropertiesAccess() {
-}
-
-public void checkPropertyAccess(String key) {
-}
-
-/* public void checkPropertyAccess(String key, String def) {
-}*/
-
-public void checkRead(FileDescriptor fd) {
-}
-
-public void checkRead(String file) {
-}
-
-public void checkRead(String file, Object context) {
-}
-
-public void checkSecurityAccess(String action) {
-}
-
-public void checkSetFactory() {
-}
-
-public void checkSystemClipboardAccess() {
-}
-
-public boolean checkTopLevelWindow(Object window) {
- return (true);
-}
-
-public void checkWrite(FileDescriptor fd) {
-}
-
-public void checkWrite(String file) {
-}
+package java.rmi;
+/**
+ * @since 1.1
+ */
+public class RMISecurityManager extends SecurityManager
+{
+ public RMISecurityManager()
+ {
+ }
}
Index: kaffe/libraries/javalib/java/rmi/Remote.java
diff -u kaffe/libraries/javalib/java/rmi/Remote.java:1.2 kaffe/libraries/javalib/java/rmi/Remote.java:1.3
--- kaffe/libraries/javalib/java/rmi/Remote.java:1.2 Mon Aug 18 17:40:34 2003
+++ kaffe/libraries/javalib/java/rmi/Remote.java Sat Oct 16 16:06:52 2004
@@ -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: kaffe/libraries/javalib/java/rmi/activation/Activatable.java
diff -u kaffe/libraries/javalib/java/rmi/activation/Activatable.java:1.3 kaffe/libraries/javalib/java/rmi/activation/Activatable.java:1.4
--- kaffe/libraries/javalib/java/rmi/activation/Activatable.java:1.3 Mon Mar 22 11:24:55 2004
+++ kaffe/libraries/javalib/java/rmi/activation/Activatable.java Sat Oct 16 16:06:52 2004
@@ -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.
@@ -37,13 +37,13 @@
package java.rmi.activation;
-import java.rmi.MarshalledObject;
-import java.rmi.NoSuchObjectException;
-import java.rmi.Remote;
-import java.rmi.RemoteException;
+import java.rmi.server.RemoteServer;
import java.rmi.server.RMIClientSocketFactory;
import java.rmi.server.RMIServerSocketFactory;
-import java.rmi.server.RemoteServer;
+import java.rmi.RemoteException;
+import java.rmi.Remote;
+import java.rmi.NoSuchObjectException;
+import java.rmi.MarshalledObject;
public abstract class Activatable
extends RemoteServer {
Index: kaffe/libraries/javalib/java/rmi/activation/ActivationDesc.java
diff -u kaffe/libraries/javalib/java/rmi/activation/ActivationDesc.java:1.2 kaffe/libraries/javalib/java/rmi/activation/ActivationDesc.java:1.3
--- kaffe/libraries/javalib/java/rmi/activation/ActivationDesc.java:1.2 Mon Aug 18 17:40:34 2003
+++ kaffe/libraries/javalib/java/rmi/activation/ActivationDesc.java Sat Oct 16 16:06:52 2004
@@ -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: kaffe/libraries/javalib/java/rmi/activation/ActivationGroup.java
diff -u kaffe/libraries/javalib/java/rmi/activation/ActivationGroup.java:1.3 kaffe/libraries/javalib/java/rmi/activation/ActivationGroup.java:1.4
--- kaffe/libraries/javalib/java/rmi/activation/ActivationGroup.java:1.3 Mon Mar 22 11:24:55 2004
+++ kaffe/libraries/javalib/java/rmi/activation/ActivationGroup.java Sat Oct 16 16:06:52 2004
@@ -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.
@@ -37,10 +37,10 @@
package java.rmi.activation;
-import java.rmi.MarshalledObject;
-import java.rmi.Remote;
-import java.rmi.RemoteException;
import java.rmi.server.UnicastRemoteObject;
+import java.rmi.RemoteException;
+import java.rmi.Remote;
+import java.rmi.MarshalledObject;
public abstract class ActivationGroup
extends UnicastRemoteObject
Index: kaffe/libraries/javalib/java/rmi/activation/ActivationGroupDesc.java
diff -u kaffe/libraries/javalib/java/rmi/activation/ActivationGroupDesc.java:1.3 kaffe/libraries/javalib/java/rmi/activation/ActivationGroupDesc.java:1.4
--- kaffe/libraries/javalib/java/rmi/activation/ActivationGroupDesc.java:1.3 Mon Mar 22 11:24:55 2004
+++ kaffe/libraries/javalib/java/rmi/activation/ActivationGroupDesc.java Sat Oct 16 16:06:52 2004
@@ -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.
@@ -38,8 +38,8 @@
package java.rmi.activation;
import java.io.Serializable;
-import java.rmi.MarshalledObject;
import java.util.Properties;
+import java.rmi.MarshalledObject;
public final class ActivationGroupDesc implements Serializable
{
Index: kaffe/libraries/javalib/java/rmi/activation/ActivationGroupID.java
diff -u kaffe/libraries/javalib/java/rmi/activation/ActivationGroupID.java:1.2 kaffe/libraries/javalib/java/rmi/activation/ActivationGroupID.java:1.3
--- kaffe/libraries/javalib/java/rmi/activation/ActivationGroupID.java:1.2 Mon Aug 18 17:40:34 2003
+++ kaffe/libraries/javalib/java/rmi/activation/ActivationGroupID.java Sat Oct 16 16:06:52 2004
@@ -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: kaffe/libraries/javalib/java/rmi/activation/ActivationID.java
diff -u kaffe/libraries/javalib/java/rmi/activation/ActivationID.java:1.2 kaffe/libraries/javalib/java/rmi/activation/ActivationID.java:1.3
--- kaffe/libraries/javalib/java/rmi/activation/ActivationID.java:1.2 Mon Aug 18 17:40:34 2003
+++ kaffe/libraries/javalib/java/rmi/activation/ActivationID.java Sat Oct 16 16:06:52 2004
@@ -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: kaffe/libraries/javalib/java/rmi/activation/ActivationInstantiator.java
diff -u kaffe/libraries/javalib/java/rmi/activation/ActivationInstantiator.java:1.4 kaffe/libraries/javalib/java/rmi/activation/ActivationInstantiator.java:1.5
--- kaffe/libraries/javalib/java/rmi/activation/ActivationInstantiator.java:1.4 Mon Mar 22 11:24:55 2004
+++ kaffe/libraries/javalib/java/rmi/activation/ActivationInstantiator.java Sat Oct 16 16:06:52 2004
@@ -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.
@@ -37,9 +37,9 @@
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: kaffe/libraries/javalib/java/rmi/activation/ActivationMonitor.java
diff -u kaffe/libraries/javalib/java/rmi/activation/ActivationMonitor.java:1.4 kaffe/libraries/javalib/java/rmi/activation/ActivationMonitor.java:1.5
--- kaffe/libraries/javalib/java/rmi/activation/ActivationMonitor.java:1.4 Mon Mar 22 11:24:55 2004
+++ kaffe/libraries/javalib/java/rmi/activation/ActivationMonitor.java Sat Oct 16 16:06:52 2004
@@ -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.
@@ -37,9 +37,9 @@
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: kaffe/libraries/javalib/java/rmi/activation/ActivationSystem.java
diff -u kaffe/libraries/javalib/java/rmi/activation/ActivationSystem.java:1.3 kaffe/libraries/javalib/java/rmi/activation/ActivationSystem.java:1.4
--- kaffe/libraries/javalib/java/rmi/activation/ActivationSystem.java:1.3 Wed Oct 22 10:34:56 2003
+++ kaffe/libraries/javalib/java/rmi/activation/ActivationSystem.java Sat Oct 16 16:06:52 2004
@@ -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.
@@ -42,7 +42,7 @@
public interface ActivationSystem extends Remote
{
- int SYSTEM_PORT = 0; // XXX
+ int SYSTEM_PORT = 1098;
ActivationID registerObject (ActivationDesc desc)
throws ActivationException, UnknownGroupException, RemoteException;
Index: kaffe/libraries/javalib/java/rmi/activation/Activator.java
diff -u kaffe/libraries/javalib/java/rmi/activation/Activator.java:1.4 kaffe/libraries/javalib/java/rmi/activation/Activator.java:1.5
--- kaffe/libraries/javalib/java/rmi/activation/Activator.java:1.4 Mon Mar 22 11:24:55 2004
+++ kaffe/libraries/javalib/java/rmi/activation/Activator.java Sat Oct 16 16:06:52 2004
@@ -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.
@@ -37,9 +37,9 @@
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: kaffe/libraries/javalib/java/rmi/dgc/DGC.java
diff -u kaffe/libraries/javalib/java/rmi/dgc/DGC.java:1.3 kaffe/libraries/javalib/java/rmi/dgc/DGC.java:1.4
--- kaffe/libraries/javalib/java/rmi/dgc/DGC.java:1.3 Wed Oct 22 10:34:56 2003
+++ kaffe/libraries/javalib/java/rmi/dgc/DGC.java Sat Oct 16 16:06:53 2004
@@ -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: kaffe/libraries/javalib/java/rmi/dgc/Lease.java
diff -u kaffe/libraries/javalib/java/rmi/dgc/Lease.java:1.3 kaffe/libraries/javalib/java/rmi/dgc/Lease.java:1.4
--- kaffe/libraries/javalib/java/rmi/dgc/Lease.java:1.3 Mon Mar 22 11:24:57 2004
+++ kaffe/libraries/javalib/java/rmi/dgc/Lease.java Sat Oct 16 16:06:53 2004
@@ -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.
Index: kaffe/libraries/javalib/java/rmi/dgc/VMID.java
diff -u kaffe/libraries/javalib/java/rmi/dgc/VMID.java:1.2 kaffe/libraries/javalib/java/rmi/dgc/VMID.java:1.3
--- kaffe/libraries/javalib/java/rmi/dgc/VMID.java:1.2 Mon Aug 18 17:40:35 2003
+++ kaffe/libraries/javalib/java/rmi/dgc/VMID.java Sat Oct 16 16:06:53 2004
@@ -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: kaffe/libraries/javalib/java/rmi/registry/LocateRegistry.java
diff -u kaffe/libraries/javalib/java/rmi/registry/LocateRegistry.java:1.3 kaffe/libraries/javalib/java/rmi/registry/LocateRegistry.java:1.4
--- kaffe/libraries/javalib/java/rmi/registry/LocateRegistry.java:1.3 Mon Mar 22 11:24:57 2004
+++ kaffe/libraries/javalib/java/rmi/registry/LocateRegistry.java Sat Oct 16 16:06:53 2004
@@ -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,16 +37,16 @@
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: kaffe/libraries/javalib/java/rmi/registry/Registry.java
diff -u kaffe/libraries/javalib/java/rmi/registry/Registry.java:1.4 kaffe/libraries/javalib/java/rmi/registry/Registry.java:1.5
--- kaffe/libraries/javalib/java/rmi/registry/Registry.java:1.4 Mon Mar 22 11:24:57 2004
+++ kaffe/libraries/javalib/java/rmi/registry/Registry.java Sat Oct 16 16:06:53 2004
@@ -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.
@@ -37,11 +37,11 @@
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: kaffe/libraries/javalib/java/rmi/registry/RegistryHandler.java
diff -u kaffe/libraries/javalib/java/rmi/registry/RegistryHandler.java:1.3 kaffe/libraries/javalib/java/rmi/registry/RegistryHandler.java:1.4
--- kaffe/libraries/javalib/java/rmi/registry/RegistryHandler.java:1.3 Wed Oct 22 10:34:57 2003
+++ kaffe/libraries/javalib/java/rmi/registry/RegistryHandler.java Sat Oct 16 16:06:53 2004
@@ -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: kaffe/libraries/javalib/java/rmi/server/LoaderHandler.java
diff -u kaffe/libraries/javalib/java/rmi/server/LoaderHandler.java:1.3 kaffe/libraries/javalib/java/rmi/server/LoaderHandler.java:1.4
--- kaffe/libraries/javalib/java/rmi/server/LoaderHandler.java:1.3 Wed Oct 22 10:34:57 2003
+++ kaffe/libraries/javalib/java/rmi/server/LoaderHandler.java Sat Oct 16 16:06:54 2004
@@ -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: kaffe/libraries/javalib/java/rmi/server/LogStream.java
diff -u kaffe/libraries/javalib/java/rmi/server/LogStream.java:1.3 kaffe/libraries/javalib/java/rmi/server/LogStream.java:1.4
--- kaffe/libraries/javalib/java/rmi/server/LogStream.java:1.3 Mon Mar 22 11:24:58 2004
+++ kaffe/libraries/javalib/java/rmi/server/LogStream.java Sat Oct 16 16:06:54 2004
@@ -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.
@@ -37,8 +37,8 @@
package java.rmi.server;
-import java.io.OutputStream;
import java.io.PrintStream;
+import java.io.OutputStream;
/**
* @deprecated
Index: kaffe/libraries/javalib/java/rmi/server/ObjID.java
diff -u kaffe/libraries/javalib/java/rmi/server/ObjID.java:1.3 kaffe/libraries/javalib/java/rmi/server/ObjID.java:1.4
--- kaffe/libraries/javalib/java/rmi/server/ObjID.java:1.3 Mon Mar 22 11:24:58 2004
+++ kaffe/libraries/javalib/java/rmi/server/ObjID.java Sat Oct 16 16:06:54 2004
@@ -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.
@@ -37,12 +37,12 @@
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 {
Index: kaffe/libraries/javalib/java/rmi/server/Operation.java
diff -u kaffe/libraries/javalib/java/rmi/server/Operation.java:1.2 kaffe/libraries/javalib/java/rmi/server/Operation.java:1.3
--- kaffe/libraries/javalib/java/rmi/server/Operation.java:1.2 Mon Aug 18 17:40:36 2003
+++ kaffe/libraries/javalib/java/rmi/server/Operation.java Sat Oct 16 16:06:54 2004
@@ -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: kaffe/libraries/javalib/java/rmi/server/RMIClassLoader.java
diff -u kaffe/libraries/javalib/java/rmi/server/RMIClassLoader.java:1.5 kaffe/libraries/javalib/java/rmi/server/RMIClassLoader.java:1.6
--- kaffe/libraries/javalib/java/rmi/server/RMIClassLoader.java:1.5 Thu Dec 4 01:30:33 2003
+++ kaffe/libraries/javalib/java/rmi/server/RMIClassLoader.java Sat Oct 16 16:06:54 2004
@@ -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: kaffe/libraries/javalib/java/rmi/server/RMIClassLoaderSpi.java
diff -u kaffe/libraries/javalib/java/rmi/server/RMIClassLoaderSpi.java:1.1 kaffe/libraries/javalib/java/rmi/server/RMIClassLoaderSpi.java:1.2
--- kaffe/libraries/javalib/java/rmi/server/RMIClassLoaderSpi.java:1.1 Fri Aug 15 16:59:09 2003
+++ kaffe/libraries/javalib/java/rmi/server/RMIClassLoaderSpi.java Sat Oct 16 16:06:54 2004
@@ -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: kaffe/libraries/javalib/java/rmi/server/RMIClientSocketFactory.java
diff -u kaffe/libraries/javalib/java/rmi/server/RMIClientSocketFactory.java:1.4 kaffe/libraries/javalib/java/rmi/server/RMIClientSocketFactory.java:1.5
--- kaffe/libraries/javalib/java/rmi/server/RMIClientSocketFactory.java:1.4 Mon Mar 22 11:24:58 2004
+++ kaffe/libraries/javalib/java/rmi/server/RMIClientSocketFactory.java Sat Oct 16 16:06:54 2004
@@ -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.
@@ -37,8 +37,8 @@
package java.rmi.server;
-import java.io.IOException;
import java.net.Socket;
+import java.io.IOException;
public interface RMIClientSocketFactory
{
Index: kaffe/libraries/javalib/java/rmi/server/RMIFailureHandler.java
diff -u kaffe/libraries/javalib/java/rmi/server/RMIFailureHandler.java:1.3 kaffe/libraries/javalib/java/rmi/server/RMIFailureHandler.java:1.4
--- kaffe/libraries/javalib/java/rmi/server/RMIFailureHandler.java:1.3 Wed Oct 22 10:34:57 2003
+++ kaffe/libraries/javalib/java/rmi/server/RMIFailureHandler.java Sat Oct 16 16:06:54 2004
@@ -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: kaffe/libraries/javalib/java/rmi/server/RMIServerSocketFactory.java
diff -u kaffe/libraries/javalib/java/rmi/server/RMIServerSocketFactory.java:1.4 kaffe/libraries/javalib/java/rmi/server/RMIServerSocketFactory.java:1.5
--- kaffe/libraries/javalib/java/rmi/server/RMIServerSocketFactory.java:1.4 Mon Mar 22 11:24:58 2004
+++ kaffe/libraries/javalib/java/rmi/server/RMIServerSocketFactory.java Sat Oct 16 16:06:54 2004
@@ -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.
@@ -37,8 +37,8 @@
package java.rmi.server;
-import java.io.IOException;
import java.net.ServerSocket;
+import java.io.IOException;
public interface RMIServerSocketFactory
{
Index: kaffe/libraries/javalib/java/rmi/server/RMISocketFactory.java
diff -u kaffe/libraries/javalib/java/rmi/server/RMISocketFactory.java:1.3 kaffe/libraries/javalib/java/rmi/server/RMISocketFactory.java:1.4
--- kaffe/libraries/javalib/java/rmi/server/RMISocketFactory.java:1.3 Mon Mar 22 11:24:58 2004
+++ kaffe/libraries/javalib/java/rmi/server/RMISocketFactory.java Sat Oct 16 16:06:54 2004
@@ -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.
@@ -37,11 +37,10 @@
package java.rmi.server;
-import gnu.java.rmi.server.RMIDefaultSocketFactory;
-
-import java.io.IOException;
-import java.net.ServerSocket;
import java.net.Socket;
+import java.net.ServerSocket;
+import java.io.IOException;
+import gnu.java.rmi.server.RMIDefaultSocketFactory;
public abstract class RMISocketFactory
implements RMIClientSocketFactory, RMIServerSocketFactory
Index: kaffe/libraries/javalib/java/rmi/server/RemoteCall.java
diff -u kaffe/libraries/javalib/java/rmi/server/RemoteCall.java:1.4 kaffe/libraries/javalib/java/rmi/server/RemoteCall.java:1.5
--- kaffe/libraries/javalib/java/rmi/server/RemoteCall.java:1.4 Mon Mar 22 11:24:58 2004
+++ kaffe/libraries/javalib/java/rmi/server/RemoteCall.java Sat Oct 16 16:06:54 2004
@@ -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.
*** Patch too long, truncated ***
More information about the kaffe
mailing list