natClassLoader.cc (_Jv_PrepareCompiledClass): Renamed from _Jv_InternClassStrings.

	* java/lang/natClassLoader.cc (_Jv_PrepareCompiledClass): Renamed
	from _Jv_InternClassStrings.

	* prims.cc (_Jv_RunMain): New function.
	(JvRunMain): Remove gij-support.

	* gij.cc (main): Use _Jv_RunMain.

	* java/util/zip/ZipFile.java: Call readDirectory in constructor.

	* interpret.cc (PUSHA, PUSHI, PUSHF, PUSHL, PUSHD): Don't store
	argument in temp variable.
	(continue1): For all op_x2y insns, use temp variable for
	intermediate value.  Also remove some comments.

	* java/lang/natClass.cc (newInstance): Call _Jv_InitClass.
	(forName): Don't call _Jv_InitClass.

	* java/lang/Class.java (getResource,getResourceAsStream): Implement.

	* java/util/zip/ZipEntry.java (ZipEntry(ZipEntry)): New construcor.

	* java/util/jar/JarInputStream.java: New file.

	* java/util/jar/JarEntry.java: New file.

	* java/util/jar/JarFile.java: New file.

	* java/net/URLClassLoader.java: New file.

	* java/net/JarURLConnection.java: New file.

	* gnu/gcj/protocol/jar/Handler.java: New file.

	* gnu/gcj/protocol/jar/Connection.java: New file.

	* java/security/SecureClassLoader.java: New file.

	* java/lang/ClassLoader.java (parent): New variable.
	(ClassLoader (ClassLoader)): new constructor.
	(findClass): New method.
	(loadClass): Add default 1.2 implementation.
	(getSystemResourceAsBytes, getResourceAsBytes): Removed.
	(readfully): Removed.

	* gnu/gcj/runtime/VMClassLoader.java: Moved from java/lang.
	(findSystemClass): New method.
	(VMClassLoader): Constructor rewritten.
	(init): New method.
	All other methods removed.

	* java/lang/natClassLoader.cc: Change use of java::lang::VMClassLoader
	to gnu::gcj::runtime::VMClassLoader.
	(_Jv_InternClassStrings): Use _Jv_ResolvePoolEntry.  Also handle
	class entries.
	(VMClassLoader::findSystemClass): renamed from findBootClass.

	* Makefile.am: Add new files.
	(FirstThread.h, ThreadGroup.h): Add _Jv_Main friend.

	* Makefile.in: Rebuilt.

From-SVN: r28748

1 files changed, 0 insertions, 117 deletions

diff --git a/libjava/java/lang/VMClassLoader.java b/libjava/java/lang/VMClassLoader.java
deleted file mode 100644
index 026f6d8..0000000
--- a/libjava/java/lang/VMClassLoader.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Copyright (C) 1999  Cygnus Solutions
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-/* Author: Kresten Krab Thorup <krab@gnu.org>  */
-
-package java.lang;
-
-import java.io.*;
-import java.net.URL;
-import gnu.gcj.util.path.SearchPath;
-
-final class VMClassLoader extends java.lang.ClassLoader
-{
-  private SearchPath   path;
-  private final String path_seperator;
-  private final String file_seperator;
-  private final char   file_seperator_char;
-    
-  private VMClassLoader () {	
-    path_seperator = System.getProperty ("path.separator", ":");
-    file_seperator = System.getProperty ("file.separator", "/");
-
-    file_seperator_char = file_seperator.charAt (0);
-
-    String class_path = System.getProperty ("java.class.path", ".");
-    path = new SearchPath (class_path);
-  }
-
-  protected Class loadClass(String name,
-			    boolean resolve) 
-    throws java.lang.ClassNotFoundException, java.lang.LinkageError
-  {
-    return loadClassInternal (name, resolve, false);
-  }
-	
-    /** I'm a little in doubt here, if this method is 
-	actually supposed to throw a LinkageError, or not.  
-	The spec, 20.14.3, is a little unclear.  It says:
-
-	`` The general contract of loadClass is that, given the name
-	of a class, it either returns the Class object for the class
-	or throws a ClassNotFoundException.''
-
-	However, by making LinkageError a checked exception, 
-	i.e., mention it directly in the throws clause,
-	we'll force caller to consider that case as well.
-    **/
-
-  protected Class loadClassInternal(String name,
-				    boolean resolve, 
-				    boolean fromBootLoader) 
-    throws java.lang.ClassNotFoundException, java.lang.LinkageError
-  {
-    Class clazz;
-
-    /** TODO: call _Jv_VerifyClassName **/
-    if (   (name.indexOf ('/') != -1)
-	   || (name.charAt (0) == '.')
-	   || (name.indexOf (file_seperator) != -1)
-	   || (name.indexOf ("..") != -1))
-	{
-	    throw new IllegalArgumentException (name);
-	}
-
-    // already loaded?
-    clazz = findLoadedClass (name);
-
-    // we need access to the boot class loader here
-    if (clazz == null && !fromBootLoader)
-      clazz = findBootClass (name);
-
-    if (clazz == null)
-      {
-	StringBuffer res = new StringBuffer ();
-
-	// here we do actually replace .'s with /'s because
-	// we're going to find something in the file system.
-	res.append (name.replace ('.', file_seperator_char));
-	res.append (".class");
-		
-	byte[] data = getResourceAsBytes (res.toString ());
-
-	if (data == null)
-	  throw new ClassNotFoundException (name);
-
-	clazz = defineClass (name, data, 0, data.length);
-	    
-      }
-
-    if (resolve && clazz != null)
-      resolveClass (clazz);
-
-    return clazz;
-  }
-
-  private native Class findBootClass (String name);
-
-  public InputStream getResourceAsStream(String name) 
-  {
-    return path.getStream (name);
-  }
-
-  public URL getResource(String name) 
-  {
-    return path.getURL (name);
-  }
-
-  public byte[] getResourceAsBytes(String name) 
-  {
-    return path.getBytes (name);
-  }
-}