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

7 files changed, 485 insertions, 7 deletions

diff --git a/gnu/java/net/protocol/Makefile.am b/gnu/java/net/protocol/Makefile.am
index 8d0b95c5c..6ad338f17 100644
--- a/gnu/java/net/protocol/Makefile.am
+++ b/gnu/java/net/protocol/Makefile.am
@@ -1,4 +1,4 @@
 # this file used by automake to generate Makefile.in
 
-SUBDIRS = file http
+SUBDIRS = file http jar
 
diff --git a/gnu/java/net/protocol/file/FileURLConnection.java b/gnu/java/net/protocol/file/FileURLConnection.java
index 826ac51d2..4648629d4 100644
--- a/gnu/java/net/protocol/file/FileURLConnection.java
+++ b/gnu/java/net/protocol/file/FileURLConnection.java
@@ -63,27 +63,37 @@ public class FileURLConnection extends java.net.URLConnection
    */
   private java.io.FileOutputStream out_stream;
 
-  
 
+  
   /**
    * Calls superclass constructor to initialize.
    */
-  protected FileURLConnection (java.net.URL url)
+  protected FileURLConnection(java.net.URL url)
   {
     super(url);
+    
     /* Set up some variables */
     doOutput = false;
   }
-
+  
+  /*************************************************************************/
+  
+  /*
+   * Instance Methods
+   */
+  
   /**
    * "Connects" to the file by opening it.
    */
-  public void connect ()
-    throws java.io.IOException
+  public void connect() throws java.io.IOException
   {
+    if(connected)return;
     file = new java.io.File(getURL().getFile());
+    if(!file.exists())
+      throw new java.io.FileNotFoundException(file.getPath());
+    connected = true;
   }
-
+  
   /**
    * Opens the file for reading and returns a stream for it.
    *
diff --git a/gnu/java/net/protocol/file/Handler.java b/gnu/java/net/protocol/file/Handler.java
index 176c437fb..aa36eaf0c 100644
--- a/gnu/java/net/protocol/file/Handler.java
+++ b/gnu/java/net/protocol/file/Handler.java
@@ -44,6 +44,7 @@ import java.net.URL;
 import java.net.URLStreamHandler;
 import java.net.URLConnection;
 import java.io.IOException;
+import gnu.java.io.PlatformHelper;
 
 /**
   * This is the protocol handler for the "file" protocol.
@@ -77,5 +78,169 @@ public class Handler extends URLStreamHandler
     return (new gnu.java.net.protocol.file.FileURLConnection(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.
+
+    // Bunches of things should be true.  Make sure.
+    if (end < start)
+        return;
+    if (end - start < 2)
+        return;
+    if (start > url_string.length())
+        return;
+    if (end > url_string.length())
+        end = url_string.length(); // This should be safe
+    
+    // Turn end into an offset from the end of the string instead of 
+    // the beginning
+    end = url_string.length() - end;
+    
+    // Skip remains of protocol
+    url_string = url_string.substring(start);
+    
+    if ( !url.getProtocol().equals("file") )
+        return;
+    
+    // Normalize the file separator
+    url_string = url_string.replace(System.getProperty("file.separator").charAt(0), '/');
+    
+    // Deal with the case: file:///d|/dir/dir/file and file:///d%7C/dir/dir/file
+    url_string = url_string.replace('|', ':');
+    int i;
+    if ((i = url_string.toUpperCase().indexOf("%7C")) >= 0)
+        url_string = url_string.substring(0, i) + ":" + url_string.substring(i+3);
+
+    boolean needContext = url.getFile() != null;
+    // Skip the leading "//"
+    if (url_string.startsWith("//")){
+        url_string = url_string.substring(2);
+        needContext = false;
+    }
+
+    // Declare some variables
+    String host = null;
+    int port = -1;
+    String file = null;
+    String anchor = null;
+    String prefix = "/";  //root path prefix of a file: could be "/", and for some windows file: "drive:/"
+    
+    if (!needContext){
+        boolean hostpart = true; //whether host part presents
+        
+        // Deal with the UNC case: //server/file
+        if ( url_string.startsWith("//") ){
+            hostpart = true;
+            url_string = url_string.substring(2);
+        }
+        else {
+            // If encounter another "/", it's end of a null host part or beginning of root path 
+            if ( url_string.startsWith("/") ){
+                hostpart = false;
+                url_string = url_string.substring(1);
+            }
+        }
+        
+        // If another "/" or "drive:/" or "drive:\\" encounters, 
+        if ( (i = PlatformHelper.beginWithRootPathPrefix(url_string)) > 0) {
+            hostpart = false;
+            // Skip root path prefix
+            prefix = url_string.substring(0, i);
+            url_string = url_string.substring(i);
+        }
+        
+        if (hostpart){
+          // Process host and port
+          int slash_index = url_string.indexOf("/");
+          int colon_index = url_string.indexOf(":");
+        
+          if (slash_index > (url_string.length() - end))
+              return;
+          else if (slash_index == -1)
+              slash_index = url_string.length() - end;
+        
+          if ((colon_index == -1) || (colon_index > slash_index)) {
+              host = url_string.substring(0, slash_index);
+          }
+          else {
+              host = url_string.substring(0, colon_index);
+          
+              String port_str = url_string.substring(colon_index + 1, slash_index);
+              try {
+                  port = Integer.parseInt(port_str);
+              }
+              catch (NumberFormatException e) {
+                  return;
+              }
+          }
+          if (slash_index < (url_string.length() - 1))
+              url_string = url_string.substring(slash_index + 1);
+          else
+              url_string = "";
+        }
+    }
+    
+    // Process file and anchor 
+    if (needContext){
+        host = url.getHost();
+        port = url.getPort();
+        if ( (i = PlatformHelper.beginWithRootPathPrefix(url_string)) > 0){ //url string is an absolute path
+            file = url.getFile();
+            int j = PlatformHelper.beginWithRootPathPrefix(file);
+            if (j >= i)
+                file = file.substring(0, j) + url_string.substring(i);
+            else
+                file = url_string;
+        }else{
+            file = url.getFile();
+            /*
+            // Is the following necessary?
+            java.io.File f = new java.io.File(file);
+            if(f.isDirectory() && !PlatformHelper.endWithSeparator(file)){
+                file += "/";
+            }
+            */
+            
+            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
+                file = file.substring(0, idx + 1) + url_string;
+        }
+    }else
+        file = prefix + url_string;  
+        
+    if (end == 0) {
+        anchor = null;
+    } else {
+        // Only set anchor if end char is a '#'.  Otherwise assume we're
+        // just supposed to stop scanning for some reason
+        if (file.charAt(file.length() - end) == '#'){
+            int len = file.length();
+            anchor = file.substring( len - end + 1, len);
+            file = file.substring(0, len - end);
+        }else
+            anchor = null;
+    }
+    file = PlatformHelper.toCanonicalForm(file, '/');
+    
+    // Now set the values
+    setURL(url, url.getProtocol(), host, port, file, anchor); 
+}
+
 } // class Handler
 
