Merged gcj-eclipse branch to trunk.

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

18 files changed, 1185 insertions, 802 deletions

diff --git a/libjava/gnu/CORBA/DynAn/AbstractAny.h b/libjava/gnu/CORBA/DynAn/AbstractAny.h
new file mode 100644
index 00000000000..12346310a65
--- /dev/null
+++ b/libjava/gnu/CORBA/DynAn/AbstractAny.h
@@ -0,0 +1,68 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_CORBA_DynAn_AbstractAny__
+#define __gnu_CORBA_DynAn_AbstractAny__
+
+#pragma interface
+
+#include <org/omg/CORBA/LocalObject.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace CORBA
+    {
+      namespace DynAn
+      {
+          class AbstractAny;
+          class ValueChangeListener;
+          class gnuDynAnyFactory;
+      }
+    }
+  }
+  namespace org
+  {
+    namespace omg
+    {
+      namespace CORBA
+      {
+          class Any;
+          class ORB;
+          class TypeCode;
+      }
+    }
+  }
+}
+
+class gnu::CORBA::DynAn::AbstractAny : public ::org::omg::CORBA::LocalObject
+{
+
+public:
+  AbstractAny(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
+  virtual ::org::omg::CORBA::TypeCode * type();
+  virtual ::org::omg::CORBA::Any * createAny();
+public: // actually protected
+  virtual void valueChanged();
+public: // actually package-private
+  virtual void checkType(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *);
+  virtual ::java::lang::String * typeMismatch(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *);
+  virtual ::java::lang::String * sizeMismatch(jint, jint);
+private:
+  static const jlong serialVersionUID = 1LL;
+public:
+  ::org::omg::CORBA::TypeCode * __attribute__((aligned(__alignof__( ::org::omg::CORBA::LocalObject)))) official_type;
+  ::org::omg::CORBA::TypeCode * final_type;
+  ::gnu::CORBA::DynAn::gnuDynAnyFactory * factory;
+  ::org::omg::CORBA::ORB * orb;
+public: // actually package-private
+  jshort MINOR;
+  static ::java::lang::String * EMPTY;
+  static ::java::lang::String * SIZE;
+  static ::java::lang::String * ISNULL;
+  ::gnu::CORBA::DynAn::ValueChangeListener * listener;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_CORBA_DynAn_AbstractAny__
diff --git a/libjava/gnu/CORBA/DynAn/DivideableAny.h b/libjava/gnu/CORBA/DynAn/DivideableAny.h
new file mode 100644
index 00000000000..1222d2ada9b
--- /dev/null
+++ b/libjava/gnu/CORBA/DynAn/DivideableAny.h
@@ -0,0 +1,107 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_CORBA_DynAn_DivideableAny__
+#define __gnu_CORBA_DynAn_DivideableAny__
+
+#pragma interface
+
+#include <gnu/CORBA/DynAn/AbstractAny.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace CORBA
+    {
+      namespace DynAn
+      {
+          class DivideableAny;
+          class gnuDynAnyFactory;
+      }
+    }
+  }
+  namespace org
+  {
+    namespace omg
+    {
+      namespace CORBA
+      {
+          class Any;
+          class ORB;
+          class Object;
+          class TypeCode;
+      }
+      namespace DynamicAny
+      {
+          class DynAny;
+      }
+    }
+  }
+}
+
+class gnu::CORBA::DynAn::DivideableAny : public ::gnu::CORBA::DynAn::AbstractAny
+{
+
+public:
+  DivideableAny(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
+  virtual jboolean next();
+  virtual void rewind();
+  virtual jboolean seek(jint);
+public: // actually protected
+  virtual ::org::omg::DynamicAny::DynAny * focused();
+public:
+  virtual jint component_count();
+  virtual ::org::omg::CORBA::Any * get_any();
+  virtual jboolean get_boolean();
+  virtual jchar get_char();
+  virtual jdouble get_double();
+  virtual jfloat get_float();
+  virtual jint get_long();
+  virtual jlong get_longlong();
+  virtual jbyte get_octet();
+  virtual ::org::omg::CORBA::Object * get_reference();
+  virtual jshort get_short();
+  virtual ::java::lang::String * get_string();
+  virtual ::org::omg::CORBA::TypeCode * get_typecode();
+  virtual jint get_ulong();
+  virtual jlong get_ulonglong();
+  virtual jshort get_ushort();
+  virtual ::java::io::Serializable * get_val();
+  virtual jchar get_wchar();
+  virtual ::java::lang::String * get_wstring();
+  virtual void insert_any(::org::omg::CORBA::Any *);
+  virtual void insert_boolean(jboolean);
+  virtual void insert_char(jchar);
+  virtual void insert_double(jdouble);
+  virtual void insert_float(jfloat);
+  virtual void insert_long(jint);
+  virtual void insert_longlong(jlong);
+  virtual void insert_octet(jbyte);
+  virtual void insert_reference(::org::omg::CORBA::Object *);
+  virtual void insert_short(jshort);
+  virtual void insert_string(::java::lang::String *);
+  virtual void insert_typecode(::org::omg::CORBA::TypeCode *);
+  virtual void insert_ulong(jint);
+  virtual void insert_ulonglong(jlong);
+  virtual void insert_ushort(jshort);
+  virtual void insert_val(::java::io::Serializable *);
+  virtual void insert_wchar(jchar);
+  virtual void insert_wstring(::java::lang::String *);
+  virtual ::org::omg::DynamicAny::DynAny * get_dyn_any();
+  virtual void insert_dyn_any(::org::omg::DynamicAny::DynAny *);
+  virtual ::org::omg::DynamicAny::DynAny * current_component();
+  virtual void destroy();
+  virtual ::org::omg::CORBA::Any * to_any() = 0;
+  virtual jboolean equal(::org::omg::DynamicAny::DynAny *);
+private:
+  static const jlong serialVersionUID = 1LL;
+public: // actually protected
+  JArray< ::org::omg::DynamicAny::DynAny * > * __attribute__((aligned(__alignof__( ::gnu::CORBA::DynAn::AbstractAny)))) array;
+  jint pos;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_CORBA_DynAn_DivideableAny__
diff --git a/libjava/gnu/CORBA/DynAn/NameValuePairHolder.h b/libjava/gnu/CORBA/DynAn/NameValuePairHolder.h
new file mode 100644
index 00000000000..26a6e5b4543
--- /dev/null
+++ b/libjava/gnu/CORBA/DynAn/NameValuePairHolder.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_CORBA_DynAn_NameValuePairHolder__
+#define __gnu_CORBA_DynAn_NameValuePairHolder__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace CORBA
+    {
+      namespace DynAn
+      {
+          class NameValuePairHolder;
+      }
+    }
+  }
+  namespace org
+  {
+    namespace omg
+    {
+      namespace CORBA
+      {
+          class NameValuePair;
+          class TypeCode;
+        namespace portable
+        {
+            class InputStream;
+            class OutputStream;
+        }
+      }
+    }
+  }
+}
+
+class gnu::CORBA::DynAn::NameValuePairHolder : public ::java::lang::Object
+{
+
+public:
+  NameValuePairHolder();
+  NameValuePairHolder(::org::omg::CORBA::NameValuePair *);
+  virtual void _read(::org::omg::CORBA::portable::InputStream *);
+  virtual ::org::omg::CORBA::TypeCode * _type();
+  virtual void _write(::org::omg::CORBA::portable::OutputStream *);
+  ::org::omg::CORBA::NameValuePair * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_CORBA_DynAn_NameValuePairHolder__
diff --git a/libjava/gnu/CORBA/DynAn/RecordAny.h b/libjava/gnu/CORBA/DynAn/RecordAny.h
new file mode 100644
index 00000000000..77f3f5c7486
--- /dev/null
+++ b/libjava/gnu/CORBA/DynAn/RecordAny.h
@@ -0,0 +1,76 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_CORBA_DynAn_RecordAny__
+#define __gnu_CORBA_DynAn_RecordAny__
+
+#pragma interface
+
+#include <gnu/CORBA/DynAn/DivideableAny.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace CORBA
+    {
+      namespace DynAn
+      {
+          class RecordAny;
+          class gnuDynAnyFactory;
+      }
+    }
+  }
+  namespace org
+  {
+    namespace omg
+    {
+      namespace CORBA
+      {
+          class Any;
+          class ORB;
+          class TCKind;
+          class TypeCode;
+      }
+      namespace DynamicAny
+      {
+          class DynAny;
+          class NameDynAnyPair;
+          class NameValuePair;
+      }
+    }
+  }
+}
+
+class gnu::CORBA::DynAn::RecordAny : public ::gnu::CORBA::DynAn::DivideableAny
+{
+
+public:
+  RecordAny(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
+  virtual ::org::omg::CORBA::TCKind * current_member_kind();
+  virtual ::java::lang::String * current_member_name();
+  virtual JArray< ::org::omg::DynamicAny::NameDynAnyPair * > * gnu_get_members_as_dyn_any();
+  virtual JArray< ::org::omg::DynamicAny::NameValuePair * > * gnu_get_members();
+  virtual void set_members_as_dyn_any(JArray< ::org::omg::DynamicAny::NameDynAnyPair * > *);
+private:
+  void checkName(::java::lang::String *, jint);
+  void checkType(::org::omg::CORBA::TypeCode *, jint);
+public:
+  virtual void set_members(JArray< ::org::omg::DynamicAny::NameValuePair * > *);
+  virtual void assign(::org::omg::DynamicAny::DynAny *);
+  virtual ::org::omg::DynamicAny::DynAny * copy();
+public: // actually protected
+  virtual ::gnu::CORBA::DynAn::RecordAny * newInstance(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *) = 0;
+public:
+  virtual ::org::omg::CORBA::Any * to_any();
+  virtual void from_any(::org::omg::CORBA::Any *);
+private:
+  static const jlong serialVersionUID = 1LL;
+public: // actually package-private
+  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::gnu::CORBA::DynAn::DivideableAny)))) fNames;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_CORBA_DynAn_RecordAny__
diff --git a/libjava/gnu/CORBA/DynAn/RecordAny.java b/libjava/gnu/CORBA/DynAn/RecordAny.java
deleted file mode 100644
index 7cfabccd7ba..00000000000
--- a/libjava/gnu/CORBA/DynAn/RecordAny.java
+++ /dev/null
@@ -1,416 +0,0 @@
-/* RecordAny.java --
-   Copyright (C) 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 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.CORBA.DynAn;
-
-import gnu.CORBA.Unexpected;
-import gnu.CORBA.HolderLocator;
-
-import org.omg.CORBA.Any;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.TCKind;
-import org.omg.CORBA.TypeCode;
-import org.omg.CORBA.TypeCodePackage.BadKind;
-import org.omg.CORBA.TypeCodePackage.Bounds;
-import org.omg.CORBA.portable.Streamable;
-import org.omg.DynamicAny.DynAny;
-import org.omg.DynamicAny.DynAnyPackage.InvalidValue;
-import org.omg.DynamicAny.DynAnyPackage.TypeMismatch;
-import org.omg.DynamicAny.DynStruct;
-import org.omg.DynamicAny.DynValueCommonOperations;
-import org.omg.DynamicAny.NameDynAnyPair;
-import org.omg.DynamicAny.NameValuePair;
-
-import java.io.Serializable;
-
-import java.lang.reflect.Field;
-
-/**
- * A shared base for both dynamic structure an dynamic value final_type.
- *
- * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
- */
-public abstract class RecordAny
-  extends DivideableAny
-  implements DynAny, Serializable
-{
-  /**
-   * Use serialVersionUID for interoperability.
-   */
-  private static final long serialVersionUID = 1;
-  String[] fNames;
-
-  /**
-   * Creates the structure with the given typecode.
-   *
-   * @param fields The DynAny's, representing the fields of the structure.
-   */
-  public RecordAny(TypeCode oType, TypeCode aType,
-                        gnuDynAnyFactory aFactory, ORB anOrb
-                       )
-  {
-    super(oType, aType, aFactory, anOrb);
-  }
-
-  /** @inheritDoc */
-  public TCKind current_member_kind()
-                             throws TypeMismatch, InvalidValue
-  {
-    if (array.length == 0)
-      throw new TypeMismatch(EMPTY);
-    try
-      {
-        return final_type.member_type(pos).kind();
-      }
-    catch (BadKind e)
-      {
-        TypeMismatch t = new TypeMismatch();
-        t.initCause(e);
-        throw t;
-      }
-    catch (Bounds e)
-      {
-        InvalidValue t = new InvalidValue();
-        t.initCause(e);
-        throw t;
-      }
-  }
-
-  /** @inheritDoc */
-  public String current_member_name()
-                             throws TypeMismatch, InvalidValue
-  {
-    if (array.length == 0)
-      throw new TypeMismatch(EMPTY);
-    try
-      {
-        return final_type.member_name(pos);
-      }
-    catch (BadKind e)
-      {
-        TypeMismatch t = new TypeMismatch();
-        t.initCause(e);
-        throw t;
-      }
-    catch (Bounds e)
-      {
-        InvalidValue t = new InvalidValue();
-        t.initCause(e);
-        throw t;
-      }
-  }
-
-  /**
-   * Get content of the structure. This method must be defined on a different
-   * name because get_members_as_dyn_any() throws exception only in some of the
-   * supported interfaces.
-   */
-  public NameDynAnyPair[] gnu_get_members_as_dyn_any()
-  {
-    NameDynAnyPair[] r = new NameDynAnyPair[ array.length ];
-    for (int i = 0; i < r.length; i++)
-      {
-        try
-          {
-            r [ i ] = new NameDynAnyPair(fNames [ i ], array [ i ]);
-          }
-        catch (Exception ex)
-          {
-            throw new Unexpected(ex);
-          }
-      }
-    return r;
-  }
-
-  /**
-   * Get content of the structure. This method must be defined on a different
-   * name because get_members_as_dyn_any() throws exception only in some of the
-   * supported interfaces.
-   */
-  public NameValuePair[] gnu_get_members()
-  {
-    NameValuePair[] r = new NameValuePair[ array.length ];
-    for (int i = 0; i < r.length; i++)
-      {
-        try
-          {
-            r [ i ] = new NameValuePair(fNames [ i ], array [ i ].to_any());
-          }
-        catch (Exception ex)
-          {
-            throw new Unexpected(ex);
-          }
-      }
-    return r;
-  }
-
-  /**
-   * Set members from the provided array.
-   */
-  public void set_members_as_dyn_any(NameDynAnyPair[] value)
-                              throws TypeMismatch, InvalidValue
-  {
-    if (value.length != array.length)
-      throw new InvalidValue(sizeMismatch(array.length, value.length));
-
-    for (int i = 0; i < value.length; i++)
-      {
-        DynAny dynAny = value [ i ].value;
-        checkType(dynAny.type(), i);
-        checkName(value [ i ].id, i);
-
-        array [ i ] = dynAny;
-      }
-    pos = 0;
-  }
-
-  /**
-   * Check the name at the given position ("" matches everything).
-   */
-  private void checkName(String xName, int i)
-                  throws TypeMismatch
-  {
-    if (xName.length() > 0 && fNames [ i ].length() > 0)
-      if (!xName.equals(fNames [ i ]))
-        throw new TypeMismatch("Field name mismatch " + xName + " expected " +
-                               fNames [ i ]
-                              );
-  }
-
-  /**
-   * Check the type at the given position.
-   */
-  private void checkType(TypeCode t, int i)
-                  throws TypeMismatch
-  {
-    if (!array [ i ].type().equal(t))
-      throw new TypeMismatch(typeMismatch(array [ i ].type(), t) + " field " +
-                             i
-                            );
-  }
-
-  /**
-   * Set members from the provided array.
-   */
-  public void set_members(NameValuePair[] value)
-                   throws TypeMismatch, InvalidValue
-  {
-    if (value.length != array.length)
-      throw new InvalidValue(sizeMismatch(array.length, value.length));
-
-    for (int i = 0; i < value.length; i++)
-      {
-        Any any = value [ i ].value;
-        checkType(any.type(), i);
-        checkName(value [ i ].id, i);
-
-        array [ i ].from_any(any);
-      }
-    pos = 0;
-  }
-
-  /** @inheritDoc */
-  public void assign(DynAny from)
-              throws TypeMismatch
-  {
-    checkType(official_type, from.type());
-    if (from instanceof DynStruct)
-      {
-        try
-          {
-            set_members_as_dyn_any(((DynStruct) from).get_members_as_dyn_any());
-          }
-        catch (InvalidValue e)
-          {
-            TypeMismatch t = new TypeMismatch("Invalid value");
-            t.initCause(e);
-            throw t;
-          }
-      }
-    else
-      throw new TypeMismatch("Not a DynStruct");
-  }
-
-  /**
-   * Create a copy.
-   */
-  public DynAny copy()
-  {
-    DynAny[] c = new DynAny[ array.length ];
-    for (int i = 0; i < c.length; i++)
-      {
-        c [ i ] = array [ i ].copy();
-      }
-
-    RecordAny d = newInstance(official_type, final_type, factory, orb);
-    d.array = c;
-    return d;
-  }
-
-  /**
-   * Create a new instance when copying.
-   */
-  protected abstract RecordAny newInstance(TypeCode oType, TypeCode aType,
-                                                gnuDynAnyFactory aFactory,
-                                                ORB anOrb
-                                               );
-
-  /**
-   * Done via reflection.
-   */
-  public Any to_any()
-  {
-    try
-      {
-        Streamable sHolder = HolderLocator.createHolder(official_type);
-
-        Class sHolderClass = sHolder.getClass();
-        Field sHolderValue = sHolderClass.getField("value");
-        Class sClass = sHolderValue.getType();
-
-        Object structure = sClass.newInstance();
-        Object member;
-        Any am;
-        Field vread;
-        Field vwrite;
-        Streamable memberHolder;
-
-        for (int i = 0; i < array.length; i++)
-          {
-            am = array [ i ].to_any();
-            memberHolder = am.extract_Streamable();
-            vwrite = structure.getClass().getField(final_type.member_name(i));
-            vread = memberHolder.getClass().getField("value");
-            member = vread.get(memberHolder);
-            vwrite.set(structure, member);
-          }
-
-        Any g = createAny();
-        sHolderValue.set(sHolder, structure);
-        g.insert_Streamable(sHolder);
-        g.type(official_type);
-        return g;
-      }
-    catch (Exception e)
-      {
-        throw new Unexpected(e);
-      }
-  }
-
-  /**
-   * Done via reflection.
-   */
-  public void from_any(Any an_any)
-                throws TypeMismatch, InvalidValue
-  {
-    checkType(official_type, an_any.type());
-    try
-      {
-        Streamable s = an_any.extract_Streamable();
-        if (s == null)
-          {
-            if (this instanceof DynValueCommonOperations)
-              {
-                ((DynValueCommonOperations) this).set_to_null();
-                return;
-              }
-            else
-              throw new InvalidValue(ISNULL);
-          }
-
-        Object structure = s.getClass().getField("value").get(s);
-        if (structure == null && (this instanceof DynValueCommonOperations))
-          {
-            ((DynValueCommonOperations) this).set_to_null();
-            return;
-          }
-
-        Any member;
-        Streamable holder;
-        Object field;
-        TypeCode fType;
-        Field fField;
-
-        for (int i = 0; i < array.length; i++)
-          {
-            fField = structure.getClass().getField(fNames [ i ]);
-            field = fField.get(structure);
-            fType = array [ i ].type();
-            holder = HolderLocator.createHolder(fType);
-
-            member = createAny();
-            holder.getClass().getField("value").set(holder, field);
-            member.insert_Streamable(holder);
-            member.type(fType);
-
-            array [ i ].from_any(member);
-          }
-
-        if (this instanceof DynValueCommonOperations)
-          ((DynValueCommonOperations) this).set_to_value();
-      }
-    catch (InvalidValue v)
-      {
-        throw v;
-      }
-    catch (NoSuchFieldException ex)
-      {
-        TypeMismatch v =
-          new TypeMismatch("holder value does not match typecode");
-        v.initCause(ex);
-        throw v;
-      }
-    catch (Exception ex)
-      {
-        TypeMismatch t = new TypeMismatch();
-        t.initCause(ex);
-        throw t;
-      }
-  }
-
-// GCJ LOCAL - package private delegates to work around bug in gnuDynValue.
-  int record_component_count()
-  {
-    return component_count();
-  }
-
-  boolean record_equal(DynAny o)
-  {
-    return equal(o);
-  }
-}
diff --git a/libjava/gnu/CORBA/DynAn/UndivideableAny.h b/libjava/gnu/CORBA/DynAn/UndivideableAny.h
new file mode 100644
index 00000000000..dd827d6e8b4
--- /dev/null
+++ b/libjava/gnu/CORBA/DynAn/UndivideableAny.h
@@ -0,0 +1,100 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_CORBA_DynAn_UndivideableAny__
+#define __gnu_CORBA_DynAn_UndivideableAny__
+
+#pragma interface
+
+#include <gnu/CORBA/DynAn/AbstractAny.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace CORBA
+    {
+      namespace DynAn
+      {
+          class UndivideableAny;
+          class gnuDynAnyFactory;
+      }
+    }
+  }
+  namespace org
+  {
+    namespace omg
+    {
+      namespace CORBA
+      {
+          class Any;
+          class ORB;
+          class Object;
+          class TypeCode;
+      }
+      namespace DynamicAny
+      {
+          class DynAny;
+      }
+    }
+  }
+}
+
+class gnu::CORBA::DynAn::UndivideableAny : public ::gnu::CORBA::DynAn::AbstractAny
+{
+
+public:
+  UndivideableAny(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
+  virtual jint component_count();
+  virtual ::org::omg::DynamicAny::DynAny * current_component();
+  virtual void destroy();
+  virtual ::org::omg::CORBA::Any * get_any();
+  virtual jboolean get_boolean();
+  virtual jchar get_char();
+  virtual jdouble get_double();
+  virtual ::org::omg::DynamicAny::DynAny * get_dyn_any();
+  virtual jfloat get_float();
+  virtual jint get_long();
+  virtual jlong get_longlong();
+  virtual jbyte get_octet();
+  virtual ::org::omg::CORBA::Object * get_reference();
+  virtual jshort get_short();
+  virtual ::java::lang::String * get_string();
+  virtual ::org::omg::CORBA::TypeCode * get_typecode();
+  virtual jint get_ulong();
+  virtual jlong get_ulonglong();
+  virtual jshort get_ushort();
+  virtual ::java::io::Serializable * get_val();
+  virtual jchar get_wchar();
+  virtual ::java::lang::String * get_wstring();
+  virtual void insert_any(::org::omg::CORBA::Any *);
+  virtual void insert_boolean(jboolean);
+  virtual void insert_char(jchar);
+  virtual void insert_double(jdouble);
+  virtual void insert_dyn_any(::org::omg::DynamicAny::DynAny *);
+  virtual void insert_float(jfloat);
+  virtual void insert_long(jint);
+  virtual void insert_longlong(jlong);
+  virtual void insert_octet(jbyte);
+  virtual void insert_reference(::org::omg::CORBA::Object *);
+  virtual void insert_short(jshort);
+  virtual void insert_string(::java::lang::String *);
+  virtual void insert_typecode(::org::omg::CORBA::TypeCode *);
+  virtual void insert_ulong(jint);
+  virtual void insert_ulonglong(jlong);
+  virtual void insert_ushort(jshort);
+  virtual void insert_val(::java::io::Serializable *);
+  virtual void insert_wchar(jchar);
+  virtual void insert_wstring(::java::lang::String *);
+  virtual jboolean next();
+  virtual void rewind();
+  virtual jboolean seek(jint);
+  virtual ::org::omg::CORBA::TypeCode * type();
+  virtual jboolean equals(::java::lang::Object *);
+  virtual jboolean equal(::org::omg::DynamicAny::DynAny *) = 0;
+private:
+  static const jlong serialVersionUID = 1LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_CORBA_DynAn_UndivideableAny__
diff --git a/libjava/gnu/CORBA/DynAn/ValueChangeListener.h b/libjava/gnu/CORBA/DynAn/ValueChangeListener.h
new file mode 100644
index 00000000000..3a106d61409
--- /dev/null
+++ b/libjava/gnu/CORBA/DynAn/ValueChangeListener.h
@@ -0,0 +1,32 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_CORBA_DynAn_ValueChangeListener__
+#define __gnu_CORBA_DynAn_ValueChangeListener__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace CORBA
+    {
+      namespace DynAn
+      {
+          class ValueChangeListener;
+      }
+    }
+  }
+}
+
+class gnu::CORBA::DynAn::ValueChangeListener : public ::java::lang::Object
+{
+
+public:
+  virtual void changed() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __gnu_CORBA_DynAn_ValueChangeListener__
diff --git a/libjava/gnu/CORBA/DynAn/gnuDynAny.h b/libjava/gnu/CORBA/DynAn/gnuDynAny.h
new file mode 100644
index 00000000000..f8e0c0f3dd2
--- /dev/null
+++ b/libjava/gnu/CORBA/DynAn/gnuDynAny.h
@@ -0,0 +1,114 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_CORBA_DynAn_gnuDynAny__
+#define __gnu_CORBA_DynAn_gnuDynAny__
+
+#pragma interface
+
+#include <gnu/CORBA/DynAn/AbstractAny.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace CORBA
+    {
+      namespace DynAn
+      {
+          class gnuDynAny;
+          class gnuDynAnyFactory;
+      }
+    }
+  }
+  namespace org
+  {
+    namespace omg
+    {
+      namespace CORBA
+      {
+          class Any;
+          class ORB;
+          class Object;
+          class TCKind;
+          class TypeCode;
+        namespace portable
+        {
+            class Streamable;
+        }
+      }
+      namespace DynamicAny
+      {
+          class DynAny;
+      }
+    }
+  }
+}
+
+class gnu::CORBA::DynAn::gnuDynAny : public ::gnu::CORBA::DynAn::AbstractAny
+{
+
+public:
+  gnuDynAny(::org::omg::CORBA::portable::Streamable *, ::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
+  virtual void assign(::org::omg::DynamicAny::DynAny *);
+  virtual ::org::omg::DynamicAny::DynAny * copy();
+  virtual ::org::omg::DynamicAny::DynAny * current_component();
+  virtual void destroy();
+  virtual void from_any(::org::omg::CORBA::Any *);
+  virtual ::org::omg::CORBA::Any * get_any();
+  virtual jboolean get_boolean();
+  virtual jchar get_char();
+  virtual jdouble get_double();
+  virtual jfloat get_float();
+  virtual jint get_long();
+  virtual jlong get_longlong();
+  virtual jbyte get_octet();
+  virtual ::org::omg::CORBA::Object * get_reference();
+  virtual jshort get_short();
+  virtual ::java::lang::String * get_string();
+  virtual ::org::omg::CORBA::TypeCode * get_typecode();
+  virtual jint get_ulong();
+  virtual jlong get_ulonglong();
+  virtual jshort get_ushort();
+  virtual ::java::io::Serializable * get_val();
+  virtual jchar get_wchar();
+  virtual ::java::lang::String * get_wstring();
+  virtual void insert_any(::org::omg::CORBA::Any *);
+  virtual void insert_boolean(jboolean);
+  virtual void insert_char(jchar);
+  virtual void insert_double(jdouble);
+  virtual void insert_float(jfloat);
+  virtual void insert_long(jint);
+  virtual void insert_longlong(jlong);
+  virtual void insert_octet(jbyte);
+  virtual void insert_reference(::org::omg::CORBA::Object *);
+  virtual void insert_short(jshort);
+  virtual void insert_string(::java::lang::String *);
+  virtual void insert_typecode(::org::omg::CORBA::TypeCode *);
+  virtual void insert_ulong(jint);
+  virtual void insert_ulonglong(jlong);
+  virtual void insert_ushort(jshort);
+  virtual void insert_val(::java::io::Serializable *);
+  virtual void insert_wchar(jchar);
+  virtual void insert_wstring(::java::lang::String *);
+  virtual jboolean next();
+  virtual void rewind();
+  virtual jboolean seek(jint);
+  virtual ::org::omg::CORBA::Any * to_any();
+  virtual ::org::omg::CORBA::TypeCode * type();
+public: // actually protected
+  virtual jint getHashCodeSimple(jint);
+public:
+  virtual void insert_dyn_any(::org::omg::DynamicAny::DynAny *);
+  virtual jboolean equal(::org::omg::DynamicAny::DynAny *);
+  virtual jint component_count();
+  virtual ::org::omg::DynamicAny::DynAny * get_dyn_any();
+private:
+  void check(::org::omg::CORBA::TCKind *);
+  static const jlong serialVersionUID = 1LL;
+public: // actually protected
+  ::org::omg::CORBA::portable::Streamable * __attribute__((aligned(__alignof__( ::gnu::CORBA::DynAn::AbstractAny)))) holder;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_CORBA_DynAn_gnuDynAny__
diff --git a/libjava/gnu/CORBA/DynAn/gnuDynAnyFactory.h b/libjava/gnu/CORBA/DynAn/gnuDynAnyFactory.h
new file mode 100644
index 00000000000..6bfc5d55e18
--- /dev/null
+++ b/libjava/gnu/CORBA/DynAn/gnuDynAnyFactory.h
@@ -0,0 +1,78 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_CORBA_DynAn_gnuDynAnyFactory__
+#define __gnu_CORBA_DynAn_gnuDynAnyFactory__
+
+#pragma interface
+
+#include <org/omg/CORBA/LocalObject.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace CORBA
+    {
+      namespace DynAn
+      {
+          class gnuDynAnyFactory;
+      }
+      namespace Poa
+      {
+          class ORB_1_4;
+      }
+    }
+  }
+  namespace org
+  {
+    namespace omg
+    {
+      namespace CORBA
+      {
+          class Any;
+          class TypeCode;
+      }
+      namespace DynamicAny
+      {
+          class DynAny;
+          class DynArray;
+          class DynEnum;
+          class DynFixed;
+          class DynSequence;
+          class DynStruct;
+          class DynUnion;
+          class DynValue;
+          class DynValueBox;
+      }
+    }
+  }
+}
+
+class gnu::CORBA::DynAn::gnuDynAnyFactory : public ::org::omg::CORBA::LocalObject
+{
+
+public:
+  gnuDynAnyFactory(::gnu::CORBA::Poa::ORB_1_4 *);
+  virtual ::gnu::CORBA::Poa::ORB_1_4 * getOrb();
+  virtual ::org::omg::DynamicAny::DynArray * create_array(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *);
+  virtual ::org::omg::DynamicAny::DynSequence * create_sequence(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *);
+  virtual ::org::omg::DynamicAny::DynStruct * create_structure(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *);
+  virtual ::org::omg::DynamicAny::DynUnion * create_union(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *);
+  virtual ::org::omg::DynamicAny::DynValue * create_value(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *);
+  virtual ::org::omg::DynamicAny::DynValueBox * create_value_box(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *);
+  virtual ::org::omg::DynamicAny::DynEnum * create_enumeration(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *);
+  virtual ::org::omg::DynamicAny::DynFixed * create_fixed(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *);
+  virtual ::org::omg::DynamicAny::DynAny * create_alias(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *);
+  virtual ::org::omg::DynamicAny::DynAny * create_simple(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *);
+  virtual ::org::omg::DynamicAny::DynAny * create_dyn_any_from_type_code(::org::omg::CORBA::TypeCode *);
+  virtual ::org::omg::DynamicAny::DynAny * create_dyn_any_from_type_code(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *);
+  virtual ::org::omg::DynamicAny::DynAny * create_dyn_any(::org::omg::CORBA::Any *);
+private:
+  static const jlong serialVersionUID = 1LL;
+public: // actually package-private
+  ::gnu::CORBA::Poa::ORB_1_4 * __attribute__((aligned(__alignof__( ::org::omg::CORBA::LocalObject)))) orb;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_CORBA_DynAn_gnuDynAnyFactory__
diff --git a/libjava/gnu/CORBA/DynAn/gnuDynArray.h b/libjava/gnu/CORBA/DynAn/gnuDynArray.h
new file mode 100644
index 00000000000..d14d9efc807
--- /dev/null
+++ b/libjava/gnu/CORBA/DynAn/gnuDynArray.h
@@ -0,0 +1,67 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_CORBA_DynAn_gnuDynArray__
+#define __gnu_CORBA_DynAn_gnuDynArray__
+
+#pragma interface
+
+#include <gnu/CORBA/DynAn/DivideableAny.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace CORBA
+    {
+      namespace DynAn
+      {
+          class gnuDynAnyFactory;
+          class gnuDynArray;
+      }
+    }
+  }
+  namespace org
+  {
+    namespace omg
+    {
+      namespace CORBA
+      {
+          class Any;
+          class ORB;
+          class TypeCode;
+      }
+      namespace DynamicAny
+      {
+          class DynAny;
+      }
+    }
+  }
+}
+
+class gnu::CORBA::DynAn::gnuDynArray : public ::gnu::CORBA::DynAn::DivideableAny
+{
+
+public:
+  gnuDynArray(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *, jboolean);
+  virtual void assign(::org::omg::DynamicAny::DynAny *);
+  virtual ::org::omg::DynamicAny::DynAny * copy();
+  virtual JArray< ::org::omg::CORBA::Any * > * get_elements();
+  virtual JArray< ::org::omg::DynamicAny::DynAny * > * get_elements_as_dyn_any();
+  virtual void set_elements_as_dyn_any(JArray< ::org::omg::DynamicAny::DynAny * > *);
+  virtual void set_elements(JArray< ::org::omg::CORBA::Any * > *);
+  virtual ::org::omg::CORBA::Any * to_any();
+  virtual void from_any(::org::omg::CORBA::Any *);
+public: // actually protected
+  virtual void checkArrayValid(::java::lang::Object *);
+private:
+  static const jlong serialVersionUID = 1LL;
+public: // actually package-private
+  ::org::omg::CORBA::TypeCode * __attribute__((aligned(__alignof__( ::gnu::CORBA::DynAn::DivideableAny)))) official_components;
+  ::org::omg::CORBA::TypeCode * final_components;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_CORBA_DynAn_gnuDynArray__
diff --git a/libjava/gnu/CORBA/DynAn/gnuDynEnum.h b/libjava/gnu/CORBA/DynAn/gnuDynEnum.h
new file mode 100644
index 00000000000..0aaebf60429
--- /dev/null
+++ b/libjava/gnu/CORBA/DynAn/gnuDynEnum.h
@@ -0,0 +1,67 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_CORBA_DynAn_gnuDynEnum__
+#define __gnu_CORBA_DynAn_gnuDynEnum__
+
+#pragma interface
+
+#include <gnu/CORBA/DynAn/UndivideableAny.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace CORBA
+    {
+      namespace DynAn
+      {
+          class gnuDynAnyFactory;
+          class gnuDynEnum;
+      }
+    }
+  }
+  namespace org
+  {
+    namespace omg
+    {
+      namespace CORBA
+      {
+          class Any;
+          class ORB;
+          class TypeCode;
+      }
+      namespace DynamicAny
+      {
+          class DynAny;
+      }
+    }
+  }
+}
+
+class gnu::CORBA::DynAn::gnuDynEnum : public ::gnu::CORBA::DynAn::UndivideableAny
+{
+
+public:
+  gnuDynEnum(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
+  gnuDynEnum(::gnu::CORBA::DynAn::gnuDynEnum *);
+  virtual void assign(::org::omg::DynamicAny::DynAny *);
+  virtual ::org::omg::DynamicAny::DynAny * copy();
+  virtual jboolean equal(::org::omg::DynamicAny::DynAny *);
+  virtual void from_any(::org::omg::CORBA::Any *);
+  virtual ::java::lang::String * get_as_string();
+  virtual jint get_as_ulong();
+  virtual void set_as_string(::java::lang::String *);
+  virtual void set_as_ulong(jint);
+  virtual ::org::omg::CORBA::Any * to_any();
+private:
+  static const jlong serialVersionUID = 1LL;
+public: // actually package-private
+  JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::gnu::CORBA::DynAn::UndivideableAny)))) values;
+  jint current;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_CORBA_DynAn_gnuDynEnum__
diff --git a/libjava/gnu/CORBA/DynAn/gnuDynFixed.h b/libjava/gnu/CORBA/DynAn/gnuDynFixed.h
new file mode 100644
index 00000000000..ced924bed17
--- /dev/null
+++ b/libjava/gnu/CORBA/DynAn/gnuDynFixed.h
@@ -0,0 +1,72 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_CORBA_DynAn_gnuDynFixed__
+#define __gnu_CORBA_DynAn_gnuDynFixed__
+
+#pragma interface
+
+#include <gnu/CORBA/DynAn/UndivideableAny.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace CORBA
+    {
+      namespace DynAn
+      {
+          class gnuDynAnyFactory;
+          class gnuDynFixed;
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigDecimal;
+    }
+  }
+  namespace org
+  {
+    namespace omg
+    {
+      namespace CORBA
+      {
+          class Any;
+          class ORB;
+          class TypeCode;
+      }
+      namespace DynamicAny
+      {
+          class DynAny;
+      }
+    }
+  }
+}
+
+class gnu::CORBA::DynAn::gnuDynFixed : public ::gnu::CORBA::DynAn::UndivideableAny
+{
+
+public:
+  gnuDynFixed(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
+  gnuDynFixed(::gnu::CORBA::DynAn::gnuDynFixed *);
+  virtual ::java::lang::String * get_value();
+  virtual jboolean set_value(::java::lang::String *);
+  virtual void assign(::org::omg::DynamicAny::DynAny *);
+  virtual ::org::omg::DynamicAny::DynAny * copy();
+  virtual jboolean equal(::org::omg::DynamicAny::DynAny *);
+  virtual void from_any(::org::omg::CORBA::Any *);
+  virtual ::org::omg::CORBA::Any * to_any();
+private:
+  static const jlong serialVersionUID = 1LL;
+public: // actually package-private
+  static ::java::math::BigDecimal * ZERO;
+  ::java::math::BigDecimal * __attribute__((aligned(__alignof__( ::gnu::CORBA::DynAn::UndivideableAny)))) value;
+  jint scale;
+  jint digits;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_CORBA_DynAn_gnuDynFixed__
diff --git a/libjava/gnu/CORBA/DynAn/gnuDynSequence.h b/libjava/gnu/CORBA/DynAn/gnuDynSequence.h
new file mode 100644
index 00000000000..cba3b1c5de0
--- /dev/null
+++ b/libjava/gnu/CORBA/DynAn/gnuDynSequence.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_CORBA_DynAn_gnuDynSequence__
+#define __gnu_CORBA_DynAn_gnuDynSequence__
+
+#pragma interface
+
+#include <gnu/CORBA/DynAn/gnuDynArray.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace CORBA
+    {
+      namespace DynAn
+      {
+          class gnuDynAnyFactory;
+          class gnuDynSequence;
+      }
+    }
+  }
+  namespace org
+  {
+    namespace omg
+    {
+      namespace CORBA
+      {
+          class Any;
+          class ORB;
+          class TypeCode;
+      }
+      namespace DynamicAny
+      {
+          class DynAny;
+      }
+    }
+  }
+}
+
+class gnu::CORBA::DynAn::gnuDynSequence : public ::gnu::CORBA::DynAn::gnuDynArray
+{
+
+public:
+  gnuDynSequence(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
+  virtual jint get_length();
+  virtual void set_length(jint);
+  virtual void assign(::org::omg::DynamicAny::DynAny *);
+  virtual void set_elements_as_dyn_any(JArray< ::org::omg::DynamicAny::DynAny * > *);
+  virtual void set_elements(JArray< ::org::omg::CORBA::Any * > *);
+  virtual ::org::omg::DynamicAny::DynAny * copy();
+public: // actually package-private
+  virtual void checkBound(jint);
+public: // actually protected
+  virtual void checkArrayValid(::java::lang::Object *);
+private:
+  static const jlong serialVersionUID = 1LL;
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::gnu::CORBA::DynAn::gnuDynArray)))) bound;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_CORBA_DynAn_gnuDynSequence__
diff --git a/libjava/gnu/CORBA/DynAn/gnuDynStruct.h b/libjava/gnu/CORBA/DynAn/gnuDynStruct.h
new file mode 100644
index 00000000000..76c32e28517
--- /dev/null
+++ b/libjava/gnu/CORBA/DynAn/gnuDynStruct.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_CORBA_DynAn_gnuDynStruct__
+#define __gnu_CORBA_DynAn_gnuDynStruct__
+
+#pragma interface
+
+#include <gnu/CORBA/DynAn/RecordAny.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace CORBA
+    {
+      namespace DynAn
+      {
+          class RecordAny;
+          class gnuDynAnyFactory;
+          class gnuDynStruct;
+      }
+    }
+  }
+  namespace org
+  {
+    namespace omg
+    {
+      namespace CORBA
+      {
+          class ORB;
+          class TypeCode;
+      }
+      namespace DynamicAny
+      {
+          class NameDynAnyPair;
+          class NameValuePair;
+      }
+    }
+  }
+}
+
+class gnu::CORBA::DynAn::gnuDynStruct : public ::gnu::CORBA::DynAn::RecordAny
+{
+
+public:
+  gnuDynStruct(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
+public: // actually protected
+  virtual ::gnu::CORBA::DynAn::RecordAny * newInstance(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
+public:
+  virtual JArray< ::org::omg::DynamicAny::NameDynAnyPair * > * get_members_as_dyn_any();
+  virtual JArray< ::org::omg::DynamicAny::NameValuePair * > * get_members();
+private:
+  static const jlong serialVersionUID = 1LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_CORBA_DynAn_gnuDynStruct__
diff --git a/libjava/gnu/CORBA/DynAn/gnuDynUnion.h b/libjava/gnu/CORBA/DynAn/gnuDynUnion.h
new file mode 100644
index 00000000000..a159c8c2b59
--- /dev/null
+++ b/libjava/gnu/CORBA/DynAn/gnuDynUnion.h
@@ -0,0 +1,71 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_CORBA_DynAn_gnuDynUnion__
+#define __gnu_CORBA_DynAn_gnuDynUnion__
+
+#pragma interface
+
+#include <gnu/CORBA/DynAn/DivideableAny.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace CORBA
+    {
+      namespace DynAn
+      {
+          class gnuDynAnyFactory;
+          class gnuDynUnion;
+      }
+    }
+  }
+  namespace org
+  {
+    namespace omg
+    {
+      namespace CORBA
+      {
+          class Any;
+          class ORB;
+          class TCKind;
+          class TypeCode;
+      }
+      namespace DynamicAny
+      {
+          class DynAny;
+      }
+    }
+  }
+}
+
+class gnu::CORBA::DynAn::gnuDynUnion : public ::gnu::CORBA::DynAn::DivideableAny
+{
+
+public:
+  gnuDynUnion(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
+  virtual ::org::omg::CORBA::Any * to_any();
+  virtual void assign(::org::omg::DynamicAny::DynAny *);
+  virtual ::org::omg::DynamicAny::DynAny * copy();
+  virtual void from_any(::org::omg::CORBA::Any *);
+  virtual ::org::omg::CORBA::TCKind * discriminator_kind();
+  virtual ::org::omg::DynamicAny::DynAny * get_discriminator();
+  virtual jboolean has_no_active_member();
+  virtual ::org::omg::CORBA::TCKind * member_kind();
+  virtual ::java::lang::String * member_name();
+  virtual ::org::omg::DynamicAny::DynAny * member();
+  virtual void set_discriminator(::org::omg::DynamicAny::DynAny *);
+  virtual void set_to_default_member();
+  virtual void set_to_no_active_member();
+  virtual void updateMember();
+  virtual void changed();
+private:
+  static const jlong serialVersionUID = 1LL;
+public: // actually package-private
+  ::org::omg::DynamicAny::DynAny * __attribute__((aligned(__alignof__( ::gnu::CORBA::DynAn::DivideableAny)))) discriminator;
+  static ::java::lang::String * NOAM;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_CORBA_DynAn_gnuDynUnion__
diff --git a/libjava/gnu/CORBA/DynAn/gnuDynValue.h b/libjava/gnu/CORBA/DynAn/gnuDynValue.h
new file mode 100644
index 00000000000..852e69ca9df
--- /dev/null
+++ b/libjava/gnu/CORBA/DynAn/gnuDynValue.h
@@ -0,0 +1,84 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_CORBA_DynAn_gnuDynValue__
+#define __gnu_CORBA_DynAn_gnuDynValue__
+
+#pragma interface
+
+#include <gnu/CORBA/DynAn/RecordAny.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace CORBA
+    {
+      namespace DynAn
+      {
+          class RecordAny;
+          class gnuDynAnyFactory;
+          class gnuDynValue;
+      }
+    }
+  }
+  namespace org
+  {
+    namespace omg
+    {
+      namespace CORBA
+      {
+          class Any;
+          class ORB;
+          class TCKind;
+          class TypeCode;
+      }
+      namespace DynamicAny
+      {
+          class DynAny;
+          class NameDynAnyPair;
+          class NameValuePair;
+      }
+    }
+  }
+}
+
+class gnu::CORBA::DynAn::gnuDynValue : public ::gnu::CORBA::DynAn::RecordAny
+{
+
+public:
+  gnuDynValue(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
+private:
+  void inheritFields(JArray< ::org::omg::DynamicAny::NameDynAnyPair * > *);
+public:
+  virtual ::org::omg::CORBA::TCKind * current_member_kind();
+  virtual ::java::lang::String * current_member_name();
+  virtual JArray< ::org::omg::DynamicAny::NameDynAnyPair * > * get_members_as_dyn_any();
+  virtual JArray< ::org::omg::DynamicAny::NameValuePair * > * get_members();
+  virtual void set_members_as_dyn_any(JArray< ::org::omg::DynamicAny::NameDynAnyPair * > *);
+  virtual void set_members(JArray< ::org::omg::DynamicAny::NameValuePair * > *);
+  virtual jboolean is_null();
+  virtual void set_to_null();
+  virtual void set_to_value();
+public: // actually protected
+  virtual ::gnu::CORBA::DynAn::RecordAny * newInstance(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
+public:
+  virtual jboolean equal(::org::omg::DynamicAny::DynAny *);
+public: // actually protected
+  virtual ::org::omg::DynamicAny::DynAny * focused();
+public:
+  virtual ::org::omg::CORBA::Any * to_any();
+  virtual void assign(::org::omg::DynamicAny::DynAny *);
+  virtual jint component_count();
+  virtual ::java::io::Serializable * get_val();
+  virtual void insert_val(::java::io::Serializable *);
+private:
+  static const jlong serialVersionUID = 1LL;
+public: // actually package-private
+  jboolean __attribute__((aligned(__alignof__( ::gnu::CORBA::DynAn::RecordAny)))) isNull;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_CORBA_DynAn_gnuDynValue__
diff --git a/libjava/gnu/CORBA/DynAn/gnuDynValue.java b/libjava/gnu/CORBA/DynAn/gnuDynValue.java
deleted file mode 100644
index df952412512..00000000000
--- a/libjava/gnu/CORBA/DynAn/gnuDynValue.java
+++ /dev/null
@@ -1,386 +0,0 @@
-/* gnuDynValue.java --
-   Copyright (C) 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 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.CORBA.DynAn;
-
-import gnu.CORBA.Minor;
-import gnu.CORBA.Unexpected;
-
-import org.omg.CORBA.Any;
-import org.omg.CORBA.BAD_PARAM;
-import org.omg.CORBA.MARSHAL;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.TCKind;
-import org.omg.CORBA.TypeCode;
-import org.omg.CORBA.VM_TRUNCATABLE;
-import org.omg.CORBA.portable.OutputStream;
-import org.omg.CORBA.portable.ValueFactory;
-import org.omg.DynamicAny.DynAny;
-import org.omg.DynamicAny.DynAnyPackage.InvalidValue;
-import org.omg.DynamicAny.DynAnyPackage.TypeMismatch;
-import org.omg.DynamicAny.DynStruct;
-import org.omg.DynamicAny.DynValue;
-import org.omg.DynamicAny.DynValueCommon;
-import org.omg.DynamicAny.DynValueOperations;
-import org.omg.DynamicAny.NameDynAnyPair;
-import org.omg.DynamicAny.NameValuePair;
-
-import java.io.Serializable;
-
-/**
- * Implementation of DynValue.
- *
- * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
- */
-public class gnuDynValue extends RecordAny implements DynValue,
-  Serializable
-{
-  /**
-   * Use serialVersionUID for interoperability.
-   */
-  private static final long serialVersionUID = 1;
-
-  /**
-   * If true, the value of this ValueType is set to null.
-   */
-  boolean isNull;
-
-  /**
-   * Create an instance.
-   */
-  public gnuDynValue(TypeCode oType, TypeCode aType,
-    gnuDynAnyFactory aFactory, ORB anOrb
-  )
-  {
-    super(oType, aType, aFactory, anOrb);
-
-    // Initialise fields. The array of fields also includes all inherited
-    // fields.
-    try
-      {
-        array = new DynAny[ final_type.member_count() ];
-        fNames = new String[ array.length ];
-        for (int i = 0; i < array.length; i++)
-          {
-            array [ i ] =
-              factory.create_dyn_any_from_type_code(final_type.member_type(i));
-            fNames [ i ] = final_type.member_name(i);
-          }
-
-        // Search of inherited members.
-        if (final_type.type_modifier() == VM_TRUNCATABLE.value)
-          {
-            TypeCode parent = final_type.concrete_base_type();
-            DynAny ancestor = factory.create_dyn_any_from_type_code(parent);
-
-            if (ancestor instanceof DynValue)
-              {
-                // Add members of ancestor in front of the curren members.
-                DynValue anc = (DynValue) ancestor;
-                anc.set_to_value();
-
-                NameDynAnyPair[] aar = anc.get_members_as_dyn_any();
-                inheritFields(aar);
-              }
-            else if (ancestor instanceof DynStruct)
-              {
-                // Add members of ancestor in front of the curren members.
-                DynStruct anc = (DynStruct) ancestor;
-                NameDynAnyPair[] aar = anc.get_members_as_dyn_any();
-                inheritFields(aar);
-              }
-            else
-              throw new BAD_PARAM("The parent of " + final_type.id() + ", " +
-                parent.id() + ", is not structure nor value."
-              );
-          }
-      }
-    catch (Exception e)
-      {
-        throw new Unexpected(e);
-      }
-
-    set_to_null();
-  }
-
-  /**
-   * Inherit the provided fields.
-   */
-  private void inheritFields(NameDynAnyPair[] aar)
-  {
-    DynAny[] nArray = new DynAny[ array.length + aar.length ];
-    String[] nNames = new String[ array.length + aar.length ];
-    int p = 0;
-    for (int i = 0; i < aar.length; i++)
-      {
-        nArray [ p ] = aar [ i ].value;
-        nNames [ p ] = aar [ i ].id;
-        p++;
-      }
-
-    for (int i = 0; i < array.length; i++)
-      {
-        nArray [ p ] = array [ i ];
-        nNames [ p ] = fNames [ i ];
-        p++;
-      }
-
-    array = nArray;
-    fNames = nNames;
-  }
-
-  /** @inheritDoc */
-  public TCKind current_member_kind() throws TypeMismatch, InvalidValue
-  {
-    if (isNull)
-      throw new TypeMismatch(ISNULL);
-    else
-      return super.current_member_kind();
-  }
-  ;
-
-  /** @inheritDoc */
-  public String current_member_name() throws TypeMismatch, InvalidValue
-  {
-    if (isNull)
-      throw new TypeMismatch(ISNULL);
-    else
-      return super.current_member_name();
-  }
-  ;
-
-  /** @inheritDoc */
-  public NameDynAnyPair[] get_members_as_dyn_any() throws InvalidValue
-  {
-    if (isNull)
-      throw new InvalidValue(ISNULL);
-    return super.gnu_get_members_as_dyn_any();
-  }
-  ;
-
-  /** @inheritDoc */
-  public NameValuePair[] get_members() throws InvalidValue
-  {
-    if (isNull)
-      throw new InvalidValue(ISNULL);
-    else
-      return super.gnu_get_members();
-  }
-  ;
-
-  /** @inheritDoc */
-  public void set_members_as_dyn_any(NameDynAnyPair[] value)
-    throws TypeMismatch, InvalidValue
-  {
-    super.set_members_as_dyn_any(value);
-    isNull = false;
-  }
-  ;
-
-  /** @inheritDoc */
-  public void set_members(NameValuePair[] value)
-    throws TypeMismatch, InvalidValue
-  {
-    super.set_members(value);
-    isNull = false;
-  }
-  ;
-
-  /** @inheritDoc */
-  public boolean is_null()
-  {
-    return isNull;
-  }
-
-  /** @inheritDoc */
-  public void set_to_null()
-  {
-    isNull = true;
-    valueChanged();
-  }
-
-  /** @inheritDoc */
-  public void set_to_value()
-  {
-    isNull = false;
-    valueChanged();
-  }
-
-  /**
-   * Create a new instance.
-   */
-  protected RecordAny newInstance(TypeCode oType, TypeCode aType,
-    gnuDynAnyFactory aFactory, ORB anOrb
-  )
-  {
-    gnuDynValue v = new gnuDynValue(oType, aType, aFactory, anOrb);
-    if (isNull)
-      v.set_to_null();
-    else
-      v.set_to_value();
-    return v;
-  }
-
-  /**
-   * Compare for equality, minding null values.
-   */
-  public boolean equal(DynAny other)
-  {
-    if (other instanceof DynValueOperations)
-      {
-        DynValueCommon o = (DynValueCommon) other;
-        if (isNull)
-          return o.is_null() && o.type().equal(official_type);
-        else
-          return !o.is_null() && record_equal(other); // GCJ LOCAL bug #24938
-      }
-    else
-      return false;
-  }
-
-  /**
-   * Get the focused component, throwing exception if the current value is null.
-   */
-  protected DynAny focused() throws InvalidValue, TypeMismatch
-  {
-    if (isNull)
-      throw new TypeMismatch(ISNULL);
-    else
-      return super.focused();
-  }
-
-  /**
-   * Convert into Any.
-   */
-  public Any to_any()
-  {
-    if (isNull)
-      {
-        Any a0 = createAny();
-        a0.type(orb.get_primitive_tc(TCKind.tk_null));
-        return a0;
-      }
-    else
-      {
-        try
-          {
-            ValueFactory factory =
-              ((org.omg.CORBA_2_3.ORB) orb).lookup_value_factory(official_type.id());
-            if (factory == null)
-              {
-                MARSHAL m = new MARSHAL("Factory for " + official_type.id() +
-                " not registered.");
-                m.minor = Minor.Factory;
-                throw m;
-              }
-
-            OutputStream out = orb.create_output_stream();
-
-            for (int i = 0; i < array.length; i++)
-              array [ i ].to_any().write_value(out);
-
-            org.omg.CORBA_2_3.portable.InputStream in =
-              (org.omg.CORBA_2_3.portable.InputStream) out.create_input_stream();
-            Serializable v = factory.read_value(in);
-
-            Any g = createAny();
-            g.type(official_type);
-            g.insert_Value(v, official_type);
-
-            return g;
-          }
-        catch (Exception e)
-          {
-            throw new Unexpected(e);
-          }
-      }
-  }
-
-  /** @inheritDoc */
-  public void assign(DynAny from) throws TypeMismatch
-  {
-    checkType(official_type, from.type());
-
-    if (from instanceof DynValue)
-      {
-        DynValue other = (DynValue) from;
-        if (other.is_null())
-          set_to_null();
-        else
-          {
-            set_to_value();
-            try
-              {
-                DynValueOperations src = (DynValueOperations) from;
-                set_members_as_dyn_any(src.get_members_as_dyn_any());
-              }
-            catch (InvalidValue e)
-              {
-                TypeMismatch t = new TypeMismatch("Invalid value");
-                t.initCause(e);
-                throw t;
-              }
-          }
-      }
-    else
-      throw new TypeMismatch("Not a DynValue");
-  }
-
-  /**
-   * Get the number of components.
-   */
-  public int component_count()
-  {
-    return isNull ? 0 : record_component_count(); // GCJ LOCAL bug #24938
-  }
-
-  /** {@inheritDoc} */
-  public Serializable get_val() throws TypeMismatch, InvalidValue
-  {
-    return to_any().extract_Value();
-  }
-
-  /** {@inheritDoc} */
-  public void insert_val(Serializable a_x) throws InvalidValue, TypeMismatch
-  {
-    Any a = to_any();
-    a.insert_Value(a_x);
-    from_any(a);
-    valueChanged();
-  }
-}
diff --git a/libjava/gnu/CORBA/DynAn/gnuDynValueBox.h b/libjava/gnu/CORBA/DynAn/gnuDynValueBox.h
new file mode 100644
index 00000000000..da79ceba0b7
--- /dev/null
+++ b/libjava/gnu/CORBA/DynAn/gnuDynValueBox.h
@@ -0,0 +1,70 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_CORBA_DynAn_gnuDynValueBox__
+#define __gnu_CORBA_DynAn_gnuDynValueBox__
+
+#pragma interface
+
+#include <gnu/CORBA/DynAn/DivideableAny.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace CORBA
+    {
+      namespace DynAn
+      {
+          class gnuDynAnyFactory;
+          class gnuDynValueBox;
+      }
+    }
+  }
+  namespace org
+  {
+    namespace omg
+    {
+      namespace CORBA
+      {
+          class Any;
+          class ORB;
+          class TypeCode;
+      }
+      namespace DynamicAny
+      {
+          class DynAny;
+      }
+    }
+  }
+}
+
+class gnu::CORBA::DynAn::gnuDynValueBox : public ::gnu::CORBA::DynAn::DivideableAny
+{
+
+public:
+  gnuDynValueBox(::org::omg::CORBA::TypeCode *, ::org::omg::CORBA::TypeCode *, ::gnu::CORBA::DynAn::gnuDynAnyFactory *, ::org::omg::CORBA::ORB *);
+  virtual void assign(::org::omg::DynamicAny::DynAny *);
+  virtual ::org::omg::DynamicAny::DynAny * copy();
+  virtual ::org::omg::DynamicAny::DynAny * current_component();
+  virtual jboolean equal(::org::omg::DynamicAny::DynAny *);
+  virtual void from_any(::org::omg::CORBA::Any *);
+  virtual ::org::omg::CORBA::Any * get_boxed_value();
+  virtual ::org::omg::DynamicAny::DynAny * get_boxed_value_as_dyn_any();
+  virtual ::java::io::Serializable * get_val();
+  virtual void insert_val(::java::io::Serializable *);
+  virtual jboolean is_null();
+  virtual void set_boxed_value(::org::omg::CORBA::Any *);
+  virtual void set_boxed_value_as_dyn_any(::org::omg::DynamicAny::DynAny *);
+  virtual void set_to_null();
+  virtual void set_to_value();
+  virtual ::org::omg::CORBA::Any * to_any();
+private:
+  static const jlong serialVersionUID = 1LL;
+public: // actually package-private
+  ::org::omg::CORBA::TypeCode * __attribute__((aligned(__alignof__( ::gnu::CORBA::DynAn::DivideableAny)))) content;
+  ::java::lang::String * CONTENT;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_CORBA_DynAn_gnuDynValueBox__