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, 158 insertions, 0 deletions

diff --git a/gnu/java/net/protocol/jar/Handler.java b/gnu/java/net/protocol/jar/Handler.java
new file mode 100644
index 000000000..ff463b6f1
--- /dev/null
+++ b/gnu/java/net/protocol/jar/Handler.java
@@ -0,0 +1,158 @@
+/* gnu.java.net.protocol.jar.Handler - jar protocol handler for java.net
+   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.net.protocol.jar;
+
+import java.net.URL;
+import java.net.URLStreamHandler;
+import java.net.URLConnection;
+import java.io.IOException;
+import gnu.java.io.PlatformHelper;
+
+public class Handler extends URLStreamHandler
+{
+
+/*************************************************************************/
+
+/*
+ * Constructors
+ */
+
+/**
+  * A do nothing constructor
+  */
+public
+Handler()
+{
+  ;
+}
+
+/*************************************************************************/
+
+/*
+ * Instance Methods
+ */
+
+/**
+  * This method returs a new JarURLConnection for the specified URL
+  *
+  * @param url The URL to return a connection for
+  *
+  * @return The URLConnection
+  *
+  * @exception IOException If an error occurs
+  */
+protected URLConnection
+openConnection(URL url) throws IOException
+{
+  return(new gnu.java.net.protocol.jar.JarURLConnection(url));
+}
+
+/**
+  * This method overrides URLStreamHandler's for parsing url of protocol "file"
+  *
+  * @param url The URL object in which to store the results
+  * @param url_string The String-ized URL to parse
+  * @param start The position in the string to start scanning from
+  * @param end The position in the string to stop scanning
+  */
+protected void
+parseURL(URL url, String url_string, int start, int end)
+{
+    // This method does not throw an exception or return a value.  Thus our
+    // strategy when we encounter an error in parsing is to return without
+    // doing anything.
+    String file = url.getFile();
+    
+    if (file != null){ //has context url
+        if (url_string.startsWith("/")){ //url string is an absolute path
+            int idx = file.lastIndexOf("!/");
+            if (idx == -1) //context path is weird
+                file = file + "!" + url_string; 
+            else
+                file = file.substring(0, idx+1) + url_string;
+        }else{
+            int idx = file.lastIndexOf("/");
+            if (idx == -1) //context path is weird
+                file = "/" + url_string; 
+            else if (idx == (file.length() - 1))
+                //just concatenate two parts
+                file = file + url_string;
+            else
+                // according to Java API Documentation, here is a little different 
+                // with URLStreamHandler.parseURL
+                // but JDK seems doesn't handle it well
+                file = file + "/" + url_string;
+        }
+        setURL(url, "jar", url.getHost(), url.getPort(), file, null);
+        return;
+    }
+
+    // Bunches of things should be true.  Make sure.
+    if (end < start)
+        return;
+    if (end - start < 2)
+        return;
+    if (start > url_string.length())
+        return;
+    
+    // Skip remains of protocol
+    url_string = url_string.substring(start);
+    
+    if ( !url.getProtocol().equals("jar") )
+        return;
+        
+    setURL(url, "jar", url.getHost(), url.getPort(), url_string, null);
+}
+
+/**
+  * This method converts a Jar URL object into a String.
+  *
+  * @param url The URL object to convert
+  */
+protected String
+toExternalForm(URL url)
+{
+  String file = url.getFile();
+
+  return "jar:" + file;
+}
+
+
+} // class Handler
+