Imported GNU Classpath 0.19 + gcj-import-20051115.

       * sources.am: Regenerated.
       * Makefile.in: Likewise.
       * scripts/makemake.tcl: Use glob -nocomplain.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@107049 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 8 insertions, 5 deletions

diff --git a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java
index a5c83fa80b0..648e9679b42 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java
@@ -110,6 +110,7 @@ public abstract class DuplicateNameHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("DuplicateName expected");
+        bad.minor = Minor.Any;        
         bad.initCause(cex);
         throw bad;
       }
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java
index 7f1132f98a3..f89f9d4c6db 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableInterceptor.ORBInitInfoPackage;
 
 import gnu.CORBA.EmptyExceptionHolder;
+import gnu.CORBA.Minor;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
@@ -103,6 +104,7 @@ public abstract class InvalidNameHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("InvalidName expected");
+        bad.minor = Minor.Any;        
         bad.initCause(cex);
         throw bad;
       }
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java
index d0946e3fa00..c22d14a11fd 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.PortableInterceptor.ORBInitInfoPackage;
 
-import gnu.CORBA.Restricted_ORB;
+import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.ORB;
@@ -81,8 +81,8 @@ public class ObjectIdHelper
    */
   public static TypeCode type()
   {
-    ORB orb = Restricted_ORB.Singleton;
-    return orb.create_alias_tc(id(), "Object Id", orb.create_string_tc(0));
+    ORB orb = OrbRestricted.Singleton;
+    return orb.create_alias_tc(id(), "ObjectId", orb.create_string_tc(0));
   }
 
   /**
@@ -97,7 +97,7 @@ public class ObjectIdHelper
   /**
    * Calls {@link InputStream#read_string()}.
    *
-   * @param instream the stream to read from.
+   * @param input the stream to read from.
    */
   public static String read(InputStream input)
   {
@@ -107,7 +107,7 @@ public class ObjectIdHelper
   /**
    * Calls {@link OutputStream#write_string()}.
    *
-   * @param ostream the stream to write into.
+   * @param output the stream to write into.
    * @param value the string (Object Id) value to write.
    */
   public static void write(OutputStream output, String value)