Makefile.in: Rebuilt.

	* Makefile.in: Rebuilt.
	* Makefile.am (AM_CXXFLAGS): Define TOOLEXECLIBDIR.
	(libgcj0_convenience_la_SOURCES): Don't include
	gnu_xml_source_files.
	(libgcj0_convenience_la_LIBADD): New variable.
	(libgcj_la_LIBADD): Don't include sax or w3c_dom.
	(all_java_source_files): javax_imageio_source_files,
	javax_xml_source_files, and gnu_java_beans_source_files.
	($(gnu_xml_source_files:.java=.lo)): Removed target.
	(gnu-xml.lo): New target.
	(javax-imageio.lo): Likewise.
	(javax-xml.lo): Likewise.
	(gnu-java-beans.lo): Likewise.
	(gnu_java_beans_source_files): New variable.
	(javax_imageio_source_files): Likewise.
	(javax_xml_source_files): Likewise.
	(javax_source_files): Moved files to other variable.
	(awt_java_source_files): Likewise.
	(ordinary_java_source_files): Added BootClassLoader.java.
	* java/lang/natVMClassLoader.cc (defineClass): Use boot loader,
	not system class loader.
	(initBootLoader): New method.
	(loadClass): Search bootLoader.
	* java/lang/natClassLoader.cc (_Jv_RegisterInitiatingLoader): Use
	boot loader, not system class loader.
	(_Jv_UnregisterInitiatingLoader): Likewise.
	(_Jv_FindClass): Likewise.  Ensure entries in
	bootstrap_class_list are unique.
	* java/lang/natClass.cc (getClassLoader): Don't special case
	system class loader.
	* java/lang/VMClassLoader.java (bootLoader): New field.
	(getResource): Use bootLoader.
	(getResources): Likewise.
	(initBootLoader): Declare.
	* gnu/gcj/runtime/BootClassLoader.java: New file.
	* external/sax/org/xml/sax/helpers/NamespaceSupport.java
	(EMPTY_ENUMERATION): Now package-private.
	* external/w3c_com/Makefile.in: Rebuilt.
	* external/w3c_com/Makefile.am (MULTIBUILDTOP): New variable.
	(w3c.jar): New target.
	(classes.stamp): Updated.
	(toolexeclib_LTLIBRARIES): Renamed from noinst_LTLIBRARIES.
	Changed name of library.
	(libw3c_gcj_la_SOURCES): New variable.
	(libw3c_gcj_la_GCJFLAGS): Likewise.
	(source_files): Renamed from lib3c_convenience_la_SOURCES.
	* external/sax/Makefile.in: Rebuilt.
	* external/sax/Makefile.am (MULTIBUILDTOP): New variable.
	(sax.jar): New target.
	(classes.stamp): Updated.
	(toolexeclib_LTLIBRARIES): Renamed from noinst_LTLIBRARIES.
	Changed name of library.
	(libsax_gcj_la_SOURCES): New variable.
	(libsax_gcj_la_GCJFLAGS): Likewise.
	(source_files): Renamed from libsax_convenience_la_SOURCES.
	* stacktrace.cc (non_system_trace_fn): Don't look at system class
	loader.
	* prims.cc (_Jv_CreateJavaVM): Initialize the bootstrap class
	loader.
	(_Jv_RunMain): Handle case where 'runtime' is NULL at exit.

From-SVN: r96960

1 files changed, 154 insertions, 119 deletions

diff --git a/libjava/gnu/xml/aelfred2/JAXPFactory.java b/libjava/gnu/xml/aelfred2/JAXPFactory.java
index 006dc13..ff585a8 100644
--- a/libjava/gnu/xml/aelfred2/JAXPFactory.java
+++ b/libjava/gnu/xml/aelfred2/JAXPFactory.java
@@ -60,137 +60,172 @@ import javax.xml.parsers.SAXParserFactory;
  *
  * @author David Brownell
  */
