libjava/classpath/ChangeLog.gcj:

2007-05-31  Matthias Klose  <doko@ubuntu.com>

        * javax/management/NotificationBroadcasterSupport.java
        (getNotificationInfo): Add cast.
        * native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include
        directories.
        * native/jni/qt-peer/Makefile.in: Regenerate.

libjava/ChangeLog:

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        * java/io/natFileWin32.cc (setFilePermissions): New (stub only).
        _access: Handle EXEC query, stub only.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        Merged from classpath:
        * gnu/java/nio/SelectorProviderImpl.java: Whitespace merge.
        * java/lang/System.java(inheritedChannel): New.
        * java/lang/Character.java: Remove stray`;'.
        * java/net/MulticastSocket.java: Merged.
        * java/text/DateFormatSymbols.java(getInstance): New, comment updates.
        * java/text/Collator.java(getInstance): Merged.
        * java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG.
        getDisplayName, getDisplayNames: New.
        * java/util/logging/Logger.java: Merged.
        * Regenerate .class and .h files.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        * java/io/File.java: Merge with classpath-0.95, new method
        setFilePermissions, new attribute EXEC.
        * java/io/natFilePosix.cc (setFilePermissions): New.
        _access: Handle EXEC query.
        * classpath/lib/java/io/File.class, java/io/File.h: Regenerate.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        Imported GNU Classpath 0.95.

        * classpath/Makefile.in,
        classpath/native/jni/midi-dssi/Makefile.in,
        classpath/native/jni/classpath/Makefile.in,
        classpath/native/jni/Makefile.in,
        classpath/native/jni/gconf-peer/Makefile.in,
        classpath/native/jni/java-io/Makefile.in,
        classpath/native/jni/native-lib/Makefile.in,
        classpath/native/jni/java-util/Makefile.in,
        classpath/native/jni/midi-alsa/Makefile.in,
        classpath/native/jni/java-lang/Makefile.in,
        classpath/native/jni/java-nio/Makefile.in,
        classpath/native/jni/java-net/Makefile.in,
        classpath/native/jni/xmlj/Makefile.in,
        classpath/native/jni/qt-peer/Makefile.in,
        classpath/native/jni/gtk-peer/Makefile.in,
        classpath/native/Makefile.in, classpath/native/jawt/Makefile.in,
        classpath/native/fdlibm/Makefile.in,
        classpath/native/plugin/Makefile.in,
        classpath/resource/Makefile.in, classpath/scripts/Makefile.in,
        classpath/tools/Makefile.in, classpath/doc/Makefile.in,
        classpath/doc/api/Makefile.in, classpath/lib/Makefile.in,
        classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in,
        classpath/external/sax/Makefile.in,
        classpath/external/w3c_dom/Makefile.in,
        classpath/external/relaxngDatatype/Makefile.in,
        classpath/include/Makefile.in,
        classpath/examples/Makefile.in: Regenerate.
        * classpath/config.guess, classpath/config.sub,
        classpath/ltmain.sh : Update.
        * classpath/configure, classpath/depcomp, classpath/missing,
        classpath/aclocal.m4, classpath/install-sh: Regenerate.

        * gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95.
        * sources.am: Regenerate.
        * Makefile.in: Regenerate.

        * Update the .class files and generated CNI header files, add new
        .class and generated CNI header files.
        * Remove generated files for removed java source files:
        classpath/gnu/java/net/BASE64.java,
        classpath/gnu/java/security/util/Base64.java,
        classpath/gnu/java/awt/peer/gtk/GThreadMutex.java,
        classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java,
        classpath/gnu/java/awt/font/autofit/Scaler.java,
        classpath/gnu/classpath/jdwp/util/Value.java,
        classpath/gnu/javax/net/ssl/Base64.java.
        * Remove empty directories.

        * Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc.
        * java/lang/Class.java(setAccessible): Merge from classpath.
        * java/util/Locale.java: Remove.
        * gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java,
        gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New.
        * gcj/javaprims.h: Update class declarations.
        * scripts/classes.pl: Update usage.
        * HACKING: Mention to build all peers.

From-SVN: r125302

6 files changed, 82 insertions, 10 deletions

diff --git a/libjava/classpath/gnu/xml/dom/DomDocumentBuilder.java b/libjava/classpath/gnu/xml/dom/DomDocumentBuilder.java
index 343f48c..e62ce20 100644
--- a/libjava/classpath/gnu/xml/dom/DomDocumentBuilder.java
+++ b/libjava/classpath/gnu/xml/dom/DomDocumentBuilder.java
@@ -1,5 +1,5 @@
 /* DomDocumentBuilder.java -- 
-   Copyright (C) 2004,2006 Free Software Foundation, Inc.
+   Copyright (C) 2004,2006,2007 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -48,6 +48,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.DOMConfiguration;
 import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.ls.DOMImplementationLS;
+import org.w3c.dom.ls.LSException;
 import org.w3c.dom.ls.LSInput;
 import org.w3c.dom.ls.LSParser;
 import org.xml.sax.EntityResolver;
@@ -122,7 +123,18 @@ class DomDocumentBuilder
   {
     LSInput input = ls.createLSInput();
     input.setByteStream(in);
-    return parser.parse(input);
+    try
+      {
+        return parser.parse(input);
+      }
+    catch (LSException e)
+      {
+        Throwable e2 = e.getCause();
+        if (e2 instanceof IOException)
+          throw (IOException) e2;
+        else
+          throw e;
+      }
   }
 
   public Document parse(InputStream in, String systemId)
@@ -131,13 +143,35 @@ class DomDocumentBuilder
     LSInput input = ls.createLSInput();
     input.setByteStream(in);
     input.setSystemId(systemId);
-    return parser.parse(input);
+    try
+      {
+        return parser.parse(input);
+      }
+    catch (LSException e)
+      {
+        Throwable e2 = e.getCause();
+        if (e2 instanceof IOException)
+          throw (IOException) e2;
+        else
+          throw e;
+      }
   }
 
   public Document parse(String systemId)
     throws SAXException, IOException
   {
-    return parser.parseURI(systemId);
+    try
+      {
+        return parser.parseURI(systemId);
+      }
+    catch (LSException e)
+      {
+        Throwable e2 = e.getCause();
+        if (e2 instanceof IOException)
+          throw (IOException) e2;
+        else
+          throw e;
+      }
   }
 
   public Document parse(InputSource is)
@@ -176,7 +210,18 @@ class DomDocumentBuilder
     input.setPublicId(is.getPublicId());
     input.setSystemId(systemId);
     input.setEncoding(is.getEncoding());
-    return parser.parse(input);
+    try
+      {
+        return parser.parse(input);
+      }
+    catch (LSException e)
+      {
+        Throwable e2 = e.getCause();
+        if (e2 instanceof IOException)
+          throw (IOException) e2;
+        else
+          throw e;
+      }
   }
 
 }
diff --git a/libjava/classpath/gnu/xml/dom/ls/DomLSParser.java b/libjava/classpath/gnu/xml/dom/ls/DomLSParser.java
index 6bc069d..88f9bae 100644
--- a/libjava/classpath/gnu/xml/dom/ls/DomLSParser.java
+++ b/libjava/classpath/gnu/xml/dom/ls/DomLSParser.java
@@ -1,5 +1,5 @@
 /* DomLSParser.java -- 
-   Copyright (C) 1999,2000,2001 Free Software Foundation, Inc.
+   Copyright (C) 1999,2000,2001,2007 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -277,6 +277,15 @@ public class DomLSParser
                           validating);
         try
           {
+            reader.setFeature("http://gnu.org/sax/features/coalescing",
+                              coalescing);
+          }
+        catch (SAXNotRecognizedException e)
+          {
+            // ignore
+          } 
+        try
+          {
             reader.setFeature("http://xml.org/sax/features/use-attributes2",
                               true);
           }
diff --git a/libjava/classpath/gnu/xml/pipeline/DomConsumer.java b/libjava/classpath/gnu/xml/pipeline/DomConsumer.java
index bdbf928..da527b9 100644
--- a/libjava/classpath/gnu/xml/pipeline/DomConsumer.java
+++ b/libjava/classpath/gnu/xml/pipeline/DomConsumer.java
@@ -365,7 +365,7 @@ public class DomConsumer implements EventConsumer
 	throws SAXException
 	{
 	    SAXParseException	e;
-	    ErrorHandler	errHandler = consumer.getErrorHandler ();;
+	    ErrorHandler	errHandler = consumer.getErrorHandler ();
 
 	    if (locator == null)
 		e = new SAXParseException (message, null, null, -1, -1, x);
diff --git a/libjava/classpath/gnu/xml/stream/SAXParser.java b/libjava/classpath/gnu/xml/stream/SAXParser.java
index 1329ab2..af4a6af 100644
--- a/libjava/classpath/gnu/xml/stream/SAXParser.java
+++ b/libjava/classpath/gnu/xml/stream/SAXParser.java
@@ -1,5 +1,5 @@
 /* SAXParser.java -- 
-   Copyright (C) 2005, 2006  Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -187,6 +187,8 @@ public class SAXParser
       lexicalHandler = (LexicalHandler) value;
     else if ((GNU_FEATURES + "xml-base").equals(name))
       baseAware = Boolean.TRUE.equals(value);
+    else if ((GNU_FEATURES + "coalescing").equals(name))
+      coalescing = Boolean.TRUE.equals(value);
     else
       throw new SAXNotSupportedException(name);
   }
diff --git a/libjava/classpath/gnu/xml/stream/XMLParser.java b/libjava/classpath/gnu/xml/stream/XMLParser.java
index 663a300..fae4afe 100644
--- a/libjava/classpath/gnu/xml/stream/XMLParser.java
+++ b/libjava/classpath/gnu/xml/stream/XMLParser.java
@@ -439,6 +439,7 @@ public class XMLParser
             throw e2;
           }
       }
+    systemId = canonicalize(systemId);
     pushInput(new Input(in, null, null, systemId, null, null, false, true));
   }
 
@@ -513,6 +514,7 @@ public class XMLParser
             throw e2;
           }
       }
+    systemId = canonicalize(systemId);
     pushInput(new Input(null, reader, null, systemId, null, null, false, true));
   }
 
@@ -1540,7 +1542,7 @@ public class XMLParser
   {
     if (!externalEntities)
       return;
-    String url = absolutize(input.systemId, ids.systemId);
+    String url = canonicalize(absolutize(input.systemId, ids.systemId));
     // Check for recursion
     for (Iterator i = inputStack.iterator(); i.hasNext(); )
       {
@@ -1587,6 +1589,20 @@ public class XMLParser
   }
 
   /**
+   * Returns a canonicalized version of the specified URL.
+   * This is largely to work around a problem with the specification of
+   * file URLs.
+   */
+  static String canonicalize(String url)
+  {
+    if (url == null)
+      return null;
+    if (url.startsWith("file:") && !url.startsWith("file://"))
+      url = "file://" + url.substring(5);
+    return url;
+  }
+
+  /**
    * "Absolutize" a URL. This resolves a relative URL into an absolute one.
    * @param base the current base URL
    * @param href the (absolute or relative) URL to resolve
diff --git a/libjava/classpath/gnu/xml/util/XCat.java b/libjava/classpath/gnu/xml/util/XCat.java
index 0f16338..f3704cd 100644
--- a/libjava/classpath/gnu/xml/util/XCat.java
+++ b/libjava/classpath/gnu/xml/util/XCat.java
@@ -274,7 +274,7 @@ public class XCat implements EntityResolver2
 		InputSource	retval;
 		retval = catalogs [i].resolve (usingPublic, publicId, systemId);
 		if (retval != null)
-		    return retval;;
+		    return retval;
 	    }
 	} catch (DoneDelegation x) {
 	    // done!