The following changes are all from patch submissions from Intel's

ORP team to get Classpath into a JBOSS compatible state.  This
is primarily just the non-public API patches.

* gnu/java/io/PlatformHelper.java: new file
* gnu/java/io/Makefile.am: add new file to EXTRA_DIST
* gnu/java/lang/ClassLoaderHelper.java (getSystemResourceAsFile):
add support for .zip/.jar archive loading
* gnu/java/lang/reflect/TypeSignature.java: additional comments
* gnu/java/net/protocol/file/FileURLConnection.java (connect): if
file does not exist, throw FileNotFoundException
* gnu/java/net/protocol/file/Handler.java (parseURL): override
method from URLStreamHandler for parsing file URL
* gnu/java/net/protocol/jar/JarURLConnection.java: new file
* gnu/java/net/protocol/jar/Handler.java: new file
* gnu/java/net/protocol/jar/.cvsignore: new file
* gnu/java/net/protocol/jar/Makefile.am: new file
* gnu/java/net/protocol/Makefile.am: add jar to SUBDIRS
* gnu/java/rmi/RMIMarshalledObjectInputStream.java: new file
* gnu/java/rmi/RMIMarshalledObjectOutputStream.java: new file
* gnu/java/rmi/Makefile.am: add new file to EXTRA_DIST
* gnu/java/rmi/dgc/DGCImpl.java (dirty): partially implemented
* gnu/java/rmi/server/Makefile.am: add new file to EXTRA_DIST
* gnu/java/rmi/server/ConnectionRunnerPool.java: new file
* gnu/java/rmi/server/RMIHashes.java (getMethodHash): conformance
to object serialization specification 8.3
* gnu/java/rmi/server/RMIObjectInputStream.java
(RMIObjectInputStream): new constructor
(resolveClass): try additional method of loading class and catch
exception from super.resolveClass
(getAnnotation): new method
(resolveProxyClass): new method
(readValue): new method
* gnu/java/rmi/server/RMIObjectOutputStream.java
(setAnnotation): new method
(annotateClass): use new setAnnotation method
(annotateProxyClass): new method
(replaceObject): new method
(writeValue): new method
* gnu/java/rmi/server/UnicastConnection.java
(acceptConnection): use buffered streams to improve efficiency
(makeConnection): ditto
(disconnect): close oout stream if needed
* gnu/java/rmi/server/UnicastConnectionManager.java
(static): use host address instead of host name
(getInstance): ditto
(stopServer): new method
(run): exit thread if server thread is null
* gnu/java/rmi/server/UnicastRef.java (invokeCommon): handle
primitive types and null return type
(writeExternal): remove write of RETURN_ACK because it confuses Sun's
implementation when interoperating
(readExternal): similarly read of RETURN_ACK or Sun's value ok
* gnu/java/rmi/server/UnicastServer.java
(unexportObject): new method
(incomingMessageCall): check for primitive type and write it out
correctly
* gnu/java/rmi/server/UnicastServerRef.java: implements ServerRef
(exportObject): call new exportObject method with argument
(exportObject): new method, not completely implemented
(unexportObject): new method
(getHelperClass): remove use of Class.forName
(buildMethodHash): boolean argument allows build up or tear down
of method hash
(getMethodReturnType): new method
(incomingMessageCall): handle exceptions from meth.invoke differently
* gnu/java/security/provider/DefaultPolicy.java
(getPermissions): do not maintain static class variable of Permissions
* gnu/java/security/provider/SHA.java
(engineUpdate): algorithm change
(engineDigest): algorithm change
* java/io/ObjectInputStream.java (resolveProxyClass): new method
* configure.in: add new Makefiles to AC_OUTPUT

1 files changed, 103 insertions, 0 deletions

diff --git a/gnu/java/rmi/RMIMarshalledObjectOutputStream.java b/gnu/java/rmi/RMIMarshalledObjectOutputStream.java
new file mode 100644
index 000000000..663929198
--- /dev/null
+++ b/gnu/java/rmi/RMIMarshalledObjectOutputStream.java
@@ -0,0 +1,103 @@
+/* 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
+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 java.io.OutputStream;
+import java.io.ObjectOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.rmi.Remote;
+import java.rmi.server.ObjID;
+import java.rmi.server.RemoteStub;
+
+import gnu.java.rmi.server.RMIObjectOutputStream;
+import gnu.java.rmi.server.UnicastServerRef;
+
+/**
+ * This class is only for java.rmi.MarshalledObject to serialize object and 
+ * got objBytes and locBytes
+ */
+public class RMIMarshalledObjectOutputStream extends RMIObjectOutputStream
+{
+  private ObjectOutputStream locStream;
+  private ByteArrayOutputStream locBytesStream;
+  
+  public RMIMarshalledObjectOutputStream(OutputStream objStream) throws IOException
+  {
+    super(objStream);
+  }
+  
+  //This method overrides RMIObjectOutputStream's.
+  protected void setAnnotation(String annotation) throws IOException{
+    synchronized(this){
+      if(locStream == null){
+	locBytesStream = new ByteArrayOutputStream();
+	locStream = new ObjectOutputStream(locBytesStream);
+      }
+    }
+    locStream.writeObject(annotation);
+  }
+  
+  //This method overrides ObjectOutputStream's to replace Remote to RemoteStub 
+  protected Object replaceObject(Object obj) throws IOException
+  {
+    if((obj instanceof Remote) && !(obj instanceof RemoteStub))
+      {
+	UnicastServerRef ref = new UnicastServerRef(new ObjID(), 0, null);
+	try{
+	  return ref.exportObject((Remote)obj);
+	}catch(Exception e){}
+      }
+    return obj;
+  }
+  
+  public void flush() throws IOException {
+    super.flush();
+    if(locStream != null)
+      locStream.flush();
+  }
+  
+  public byte[] getLocBytes(){
+    if(locStream != null)
+      return locBytesStream.toByteArray();
+    return null;
+  }
+  
+} // End of RMIMarshalledObjectOutputStream
+