-public final class JAXPFactory extends SAXParserFactory
+public final class JAXPFactory
+  extends SAXParserFactory
 {
-    private Hashtable	flags = new Hashtable ();
-
-    /**
-     * Constructs a factory which normally returns a non-validating
-     * parser.
-     */
-    public JAXPFactory () { }
-
-    public SAXParser newSAXParser ()
+  
+  private Hashtable flags = new Hashtable();
+
+  /**
+   * Constructs a factory which normally returns a non-validating
+   * parser.
+   */
+  public JAXPFactory()
+  {
+  }
+
+  public SAXParser newSAXParser()
     throws ParserConfigurationException, SAXException
+  {
+    JaxpParser jaxp = new JaxpParser();
+    Enumeration e = flags.keys();
+    XMLReader parser = jaxp.getXMLReader();
+
+    parser.setFeature(SAXDriver.FEATURE + "namespaces",
+                      isNamespaceAware());
+    parser.setFeature(SAXDriver.FEATURE + "validation",
+                      isValidating());
+    // that makes SAX2 feature flags trump JAXP
+    
+    while (e.hasMoreElements())
+      {
+        String uri = (String) e.nextElement();
+        Boolean value = (Boolean) flags.get(uri);
+        parser.setFeature(uri, value.booleanValue());
+      }
+
+    return jaxp;
+  }
+
+  // yes, this "feature transfer" mechanism doesn't play well
+  
+  public void setFeature(String name, boolean value) 
+    throws ParserConfigurationException, SAXNotRecognizedException,
+           SAXNotSupportedException
+  {
+    try
+      {
+        // force "early" detection of errors where possible
+        // (flags can't necessarily be set before parsing)
+        new JaxpParser().getXMLReader().setFeature(name, value);
+        
+        flags.put(name, new Boolean(value));
+      }
+    catch (SAXNotRecognizedException e)
+      {
+        throw new SAXNotRecognizedException(name);
+      }
+    catch (SAXNotSupportedException e)
+      {
+        throw new SAXNotSupportedException(name);
+      }
+    catch (Exception e)
+      {
+        throw new ParserConfigurationException(e.getClass().getName()
+                                               + ": "
+                                               + e.getMessage());
+      }
+  }
+
+  public boolean getFeature(String name) 
+    throws ParserConfigurationException, SAXNotRecognizedException,
+           SAXNotSupportedException
+  {
+    Boolean value = (Boolean) flags.get(name);
+    
+    if (value != null)
+      {
+        return value.booleanValue();
+      }
+    else
+      {
+        try
+          {
+            return new JaxpParser().getXMLReader().getFeature(name);
+          }
+        catch (SAXNotRecognizedException e)
+          {
+            throw new SAXNotRecognizedException(name);
+          }
+        catch (SAXNotSupportedException e)
+          {
+            throw new SAXNotSupportedException(name);
+          }
+        catch (SAXException e)
+          {
+            throw new ParserConfigurationException(e.getClass().getName()
+                                                   + ": "
+                                                   + e.getMessage());
+          }
+      }
+  }
+           
+  private static class JaxpParser
+    extends SAXParser
+  {
+    
+    private XmlReader ae2 = new XmlReader();
+    private XMLReaderAdapter parser = null;
+    
+    JaxpParser()
     {
-	JaxpParser	jaxp = new JaxpParser ();
-	Enumeration	e = flags.keys ();
-	XMLReader	parser = jaxp.getXMLReader ();
-
-	parser.setFeature (
-		SAXDriver.FEATURE + "namespaces",
-		isNamespaceAware ());
-	parser.setFeature (
-		SAXDriver.FEATURE + "validation",
-		isValidating ());
-	// that makes SAX2 feature flags trump JAXP
-
-	while (e.hasMoreElements ()) {
-	    String	uri = (String) e.nextElement ();
-	    Boolean	value = (Boolean) flags.get (uri);
-	    parser.setFeature (uri, value.booleanValue ());
-	}
-
-	return jaxp;
     }
 
-    // yes, this "feature transfer" mechanism doesn't play well
+    public void setProperty(String id, Object value) 
+      throws SAXNotRecognizedException, SAXNotSupportedException
+    {
+      ae2.setProperty(id, value);
+    }
 
-    public void setFeature (String name, boolean value) 
-    throws
-	ParserConfigurationException,
-	SAXNotRecognizedException,
-	SAXNotSupportedException
+    public Object getProperty(String id) 
+      throws SAXNotRecognizedException, SAXNotSupportedException
     {
-	try {
-	    // force "early" detection of errors where possible
-	    // (flags can't necessarily be set before parsing)
-	    new JaxpParser ().getXMLReader ().setFeature (name, value);
-
-	    flags.put (name, new Boolean (value));
-	} catch (SAXNotRecognizedException e) {
-	    throw new SAXNotRecognizedException (name);
-	} catch (SAXNotSupportedException e) {
-	    throw new SAXNotSupportedException (name);
-	} catch (Exception e) {
-	    throw new ParserConfigurationException (
-		  e.getClass ().getName ()
-		+ ": "
-		+ e.getMessage ());
-	}
+      return ae2.getProperty(id);
     }
 
-    public boolean getFeature (String name) 
-    throws
-	ParserConfigurationException,
-	SAXNotRecognizedException,
-	SAXNotSupportedException
+    public Parser getParser()
+      throws SAXException
     {
-	Boolean	value = (Boolean) flags.get (name);
-	
-	if (value != null)
-	    return value.booleanValue ();
-	else
-	    try {
-		return new JaxpParser ().getXMLReader ().getFeature (name);
-	    } catch (SAXNotRecognizedException e) {
-		throw new SAXNotRecognizedException (name);
-	    } catch (SAXNotSupportedException e) {
-		throw new SAXNotSupportedException (name);
-	    } catch (SAXException e) {
-		throw new ParserConfigurationException (
-		      e.getClass ().getName ()
-		    + ": "
-		    + e.getMessage ());
-	    }
+      if (parser == null)
+        {
+          parser = new XMLReaderAdapter(ae2);
+        }
+      return parser;
     }
 
-    private static class JaxpParser extends SAXParser
+    public XMLReader getXMLReader ()
+      throws SAXException
     {
-	private XmlReader	ae2 = new XmlReader ();
-	private XMLReaderAdapter parser = null;
-
-	JaxpParser () { }
-
-	public void setProperty (String id, Object value) 
-	throws SAXNotRecognizedException, SAXNotSupportedException
-	    { ae2.setProperty (id, value); }
-
-	public Object getProperty (String id) 
-	throws SAXNotRecognizedException, SAXNotSupportedException
-	    { return ae2.getProperty (id); }
-
-	public Parser getParser ()
-	throws SAXException
-	{ 
-	    if (parser == null)
-		parser = new XMLReaderAdapter (ae2);
-	    return parser;
-	}
-
-	public XMLReader getXMLReader ()
-	throws SAXException
-	    { return ae2; }
-
-	public boolean isNamespaceAware ()
-	{
-	    try {
-		return ae2.getFeature (SAXDriver.FEATURE + "namespaces");
-	    } catch (Exception e) {
-		throw new Error ();
-	    }
-	}
-
-	public boolean isValidating ()
-	{
-	    try {
-		return ae2.getFeature (SAXDriver.FEATURE + "validation");
-	    } catch (Exception e) {
-		throw new Error ();
-	    }
-	}
-
-        // TODO isXIncludeAware()
-        
+      return ae2;
     }
+
+    public boolean isNamespaceAware()
+    {
+      try
+        {
+          return ae2.getFeature(SAXDriver.FEATURE + "namespaces");
+        }
+      catch (Exception e)
+        {
+          throw new Error();
+        }
+    }
+    
+    public boolean isValidating()
+    {
+      try
+        {
+          return ae2.getFeature(SAXDriver.FEATURE + "validation");
+        }
+      catch (Exception e)
+        {
+          throw new Error();
+        }
+    }
+    
+    // TODO isXIncludeAware()
+    
+  }
+  
 }
+