diff --git a/gnu/java/net/protocol/jar/.cvsignore b/gnu/java/net/protocol/jar/.cvsignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/gnu/java/net/protocol/jar/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
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
+
diff --git a/gnu/java/net/protocol/jar/JarURLConnection.java b/gnu/java/net/protocol/jar/JarURLConnection.java
new file mode 100644
index 000000000..f08031ba3
--- /dev/null
+++ b/gnu/java/net/protocol/jar/JarURLConnection.java
@@ -0,0 +1,138 @@
+/* gnu.java.net.protocol.jar.JarURLConnection - jar url connection 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.io.*;
+import java.net.*;
+import java.util.Hashtable;
+import java.util.jar.*;
+
+/**
+  * This subclass of java.net.JarURLConnection models a URLConnection via
+  * the "jar" protocol.
+  *
+  */
+public class JarURLConnection extends java.net.JarURLConnection
+{
+
+  private JarFile jar_file;
+  private JarEntry jar_entry;
+  private URL jar_url;
+  
+  public static class JarFileCache
+  {
+    private static Hashtable cache = new Hashtable();
+    private static final int READBUFSIZE = 1024;
+    private static boolean is_trying = false;
+    
+    public static synchronized JarFile get(URL url) throws IOException{
+      JarFile jf = (JarFile)cache.get(url);
+      if(jf != null)return jf; 
+      if(is_trying)return null;
+      try{
+	is_trying = true;
+	if("file".equals(url.getProtocol())){
+	  jf = new JarFile(url.getFile());
+	}else{
+	  URLConnection urlconn = url.openConnection();
+	  InputStream is = urlconn.getInputStream();
+	  byte[] buf = new byte[READBUFSIZE];
+	  File f;
+	  FileOutputStream fos = new FileOutputStream(f = File.createTempFile("cache", "jar")); 
+	  int len = 0;
+	  while((len = is.read(buf)) != -1){
+	    fos.write(buf);
+	  }
+	  fos.close();
+	  jf = new JarFile(f);
+	}
+	cache.put(url, jf);
+      }finally{
+	is_trying = false;
+      }
+      return jf;
+    }
+    
+  }
+  
+  public 
+    JarURLConnection(URL url) throws MalformedURLException, IOException
+  {
+    super(url);
+    jar_url = getJarFileURL();
+  }
+  
+  public void 
+    connect() throws IOException
+  {
+    if(connected)return;
+    
+    jar_file = JarFileCache.get(jar_url);
+    String entry_name = getEntryName();
+    if(entry_name != null && !entry_name.equals("")){
+      jar_entry = (JarEntry)jar_file.getEntry(entry_name);
+      //wgs
+      if(jar_entry == null)
+	throw new IOException("No entry for " + entry_name + " exists.");
+    }
+    
+    connected = true;
+  }
+  
+  public JarFile 
+    getJarFile() throws IOException
+  {
+    if(!connected)
+      connect();
+    return jar_file;
+  }
+  
+  public InputStream
+    getInputStream() throws IOException
+  {
+    if(!connected)
+      connect();
+    if(jar_entry == null)
+      throw new IOException(jar_url + " couldn't be found.");
+    return jar_file.getInputStream(jar_entry);
+    
+  }
+  
+} // class JarURLConnection
+
diff --git a/gnu/java/net/protocol/jar/Makefile.am b/gnu/java/net/protocol/jar/Makefile.am
new file mode 100644
index 000000000..b35e0809b
--- /dev/null
+++ b/gnu/java/net/protocol/jar/Makefile.am
@@ -0,0 +1,5 @@
+# this file used by automake to generate Makefile.in
+
+EXTRA_DIST = \
+Handler.java \
+JarURLConnection.java