PatchSet 3961
Date: 2003/08/18 17:40:27
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Merged in RMI from GNU Classpath, replacing kaffe's old implementation. I've left out
the RMISecurityManager for now, as it prevents native libraries needed for java.net
from loading. I've changed classpath's implementation to fix a few bugs, and added kjc
and jikes rmic compiler classes. Now at least RMIC works, but there are still some
issues with serialization and class loading.
Members:
ChangeLog:1.1559->1.1560
include/Makefile.am:1.45->1.46
include/Makefile.in:1.117->1.118
kaffe/Makefile.in:1.77->1.78
kaffe/kaffe/Makefile.in:1.91->1.92
kaffe/scripts/Makefile.in:1.100->1.101
kaffe/scripts/rmic.in:1.4->1.5
kaffe/scripts/rmiregistry.in:1.4->1.5
kaffe/scripts/compat/Makefile.in:1.83->1.84
libraries/clib/native/Makefile.am:1.25->1.26
libraries/clib/native/Makefile.in:1.104->1.105
libraries/clib/native/RMIHashes.c:1.5->1.6(DEAD)
libraries/javalib/Makefile.am:1.130->1.131
libraries/javalib/Makefile.in:1.178->1.179
libraries/javalib/gnu/java/rmi/RMIMarshalledObjectInputStream.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/RMIMarshalledObjectOutputStream.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/dgc/DGCImpl.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/dgc/DGCImpl_Skel.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/dgc/DGCImpl_Stub.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/registry/RegistryImpl.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/registry/RegistryImpl_Skel.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/registry/RegistryImpl_Stub.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/rmic/Compile_gcj.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/rmic/Compile_jikes.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/rmic/Compile_kjc.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/rmic/Compiler.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/rmic/CompilerProcess.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/rmic/RMIC.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/rmic/RMICException.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/rmic/TabbedWriter.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/server/ConnectionRunnerPool.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/server/ProtocolConstants.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/server/RMIDefaultSocketFactory.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/server/RMIHashes.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/server/RMIObjectInputStream.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/server/RMIObjectOutputStream.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/server/UnicastConnection.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/server/UnicastConnectionManager.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/server/UnicastRef.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/server/UnicastRemoteStub.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/server/UnicastServer.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/server/UnicastServerRef.java:INITIAL->1.1
libraries/javalib/java/rmi/MarshalledObject.java:1.1->1.2
libraries/javalib/java/rmi/Naming.java:1.1->1.2
libraries/javalib/java/rmi/Remote.java:1.1->1.2
libraries/javalib/java/rmi/activation/Activatable.java:1.1->1.2
libraries/javalib/java/rmi/activation/ActivationDesc.java:1.1->1.2
libraries/javalib/java/rmi/activation/ActivationGroup.java:1.1->1.2
libraries/javalib/java/rmi/activation/ActivationGroupDesc.java:1.1->1.2
libraries/javalib/java/rmi/activation/ActivationGroupID.java:1.1->1.2
libraries/javalib/java/rmi/activation/ActivationID.java:1.1->1.2
libraries/javalib/java/rmi/activation/ActivationInstantiator.java:1.1->1.2
libraries/javalib/java/rmi/activation/ActivationMonitor.java:1.1->1.2
libraries/javalib/java/rmi/activation/ActivationSystem.java:1.1->1.2
libraries/javalib/java/rmi/activation/Activator.java:1.1->1.2
libraries/javalib/java/rmi/dgc/DGC.java:1.1->1.2
libraries/javalib/java/rmi/dgc/Lease.java:1.1->1.2
libraries/javalib/java/rmi/dgc/VMID.java:1.1->1.2
libraries/javalib/java/rmi/registry/LocateRegistry.java:1.1->1.2
libraries/javalib/java/rmi/registry/Registry.java:1.1->1.2
libraries/javalib/java/rmi/registry/RegistryHandler.java:1.1->1.2
libraries/javalib/java/rmi/server/LoaderHandler.java:1.1->1.2
libraries/javalib/java/rmi/server/LogStream.java:1.1->1.2
libraries/javalib/java/rmi/server/ObjID.java:1.1->1.2
libraries/javalib/java/rmi/server/Operation.java:1.1->1.2
libraries/javalib/java/rmi/server/RMIClassLoader.java:1.1->1.2
libraries/javalib/java/rmi/server/RMIClientSocketFactory.java:1.1->1.2
libraries/javalib/java/rmi/server/RMIFailureHandler.java:1.1->1.2
libraries/javalib/java/rmi/server/RMIServerSocketFactory.java:1.1->1.2
libraries/javalib/java/rmi/server/RMISocketFactory.java:1.1->1.2
libraries/javalib/java/rmi/server/RemoteCall.java:1.1->1.2
libraries/javalib/java/rmi/server/RemoteObject.java:1.1->1.2
libraries/javalib/java/rmi/server/RemoteRef.java:1.1->1.2
libraries/javalib/java/rmi/server/RemoteServer.java:1.1->1.2
libraries/javalib/java/rmi/server/RemoteStub.java:1.1->1.2
libraries/javalib/java/rmi/server/ServerRef.java:1.1->1.2
libraries/javalib/java/rmi/server/Skeleton.java:1.1->1.2
libraries/javalib/java/rmi/server/UID.java:1.1->1.2
libraries/javalib/java/rmi/server/UnicastRemoteObject.java:1.1->1.2
libraries/javalib/java/rmi/server/Unreferenced.java:1.1->1.2
libraries/javalib/kaffe/rmi/dgc/DGCImpl.java:1.1->1.2(DEAD)
libraries/javalib/kaffe/rmi/dgc/DGCImpl_Skel.java:1.1->1.2(DEAD)
libraries/javalib/kaffe/rmi/dgc/DGCImpl_Stub.java:1.1->1.2(DEAD)
libraries/javalib/kaffe/rmi/registry/RegistryImpl.java:1.1->1.2(DEAD)
libraries/javalib/kaffe/rmi/registry/RegistryImpl_Skel.java:1.1->1.2(DEAD)
libraries/javalib/kaffe/rmi/registry/RegistryImpl_Stub.java:1.1->1.2(DEAD)
libraries/javalib/kaffe/rmi/rmic/RMIC.java:1.1->1.2(DEAD)
libraries/javalib/kaffe/rmi/rmic/TabbedWriter.java:1.1->1.2(DEAD)
libraries/javalib/kaffe/rmi/server/ProtocolConstants.java:1.1->1.2(DEAD)
libraries/javalib/kaffe/rmi/server/RMIDefaultSocketFactory.java:1.1->1.2(DEAD)
libraries/javalib/kaffe/rmi/server/RMIHashes.java:1.1->1.2(DEAD)
libraries/javalib/kaffe/rmi/server/RMIObjectInputStream.java:1.1->1.2(DEAD)
libraries/javalib/kaffe/rmi/server/RMIObjectOutputStream.java:1.1->1.2(DEAD)
libraries/javalib/kaffe/rmi/server/UnicastConnection.java:1.1->1.2(DEAD)
libraries/javalib/kaffe/rmi/server/UnicastConnectionManager.java:1.1->1.2(DEAD)
libraries/javalib/kaffe/rmi/server/UnicastRef.java:1.1->1.2(DEAD)
libraries/javalib/kaffe/rmi/server/UnicastRemoteCall.java:1.1->1.2(DEAD)
libraries/javalib/kaffe/rmi/server/UnicastRemoteStub.java:1.1->1.2(DEAD)
libraries/javalib/kaffe/rmi/server/UnicastServer.java:1.1->1.2(DEAD)
libraries/javalib/kaffe/rmi/server/UnicastServerRef.java:1.1->1.2(DEAD)
libraries/javalib/kaffe/tools/compiler/Compiler.java:1.1->1.2(DEAD)
libraries/javalib/kaffe/tools/compiler/Compiler_default.java:1.1->1.2(DEAD)
libraries/javalib/kaffe/tools/compiler/Compiler_jikes.java:1.1->1.2(DEAD)
libraries/javalib/kaffe/tools/compiler/Compiler_kjc.java:1.2->1.3(DEAD)
libraries/javalib/kaffe/tools/compiler/Compiler_pizza.java:1.2->1.3(DEAD)
libraries/javalib/profiles/allatonce/all.files:1.17->1.18
libraries/javalib/profiles/default/rmi.files:1.3->1.4
test/internal/Makefile.in:1.24->1.25
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1559 kaffe/ChangeLog:1.1560
--- kaffe/ChangeLog:1.1559 Mon Aug 18 06:34:45 2003
+++ kaffe/ChangeLog Mon Aug 18 17:40:27 2003
@@ -1,3 +1,137 @@
+2003-08-18 Dalibor Topic <[EMAIL PROTECTED]>
+
+ Merged in GNU Classpath's RMI implementation.
+
+ * include/Makefile.am:
+ Removed commented out kaffe_rmi_server_RMIHashes.h.
+
+ * include/Makefile.in,
+ kaffe/Makefile.in,
+ kaffe/kaffe/Makefile.in,
+ kaffe/scripts/Makefile.in,
+ kaffe/scripts/compat/Makefile.in,
+ libraries/clib/native/Makefile.in,
+ libraries/javalib/Makefile.am,
+ libraries/javalib/Makefile.in,
+ libraries/javalib/profiles/allatonce/all.files,
+ libraries/javalib/profiles/default/rmi.files,
+ test/internal/Makefile.in:
+ Regenerated.
+
+ * kaffe/scripts/rmic.in:
+ Execute gnu.java.rmi.rmic.RMI with kjc as the default compiler.
+
+ * kaffe/scripts/rmiregistry.in:
+ Execute gnu.java.rmi.registry.RegistryImpl.
+
+ * libraries/clib/native/Makefile.am:
+ (LANG_SRCS) Removed RMIHashes.c.
+
+ * libraries/clib/native/RMIHashes.c:
+ Removed. No longer necessary, since RMI hashes are now computed by
+ pure java code.
+
+ * libraries/javalib/gnu/java/rmi/RMIMarshalledObjectInputStream.java,
+ libraries/javalib/gnu/java/rmi/RMIMarshalledObjectOutputStream.java,
+ libraries/javalib/gnu/java/rmi/dgc/DGCImpl.java,
+ libraries/javalib/gnu/java/rmi/dgc/DGCImpl_Skel.java,
+ libraries/javalib/gnu/java/rmi/dgc/DGCImpl_Stub.java,
+ libraries/javalib/gnu/java/rmi/registry/RegistryImpl.java,
+ libraries/javalib/gnu/java/rmi/registry/RegistryImpl_Skel.java,
+ libraries/javalib/gnu/java/rmi/registry/RegistryImpl_Stub.java,
+ libraries/javalib/gnu/java/rmi/rmic/Compile_gcj.java,
+ libraries/javalib/gnu/java/rmi/rmic/Compiler.java,
+ libraries/javalib/gnu/java/rmi/rmic/CompilerProcess.java,
+ libraries/javalib/gnu/java/rmi/rmic/RMIC.java,
+ libraries/javalib/gnu/java/rmi/rmic/RMICException.java,
+ libraries/javalib/gnu/java/rmi/rmic/TabbedWriter.java,
+ libraries/javalib/gnu/java/rmi/server/ConnectionRunnerPool.java,
+ libraries/javalib/gnu/java/rmi/server/ProtocolConstants.java,
+ libraries/javalib/gnu/java/rmi/server/RMIDefaultSocketFactory.java,
+ libraries/javalib/gnu/java/rmi/server/RMIHashes.java,
+ libraries/javalib/gnu/java/rmi/server/RMIObjectInputStream.java,
+ libraries/javalib/gnu/java/rmi/server/RMIObjectOutputStream.java,
+ libraries/javalib/gnu/java/rmi/server/UnicastConnection.java,
+ libraries/javalib/gnu/java/rmi/server/UnicastConnectionManager.java,
+ libraries/javalib/gnu/java/rmi/server/UnicastRef.java,
+ libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java,
+ libraries/javalib/gnu/java/rmi/server/UnicastRemoteStub.java,
+ libraries/javalib/gnu/java/rmi/server/UnicastServer.java,
+ libraries/javalib/gnu/java/rmi/server/UnicastServerRef.java:
+ New files merged in from GNU Classpath.
+
+ * libraries/javalib/gnu/java/rmi/rmic/Compile_jikes.java,
+ libraries/javalib/gnu/java/rmi/rmic/Compile_kjc.java:
+ New files.
+
+
+ * 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/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/UID.java,
+ libraries/javalib/java/rmi/server/UnicastRemoteObject.java,
+ libraries/javalib/java/rmi/server/Unreferenced.java:
+ Replaced by implementation from GNU Classpath.
+
+ * libraries/javalib/kaffe/rmi/dgc/DGCImpl.java,
+ libraries/javalib/kaffe/rmi/dgc/DGCImpl_Skel.java,
+ libraries/javalib/kaffe/rmi/dgc/DGCImpl_Stub.java,
+ libraries/javalib/kaffe/rmi/registry/RegistryImpl.java,
+ libraries/javalib/kaffe/rmi/registry/RegistryImpl_Skel.java,
+ libraries/javalib/kaffe/rmi/registry/RegistryImpl_Stub.java,
+ libraries/javalib/kaffe/rmi/rmic/RMIC.java,
+ libraries/javalib/kaffe/rmi/rmic/TabbedWriter.java,
+ libraries/javalib/kaffe/rmi/server/ProtocolConstants.java,
+ libraries/javalib/kaffe/rmi/server/RMIDefaultSocketFactory.java,
+ libraries/javalib/kaffe/rmi/server/RMIHashes.java,
+ libraries/javalib/kaffe/rmi/server/RMIObjectInputStream.java,
+ libraries/javalib/kaffe/rmi/server/RMIObjectOutputStream.java,
+ libraries/javalib/kaffe/rmi/server/UnicastConnection.java,
+ libraries/javalib/kaffe/rmi/server/UnicastConnectionManager.java,
+ libraries/javalib/kaffe/rmi/server/UnicastRef.java,
+ libraries/javalib/kaffe/rmi/server/UnicastRemoteCall.java,
+ libraries/javalib/kaffe/rmi/server/UnicastRemoteStub.java,
+ libraries/javalib/kaffe/rmi/server/UnicastServer.java,
+ libraries/javalib/kaffe/rmi/server/UnicastServerRef.java,
+ libraries/javalib/kaffe/tools/compiler/Compiler.java,
+ libraries/javalib/kaffe/tools/compiler/Compiler_default.java,
+ libraries/javalib/kaffe/tools/compiler/Compiler_jikes.java,
+ libraries/javalib/kaffe/tools/compiler/Compiler_kjc.java,
+ libraries/javalib/kaffe/tools/compiler/Compiler_pizza.java:
+ Removed.
+
2003-08-16 Jim Pick <[EMAIL PROTECTED]>
* test/regression/TestScript.in:
Index: kaffe/include/Makefile.am
diff -u kaffe/include/Makefile.am:1.45 kaffe/include/Makefile.am:1.46
--- kaffe/include/Makefile.am:1.45 Sat Aug 16 11:03:40 2003
+++ kaffe/include/Makefile.am Mon Aug 18 17:40:27 2003
@@ -144,9 +144,6 @@
JNI_DERIVED_HDRS = $(INSTALL_JNI_DERIVED_HDRS) $(NOINSTALL_JNI_DERIVED_HDRS)
-# rmi.jar
-# kaffe_rmi_server_RMIHashes.h
-
if USE_COMPAT_IFADDRS
ifaddrs_compat = ifaddrs.h
ifaddrs.h: ifaddrs_compat.h
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.117 kaffe/include/Makefile.in:1.118
--- kaffe/include/Makefile.in:1.117 Sat Aug 16 11:03:40 2003
+++ kaffe/include/Makefile.in Mon Aug 18 17:40:27 2003
@@ -382,9 +382,6 @@
JNI_DERIVED_HDRS = $(INSTALL_JNI_DERIVED_HDRS) $(NOINSTALL_JNI_DERIVED_HDRS)
@[EMAIL PROTECTED] = #
-
-# rmi.jar
-# kaffe_rmi_server_RMIHashes.h
@[EMAIL PROTECTED] = ifaddrs.h
nodist_noinst_HEADERS = \
Index: kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/Makefile.in:1.77 kaffe/kaffe/Makefile.in:1.78
--- kaffe/kaffe/Makefile.in:1.77 Fri Aug 15 16:29:40 2003
+++ kaffe/kaffe/Makefile.in Mon Aug 18 17:40:28 2003
@@ -243,9 +243,9 @@
@[EMAIL PROTECTED] = #
@[EMAIL PROTECTED] = xprof
[EMAIL PROTECTED]@JVMPI_SUBDIRS = #
@[EMAIL PROTECTED] = jvmpi
[EMAIL PROTECTED]@JVMPI_SUBDIRS = #
SUBDIRS = kaffeh kaffevm $(XPROF_SUBDIRS) $(JVMPI_SUBDIRS) kaffe scripts man
subdir = kaffe
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.91 kaffe/kaffe/kaffe/Makefile.in:1.92
--- kaffe/kaffe/kaffe/Makefile.in:1.91 Fri Aug 15 16:29:41 2003
+++ kaffe/kaffe/kaffe/Makefile.in Mon Aug 18 17:40:29 2003
@@ -245,9 +245,9 @@
@[EMAIL PROTECTED] = #
@[EMAIL PROTECTED] = ../xprof/libkaffexprof.la
[EMAIL PROTECTED]@libjvmpi = #
@[EMAIL PROTECTED] = ../jvmpi/libkaffejvmpi.la
[EMAIL PROTECTED]@libjvmpi = #
AM_CPPFLAGS = \
-I../kaffevm \
Index: kaffe/kaffe/scripts/Makefile.in
diff -u kaffe/kaffe/scripts/Makefile.in:1.100 kaffe/kaffe/scripts/Makefile.in:1.101
--- kaffe/kaffe/scripts/Makefile.in:1.100 Fri Aug 15 16:29:41 2003
+++ kaffe/kaffe/scripts/Makefile.in Mon Aug 18 17:40:29 2003
@@ -255,8 +255,8 @@
@[EMAIL PROTECTED] = compat
[EMAIL PROTECTED]@SCRIPTFILES_COMPAT =
@[EMAIL PROTECTED] = appletviewer javac javadoc
[EMAIL PROTECTED]@SCRIPTFILES_COMPAT =
@[EMAIL PROTECTED] = kaffexprof nm2as.awk
@[EMAIL PROTECTED] =
Index: kaffe/kaffe/scripts/rmic.in
diff -u kaffe/kaffe/scripts/rmic.in:1.4 kaffe/kaffe/scripts/rmic.in:1.5
--- kaffe/kaffe/scripts/rmic.in:1.4 Sat Oct 9 19:56:38 1999
+++ kaffe/kaffe/scripts/rmic.in Mon Aug 18 17:40:29 2003
@@ -1,5 +1,5 @@
#! /bin/sh
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-exec @bindir@/@kaffe_TRANSF@ kaffe.rmi.rmic.RMIC ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ -Dclasspath.compiler=kjc gnu.java.rmi.rmic.RMIC ${1+"$@"}
Index: kaffe/kaffe/scripts/rmiregistry.in
diff -u kaffe/kaffe/scripts/rmiregistry.in:1.4 kaffe/kaffe/scripts/rmiregistry.in:1.5
--- kaffe/kaffe/scripts/rmiregistry.in:1.4 Sat Oct 9 19:56:38 1999
+++ kaffe/kaffe/scripts/rmiregistry.in Mon Aug 18 17:40:29 2003
@@ -1,5 +1,5 @@
#! /bin/sh
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-exec @bindir@/@kaffe_TRANSF@ kaffe.rmi.registry.RegistryImpl ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ gnu.java.rmi.registry.RegistryImpl ${1+"$@"}
Index: kaffe/kaffe/scripts/compat/Makefile.in
diff -u kaffe/kaffe/scripts/compat/Makefile.in:1.83
kaffe/kaffe/scripts/compat/Makefile.in:1.84
--- kaffe/kaffe/scripts/compat/Makefile.in:1.83 Fri Aug 15 16:29:42 2003
+++ kaffe/kaffe/scripts/compat/Makefile.in Mon Aug 18 17:40:30 2003
@@ -240,11 +240,11 @@
target_alias = @target_alias@
toolslibdir = @toolslibdir@
with_engine = @with_engine@
[EMAIL PROTECTED]@jrebin_SCRIPTS =
@[EMAIL PROTECTED] = java
[EMAIL PROTECTED]@jrebin_SCRIPTS =
[EMAIL PROTECTED]@bin_SCRIPTS = appletviewer javac javadoc
@[EMAIL PROTECTED] =
[EMAIL PROTECTED]@bin_SCRIPTS = appletviewer javac javadoc
subdir = kaffe/scripts/compat
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
Index: kaffe/libraries/clib/native/Makefile.am
diff -u kaffe/libraries/clib/native/Makefile.am:1.25
kaffe/libraries/clib/native/Makefile.am:1.26
--- kaffe/libraries/clib/native/Makefile.am:1.25 Sat Aug 16 11:03:41 2003
+++ kaffe/libraries/clib/native/Makefile.am Mon Aug 18 17:40:30 2003
@@ -28,7 +28,6 @@
NativeLibrary.c \
Object.c \
PrimordialClassLoader.c \
- RMIHashes.c \
Runtime.c \
String.c \
System.c \
Index: kaffe/libraries/clib/native/Makefile.in
diff -u kaffe/libraries/clib/native/Makefile.in:1.104
kaffe/libraries/clib/native/Makefile.in:1.105
--- kaffe/libraries/clib/native/Makefile.in:1.104 Sat Aug 16 11:03:41 2003
+++ kaffe/libraries/clib/native/Makefile.in Mon Aug 18 17:40:30 2003
@@ -264,7 +264,6 @@
NativeLibrary.c \
Object.c \
PrimordialClassLoader.c \
- RMIHashes.c \
Runtime.c \
String.c \
System.c \
@@ -313,9 +312,8 @@
CharToByteDefault.lo CharToByteIconv.lo ObjectInputStream.lo
am__objects_2 = Class.lo ClassLoader.lo Compiler.lo Double.lo Float.lo \
Math.lo MemoryAdvice.lo NativeLibrary.lo Object.lo \
- PrimordialClassLoader.lo RMIHashes.lo Runtime.lo String.lo \
- System.lo Thread.lo ThreadStack.lo Throwable.lo UNIXProcess.lo \
- ZipFile.lo
+ PrimordialClassLoader.lo Runtime.lo String.lo System.lo \
+ Thread.lo ThreadStack.lo Throwable.lo UNIXProcess.lo ZipFile.lo
am__objects_3 = Array.lo Constructor.lo Field.lo Method.lo
am__objects_4 = DateFormat.lo
am__objects_5 = TestNative.lo
@@ -344,10 +342,9 @@
@AMDEP_TRUE@ ./$(DEPDIR)/Object.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/ObjectInputStream.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/PrimordialClassLoader.Plo \
[EMAIL PROTECTED]@ ./$(DEPDIR)/RMIHashes.Plo ./$(DEPDIR)/Runtime.Plo \
[EMAIL PROTECTED]@ ./$(DEPDIR)/String.Plo ./$(DEPDIR)/System.Plo \
[EMAIL PROTECTED]@ ./$(DEPDIR)/TestNative.Plo ./$(DEPDIR)/Thread.Plo \
[EMAIL PROTECTED]@ ./$(DEPDIR)/ThreadStack.Plo \
[EMAIL PROTECTED]@ ./$(DEPDIR)/Runtime.Plo ./$(DEPDIR)/String.Plo \
[EMAIL PROTECTED]@ ./$(DEPDIR)/System.Plo ./$(DEPDIR)/TestNative.Plo \
[EMAIL PROTECTED]@ ./$(DEPDIR)/Thread.Plo ./$(DEPDIR)/ThreadStack.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/Throwable.Plo ./$(DEPDIR)/TimeZone.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/UNIXProcess.Plo ./$(DEPDIR)/ZipFile.Plo
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -427,7 +424,6 @@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
===================================================================
Checking out kaffe/libraries/clib/native/RMIHashes.c
RCS: /home/cvs/kaffe/kaffe/libraries/clib/native/Attic/RMIHashes.c,v
VERS: 1.5
***************
--- kaffe/libraries/clib/native/RMIHashes.c Mon Aug 18 17:42:29 2003
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,205 +0,0 @@
-/*
- * Java core library component.
- *
- * Copyright (c) 1999
- * Transvirtual Technologies, Inc. All rights reserved.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file.
- */
-
-#include "config.h"
-#include "config-std.h"
-#include "config-mem.h"
-#include "config-net.h"
-#include "../../../kaffe/kaffevm/classMethod.h"
-#include "../../../kaffe/kaffevm/access.h"
-#include "../../../kaffe/kaffevm/exception.h"
-#include "java_lang_reflect_Method.h"
-#include <native.h>
-/* #include "kaffe_rmi_server_RMIHashes.h" */
-#include "sha-1.h"
-
-/*
- * Take a class name in slashed form pkg/subpkg/name, returns
- * a newly allocated one in dot form pkg.subpkg.name.
- * Caller must free using KFREE.
- */
-char*
-pathname2ClassnameCopy(const char *orig)
-{
- char* str;
- str = KMALLOC(strlen(orig) + 1);
- if (str != 0) {
- pathname2classname(orig, str);
- }
- return (str);
-}
-
-jlong
-kaffe_rmi_server_RMIHashes_getMethodHash(struct Hjava_lang_reflect_Method* meth)
-{
- SHA1_CTX c;
- unsigned char md[SHA_DIGEST_LENGTH];
- jshort len;
- Method* m;
-
- m = &unhand(meth)->clazz->methods[unhand(meth)->slot];
-
- SHA1Init(&c);
-
- len = strlen(m->name->data);
-
- /* NOTE: Despite what it may say in the documentation about the
- * hash values for method signatures, we do not convert the '/'s
- * into '.' as we do for serialization. Why be consistent eh?
- * - TIM 9/24/99
- */
- len += strlen(METHOD_SIGD(m));
-
- len = htons(len);
- SHA1Update(&c, (char*)&len, sizeof(len));
- SHA1Update(&c, m->name->data, strlen(m->name->data));
- SHA1Update(&c, METHOD_SIGD(m), strlen(METHOD_SIGD(m)));
-
- SHA1Final(md, &c);
-
- return ( (jlong)md[0] |
- ((jlong)md[1] << 8) |
- ((jlong)md[2] << 16) |
- ((jlong)md[3] << 24) |
- ((jlong)md[4] << 32) |
- ((jlong)md[5] << 40) |
- ((jlong)md[6] << 48) |
- ((jlong)md[7] << 56) );
-}
-
-static
-void
-addUTFtoSHA(SHA1_CTX* c, const char* str)
-{
- uint16 len = htons(strlen(str));
- SHA1Update(c, (char*)&len, sizeof(len));
- SHA1Update(c, str, strlen(str));
-}
-
-static
-int
-compareMethods(const void* one, const void* two)
-{
- int r;
- Method* o = *(Method**)one;
- Method* t = *(Method**)two;
-
- /* push null entries to the right end of the array */
- if (o == 0) {
- return (1);
- }
- if (t == 0) {
- return (-1);
- }
-
- r = strcmp(o->name->data, t->name->data);
- return (r);
-}
-
-static
-int
-compareClasses(const void* one, const void* two)
-{
- int r;
- Hjava_lang_Class* o = *(Hjava_lang_Class**)one;
- Hjava_lang_Class* t = *(Hjava_lang_Class**)two;
-
- /* push null entries to the right end of the array */
- if (o == 0) {
- return (1);
- }
- if (t == 0) {
- return (-1);
- }
-
- r = strcmp(o->name->data, t->name->data);
- return (r);
-}
-
-jlong
-kaffe_rmi_server_RMIHashes_getInterfaceHash(struct Hjava_lang_Class* clazz)
-{
- SHA1_CTX c;
- unsigned char md[SHA_DIGEST_LENGTH];
- Method* m;
- int nm;
- Method** base;
- Hjava_lang_Class** ebase;
- char* name;
- int one;
- int i;
- int j;
- int en;
- errorInfo einfo;
-
- SHA1Init(&c);
-
- nm = CLASS_NMETHODS(clazz);
- m = CLASS_METHODS(clazz);
-
- base = KMALLOC(sizeof(Method*) * nm);
- for (i = 0; i < nm; i++, m++) {
- base[i] = 0;
- if ((m->accflags & (ACC_CONSTRUCTOR|ACC_PUBLIC|ACC_STATIC)) ==
ACC_PUBLIC) {
- base[i] = m;
- }
- }
- qsort(base, nm, sizeof(Method*), compareMethods);
-
- one = htonl(1);
- SHA1Update(&c, (char*)&one, sizeof(one));
-
- for (i = 0; i < nm; i++) {
- Method *emeth;
-
- m = base[i];
- if (m == 0) {
- continue;
- }
- addUTFtoSHA(&c, m->name->data);
- addUTFtoSHA(&c, METHOD_SIGD(m));
-
- if (m->ndeclared_exceptions == 0) {
- continue;
- }
- if (m->ndeclared_exceptions == -1) {
- emeth = m->declared_exceptions_u.remote_exceptions;
- } else {
- emeth = m;
- }
- en = emeth->ndeclared_exceptions;
- ebase = KMALLOC(sizeof(Hjava_lang_Class*) * en);
- for (j = 0; j < en; j++) {
- ebase[j] = getClass(emeth->declared_exceptions[j], clazz,
&einfo);
- }
- qsort(ebase, en, sizeof(Hjava_lang_Class*), compareClasses);
-
- for (j = 0; j < en; j++) {
- name = pathname2ClassnameCopy(ebase[j]->name->data);
- addUTFtoSHA(&c, name);
- KFREE(name);
- }
-
- KFREE(ebase);
- }
-
- SHA1Final(md, &c);
-
- KFREE(base);
-
- return ( (jlong)md[0] |
- ((jlong)md[1] << 8) |
- ((jlong)md[2] << 16) |
- ((jlong)md[3] << 24) |
- ((jlong)md[4] << 32) |
- ((jlong)md[5] << 40) |
- ((jlong)md[6] << 48) |
- ((jlong)md[7] << 56) );
-}
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.130
kaffe/libraries/javalib/Makefile.am:1.131
--- kaffe/libraries/javalib/Makefile.am:1.130 Sat Aug 16 11:05:39 2003
+++ kaffe/libraries/javalib/Makefile.am Mon Aug 18 17:40:31 2003
@@ -59,6 +59,11 @@
$(gnu_java_locale_SRCS) \
$(gnu_java_nio_SRCS) \
$(gnu_java_nio_charset_SRCS) \
+ $(gnu_java_rmi_SRCS) \
+ $(gnu_java_rmi_dgc_SRCS) \
+ $(gnu_java_rmi_registry_SRCS) \
+ $(gnu_java_rmi_rmic_SRCS) \
+ $(gnu_java_rmi_server_SRCS) \
$(gnu_java_security_SRCS) \
$(gnu_java_security_der_SRCS) \
$(gnu_java_security_provider_SRCS) \
@@ -157,12 +162,7 @@
$(kaffe_net_www_protocol_http_SRCS) \
$(kaffe_net_www_protocol_jar_SRCS) \
$(kaffe_net_www_protocol_system_SRCS) \
- $(kaffe_rmi_dgc_SRCS) \
- $(kaffe_rmi_registry_SRCS) \
- $(kaffe_rmi_rmic_SRCS) \
- $(kaffe_rmi_server_SRCS) \
$(kaffe_security_provider_SRCS) \
- $(kaffe_tools_compiler_SRCS) \
$(kaffe_tools_jar_SRCS) \
$(kaffe_tools_native2ascii_SRCS) \
$(kaffe_tools_serialver_SRCS) \
@@ -382,6 +382,40 @@
gnu/java/nio/charset/UTF_16.java \
gnu/java/nio/charset/UTF_16LE.java \
gnu/java/nio/charset/UTF_8.java
+gnu_java_rmi_SRCS = \
+ gnu/java/rmi/RMIMarshalledObjectInputStream.java \
+ gnu/java/rmi/RMIMarshalledObjectOutputStream.java
+gnu_java_rmi_dgc_SRCS = \
+ gnu/java/rmi/dgc/DGCImpl.java \
+ gnu/java/rmi/dgc/DGCImpl_Skel.java \
+ gnu/java/rmi/dgc/DGCImpl_Stub.java
+gnu_java_rmi_registry_SRCS = \
+ gnu/java/rmi/registry/RegistryImpl.java \
+ gnu/java/rmi/registry/RegistryImpl_Skel.java \
+ gnu/java/rmi/registry/RegistryImpl_Stub.java
+gnu_java_rmi_rmic_SRCS = \
+ gnu/java/rmi/rmic/Compile_gcj.java \
+ gnu/java/rmi/rmic/Compile_jikes.java \
+ gnu/java/rmi/rmic/Compile_kjc.java \
+ gnu/java/rmi/rmic/Compiler.java \
+ gnu/java/rmi/rmic/CompilerProcess.java \
+ gnu/java/rmi/rmic/RMICException.java \
+ gnu/java/rmi/rmic/RMIC.java \
+ gnu/java/rmi/rmic/TabbedWriter.java
+gnu_java_rmi_server_SRCS = \
+ gnu/java/rmi/server/ConnectionRunnerPool.java \
+ gnu/java/rmi/server/ProtocolConstants.java \
+ gnu/java/rmi/server/RMIDefaultSocketFactory.java \
+ gnu/java/rmi/server/RMIHashes.java \
+ gnu/java/rmi/server/RMIObjectInputStream.java \
+ gnu/java/rmi/server/RMIObjectOutputStream.java \
+ gnu/java/rmi/server/UnicastConnection.java \
+ gnu/java/rmi/server/UnicastConnectionManager.java \
+ gnu/java/rmi/server/UnicastRef.java \
+ gnu/java/rmi/server/UnicastRemoteCall.java \
+ gnu/java/rmi/server/UnicastRemoteStub.java \
+ gnu/java/rmi/server/UnicastServer.java \
+ gnu/java/rmi/server/UnicastServerRef.java
gnu_java_security_SRCS = \
gnu/java/security/Engine.java \
gnu/java/security/OID.java
@@ -2013,30 +2047,6 @@
kaffe_net_www_protocol_system_SRCS = \
kaffe/net/www/protocol/system/Handler.java \
kaffe/net/www/protocol/system/SystemURLConnection.java
-kaffe_rmi_dgc_SRCS = \
- kaffe/rmi/dgc/DGCImpl.java \
- kaffe/rmi/dgc/DGCImpl_Skel.java \
- kaffe/rmi/dgc/DGCImpl_Stub.java
-kaffe_rmi_registry_SRCS = \
- kaffe/rmi/registry/RegistryImpl.java \
- kaffe/rmi/registry/RegistryImpl_Skel.java \
- kaffe/rmi/registry/RegistryImpl_Stub.java
-kaffe_rmi_rmic_SRCS = \
- kaffe/rmi/rmic/RMIC.java \
- kaffe/rmi/rmic/TabbedWriter.java
-kaffe_rmi_server_SRCS = \
- kaffe/rmi/server/ProtocolConstants.java \
- kaffe/rmi/server/RMIDefaultSocketFactory.java \
- kaffe/rmi/server/RMIHashes.java \
- kaffe/rmi/server/RMIObjectInputStream.java \
- kaffe/rmi/server/RMIObjectOutputStream.java \
- kaffe/rmi/server/UnicastConnection.java \
- kaffe/rmi/server/UnicastConnectionManager.java \
- kaffe/rmi/server/UnicastRef.java \
- kaffe/rmi/server/UnicastRemoteCall.java \
- kaffe/rmi/server/UnicastRemoteStub.java \
- kaffe/rmi/server/UnicastServer.java \
- kaffe/rmi/server/UnicastServerRef.java
kaffe_security_provider_SRCS = \
kaffe/security/provider/Kaffe.java \
kaffe/security/provider/MD2.java \
@@ -2045,12 +2055,6 @@
kaffe/security/provider/SHA1PRNG.java \
kaffe/security/provider/SHA.java \
kaffe/security/provider/UpdateDigest.java
-kaffe_tools_compiler_SRCS = \
- kaffe/tools/compiler/Compiler_default.java \
- kaffe/tools/compiler/Compiler.java \
- kaffe/tools/compiler/Compiler_jikes.java \
- kaffe/tools/compiler/Compiler_kjc.java \
- kaffe/tools/compiler/Compiler_pizza.java
kaffe_tools_jar_SRCS = \
kaffe/tools/jar/Jar.java \
kaffe/tools/jar/XPFileInputStream.java \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.178
kaffe/libraries/javalib/Makefile.in:1.179
--- kaffe/libraries/javalib/Makefile.in:1.178 Sat Aug 16 11:05:39 2003
+++ kaffe/libraries/javalib/Makefile.in Mon Aug 18 17:40:31 2003
@@ -286,6 +286,11 @@
$(gnu_java_locale_SRCS) \
$(gnu_java_nio_SRCS) \
$(gnu_java_nio_charset_SRCS) \
+ $(gnu_java_rmi_SRCS) \
+ $(gnu_java_rmi_dgc_SRCS) \
+ $(gnu_java_rmi_registry_SRCS) \
+ $(gnu_java_rmi_rmic_SRCS) \
+ $(gnu_java_rmi_server_SRCS) \
$(gnu_java_security_SRCS) \
$(gnu_java_security_der_SRCS) \
$(gnu_java_security_provider_SRCS) \
@@ -384,12 +389,7 @@
$(kaffe_net_www_protocol_http_SRCS) \
$(kaffe_net_www_protocol_jar_SRCS) \
$(kaffe_net_www_protocol_system_SRCS) \
- $(kaffe_rmi_dgc_SRCS) \
- $(kaffe_rmi_registry_SRCS) \
- $(kaffe_rmi_rmic_SRCS) \
- $(kaffe_rmi_server_SRCS) \
$(kaffe_security_provider_SRCS) \
- $(kaffe_tools_compiler_SRCS) \
$(kaffe_tools_jar_SRCS) \
$(kaffe_tools_native2ascii_SRCS) \
$(kaffe_tools_serialver_SRCS) \
@@ -623,6 +623,45 @@
gnu/java/nio/charset/UTF_16LE.java \
gnu/java/nio/charset/UTF_8.java
+gnu_java_rmi_SRCS = \
+ gnu/java/rmi/RMIMarshalledObjectInputStream.java \
+ gnu/java/rmi/RMIMarshalledObjectOutputStream.java
+
+gnu_java_rmi_dgc_SRCS = \
+ gnu/java/rmi/dgc/DGCImpl.java \
+ gnu/java/rmi/dgc/DGCImpl_Skel.java \
+ gnu/java/rmi/dgc/DGCImpl_Stub.java
+
+gnu_java_rmi_registry_SRCS = \
+ gnu/java/rmi/registry/RegistryImpl.java \
+ gnu/java/rmi/registry/RegistryImpl_Skel.java \
+ gnu/java/rmi/registry/RegistryImpl_Stub.java
+
+gnu_java_rmi_rmic_SRCS = \
+ gnu/java/rmi/rmic/Compile_gcj.java \
+ gnu/java/rmi/rmic/Compile_jikes.java \
+ gnu/java/rmi/rmic/Compile_kjc.java \
+ gnu/java/rmi/rmic/Compiler.java \
+ gnu/java/rmi/rmic/CompilerProcess.java \
+ gnu/java/rmi/rmic/RMICException.java \
+ gnu/java/rmi/rmic/RMIC.java \
+ gnu/java/rmi/rmic/TabbedWriter.java
+
+gnu_java_rmi_server_SRCS = \
+ gnu/java/rmi/server/ConnectionRunnerPool.java \
+ gnu/java/rmi/server/ProtocolConstants.java \
+ gnu/java/rmi/server/RMIDefaultSocketFactory.java \
+ gnu/java/rmi/server/RMIHashes.java \
+ gnu/java/rmi/server/RMIObjectInputStream.java \
+ gnu/java/rmi/server/RMIObjectOutputStream.java \
+ gnu/java/rmi/server/UnicastConnection.java \
+ gnu/java/rmi/server/UnicastConnectionManager.java \
+ gnu/java/rmi/server/UnicastRef.java \
+ gnu/java/rmi/server/UnicastRemoteCall.java \
+ gnu/java/rmi/server/UnicastRemoteStub.java \
+ gnu/java/rmi/server/UnicastServer.java \
+ gnu/java/rmi/server/UnicastServerRef.java
+
gnu_java_security_SRCS = \
gnu/java/security/Engine.java \
gnu/java/security/OID.java
@@ -2352,34 +2391,6 @@
kaffe/net/www/protocol/system/Handler.java \
kaffe/net/www/protocol/system/SystemURLConnection.java
-kaffe_rmi_dgc_SRCS = \
- kaffe/rmi/dgc/DGCImpl.java \
- kaffe/rmi/dgc/DGCImpl_Skel.java \
- kaffe/rmi/dgc/DGCImpl_Stub.java
-
-kaffe_rmi_registry_SRCS = \
- kaffe/rmi/registry/RegistryImpl.java \
- kaffe/rmi/registry/RegistryImpl_Skel.java \
- kaffe/rmi/registry/RegistryImpl_Stub.java
-
-kaffe_rmi_rmic_SRCS = \
- kaffe/rmi/rmic/RMIC.java \
- kaffe/rmi/rmic/TabbedWriter.java
-
-kaffe_rmi_server_SRCS = \
- kaffe/rmi/server/ProtocolConstants.java \
- kaffe/rmi/server/RMIDefaultSocketFactory.java \
- kaffe/rmi/server/RMIHashes.java \
- kaffe/rmi/server/RMIObjectInputStream.java \
- kaffe/rmi/server/RMIObjectOutputStream.java \
- kaffe/rmi/server/UnicastConnection.java \
- kaffe/rmi/server/UnicastConnectionManager.java \
- kaffe/rmi/server/UnicastRef.java \
- kaffe/rmi/server/UnicastRemoteCall.java \
- kaffe/rmi/server/UnicastRemoteStub.java \
- kaffe/rmi/server/UnicastServer.java \
- kaffe/rmi/server/UnicastServerRef.java
-
kaffe_security_provider_SRCS = \
kaffe/security/provider/Kaffe.java \
kaffe/security/provider/MD2.java \
@@ -2388,13 +2399,6 @@
kaffe/security/provider/SHA1PRNG.java \
kaffe/security/provider/SHA.java \
kaffe/security/provider/UpdateDigest.java
-
-kaffe_tools_compiler_SRCS = \
- kaffe/tools/compiler/Compiler_default.java \
- kaffe/tools/compiler/Compiler.java \
- kaffe/tools/compiler/Compiler_jikes.java \
- kaffe/tools/compiler/Compiler_kjc.java \
- kaffe/tools/compiler/Compiler_pizza.java
kaffe_tools_jar_SRCS = \
kaffe/tools/jar/Jar.java \
===================================================================
Checking out kaffe/libraries/javalib/gnu/java/rmi/RMIMarshalledObjectInputStream.java
RCS:
/home/cvs/kaffe/kaffe/libraries/javalib/gnu/java/rmi/RMIMarshalledObjectInputStream.java,v
VERS: 1.1
***************
--- /dev/null Sun Aug 4 19:57:58 2002
+++ kaffe/libraries/javalib/gnu/java/rmi/RMIMarshalledObjectInputStream.java Mon
Aug 18 17:42:30 2003
@@ -0,0 +1,70 @@
+/* gnu.java.rmi.RMIMarshalledObjectInputStream
+ Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+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. */
+
+
+package gnu.java.rmi;
+
+import gnu.java.rmi.server.RMIObjectInputStream;
+import java.io.ObjectInputStream;
+import java.io.IOException;
+import java.io.ByteArrayInputStream;
+
+/**
+ * This class is only for java.rmi.MarshalledObject to deserialize object from
+ * objBytes and locBytes
+ */
+
+public class RMIMarshalledObjectInputStream extends RMIObjectInputStream
+{
+ private ObjectInputStream locStream;
+
+ public RMIMarshalledObjectInputStream(byte[] objBytes, byte[] locBytes) throws
IOException
+ {
+ super(new ByteArrayInputStream(objBytes));
+ if(locBytes != null)
+ locStream = new ObjectInputStream(new ByteArrayInputStream(locBytes));
+ }
+
+ //This method overrides RMIObjectInputStream's
+ protected Object getAnnotation() throws IOException, ClassNotFoundException
+ {
+ if(locStream == null)
+ return null;
+ return locStream.readObject();
+ }
+
+} // End of RMIMarshalledObjectInputStream
===================================================================
Checking out kaffe/libraries/javalib/gnu/java/rmi/RMIMarshalledObjectOutputStream.java
RCS:
/home/cvs/kaffe/kaffe/libraries/javalib/gnu/java/rmi/RMIMarshalledObjectOutputStream.java,v
VERS: 1.1
***************
--- /dev/null Sun Aug 4 19:57:58 2002
+++ kaffe/libraries/javalib/gnu/java/rmi/RMIMarshalledObjectOutputStream.java Mon
Aug 18 17:42:30 2003
@@ -0,0 +1,83 @@
+/* gnu.java.rmi.RMIMarshalledObjectOutputStream
+ Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+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
*** Patch too long, truncated ***
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
