Initial revision

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

42 files changed, 4518 insertions, 0 deletions

diff --git a/libjava/classpath/org/omg/PortableServer/CurrentPackage/NoContext.java b/libjava/classpath/org/omg/PortableServer/CurrentPackage/NoContext.java
new file mode 100644
index 00000000000..eaefee30699
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/CurrentPackage/NoContext.java
@@ -0,0 +1,82 @@
+/* NoContext.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 org.omg.PortableServer.CurrentPackage;
+
+import org.omg.CORBA.UserException;
+import org.omg.CORBA.portable.IDLEntity;
+
+import java.io.Serializable;
+
+/**
+* This exception may be thrown by methods in
+* {@link org.omg.PortableServer.CurrentOperations}
+* if they are invoked outside the context of a POA-dispatched operation.
+*
+* @see org.omg.PortableServer.CurrentOperations#get_POA()
+* @see org.omg.PortableServer.CurrentOperations#get_object_id()
+*
+* @author Audrius Meskauskas, Lithiania (AudriusA@Bioinformatics.org)
+*/
+public class NoContext
+  extends UserException
+  implements IDLEntity, Serializable
+{
+  /**
+   * Use serialVersionUID (v1.4) for interoperability.
+   */
+  private static final long serialVersionUID = 4345975812295650198L;
+
+  /**
+   * Create NoContext with no explaining message and all fields initialised to
+   * default values.
+   */
+  public NoContext()
+  {
+  }
+
+  /**
+   * Create the NoContext with explaining message.
+   *
+   * @param why a string, explaining, why this exception has been thrown.
+   */
+  public NoContext(String why)
+  {
+    super(why);
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/CurrentPackage/NoContextHelper.java b/libjava/classpath/org/omg/PortableServer/CurrentPackage/NoContextHelper.java
new file mode 100644
index 00000000000..0ba6352001f
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/CurrentPackage/NoContextHelper.java
@@ -0,0 +1,148 @@
+/* NoContextHelper.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 org.omg.PortableServer.CurrentPackage;
+
+import gnu.CORBA.EmptyExceptionHolder;
+
+import org.omg.CORBA.Any;
+import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.StructMember;
+import org.omg.CORBA.TCKind;
+import org.omg.CORBA.TypeCode;
+import org.omg.CORBA.portable.InputStream;
+import org.omg.CORBA.portable.OutputStream;
+
+/**
+* The helper operations for the exception {@link NoContext}.
+*
+* @author Audrius Meskauskas, Lithiania (AudriusA@Bioinformatics.org)
+*/
+public abstract class NoContextHelper
+{
+  /**
+   * The cached typecode value, computed only once.
+   */
+  private static TypeCode typeCode;
+
+  /**
+   * Create the NoContext typecode (structure,
+   * named "NoContext").
+   */
+  public static TypeCode type()
+  {
+    if (typeCode == null)
+      {
+        ORB orb = ORB.init();
+        StructMember[] members = new StructMember[ 0 ];
+        typeCode = orb.create_exception_tc(id(), "NoContext", members);
+      }
+    return typeCode;
+  }
+
+  /* Every user exception with no user defined fields can use EmptyExceptionHolder */
+
+  /**
+   * Insert the NoContext into the given Any.
+   *
+   * @param any the Any to insert into.
+   * @param that the NoContext to insert.
+   */
+  public static void insert(Any any, NoContext that)
+  {
+    any.insert_Streamable(new EmptyExceptionHolder(that, type()));
+  }
+
+  /**
+   * Extract the NoContext from given Any.
+   *
+   * @throws BAD_OPERATION if the passed Any does not contain NoContext.
+   */
+  public static NoContext extract(Any any)
+  {
+    try
+      {
+        EmptyExceptionHolder h =
+          (EmptyExceptionHolder) any.extract_Streamable();
+        return (NoContext) h.value;
+      }
+    catch (ClassCastException cex)
+      {
+        BAD_OPERATION bad = new BAD_OPERATION("NoContext expected");
+        bad.initCause(cex);
+        throw bad;
+      }
+  }
+
+  /**
+   * Get the NoContext repository id.
+   *
+   * @return "IDL:omg.org/PortableServer/Current/NoContext:1.0", always.
+   */
+  public static String id()
+  {
+    return "IDL:omg.org/PortableServer/Current/NoContext:1.0";
+  }
+
+  /**
+   * Read the exception from the CDR intput stream.
+   *
+   * @param input a org.omg.CORBA.portable stream to read from.
+   */
+  public static NoContext read(InputStream input)
+  {
+    // Read the exception repository id.
+    String id = input.read_string();
+    NoContext value = new NoContext(id);
+
+    return value;
+  }
+
+  /**
+   * Write the exception to the CDR output stream.
+   *
+   * @param output a org.omg.CORBA.portable stream stream to write into.
+   * @param value a value to write.
+   */
+  public static void write(OutputStream output, NoContext value)
+  {
+    // Write the exception repository id.
+    output.write_string(id());
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/ID_ASSIGNMENT_POLICY_ID.java b/libjava/classpath/org/omg/PortableServer/ID_ASSIGNMENT_POLICY_ID.java
new file mode 100644
index 00000000000..a283ce6bb99
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/ID_ASSIGNMENT_POLICY_ID.java
@@ -0,0 +1,53 @@
+/* ID_ASSIGNMENT_POLICY_ID.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 org.omg.PortableServer;
+
+
+/**
+* Holds an integer {@link IdAssignmentPolicy } identifier.
+*
+* @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+*/
+public interface ID_ASSIGNMENT_POLICY_ID
+{
+  /**
+   * Specifies the ID_ASSIGNMENT_POLICY_ID value, 19.
+   */
+  int value = 19;
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/ID_UNIQUENESS_POLICY_ID.java b/libjava/classpath/org/omg/PortableServer/ID_UNIQUENESS_POLICY_ID.java
new file mode 100644
index 00000000000..8518831d686
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/ID_UNIQUENESS_POLICY_ID.java
@@ -0,0 +1,53 @@
+/* ID_UNIQUENESS_POLICY_ID.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 org.omg.PortableServer;
+
+
+/**
+* Holds an integer {@link IdUniquenessPolicy} identifier.
+*
+* @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+*/
+public interface ID_UNIQUENESS_POLICY_ID
+{
+  /**
+   * Specifies the ID_UNIQUENESS_POLICY_ID value, 18.
+   */
+  int value = 18;
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/IMPLICIT_ACTIVATION_POLICY_ID.java b/libjava/classpath/org/omg/PortableServer/IMPLICIT_ACTIVATION_POLICY_ID.java
new file mode 100644
index 00000000000..c46e79881bd
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/IMPLICIT_ACTIVATION_POLICY_ID.java
@@ -0,0 +1,53 @@
+/* IMPLICIT_ACTIVATION_POLICY_ID.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 org.omg.PortableServer;
+
+
+/**
+* Holds an integer {@link ImplicitActivationPolicy} identifier.
+*
+* @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+*/
+public interface IMPLICIT_ACTIVATION_POLICY_ID
+{
+  /**
+   * Specifies the IMPLICIT_ACTIVATION_POLICY_ID value, 20.
+   */
+  int value = 20;
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/IdAssignmentPolicyValue.java b/libjava/classpath/org/omg/PortableServer/IdAssignmentPolicyValue.java
new file mode 100644
index 00000000000..2dda0ef2b61
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/IdAssignmentPolicyValue.java
@@ -0,0 +1,153 @@
+/* IdAssignmentPolicyValue.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 org.omg.PortableServer;
+
+import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.portable.IDLEntity;
+
+import java.io.Serializable;
+
+/**
+* Specifies the Object Id assignment policy.
+* <ul>
+* <li>USER_ID Objects created with that POA obtain they Object Ids from the
+* application.
+* </li>
+* <li>SYSTEM_ID Objects created with that POA obtain they Object Ids from POA.
+*  If the POA also has the PERSISTENT policy, these Object Ids must be
+*  unique across all instantiations of the same POA.
+* </li>
+* </ul>
+* @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+*/
+public class IdAssignmentPolicyValue
+  implements Serializable, IDLEntity
+{
+  /**
+   * Use serialVersionUID (V1.4) for interoperability.
+   */
+  private static final long serialVersionUID = 2024380631469554382L;
+
+  /**
+   * The value field for the current instance.
+   */
+  private final int _value;
+
+  /**
+  * The possible value of this enumeration (USER_ID).
+  */
+  public static final int _USER_ID = 0;
+
+  /**
+   * An instance of IdAssignmentPolicyValue, initialized to USER_ID.
+   */
+  public static final IdAssignmentPolicyValue USER_ID =
+    new IdAssignmentPolicyValue(_USER_ID);
+
+  /**
+  * The possible value of this enumeration (SYSTEM_ID),.
+  */
+  public static final int _SYSTEM_ID = 1;
+
+  /**
+   * An instance of IdAssignmentPolicyValue, initialized to SYSTEM_ID,
+   * indicating, that the objects created with that POA obtain they
+   * Object Ids from POA.
+   */
+  public static final IdAssignmentPolicyValue SYSTEM_ID =
+    new IdAssignmentPolicyValue(_SYSTEM_ID);
+
+  /**
+   * The private array that maps integer codes to the enumeration
+   * values.
+   */
+  private static final IdAssignmentPolicyValue[] enume =
+    new IdAssignmentPolicyValue[] { USER_ID, SYSTEM_ID };
+
+  /**
+   * The private array of state names.
+   */
+  private static final String[] state_names =
+    new String[] { "USER_ID", "SYSTEM_ID" };
+
+  /**
+   * Normally, no new instances are required, so the constructor is protected.
+   */
+  protected IdAssignmentPolicyValue(int a_value)
+  {
+    _value = a_value;
+  }
+
+  /**
+   * Returns the IdAssignmentPolicyValue, matching the given integer constant.
+   *
+   * @param code one of _USER_ID, _SYSTEM_ID.
+   * @return one of USER_ID, SYSTEM_ID.
+   * @throws BAD_PARAM if the parameter is not one of the valid values.
+   */
+  public static IdAssignmentPolicyValue from_int(int code)
+  {
+    try
+      {
+        return enume [ code ];
+      }
+    catch (ArrayIndexOutOfBoundsException ex)
+      {
+        throw new BAD_OPERATION("Invalid enumeration code " + code);
+      }
+  }
+
+  /**
+   * Returns a short string representation.
+   * @return the name of the current enumeration value.
+   */
+  public String toString()
+  {
+    return state_names [ _value ];
+  }
+
+  /**
+   * Returns the integer code of the policy value.
+   * @return _USER_ID or _SYSTEM_ID.
+   */
+  public int value()
+  {
+    return _value;
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/IdUniquenessPolicyValue.java b/libjava/classpath/org/omg/PortableServer/IdUniquenessPolicyValue.java
new file mode 100644
index 00000000000..d0992d9dbe2
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/IdUniquenessPolicyValue.java
@@ -0,0 +1,153 @@
+/* IdUniquenessPolicyValue.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 org.omg.PortableServer;
+
+import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.portable.IDLEntity;
+
+import java.io.Serializable;
+
+/**
+* Specifies the Object Id uniqueness policy.
+*
+* This enumeration can obtain the following values:
+* <ul>
+* <li>UNIQUE_ID a servant activated with that POA supports exactly one Object Id.
+* </li>
+* <li>MULTIPLE_ID a servant activated with that POA supports
+* multiple Object Ids.
+* </li>
+* </ul>
+* @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+*/
+public class IdUniquenessPolicyValue
+  implements Serializable, IDLEntity
+{
+  /**
+   * Use serialVersionUID (V1.4) for interoperability.
+   */
+  private static final long serialVersionUID = 2698951826884611346L;
+
+  /**
+   * The value field for the current instance.
+   */
+  private final int _value;
+
+  /**
+  * The possible value of this enumeration (UNIQUE_ID).
+  */
+  public static final int _UNIQUE_ID = 0;
+
+  /**
+   * Indicates that a servant activated with that POA, supports one and only
+   * one OBject Id.
+   */
+  public static final IdUniquenessPolicyValue UNIQUE_ID =
+    new IdUniquenessPolicyValue(_UNIQUE_ID);
+
+  /**
+  * The possible value of this enumeration (MULTIPLE_ID).
+  */
+  public static final int _MULTIPLE_ID = 1;
+
+  /**
+   * Indicates that a servant activated with that POA is able to support the
+   * multiple Object Ids.
+   */
+  public static final IdUniquenessPolicyValue MULTIPLE_ID =
+    new IdUniquenessPolicyValue(_MULTIPLE_ID);
+
+  /**
+   * The private array that maps integer codes to the enumeration
+   * values.
+   */
+  private static final IdUniquenessPolicyValue[] enume =
+    new IdUniquenessPolicyValue[] { UNIQUE_ID, MULTIPLE_ID };
+
+  /**
+   * The private array of state names.
+   */
+  private static final String[] state_names =
+    new String[] { "UNIQUE_ID", "MULTIPLE_ID" };
+
+  /**
+   * Normally, no new instances are required, so the constructor is protected.
+   */
+  protected IdUniquenessPolicyValue(int a_value)
+  {
+    _value = a_value;
+  }
+
+  /**
+   * Returns the IdUniquenessPolicyValue, matching the given integer constant.
+   *
+   * @param code one of _UNIQUE_ID, _MULTIPLE_ID.
+   * @return one of UNIQUE_ID, MULTIPLE_ID.
+   * @throws BAD_PARAM if the parameter is not one of the valid values.
+   */
+  public static IdUniquenessPolicyValue from_int(int code)
+  {
+    try
+      {
+        return enume [ code ];
+      }
+    catch (ArrayIndexOutOfBoundsException ex)
+      {
+        throw new BAD_OPERATION("Invalid enumeration code " + code);
+      }
+  }
+
+  /**
+   * Returns a short string representation.
+   * @return the name of the current enumeration value.
+   */
+  public String toString()
+  {
+    return state_names [ _value ];
+  }
+
+  /**
+   * Returns the integer code of the policy value.
+   * @return _UNIQUE_ID or _MULTIPLE_ID.
+   */
+  public int value()
+  {
+    return _value;
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/ImplicitActivationPolicyValue.java b/libjava/classpath/org/omg/PortableServer/ImplicitActivationPolicyValue.java
new file mode 100644
index 00000000000..8d2913bf66f
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/ImplicitActivationPolicyValue.java
@@ -0,0 +1,153 @@
+/* ImplicitActivationPolicyValue.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 org.omg.PortableServer;
+
+import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.portable.IDLEntity;
+
+import java.io.Serializable;
+
+/**
+* Specifies the implicit activation policy.
+*
+* This enumeration can obtain the following values:
+* <ul>
+* <li>IMPLICIT_ACTIVATION The POA supports implicit activation of servants.
+* ({@link IdAssignmentPolicyValue#SYSTEM_ID} and
+* {@link ServantRetentionPolicyValue#RETAIN} policies required).</li>
+* <li>NO_IMPLICIT_ACTIVATION The POA does not support implicit activation.</li>
+* </ul>
+* @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+*/
+public class ImplicitActivationPolicyValue
+  implements Serializable, IDLEntity
+{
+  /**
+   * Use serialVersionUID (V1.4) for interoperability.
+   */
+  private static final long serialVersionUID = 3826572456602949295L;
+
+  /**
+   * The value field for the current instance.
+   */
+  private final int _value;
+
+  /**
+  * The possible value of this enumeration (IMPLICIT_ACTIVATION).
+  */
+  public static final int _IMPLICIT_ACTIVATION = 0;
+
+  /**
+   * An instance of ImplicitActivationPolicyValue, initialized to IMPLICIT_ACTIVATION.
+   */
+  public static final ImplicitActivationPolicyValue IMPLICIT_ACTIVATION =
+    new ImplicitActivationPolicyValue(_IMPLICIT_ACTIVATION);
+
+  /**
+  * The possible value of this enumeration (NO_IMPLICIT_ACTIVATION).
+  */
+  public static final int _NO_IMPLICIT_ACTIVATION = 1;
+
+  /**
+   * An instance of ImplicitActivationPolicyValue, initialized to NO_IMPLICIT_ACTIVATION.
+   */
+  public static final ImplicitActivationPolicyValue NO_IMPLICIT_ACTIVATION =
+    new ImplicitActivationPolicyValue(_NO_IMPLICIT_ACTIVATION);
+
+  /**
+   * The private array that maps integer codes to the enumeration
+   * values.
+   */
+  private static final ImplicitActivationPolicyValue[] enume =
+    new ImplicitActivationPolicyValue[]
+    {
+      IMPLICIT_ACTIVATION, NO_IMPLICIT_ACTIVATION
+    };
+
+  /**
+   * The private array of state names.
+   */
+  private static final String[] state_names =
+    new String[] { "IMPLICIT_ACTIVATION", "NO_IMPLICIT_ACTIVATION" };
+
+  /**
+   * Normally, no new instances are required, so the constructor is protected.
+   */
+  protected ImplicitActivationPolicyValue(int a_value)
+  {
+    _value = a_value;
+  }
+
+  /**
+   * Returns the ImplicitActivationPolicyValue, matching the given integer constant.
+   *
+   * @param code one of _IMPLICIT_ACTIVATION, _NO_IMPLICIT_ACTIVATION.
+   * @return one of IMPLICIT_ACTIVATION, NO_IMPLICIT_ACTIVATION.
+   * @throws BAD_PARAM if the parameter is not one of the valid values.
+   */
+  public static ImplicitActivationPolicyValue from_int(int code)
+  {
+    try
+      {
+        return enume [ code ];
+      }
+    catch (ArrayIndexOutOfBoundsException ex)
+      {
+        throw new BAD_OPERATION("Invalid enumeration code " + code);
+      }
+  }
+
+  /**
+   * Returns a short string representation.
+   * @return the name of the current enumeration value.
+   */
+  public String toString()
+  {
+    return state_names [ _value ];
+  }
+
+  /**
+   * Returns the integer code of the policy value.
+   * @return _IMPLICIT_ACTIVATION or _NO_IMPLICIT_ACTIVATION.
+   */
+  public int value()
+  {
+    return _value;
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/LIFESPAN_POLICY_ID.java b/libjava/classpath/org/omg/PortableServer/LIFESPAN_POLICY_ID.java
new file mode 100644
index 00000000000..87b93af0267
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/LIFESPAN_POLICY_ID.java
@@ -0,0 +1,52 @@
+/* LIFESPAN_POLICY_ID.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 org.omg.PortableServer;
+
+ /**
+ * Holds an integer {@link LifespanPolicy} identifier.
+ *
+ * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+ */
+public interface LIFESPAN_POLICY_ID
+{
+  /**
+   * Specifies the LIFESPAN_POLICY_ID value, 17.
+   */
+  int value = 17;
+}
diff --git a/libjava/classpath/org/omg/PortableServer/LifespanPolicyValue.java b/libjava/classpath/org/omg/PortableServer/LifespanPolicyValue.java
new file mode 100644
index 00000000000..1e046c4e941
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/LifespanPolicyValue.java
@@ -0,0 +1,150 @@
+/* LifespanPolicyValue.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 org.omg.PortableServer;
+
+import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.portable.IDLEntity;
+
+import java.io.Serializable;
+
+/**
+* Specifies the object life span policy.
+*
+* This enumeration can obtain the following values:
+* <ul>
+* <li>TRANSIENT The objects implemented in the POA never outlive
+*  the POA instance in which they are first created.</li>
+* <li>PERSISTENT The mentioned objects can outlive the process in
+* which they are first created.</li>
+* </ul>
+* @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+*/
+public class LifespanPolicyValue
+  implements Serializable, IDLEntity
+{
+  /**
+   * Use serialVersionUID (V1.4) for interoperability.
+   */
+  private static final long serialVersionUID = 6604562925399671611L;
+
+  /**
+   * The value field for the current instance.
+   */
+  private final int _value;
+
+  /**
+  * The possible value of this enumeration (TRANSIENT).
+  */
+  public static final int _TRANSIENT = 0;
+
+  /**
+   * An instance of LifespanPolicyValue, initialized to TRANSIENT.
+   */
+  public static final LifespanPolicyValue TRANSIENT =
+    new LifespanPolicyValue(_TRANSIENT);
+
+  /**
+  * The possible value of this enumeration (PERSISTENT).
+  */
+  public static final int _PERSISTENT = 1;
+
+  /**
+   * An instance of LifespanPolicyValue, initialized to PERSISTENT.
+   */
+  public static final LifespanPolicyValue PERSISTENT =
+    new LifespanPolicyValue(_PERSISTENT);
+
+  /**
+   * The private array that maps integer codes to the enumeration
+   * values.
+   */
+  private static final LifespanPolicyValue[] enume =
+    new LifespanPolicyValue[] { TRANSIENT, PERSISTENT };
+
+  /**
+   * The private array of state names.
+   */
+  private static final String[] state_names =
+    new String[] { "TRANSIENT", "PERSISTENT" };
+
+  /**
+   * Normally, no new instances are required, so the constructor is protected.
+   */
+  protected LifespanPolicyValue(int a_value)
+  {
+    _value = a_value;
+  }
+
+  /**
+   * Returns the LifespanPolicyValue, matching the given integer constant.
+   *
+   * @param code one of _TRANSIENT, _PERSISTENT.
+   * @return one of TRANSIENT, PERSISTENT.
+   * @throws BAD_PARAM if the parameter is not one of the valid values.
+   */
+  public static LifespanPolicyValue from_int(int code)
+  {
+    try
+      {
+        return enume [ code ];
+      }
+    catch (ArrayIndexOutOfBoundsException ex)
+      {
+        throw new BAD_OPERATION("Invalid enumeration code " + code);
+      }
+  }
+
+  /**
+   * Returns a short string representation.
+   * @return the name of the current enumeration value.
+   */
+  public String toString()
+  {
+    return state_names [ _value ];
+  }
+
+  /**
+   * Returns the integer code of the policy value.
+   * @return _TRANSIENT or _PERSISTENT.
+   */
+  public int value()
+  {
+    return _value;
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/POAManagerPackage/AdapterInactive.java b/libjava/classpath/org/omg/PortableServer/POAManagerPackage/AdapterInactive.java
new file mode 100644
index 00000000000..29720d7ca96
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/POAManagerPackage/AdapterInactive.java
@@ -0,0 +1,79 @@
+/* AdapterInactive.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 org.omg.PortableServer.POAManagerPackage;
+
+import org.omg.CORBA.UserException;
+import org.omg.CORBA.portable.IDLEntity;
+
+import java.io.Serializable;
+
+/**
+ * Raised when the current operation is not applicable for the system
+ * because the POA manager is in an inactive {@link State}.
+ *
+ * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+ */
+public class AdapterInactive
+  extends UserException
+  implements IDLEntity, Serializable
+{
+  /**
+   * Use serialVersionUID (v1.4) for interoperability.
+   */
+  private static final long serialVersionUID = 6945182851085567131L;
+
+  /**
+   * Create AdapterInactive with no explaining
+   * message.
+   */
+  public AdapterInactive()
+  {
+  }
+
+  /**
+   * Create the AdapterInactive with explaining
+   * message.
+   *
+   * @param why a string, explaining, why this exception has been thrown.
+   */
+  public AdapterInactive(String why)
+  {
+    super(why);
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java b/libjava/classpath/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java
new file mode 100644
index 00000000000..db7b965bbad
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java
@@ -0,0 +1,149 @@
+/* AdapterInactiveHelper.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 org.omg.PortableServer.POAManagerPackage;
+
+import gnu.CORBA.EmptyExceptionHolder;
+
+import org.omg.CORBA.Any;
+import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.StructMember;
+import org.omg.CORBA.TCKind;
+import org.omg.CORBA.TypeCode;
+import org.omg.CORBA.portable.InputStream;
+import org.omg.CORBA.portable.OutputStream;
+
+/**
+* The helper operations for the exception {@link AdapterInactive}.
+*
+* @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+*/
+public abstract class AdapterInactiveHelper
+{
+  /**
+   * The cached typecode value, computed only once.
+   */
+  private static TypeCode typeCode;
+
+  /**
+   * Create the AdapterInactive typecode (structure,
+   * named "AdapterInactive").
+   */
+  public static TypeCode type()
+  {
+    if (typeCode == null)
+      {
+        ORB orb = ORB.init();
+        StructMember[] members = new StructMember[ 0 ];
+        typeCode = orb.create_exception_tc(id(), "AdapterInactive", members);
+      }
+    return typeCode;
+  }
+
+  /* Every user exception with no user defined
+     fields can use EmptyExceptionHolder */
+
+  /**
+   * Insert the AdapterInactive into the given Any.
+   *
+   * @param any the Any to insert into.
+   * @param that the AdapterInactive to insert.
+   */
+  public static void insert(Any any, AdapterInactive that)
+  {
+    any.insert_Streamable(new EmptyExceptionHolder(that, type()));
+  }
+
+  /**
+   * Extract the AdapterInactive from given Any.
+   *
+   * @throws BAD_OPERATION if the passed Any does not contain AdapterInactive.
+   */
+  public static AdapterInactive extract(Any any)
+  {
+    try
+      {
+        EmptyExceptionHolder h =
+          (EmptyExceptionHolder) any.extract_Streamable();
+        return (AdapterInactive) h.value;
+      }
+    catch (ClassCastException cex)
+      {
+        BAD_OPERATION bad = new BAD_OPERATION("AdapterInactive expected");
+        bad.initCause(cex);
+        throw bad;
+      }
+  }
+
+  /**
+   * Get the AdapterInactive repository id.
+   *
+   * @return "IDL:omg.org/PortableServer/POAManager/AdapterInactive:1.0", always.
+   */
+  public static String id()
+  {
+    return "IDL:omg.org/PortableServer/POAManager/AdapterInactive:1.0";
+  }
+
+  /**
+   * Read the exception from the CDR intput stream.
+   *
+   * @param input a org.omg.CORBA.portable stream to read from.
+   */
+  public static AdapterInactive read(InputStream input)
+  {
+    // Read the exception repository id.
+    String id = input.read_string();
+    AdapterInactive value = new AdapterInactive(id);
+
+    return value;
+  }
+
+  /**
+   * Write the exception to the CDR output stream.
+   *
+   * @param output a org.omg.CORBA.portable stream stream to write into.
+   * @param value a value to write.
+   */
+  public static void write(OutputStream output, AdapterInactive value)
+  {
+    // Write the exception repository id.
+    output.write_string(id());
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/POAManagerPackage/State.java b/libjava/classpath/org/omg/PortableServer/POAManagerPackage/State.java
new file mode 100644
index 00000000000..536189a0ce2
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/POAManagerPackage/State.java
@@ -0,0 +1,177 @@
+/* State.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 org.omg.PortableServer.POAManagerPackage;
+
+import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.portable.IDLEntity;
+
+import java.io.Serializable;
+
+/**
+ * Defines the possible states of the POA manager.
+ *
+ * This enumeration can obtain the following values:
+ * <ul>
+ * <li>ACTIVE When the manager is in the active state, the associated POAs
+ * receive and process requests.</li>
+ * <li>DISCARDING When the manager is in the discarding state,
+ * the associated POAs discard all incoming requests. The sending clients
+ * receive the {@link org.omg.TRANSIENT} system exception, with standard
+ * minor code 1. This mode is needed for flow control, when the system is
+ * flooded with requests.
+ * </li>
+ * <li>HOLDING When the manager is in the holding state, the associated POAs
+ * queue incoming requests.</li>
+ * <li>INACTIVE This state is entered when the associated POAs are to be
+ *  shut down.</li>
+ * </ul>
+ *
+ * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+ */
+public class State
+  implements Serializable, IDLEntity
+{
+  /**
+   * Use serialVersionUID (v1.4) for interoperability.
+   */
+  private static final long serialVersionUID = -2451866258678193271L;
+
+  /**
+   * The value field for the current instance.
+   */
+  private final int _value;
+
+  /**
+  * The possible value of this enumeration (HOLDING).
+  */
+  public static final int _HOLDING = 0;
+
+  /**
+   * An instance of State, initialized to HOLDING.
+   */
+  public static final State HOLDING = new State(_HOLDING);
+
+  /**
+  * The possible value of this enumeration (ACTIVE).
+  */
+  public static final int _ACTIVE = 1;
+
+  /**
+   * An instance of State, initialized to ACTIVE.
+   */
+  public static final State ACTIVE = new State(_ACTIVE);
+
+  /**
+  * The possible value of this enumeration (DISCARDING).
+  */
+  public static final int _DISCARDING = 2;
+
+  /**
+   * An instance of State, initialized to DISCARDING.
+   */
+  public static final State DISCARDING = new State(_DISCARDING);
+
+  /**
+  * The possible value of this enumeration (INACTIVE).
+  */
+  public static final int _INACTIVE = 3;
+
+  /**
+   * An instance of State, initialized to INACTIVE.
+   */
+  public static final State INACTIVE = new State(_INACTIVE);
+
+  /**
+   * The private array that maps integer codes to the enumeration
+   * values.
+   */
+  private static final State[] enume =
+    new State[] { HOLDING, ACTIVE, DISCARDING, INACTIVE };
+
+  /**
+   * The private array of state names.
+   */
+  private static final String[] state_names =
+    new String[] { "HOLDING", "ACTIVE", "DISCARDING", "INACTIVE" };
+
+  /**
+   * Normally, no new instances are required, so the constructor is protected.
+   */
+  protected State(int a_value)
+  {
+    _value = a_value;
+  }
+
+  /**
+   * Returns the State, matching the given integer constant.
+   *
+   * @param code one of _HOLDING, _ACTIVE, _DISCARDING, _INACTIVE.
+   * @return one of HOLDING, ACTIVE, DISCARDING, INACTIVE.
+   * @throws BAD_PARAM if the parameter is not one of the valid values.
+   */
+  public static State from_int(int code)
+  {
+    try
+      {
+        return enume [ code ];
+      }
+    catch (ArrayIndexOutOfBoundsException ex)
+      {
+        throw new BAD_OPERATION("Invalid enumeration code " + code);
+      }
+  }
+
+  /**
+   * Returns a short string representation.
+   * @return the name of the current enumeration value.
+   */
+  public String toString()
+  {
+    return state_names [ _value ];
+  }
+
+  /**
+   * Returns the integer code of the enumeration value.
+   * @return one of HOLDING, ACTIVE, DISCARDING, INACTIVE.
+   */
+  public int value()
+  {
+    return _value;
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/POAManagerPackage/package.html b/libjava/classpath/org/omg/PortableServer/POAManagerPackage/package.html
new file mode 100644
index 00000000000..fb6ae58d595
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/POAManagerPackage/package.html
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!-- package.html -
+   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. -->
+
+<html>
+<head><title>GNU Classpath - org.omg.PortableServer.POAManagerPackage</title></head>
+
+<body>
+<p>Contains additional classes, needed by POA Manager</p>
+
+</body>
+</html>
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterAlreadyExists.java b/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterAlreadyExists.java
new file mode 100644
index 00000000000..ace2c842fae
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterAlreadyExists.java
@@ -0,0 +1,79 @@
+/* AdapterAlreadyExists.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 org.omg.PortableServer.POAPackage;
+
+import org.omg.CORBA.UserException;
+import org.omg.CORBA.portable.IDLEntity;
+
+import java.io.Serializable;
+
+/**
+ * Raised if the target POA already has a child POA with the specified name
+ * (during creation of the new POA as a child of the target POA).
+ *
+ * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+ */
+public class AdapterAlreadyExists
+  extends UserException
+  implements IDLEntity, Serializable
+{
+  /**
+   * Use serialVersionUID (v1.4) for interoperability.
+   */
+  private static final long serialVersionUID = -2678288222917790041L;
+
+  /**
+   * Create AdapterAlreadyExists with no explaining
+   * message.
+   */
+  public AdapterAlreadyExists()
+  {
+  }
+
+  /**
+   * Create the AdapterAlreadyExists with explaining
+   * message.
+   *
+   * @param why a string, explaining, why this exception has been thrown.
+   */
+  public AdapterAlreadyExists(String why)
+  {
+    super(why);
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java
new file mode 100644
index 00000000000..3ffee4ff85a
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java
@@ -0,0 +1,150 @@
+/* AdapterAlreadyExistsHelper.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 org.omg.PortableServer.POAPackage;
+
+import gnu.CORBA.EmptyExceptionHolder;
+
+import org.omg.CORBA.Any;
+import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.StructMember;
+import org.omg.CORBA.TCKind;
+import org.omg.CORBA.TypeCode;
+import org.omg.CORBA.portable.InputStream;
+import org.omg.CORBA.portable.OutputStream;
+
+/**
+ * The helper operations for the exception {@link AdapterAlreadyExists}.
+ *
+ * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+ */
+public abstract class AdapterAlreadyExistsHelper
+{
+  /**
+   * The cached typecode value, computed only once.
+   */
+  private static TypeCode typeCode;
+
+  /**
+   * Create the AdapterAlreadyExists typecode (emtpy structure,
+   * named "AdapterAlreadyExists").
+   */
+  public static TypeCode type()
+  {
+    if (typeCode == null)
+      {
+        ORB orb = ORB.init();
+        StructMember[] members = new StructMember[ 0 ];
+        typeCode =
+          orb.create_exception_tc(id(), "AdapterAlreadyExists", members);
+      }
+    return typeCode;
+  }
+
+  /* Every user exception with no user defined
+     fields can use EmptyExceptionHolder */
+
+  /**
+   * Insert the AdapterAlreadyExists into the given Any.
+   *
+   * @param any the Any to insert into.
+   * @param that the AdapterAlreadyExists to insert.
+   */
+  public static void insert(Any any, AdapterAlreadyExists that)
+  {
+    any.insert_Streamable(new EmptyExceptionHolder(that, type()));
+  }
+
+  /**
+   * Extract the AdapterAlreadyExists from given Any.
+   *
+   * @throws BAD_OPERATION if the passed Any does not contain AdapterAlreadyExists.
+   */
+  public static AdapterAlreadyExists extract(Any any)
+  {
+    try
+      {
+        EmptyExceptionHolder h =
+          (EmptyExceptionHolder) any.extract_Streamable();
+        return (AdapterAlreadyExists) h.value;
+      }
+    catch (ClassCastException cex)
+      {
+        BAD_OPERATION bad = new BAD_OPERATION("AdapterAlreadyExists expected");
+        bad.initCause(cex);
+        throw bad;
+      }
+  }
+
+  /**
+   * Get the AdapterAlreadyExists repository id.
+   *
+   * @return "IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:1.0", always.
+   */
+  public static String id()
+  {
+    return "IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:1.0";
+  }
+
+  /**
+   * Read the exception from the CDR intput stream.
+   *
+   * @param input a org.omg.CORBA.portable stream to read from.
+   */
+  public static AdapterAlreadyExists read(InputStream input)
+  {
+    // Read the exception repository id.
+    String id = input.read_string();
+    AdapterAlreadyExists value = new AdapterAlreadyExists(id);
+
+    return value;
+  }
+
+  /**
+   * Write the exception to the CDR output stream.
+   *
+   * @param output a org.omg.CORBA.portable stream stream to write into.
+   * @param value a value to write.
+   */
+  public static void write(OutputStream output, AdapterAlreadyExists value)
+  {
+    // Write the exception repository id.
+    output.write_string(id());
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterNonExistent.java b/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterNonExistent.java
new file mode 100644
index 00000000000..9d0a79f73f4
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterNonExistent.java
@@ -0,0 +1,79 @@
+/* AdapterNonExistent.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 org.omg.PortableServer.POAPackage;
+
+import org.omg.CORBA.UserException;
+import org.omg.CORBA.portable.IDLEntity;
+
+import java.io.Serializable;
+
+/**
+ * The AdapterNonExistent is thrown if the parent POA cannot locate
+ * the required child POA.
+ *
+ * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+ */
+public class AdapterNonExistent
+  extends UserException
+  implements IDLEntity, Serializable
+{
+  /**
+   * Use serialVersionUID (v1.4) for interoperability.
+   */
+  private static final long serialVersionUID = -9166706041988650696L;
+
+  /**
+   * Create AdapterNonExistent with no explaining
+   * message.
+   */
+  public AdapterNonExistent()
+  {
+  }
+
+  /**
+   * Create the AdapterNonExistent with explaining
+   * message.
+   *
+   * @param why a string, explaining, why this exception has been thrown.
+   */
+  public AdapterNonExistent(String why)
+  {
+    super(why);
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java
new file mode 100644
index 00000000000..f05daec3d83
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java
@@ -0,0 +1,149 @@
+/* AdapterNonExistentHelper.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 org.omg.PortableServer.POAPackage;
+
+import gnu.CORBA.EmptyExceptionHolder;
+
+import org.omg.CORBA.Any;
+import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.StructMember;
+import org.omg.CORBA.TCKind;
+import org.omg.CORBA.TypeCode;
+import org.omg.CORBA.portable.InputStream;
+import org.omg.CORBA.portable.OutputStream;
+
+/**
+ * The helper operations for the exception {@link AdapterNonExistent}.
+ *
+ * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+ */
+public abstract class AdapterNonExistentHelper
+{
+  /**
+   * The cached typecode value, computed only once.
+   */
+  private static TypeCode typeCode;
+
+  /**
+   * Create the AdapterNonExistent typecode (empty structure,
+   * named "AdapterNonExistent").
+   */
+  public static TypeCode type()
+  {
+    if (typeCode == null)
+      {
+        ORB orb = ORB.init();
+        StructMember[] members = new StructMember[ 0 ];
+        typeCode = orb.create_exception_tc(id(), "AdapterNonExistent", members);
+      }
+    return typeCode;
+  }
+
+  /* Every user exception with no user defined
+     fields can use EmptyExceptionHolder */
+
+  /**
+   * Insert the AdapterNonExistent into the given Any.
+   *
+   * @param any the Any to insert into.
+   * @param that the AdapterNonExistent to insert.
+   */
+  public static void insert(Any any, AdapterNonExistent that)
+  {
+    any.insert_Streamable(new EmptyExceptionHolder(that, type()));
+  }
+
+  /**
+   * Extract the AdapterNonExistent from given Any.
+   *
+   * @throws BAD_OPERATION if the passed Any does not contain AdapterNonExistent.
+   */
+  public static AdapterNonExistent extract(Any any)
+  {
+    try
+      {
+        EmptyExceptionHolder h =
+          (EmptyExceptionHolder) any.extract_Streamable();
+        return (AdapterNonExistent) h.value;
+      }
+    catch (ClassCastException cex)
+      {
+        BAD_OPERATION bad = new BAD_OPERATION("AdapterNonExistent expected");
+        bad.initCause(cex);
+        throw bad;
+      }
+  }
+
+  /**
+   * Get the AdapterNonExistent repository id.
+   *
+   * @return "IDL:omg.org/PortableServer/POA/AdapterNonExistent:1.0", always.
+   */
+  public static String id()
+  {
+    return "IDL:omg.org/PortableServer/POA/AdapterNonExistent:1.0";
+  }
+
+  /**
+   * Read the exception from the CDR intput stream.
+   *
+   * @param input a org.omg.CORBA.portable stream to read from.
+   */
+  public static AdapterNonExistent read(InputStream input)
+  {
+    // Read the exception repository id.
+    String id = input.read_string();
+    AdapterNonExistent value = new AdapterNonExistent(id);
+
+    return value;
+  }
+
+  /**
+   * Write the exception to the CDR output stream.
+   *
+   * @param output a org.omg.CORBA.portable stream stream to write into.
+   * @param value a value to write.
+   */
+  public static void write(OutputStream output, AdapterNonExistent value)
+  {
+    // Write the exception repository id.
+    output.write_string(id());
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicy.java b/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicy.java
new file mode 100644
index 00000000000..459335a1b44
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicy.java
@@ -0,0 +1,109 @@
+/* InvalidPolicy.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 org.omg.PortableServer.POAPackage;
+
+import org.omg.CORBA.UserException;
+import org.omg.CORBA.portable.IDLEntity;
+
+import java.io.Serializable;
+
+/**
+ * Raised if any of the policy objects specified is not supported by this
+ * ORB implementation, if conflicting policy objects are specified,
+ * or if any of the specified policy objects require prior administrative
+ * action that has not been performed.
+ *
+ *
+ * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+ */
+public class InvalidPolicy
+  extends UserException
+  implements IDLEntity, Serializable
+{
+  /**
+   * Use serialVersionUID (v1.4) for interoperability.
+   */
+  private static final long serialVersionUID = 3204212102282117205L;
+
+  /**
+   * The index in the policies parameter value of the first offending
+   * policy object.
+   */
+  public short index;
+
+  /**
+   * Create InvalidPolicy with no explaining
+   * message and leaving {@link index} with default 0 value.
+   */
+  public InvalidPolicy()
+  {
+  }
+
+  /**
+   * Create the InvalidPolicy with explaining
+   * message and initialisintg {@link index} to the passed value.
+   *
+   * @param why a string, explaining, why this exception has been thrown.
+   * @param a_index a value for index.
+   */
+  public InvalidPolicy(String why, short a_index)
+  {
+    super(why);
+    this.index = a_index;
+  }
+
+  /**
+   * Create the InvalidPolicy without explaining
+   * message and initialisintg {@link index} to the passed value.
+   *
+   * @param a_index a value for index.
+   */
+  public InvalidPolicy(short a_index)
+  {
+    this.index = a_index;
+  }
+
+  /**
+   * Adds {@link #index} to the super.getMessage().
+   */
+  public String getMessage()
+  {
+    return super.getMessage() + " at index " + index;
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java
new file mode 100644
index 00000000000..15aa62d8201
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java
@@ -0,0 +1,155 @@
+/* InvalidPolicyHelper.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 org.omg.PortableServer.POAPackage;
+
+import gnu.CORBA.Poa.InvalidPolicyHolder;
+
+import org.omg.CORBA.Any;
+import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.StructMember;
+import org.omg.CORBA.TCKind;
+import org.omg.CORBA.TypeCode;
+import org.omg.CORBA.portable.InputStream;
+import org.omg.CORBA.portable.OutputStream;
+
+/**
+ * The helper operations for the exception {@link InvalidPolicy}.
+ *
+ * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+ */
+public abstract class InvalidPolicyHelper
+{
+  /**
+   * The cached typecode value, computed only once.
+   */
+  private static TypeCode typeCode;
+
+  /**
+   * Create the InvalidPolicy typecode (emtpy structure,
+   * named "InvalidPolicy").
+   * The typecode states that the structure contains the
+   * single field, named "index".
+   */
+  public static TypeCode type()
+  {
+    if (typeCode == null)
+      {
+        ORB orb = ORB.init();
+        StructMember[] members = new StructMember[ 1 ];
+
+        TypeCode field;
+
+        field = orb.get_primitive_tc(TCKind.tk_ushort);
+        members [ 0 ] = new StructMember("index", field, null);
+        typeCode = orb.create_exception_tc(id(), "InvalidPolicy", members);
+      }
+    return typeCode;
+  }
+
+  /**
+  * Insert the InvalidPolicy into the given Any.
+  * This method uses the InvalidPolicyHolder.
+  *
+  * @param any the Any to insert into.
+  * @param that the InvalidPolicy to insert.
+  */
+  public static void insert(Any any, InvalidPolicy that)
+  {
+    any.insert_Streamable(new InvalidPolicyHolder(that));
+  }
+
+  /**
+   * Extract the InvalidPolicy from given Any.
+   * This method uses the InvalidPolicyHolder.
+   *
+   * @throws BAD_OPERATION if the passed Any does not contain InvalidPolicy.
+   */
+  public static InvalidPolicy extract(Any any)
+  {
+    try
+      {
+        return ((InvalidPolicyHolder) any.extract_Streamable()).value;
+      }
+    catch (ClassCastException cex)
+      {
+        BAD_OPERATION bad = new BAD_OPERATION("InvalidPolicy expected");
+        bad.initCause(cex);
+        throw bad;
+      }
+  }
+
+  /**
+   * Get the InvalidPolicy repository id.
+   *
+   * @return "IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0", always.
+   */
+  public static String id()
+  {
+    return "IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0";
+  }
+
+  /**
+   * Read the exception from the CDR intput stream.
+   *
+   * @param input a org.omg.CORBA.portable stream to read from.
+   */
+  public static InvalidPolicy read(InputStream input)
+  {
+    // Read the exception repository id.
+    String id = input.read_string();
+    InvalidPolicy value = new InvalidPolicy();
+
+    value.index = input.read_short();
+    return value;
+  }
+
+  /**
+   * Write the exception to the CDR output stream.
+   *
+   * @param output a org.omg.CORBA.portable stream stream to write into.
+   * @param value a value to write.
+   */
+  public static void write(OutputStream output, InvalidPolicy value)
+  {
+    // Write the exception repository id.
+    output.write_string(id());
+    output.write_short(value.index);
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/NoServant.java b/libjava/classpath/org/omg/PortableServer/POAPackage/NoServant.java
new file mode 100644
index 00000000000..3f635401778
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/NoServant.java
@@ -0,0 +1,79 @@
+/* NoServant.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 org.omg.PortableServer.POAPackage;
+
+import org.omg.CORBA.UserException;
+import org.omg.CORBA.portable.IDLEntity;
+
+import java.io.Serializable;
+
+/**
+ * Raised when trying to get the default servant, when no default servant
+ * has been associated with POA.
+ *
+ * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+ */
+public class NoServant
+  extends UserException
+  implements IDLEntity, Serializable
+{
+  /**
+   * Use serialVersionUID (v1.4) for interoperability.
+   */
+  private static final long serialVersionUID = -5893773687270266061L;
+
+  /**
+   * Create NoServant with no explaining
+   * message.
+   */
+  public NoServant()
+  {
+  }
+
+  /**
+   * Create the NoServant with explaining
+   * message.
+   *
+   * @param why a string, explaining, why this exception has been thrown.
+   */
+  public NoServant(String why)
+  {
+    super(why);
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/NoServantHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/NoServantHelper.java
new file mode 100644
index 00000000000..26b21ce6c10
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/NoServantHelper.java
@@ -0,0 +1,149 @@
+/* NoServantHelper.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 org.omg.PortableServer.POAPackage;
+
+import gnu.CORBA.EmptyExceptionHolder;
+
+import org.omg.CORBA.Any;
+import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.StructMember;
+import org.omg.CORBA.TCKind;
+import org.omg.CORBA.TypeCode;
+import org.omg.CORBA.portable.InputStream;
+import org.omg.CORBA.portable.OutputStream;
+
+/**
+ * The helper operations for the exception {@link NoServant}.
+ *
+ * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+ */
+public abstract class NoServantHelper
+{
+  /**
+   * The cached typecode value, computed only once.
+   */
+  private static TypeCode typeCode;
+
+  /**
+   * Create the NoServant typecode (empty structure,
+   * named "NoServant").
+   */
+  public static TypeCode type()
+  {
+    if (typeCode == null)
+      {
+        ORB orb = ORB.init();
+        StructMember[] members = new StructMember[ 0 ];
+        typeCode = orb.create_exception_tc(id(), "NoServant", members);
+      }
+    return typeCode;
+  }
+
+  /* Every user exception with no user defined
+     fields can use EmptyExceptionHolder */
+
+  /**
+   * Insert the NoServant into the given Any.
+   *
+   * @param any the Any to insert into.
+   * @param that the NoServant to insert.
+   */
+  public static void insert(Any any, NoServant that)
+  {
+    any.insert_Streamable(new EmptyExceptionHolder(that, type()));
+  }
+
+  /**
+   * Extract the NoServant from given Any.
+   *
+   * @throws BAD_OPERATION if the passed Any does not contain NoServant.
+   */
+  public static NoServant extract(Any any)
+  {
+    try
+      {
+        EmptyExceptionHolder h =
+          (EmptyExceptionHolder) any.extract_Streamable();
+        return (NoServant) h.value;
+      }
+    catch (ClassCastException cex)
+      {
+        BAD_OPERATION bad = new BAD_OPERATION("NoServant expected");
+        bad.initCause(cex);
+        throw bad;
+      }
+  }
+
+  /**
+   * Get the NoServant repository id.
+   *
+   * @return "IDL:omg.org/PortableServer/POA/NoServant:1.0", always.
+   */
+  public static String id()
+  {
+    return "IDL:omg.org/PortableServer/POA/NoServant:1.0";
+  }
+
+  /**
+   * Read the exception from the CDR intput stream.
+   *
+   * @param input a org.omg.CORBA.portable stream to read from.
+   */
+  public static NoServant read(InputStream input)
+  {
+    // Read the exception repository id.
+    String id = input.read_string();
+    NoServant value = new NoServant(id);
+
+    return value;
+  }
+
+  /**
+   * Write the exception to the CDR output stream.
+   *
+   * @param output a org.omg.CORBA.portable stream stream to write into.
+   * @param value a value to write.
+   */
+  public static void write(OutputStream output, NoServant value)
+  {
+    // Write the exception repository id.
+    output.write_string(id());
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectAlreadyActive.java b/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectAlreadyActive.java
new file mode 100644
index 00000000000..5a3b15e88be
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectAlreadyActive.java
@@ -0,0 +1,78 @@
+/* ObjectAlreadyActive.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 org.omg.PortableServer.POAPackage;
+
+import org.omg.CORBA.UserException;
+import org.omg.CORBA.portable.IDLEntity;
+
+import java.io.Serializable;
+
+/**
+ * Raised in response to activate the already active object.
+ *
+ * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+ */
+public class ObjectAlreadyActive
+  extends UserException
+  implements IDLEntity, Serializable
+{
+  /**
+   * Use serialVersionUID (v1.4) for interoperability.
+   */
+  private static final long serialVersionUID = -2919308871345098101L;
+
+  /**
+   * Create ObjectAlreadyActive with no explaining
+   * message.
+   */
+  public ObjectAlreadyActive()
+  {
+  }
+
+  /**
+   * Create the ObjectAlreadyActive with explaining
+   * message.
+   *
+   * @param why a string, explaining, why this exception has been thrown.
+   */
+  public ObjectAlreadyActive(String why)
+  {
+    super(why);
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java
new file mode 100644
index 00000000000..99891dbe5c3
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java
@@ -0,0 +1,150 @@
+/* ObjectAlreadyActiveHelper.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 org.omg.PortableServer.POAPackage;
+
+import gnu.CORBA.EmptyExceptionHolder;
+
+import org.omg.CORBA.Any;
+import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.StructMember;
+import org.omg.CORBA.TCKind;
+import org.omg.CORBA.TypeCode;
+import org.omg.CORBA.portable.InputStream;
+import org.omg.CORBA.portable.OutputStream;
+
+/**
+ * The helper operations for the exception {@link ObjectAlreadyActive}.
+ *
+ * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+ */
+public abstract class ObjectAlreadyActiveHelper
+{
+  /**
+   * The cached typecode value, computed only once.
+   */
+  private static TypeCode typeCode;
+
+  /**
+   * Create the ObjectAlreadyActive typecode (empty structure,
+   * named "ObjectAlreadyActive").
+   */
+  public static TypeCode type()
+  {
+    if (typeCode == null)
+      {
+        ORB orb = ORB.init();
+        StructMember[] members = new StructMember[ 0 ];
+        typeCode =
+          orb.create_exception_tc(id(), "ObjectAlreadyActive", members);
+      }
+    return typeCode;
+  }
+
+  /* Every user exception with no user defined
+     fields can use EmptyExceptionHolder */
+
+  /**
+   * Insert the ObjectAlreadyActive into the given Any.
+   *
+   * @param any the Any to insert into.
+   * @param that the ObjectAlreadyActive to insert.
+   */
+  public static void insert(Any any, ObjectAlreadyActive that)
+  {
+    any.insert_Streamable(new EmptyExceptionHolder(that, type()));
+  }
+
+  /**
+   * Extract the ObjectAlreadyActive from given Any.
+   *
+   * @throws BAD_OPERATION if the passed Any does not contain ObjectAlreadyActive.
+   */
+  public static ObjectAlreadyActive extract(Any any)
+  {
+    try
+      {
+        EmptyExceptionHolder h =
+          (EmptyExceptionHolder) any.extract_Streamable();
+        return (ObjectAlreadyActive) h.value;
+      }
+    catch (ClassCastException cex)
+      {
+        BAD_OPERATION bad = new BAD_OPERATION("ObjectAlreadyActive expected");
+        bad.initCause(cex);
+        throw bad;
+      }
+  }
+
+  /**
+   * Get the ObjectAlreadyActive repository id.
+   *
+   * @return "IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:1.0", always.
+   */
+  public static String id()
+  {
+    return "IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:1.0";
+  }
+
+  /**
+   * Read the exception from the CDR intput stream.
+   *
+   * @param input a org.omg.CORBA.portable stream to read from.
+   */
+  public static ObjectAlreadyActive read(InputStream input)
+  {
+    // Read the exception repository id.
+    String id = input.read_string();
+    ObjectAlreadyActive value = new ObjectAlreadyActive(id);
+
+    return value;
+  }
+
+  /**
+   * Write the exception to the CDR output stream.
+   *
+   * @param output a org.omg.CORBA.portable stream stream to write into.
+   * @param value a value to write.
+   */
+  public static void write(OutputStream output, ObjectAlreadyActive value)
+  {
+    // Write the exception repository id.
+    output.write_string(id());
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectNotActive.java b/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectNotActive.java
new file mode 100644
index 00000000000..4d70af4b820
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectNotActive.java
@@ -0,0 +1,79 @@
+/* ObjectNotActive.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 org.omg.PortableServer.POAPackage;
+
+import org.omg.CORBA.UserException;
+import org.omg.CORBA.portable.IDLEntity;
+
+import java.io.Serializable;
+
+/**
+ * Raised in several cases when the operation would be applicable to the
+ * activated object, but the current object is not active.
+ *
+ * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+ */
+public class ObjectNotActive
+  extends UserException
+  implements IDLEntity, Serializable
+{
+  /**
+   * Use serialVersionUID (v1.4) for interoperability.
+   */
+  private static final long serialVersionUID = 2269559915073532416L;
+
+  /**
+   * Create ObjectNotActive with no explaining
+   * message.
+   */
+  public ObjectNotActive()
+  {
+  }
+
+  /**
+   * Create the ObjectNotActive with explaining
+   * message.
+   *
+   * @param why a string, explaining, why this exception has been thrown.
+   */
+  public ObjectNotActive(String why)
+  {
+    super(why);
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java
new file mode 100644
index 00000000000..867d5f4f641
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java
@@ -0,0 +1,149 @@
+/* ObjectNotActiveHelper.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 org.omg.PortableServer.POAPackage;
+
+import gnu.CORBA.EmptyExceptionHolder;
+
+import org.omg.CORBA.Any;
+import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.StructMember;
+import org.omg.CORBA.TCKind;
+import org.omg.CORBA.TypeCode;
+import org.omg.CORBA.portable.InputStream;
+import org.omg.CORBA.portable.OutputStream;
+
+/**
+ * The helper operations for the exception {@link ObjectNotActive}.
+ *
+ * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+ */
+public abstract class ObjectNotActiveHelper
+{
+  /**
+   * The cached typecode value, computed only once.
+   */
+  private static TypeCode typeCode;
+
+  /**
+   * Create the ObjectNotActive typecode (empty structure,
+   * named "ObjectNotActive").
+   */
+  public static TypeCode type()
+  {
+    if (typeCode == null)
+      {
+        ORB orb = ORB.init();
+        StructMember[] members = new StructMember[ 0 ];
+        typeCode = orb.create_exception_tc(id(), "ObjectNotActive", members);
+      }
+    return typeCode;
+  }
+
+  /* Every user exception with no user defined
+     fields can use EmptyExceptionHolder */
+
+  /**
+   * Insert the ObjectNotActive into the given Any.
+   *
+   * @param any the Any to insert into.
+   * @param that the ObjectNotActive to insert.
+   */
+  public static void insert(Any any, ObjectNotActive that)
+  {
+    any.insert_Streamable(new EmptyExceptionHolder(that, type()));
+  }
+
+  /**
+   * Extract the ObjectNotActive from given Any.
+   *
+   * @throws BAD_OPERATION if the passed Any does not contain ObjectNotActive.
+   */
+  public static ObjectNotActive extract(Any any)
+  {
+    try
+      {
+        EmptyExceptionHolder h =
+          (EmptyExceptionHolder) any.extract_Streamable();
+        return (ObjectNotActive) h.value;
+      }
+    catch (ClassCastException cex)
+      {
+        BAD_OPERATION bad = new BAD_OPERATION("ObjectNotActive expected");
+        bad.initCause(cex);
+        throw bad;
+      }
+  }
+
+  /**
+   * Get the ObjectNotActive repository id.
+   *
+   * @return "IDL:omg.org/PortableServer/POA/ObjectNotActive:1.0", always.
+   */
+  public static String id()
+  {
+    return "IDL:omg.org/PortableServer/POA/ObjectNotActive:1.0";
+  }
+
+  /**
+   * Read the exception from the CDR intput stream.
+   *
+   * @param input a org.omg.CORBA.portable stream to read from.
+   */
+  public static ObjectNotActive read(InputStream input)
+  {
+    // Read the exception repository id.
+    String id = input.read_string();
+    ObjectNotActive value = new ObjectNotActive(id);
+
+    return value;
+  }
+
+  /**
+   * Write the exception to the CDR output stream.
+   *
+   * @param output a org.omg.CORBA.portable stream stream to write into.
+   * @param value a value to write.
+   */
+  public static void write(OutputStream output, ObjectNotActive value)
+  {
+    // Write the exception repository id.
+    output.write_string(id());
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/ServantAlreadyActive.java b/libjava/classpath/org/omg/PortableServer/POAPackage/ServantAlreadyActive.java
new file mode 100644
index 00000000000..71786ce9107
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/ServantAlreadyActive.java
@@ -0,0 +1,83 @@
+/* ServantAlreadyActive.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 org.omg.PortableServer.POAPackage;
+
+import org.omg.CORBA.UserException;
+import org.omg.CORBA.portable.IDLEntity;
+
+import java.io.Serializable;
+
+/**
+ * Raised in response to activate the already active object when
+ * the UNIQUE_ID (single ID per object, default) policy is active. If the
+ * UNIQUE_ID policy is inactive, the object can be activated several
+ * times, each time obtaining a newly generated Id to the same object.
+ *
+ * @see org.omg.PortableServer.IdUniquenessPolicyValue
+ *
+ * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+ */
+public class ServantAlreadyActive
+  extends UserException
+  implements IDLEntity, Serializable
+{
+  /**
+   * Use serialVersionUID (v1.4) for interoperability.
+   */
+  private static final long serialVersionUID = 780130793809887260L;
+
+  /**
+   * Create ServantAlreadyActive with no explaining
+   * message.
+   */
+  public ServantAlreadyActive()
+  {
+  }
+
+  /**
+   * Create the ServantAlreadyActive with explaining
+   * message.
+   *
+   * @param why a string, explaining, why this exception has been thrown.
+   */
+  public ServantAlreadyActive(String why)
+  {
+    super(why);
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java
new file mode 100644
index 00000000000..0db0e938b69
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java
@@ -0,0 +1,150 @@
+/* ServantAlreadyActiveHelper.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 org.omg.PortableServer.POAPackage;
+
+import gnu.CORBA.EmptyExceptionHolder;
+
+import org.omg.CORBA.Any;
+import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.StructMember;
+import org.omg.CORBA.TCKind;
+import org.omg.CORBA.TypeCode;
+import org.omg.CORBA.portable.InputStream;
+import org.omg.CORBA.portable.OutputStream;
+
+/**
+* The helper operations for the exception {@link ServantAlreadyActive}.
+*
+* @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+*/
+public abstract class ServantAlreadyActiveHelper
+{
+  /**
+   * The cached typecode value, computed only once.
+   */
+  private static TypeCode typeCode;
+
+  /**
+   * Create the ServantAlreadyActive typecode (structure,
+   * named "ServantAlreadyActive").
+   */
+  public static TypeCode type()
+  {
+    if (typeCode == null)
+      {
+        ORB orb = ORB.init();
+        StructMember[] members = new StructMember[ 0 ];
+        typeCode =
+          orb.create_exception_tc(id(), "ServantAlreadyActive", members);
+      }
+    return typeCode;
+  }
+
+  /* Every user exception with no user defined
+     fields can use EmptyExceptionHolder */
+
+  /**
+   * Insert the ServantAlreadyActive into the given Any.
+   *
+   * @param any the Any to insert into.
+   * @param that the ServantAlreadyActive to insert.
+   */
+  public static void insert(Any any, ServantAlreadyActive that)
+  {
+    any.insert_Streamable(new EmptyExceptionHolder(that, type()));
+  }
+
+  /**
+   * Extract the ServantAlreadyActive from given Any.
+   *
+   * @throws BAD_OPERATION if the passed Any does not contain ServantAlreadyActive.
+   */
+  public static ServantAlreadyActive extract(Any any)
+  {
+    try
+      {
+        EmptyExceptionHolder h =
+          (EmptyExceptionHolder) any.extract_Streamable();
+        return (ServantAlreadyActive) h.value;
+      }
+    catch (ClassCastException cex)
+      {
+        BAD_OPERATION bad = new BAD_OPERATION("ServantAlreadyActive expected");
+        bad.initCause(cex);
+        throw bad;
+      }
+  }
+
+  /**
+   * Get the ServantAlreadyActive repository id.
+   *
+   * @return "IDL:omg.org/PortableServer/POA/ServantAlreadyActive:1.0", always.
+   */
+  public static String id()
+  {
+    return "IDL:omg.org/PortableServer/POA/ServantAlreadyActive:1.0";
+  }
+
+  /**
+   * Read the exception from the CDR intput stream.
+   *
+   * @param input a org.omg.CORBA.portable stream to read from.
+   */
+  public static ServantAlreadyActive read(InputStream input)
+  {
+    // Read the exception repository id.
+    String id = input.read_string();
+    ServantAlreadyActive value = new ServantAlreadyActive(id);
+
+    return value;
+  }
+
+  /**
+   * Write the exception to the CDR output stream.
+   *
+   * @param output a org.omg.CORBA.portable stream stream to write into.
+   * @param value a value to write.
+   */
+  public static void write(OutputStream output, ServantAlreadyActive value)
+  {
+    // Write the exception repository id.
+    output.write_string(id());
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/ServantNotActive.java b/libjava/classpath/org/omg/PortableServer/POAPackage/ServantNotActive.java
new file mode 100644
index 00000000000..fd223e3ea99
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/ServantNotActive.java
@@ -0,0 +1,79 @@
+/* ServantNotActive.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 org.omg.PortableServer.POAPackage;
+
+import org.omg.CORBA.UserException;
+import org.omg.CORBA.portable.IDLEntity;
+
+import java.io.Serializable;
+
+/**
+ * Raised in several cases when the operation would be applicable to the
+ * activated servant, but the current object is not active.
+ *
+ * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+ */
+public class ServantNotActive
+  extends UserException
+  implements IDLEntity, Serializable
+{
+  /**
+   * Use serialVersionUID (v1.4) for interoperability.
+   */
+  private static final long serialVersionUID = -7806868032412803953L;
+
+  /**
+   * Create ServantNotActive with no explaining
+   * message.
+   */
+  public ServantNotActive()
+  {
+  }
+
+  /**
+   * Create the ServantNotActive with explaining
+   * message.
+   *
+   * @param why a string, explaining, why this exception has been thrown.
+   */
+  public ServantNotActive(String why)
+  {
+    super(why);
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java
new file mode 100644
index 00000000000..429421853ba
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java
@@ -0,0 +1,149 @@
+/* ServantNotActiveHelper.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 org.omg.PortableServer.POAPackage;
+
+import gnu.CORBA.EmptyExceptionHolder;
+
+import org.omg.CORBA.Any;
+import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.StructMember;
+import org.omg.CORBA.TCKind;
+import org.omg.CORBA.TypeCode;
+import org.omg.CORBA.portable.InputStream;
+import org.omg.CORBA.portable.OutputStream;
+
+/**
+ * The helper operations for the exception {@link ServantNotActive}.
+ *
+ * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+ */
+public abstract class ServantNotActiveHelper
+{
+  /**
+   * The cached typecode value, computed only once.
+   */
+  private static TypeCode typeCode;
+
+  /**
+   * Create the ServantNotActive typecode (empty structure,
+   * named "ServantNotActive").
+   */
+  public static TypeCode type()
+  {
+    if (typeCode == null)
+      {
+        ORB orb = ORB.init();
+        StructMember[] members = new StructMember[ 0 ];
+        typeCode = orb.create_exception_tc(id(), "ServantNotActive", members);
+      }
+    return typeCode;
+  }
+
+  /* Every user exception with no user defined
+     fields can use EmptyExceptionHolder */
+
+  /**
+   * Insert the ServantNotActive into the given Any.
+   *
+   * @param any the Any to insert into.
+   * @param that the ServantNotActive to insert.
+   */
+  public static void insert(Any any, ServantNotActive that)
+  {
+    any.insert_Streamable(new EmptyExceptionHolder(that, type()));
+  }
+
+  /**
+   * Extract the ServantNotActive from given Any.
+   *
+   * @throws BAD_OPERATION if the passed Any does not contain ServantNotActive.
+   */
+  public static ServantNotActive extract(Any any)
+  {
+    try
+      {
+        EmptyExceptionHolder h =
+          (EmptyExceptionHolder) any.extract_Streamable();
+        return (ServantNotActive) h.value;
+      }
+    catch (ClassCastException cex)
+      {
+        BAD_OPERATION bad = new BAD_OPERATION("ServantNotActive expected");
+        bad.initCause(cex);
+        throw bad;
+      }
+  }
+
+  /**
+   * Get the ServantNotActive repository id.
+   *
+   * @return "IDL:omg.org/PortableServer/POA/ServantNotActive:1.0", always.
+   */
+  public static String id()
+  {
+    return "IDL:omg.org/PortableServer/POA/ServantNotActive:1.0";
+  }
+
+  /**
+   * Read the exception from the CDR intput stream.
+   *
+   * @param input a org.omg.CORBA.portable stream to read from.
+   */
+  public static ServantNotActive read(InputStream input)
+  {
+    // Read the exception repository id.
+    String id = input.read_string();
+    ServantNotActive value = new ServantNotActive(id);
+
+    return value;
+  }
+
+  /**
+   * Write the exception to the CDR output stream.
+   *
+   * @param output a org.omg.CORBA.portable stream stream to write into.
+   * @param value a value to write.
+   */
+  public static void write(OutputStream output, ServantNotActive value)
+  {
+    // Write the exception repository id.
+    output.write_string(id());
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/WrongAdapter.java b/libjava/classpath/org/omg/PortableServer/POAPackage/WrongAdapter.java
new file mode 100644
index 00000000000..ea8d011a01e
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/WrongAdapter.java
@@ -0,0 +1,80 @@
+/* WrongAdapter.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 org.omg.PortableServer.POAPackage;
+
+import org.omg.CORBA.UserException;
+import org.omg.CORBA.portable.IDLEntity;
+
+import java.io.Serializable;
+
+/**
+ * Raised when invoking POA operations, requiring that the target
+ * object would be created by this POA, if this condition is not
+ * satisfied.
+ *
+ * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+ */
+public class WrongAdapter
+  extends UserException
+  implements IDLEntity, Serializable
+{
+  /**
+   * Use serialVersionUID (v1.4) for interoperability.
+   */
+  private static final long serialVersionUID = 7505320179916389200L;
+
+  /**
+   * Create WrongAdapter with no explaining
+   * message.
+   */
+  public WrongAdapter()
+  {
+  }
+
+  /**
+   * Create the WrongAdapter with explaining
+   * message.
+   *
+   * @param why a string, explaining, why this exception has been thrown.
+   */
+  public WrongAdapter(String why)
+  {
+    super(why);
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java
new file mode 100644
index 00000000000..ebba304a536
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java
@@ -0,0 +1,149 @@
+/* WrongAdapterHelper.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 org.omg.PortableServer.POAPackage;
+
+import gnu.CORBA.EmptyExceptionHolder;
+
+import org.omg.CORBA.Any;
+import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.StructMember;
+import org.omg.CORBA.TCKind;
+import org.omg.CORBA.TypeCode;
+import org.omg.CORBA.portable.InputStream;
+import org.omg.CORBA.portable.OutputStream;
+
+/**
+ * The helper operations for the exception {@link WrongAdapter}.
+ *
+ * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+ */
+public abstract class WrongAdapterHelper
+{
+  /**
+   * The cached typecode value, computed only once.
+   */
+  private static TypeCode typeCode;
+
+  /**
+   * Create the WrongAdapter typecode (empty structure,
+   * named "WrongAdapter").
+   */
+  public static TypeCode type()
+  {
+    if (typeCode == null)
+      {
+        ORB orb = ORB.init();
+        StructMember[] members = new StructMember[ 0 ];
+        typeCode = orb.create_exception_tc(id(), "WrongAdapter", members);
+      }
+    return typeCode;
+  }
+
+  /* Every user exception with no user defined
+     fields can use EmptyExceptionHolder */
+
+  /**
+   * Insert the WrongAdapter into the given Any.
+   *
+   * @param any the Any to insert into.
+   * @param that the WrongAdapter to insert.
+   */
+  public static void insert(Any any, WrongAdapter that)
+  {
+    any.insert_Streamable(new EmptyExceptionHolder(that, type()));
+  }
+
+  /**
+   * Extract the WrongAdapter from given Any.
+   *
+   * @throws BAD_OPERATION if the passed Any does not contain WrongAdapter.
+   */
+  public static WrongAdapter extract(Any any)
+  {
+    try
+      {
+        EmptyExceptionHolder h =
+          (EmptyExceptionHolder) any.extract_Streamable();
+        return (WrongAdapter) h.value;
+      }
+    catch (ClassCastException cex)
+      {
+        BAD_OPERATION bad = new BAD_OPERATION("WrongAdapter expected");
+        bad.initCause(cex);
+        throw bad;
+      }
+  }
+
+  /**
+   * Get the WrongAdapter repository id.
+   *
+   * @return "IDL:omg.org/PortableServer/POA/WrongAdapter:1.0", always.
+   */
+  public static String id()
+  {
+    return "IDL:omg.org/PortableServer/POA/WrongAdapter:1.0";
+  }
+
+  /**
+   * Read the exception from the CDR intput stream.
+   *
+   * @param input a org.omg.CORBA.portable stream to read from.
+   */
+  public static WrongAdapter read(InputStream input)
+  {
+    // Read the exception repository id.
+    String id = input.read_string();
+    WrongAdapter value = new WrongAdapter(id);
+
+    return value;
+  }
+
+  /**
+   * Write the exception to the CDR output stream.
+   *
+   * @param output a org.omg.CORBA.portable stream stream to write into.
+   * @param value a value to write.
+   */
+  public static void write(OutputStream output, WrongAdapter value)
+  {
+    // Write the exception repository id.
+    output.write_string(id());
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/WrongPolicy.java b/libjava/classpath/org/omg/PortableServer/POAPackage/WrongPolicy.java
new file mode 100644
index 00000000000..9f589d7d644
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/WrongPolicy.java
@@ -0,0 +1,79 @@
+/* WrongPolicy.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 org.omg.PortableServer.POAPackage;
+
+import org.omg.CORBA.UserException;
+import org.omg.CORBA.portable.IDLEntity;
+
+import java.io.Serializable;
+
+/**
+ * Raised when invoking the operation that is not allowed by the current
+ * combination of the used policies.
+ *
+ * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+ */
+public class WrongPolicy
+  extends UserException
+  implements IDLEntity, Serializable
+{
+  /**
+   * Use serialVersionUID (v1.4) for interoperability.
+   */
+  private static final long serialVersionUID = 1949765652955335195L;
+
+  /**
+   * Create WrongPolicy with no explaining
+   * message.
+   */
+  public WrongPolicy()
+  {
+  }
+
+  /**
+   * Create the WrongPolicy with explaining
+   * message.
+   *
+   * @param why a string, explaining, why this exception has been thrown.
+   */
+  public WrongPolicy(String why)
+  {
+    super(why);
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java
new file mode 100644
index 00000000000..5460d0ea79d
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java
@@ -0,0 +1,149 @@
+/* WrongPolicyHelper.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 org.omg.PortableServer.POAPackage;
+
+import gnu.CORBA.EmptyExceptionHolder;
+
+import org.omg.CORBA.Any;
+import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.StructMember;
+import org.omg.CORBA.TCKind;
+import org.omg.CORBA.TypeCode;
+import org.omg.CORBA.portable.InputStream;
+import org.omg.CORBA.portable.OutputStream;
+
+/**
+ * The helper operations for the exception {@link WrongPolicy}.
+ *
+ * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+ */
+public abstract class WrongPolicyHelper
+{
+  /**
+   * The cached typecode value, computed only once.
+   */
+  private static TypeCode typeCode;
+
+  /**
+   * Create the WrongPolicy typecode (empty structure,
+   * named "WrongPolicy").
+   */
+  public static TypeCode type()
+  {
+    if (typeCode == null)
+      {
+        ORB orb = ORB.init();
+        StructMember[] members = new StructMember[ 0 ];
+        typeCode = orb.create_exception_tc(id(), "WrongPolicy", members);
+      }
+    return typeCode;
+  }
+
+  /* Every user exception with no user defined
+     fields can use EmptyExceptionHolder */
+
+  /**
+   * Insert the WrongPolicy into the given Any.
+   *
+   * @param any the Any to insert into.
+   * @param that the WrongPolicy to insert.
+   */
+  public static void insert(Any any, WrongPolicy that)
+  {
+    any.insert_Streamable(new EmptyExceptionHolder(that, type()));
+  }
+
+  /**
+   * Extract the WrongPolicy from given Any.
+   *
+   * @throws BAD_OPERATION if the passed Any does not contain WrongPolicy.
+   */
+  public static WrongPolicy extract(Any any)
+  {
+    try
+      {
+        EmptyExceptionHolder h =
+          (EmptyExceptionHolder) any.extract_Streamable();
+        return (WrongPolicy) h.value;
+      }
+    catch (ClassCastException cex)
+      {
+        BAD_OPERATION bad = new BAD_OPERATION("WrongPolicy expected");
+        bad.initCause(cex);
+        throw bad;
+      }
+  }
+
+  /**
+   * Get the WrongPolicy repository id.
+   *
+   * @return "IDL:omg.org/PortableServer/POA/WrongPolicy:1.0", always.
+   */
+  public static String id()
+  {
+    return "IDL:omg.org/PortableServer/POA/WrongPolicy:1.0";
+  }
+
+  /**
+   * Read the exception from the CDR intput stream.
+   *
+   * @param input a org.omg.CORBA.portable stream to read from.
+   */
+  public static WrongPolicy read(InputStream input)
+  {
+    // Read the exception repository id.
+    String id = input.read_string();
+    WrongPolicy value = new WrongPolicy(id);
+
+    return value;
+  }
+
+  /**
+   * Write the exception to the CDR output stream.
+   *
+   * @param output a org.omg.CORBA.portable stream stream to write into.
+   * @param value a value to write.
+   */
+  public static void write(OutputStream output, WrongPolicy value)
+  {
+    // Write the exception repository id.
+    output.write_string(id());
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/package.html b/libjava/classpath/org/omg/PortableServer/POAPackage/package.html
new file mode 100644
index 00000000000..e95dd68ec4f
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/package.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!-- package.html - describes classes in org.omg.PortableServer.POAPackage package
+   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. -->
+
+<html>
+<head><title>GNU Classpath - org.omg.PortableServer.POAPackage</title></head>
+
+<body>
+<p>Contains exceptions that may be thrown by various POA operations.
+Also provides helpers that are used to transfer these exceptions if they
+are thrown on remote side.</p>
+
+@author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+</body>
+</html>
diff --git a/libjava/classpath/org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.java b/libjava/classpath/org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.java
new file mode 100644
index 00000000000..f71f101cd94
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.java
@@ -0,0 +1,52 @@
+/* REQUEST_PROCESSING_POLICY_ID.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 org.omg.PortableServer;
+
+ /**
+ * Holds an integer {@link RequestProcessingPolicy} identifier.
+ *
+ * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+ */
+public interface REQUEST_PROCESSING_POLICY_ID
+{
+  /**
+   * Specifies the REQUEST_PROCESSING_POLICY_ID value, 22.
+   */
+  int value = 22;
+}
diff --git a/libjava/classpath/org/omg/PortableServer/RequestProcessingPolicyValue.java b/libjava/classpath/org/omg/PortableServer/RequestProcessingPolicyValue.java
new file mode 100644
index 00000000000..139010c86e8
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/RequestProcessingPolicyValue.java
@@ -0,0 +1,176 @@
+/* RequestProcessingPolicyValue.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 org.omg.PortableServer;
+
+import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.portable.IDLEntity;
+
+import java.io.Serializable;
+
+/**
+* Specifies the behaviour in the case when the
+* requested object is not found in the Active Object Map or that map
+* is not in use. The map is not in use when the
+* {@link ServantRetentionPolicyValue#NON_RETAIN} policy is active.
+* <ul>
+* <li>USE_ACTIVE_OBJECT_MAP_ONLY Raise an {@link org.omg.CORBA.OBJECT_NOT_EXIST}
+* with the minor code 2. {@link ServantRetentionPolicyValue#RETAIN} policy is
+* also required.
+* </li>
+* <li>USE_DEFAULT_SERVANT Dispatch request to the default servant. If no such
+* exists, raise {@link org.omg.CORBA.OBJ_ADAPTER} with minor code 3.
+* {@link IdUniquenessPolicyValue#MULTIPLE_ID} is also required.
+* </li>
+* <li>USE_SERVANT_MANAGER Dispatch request to the servant manager. If no such
+* exists, raise {@link org.omg.CORBA.OBJ_ADAPTER} with the minor code 4.</li>
+* </ul>
+*
+* @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+*/
+public class RequestProcessingPolicyValue
+  implements Serializable, IDLEntity
+{
+  /**
+   * Use serialVersionUID (V1.4) for interoperability.
+   */
+  private static final long serialVersionUID = 7646563512329907695L;
+
+  /**
+   * The value field for the current instance.
+   */
+  private final int _value;
+
+  /**
+  * The possible value of this enumeration (USE_ACTIVE_OBJECT_MAP_ONLY).
+  */
+  public static final int _USE_ACTIVE_OBJECT_MAP_ONLY = 0;
+
+  /**
+   * An instance of RequestProcessingPolicyValue, initialized to USE_ACTIVE_OBJECT_MAP_ONLY.
+   */
+  public static final RequestProcessingPolicyValue USE_ACTIVE_OBJECT_MAP_ONLY =
+    new RequestProcessingPolicyValue(_USE_ACTIVE_OBJECT_MAP_ONLY);
+
+  /**
+  * The possible value of this enumeration (USE_DEFAULT_SERVANT).
+  */
+  public static final int _USE_DEFAULT_SERVANT = 1;
+
+  /**
+   * An instance of RequestProcessingPolicyValue, initialized to USE_DEFAULT_SERVANT.
+   */
+  public static final RequestProcessingPolicyValue USE_DEFAULT_SERVANT =
+    new RequestProcessingPolicyValue(_USE_DEFAULT_SERVANT);
+
+  /**
+  * The possible value of this enumeration (USE_SERVANT_MANAGER).
+  */
+  public static final int _USE_SERVANT_MANAGER = 2;
+
+  /**
+   * An instance of RequestProcessingPolicyValue, initialized to USE_SERVANT_MANAGER.
+   */
+  public static final RequestProcessingPolicyValue USE_SERVANT_MANAGER =
+    new RequestProcessingPolicyValue(_USE_SERVANT_MANAGER);
+
+  /**
+   * The private array that maps integer codes to the enumeration
+   * values.
+   */
+  private static final RequestProcessingPolicyValue[] enume =
+    new RequestProcessingPolicyValue[]
+    {
+      USE_ACTIVE_OBJECT_MAP_ONLY, USE_DEFAULT_SERVANT, USE_SERVANT_MANAGER
+    };
+
+  /**
+   * The private array of state names.
+   */
+  private static final String[] state_names =
+    new String[]
+    {
+      "USE_ACTIVE_OBJECT_MAP_ONLY", "USE_DEFAULT_SERVANT", "USE_SERVANT_MANAGER"
+    };
+
+  /**
+   * Normally, no new instances are required, so the constructor is protected.
+   */
+  protected RequestProcessingPolicyValue(int a_value)
+  {
+    _value = a_value;
+  }
+
+  /**
+   * Returns the RequestProcessingPolicyValue, matching the given integer constant.
+   *
+   * @param code one of _USE_ACTIVE_OBJECT_MAP_ONLY, _USE_DEFAULT_SERVANT, _USE_SERVANT_MANAGER.
+   * @return one of USE_ACTIVE_OBJECT_MAP_ONLY, USE_DEFAULT_SERVANT, USE_SERVANT_MANAGER.
+   * @throws BAD_PARAM if the parameter is not one of the valid values.
+   */
+  public static RequestProcessingPolicyValue from_int(int code)
+  {
+    try
+      {
+        return enume [ code ];
+      }
+    catch (ArrayIndexOutOfBoundsException ex)
+      {
+        throw new BAD_OPERATION("Invalid enumeration code " + code);
+      }
+  }
+
+  /**
+   * Returns a short string representation.
+   * @return the name of the current enumeration value.
+   */
+  public String toString()
+  {
+    return state_names [ _value ];
+  }
+
+  /**
+   * Returns the integer code of the policy value.
+   * @return one of _USE_ACTIVE_OBJECT_MAP_ONLY,
+   * _USE_DEFAULT_SERVANT, _USE_SERVANT_MANAGER.
+   */
+  public int value()
+  {
+    return _value;
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/SERVANT_RETENTION_POLICY_ID.java b/libjava/classpath/org/omg/PortableServer/SERVANT_RETENTION_POLICY_ID.java
new file mode 100644
index 00000000000..89813b921c0
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/SERVANT_RETENTION_POLICY_ID.java
@@ -0,0 +1,52 @@
+/* SERVANT_RETENTION_POLICY_ID.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 org.omg.PortableServer;
+
+ /**
+ * Holds an integer {@link ServantRetentionPolicy} identifier.
+ *
+ * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+ */
+public interface SERVANT_RETENTION_POLICY_ID
+{
+  /**
+   * Specifies the SERVANT_RETENTION_POLICY_ID value, 21.
+   */
+  int value = 21;
+}
diff --git a/libjava/classpath/org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java b/libjava/classpath/org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java
new file mode 100644
index 00000000000..e62bde709d1
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java
@@ -0,0 +1,114 @@
+/* CookieHolder.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 org.omg.PortableServer.ServantLocatorPackage;
+
+import org.omg.CORBA.NO_IMPLEMENT;
+import org.omg.CORBA.TypeCode;
+import org.omg.CORBA.portable.InputStream;
+import org.omg.CORBA.portable.OutputStream;
+import org.omg.CORBA.portable.Streamable;
+
+/**
+ * The CookieHolder is used together with the
+ * {@link org.omg.PortableServer.ServantLocator}, allowing the
+ * {@link org.omg.PortableServer.ServantLocatorOperations#preinvoke}
+ * to return an arbitrary java.lang.Object that will be later passed to
+ * {@link org.omg.PortableServer.ServantLocatorOperations#postinvoke}.
+ *
+ * @see org.omg.PortableServer.ServantLocatorOperations
+ * @see org.omg.PortableServer.ServantManager
+ *
+ * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+ */
+public class CookieHolder
+  implements Streamable
+{
+  /**
+   * The wrapped java.lang.Object.
+   */
+  public java.lang.Object value;
+
+  /**
+   * Create the unitialised instance of this holder.
+   */
+  public CookieHolder()
+  {
+  }
+
+  /**
+   * Create the instance, intialising the {@link #value} field to the passed
+   * value.
+   */
+  public CookieHolder(java.lang.Object initial)
+  {
+    value = initial;
+  }
+
+  /**
+   * java.lang.Object is outside the scope of the CORBA standards and the read
+   * operation cannot be supported in a language-neutral way.
+   *
+   * @throws NO_IMPLEMENT always.
+   */
+  public void _read(InputStream input)
+  {
+    throw new NO_IMPLEMENT();
+  }
+
+  /**
+   * There is no CORBA typecode that would specifically match a java.lang.Object.
+   *
+   * @throws NO_IMPLEMENT always.
+   */
+  public TypeCode _type()
+  {
+    throw new NO_IMPLEMENT();
+  }
+
+  /**
+   * java.lang.Object is outside the scope of the CORBA standards and the write
+   * operation cannot be supported in a language-neutral way.
+   *
+   * @throws NO_IMPLEMENT always.
+   */
+  public void _write(OutputStream output)
+  {
+    throw new NO_IMPLEMENT();
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/ServantLocatorPackage/package.html b/libjava/classpath/org/omg/PortableServer/ServantLocatorPackage/package.html
new file mode 100644
index 00000000000..58106e25f41
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/ServantLocatorPackage/package.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!-- package.html -
+   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. -->
+
+<html>
+<head><title>GNU Classpath - org.omg.PortableServer.ServantLocatorPackage</title>
+</head>
+
+<body>
+<p>Contains a holder, transferring the data between subsequent
+ calls of the Servant Manager methods.</p>
+ 
+@author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+</body>
+</html>
diff --git a/libjava/classpath/org/omg/PortableServer/ServantRetentionPolicyValue.java b/libjava/classpath/org/omg/PortableServer/ServantRetentionPolicyValue.java
new file mode 100644
index 00000000000..caf8132e638
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/ServantRetentionPolicyValue.java
@@ -0,0 +1,150 @@
+/* ServantRetentionPolicyValue.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 org.omg.PortableServer;
+
+import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.portable.IDLEntity;
+
+import java.io.Serializable;
+
+/**
+* Specifies the servant retention policy.
+*
+* This enumeration can obtain the following values:
+* <ul>
+* <li>RETAIN The POA retains active servants in its Active Object Map.</li>
+* <li>NON_RETAIN The servants are not retained.</li>
+* </ul>
+* @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+*/
+public class ServantRetentionPolicyValue
+  implements Serializable, IDLEntity
+{
+  /**
+   * Use serialVersionUID (V1.4) for interoperability.
+   */
+  private static final long serialVersionUID = -7476100336036943822L;
+
+  /**
+   * The value field for the current instance.
+   */
+  private final int _value;
+
+  /**
+  * The possible value of this enumeration (RETAIN).
+  */
+  public static final int _RETAIN = 0;
+
+  /**
+   * An instance of ServantRetentionPolicyValue, indicating that
+   * the POA retains active servants in its Active Object Map.
+   */
+  public static final ServantRetentionPolicyValue RETAIN =
+    new ServantRetentionPolicyValue(_RETAIN);
+
+  /**
+  * The possible value of this enumeration (NON_RETAIN).
+  */
+  public static final int _NON_RETAIN = 1;
+
+  /**
+   * An instance of ServantRetentionPolicyValue, indicating that
+   * the POA does not use the Active Object Map.
+   */
+  public static final ServantRetentionPolicyValue NON_RETAIN =
+    new ServantRetentionPolicyValue(_NON_RETAIN);
+
+  /**
+   * The private array that maps integer codes to the enumeration
+   * values.
+   */
+  private static final ServantRetentionPolicyValue[] enume =
+    new ServantRetentionPolicyValue[] { RETAIN, NON_RETAIN };
+
+  /**
+   * The private array of state names.
+   */
+  private static final String[] state_names =
+    new String[] { "RETAIN", "NON_RETAIN" };
+
+  /**
+   * Normally, no new instances are required, so the constructor is protected.
+   */
+  protected ServantRetentionPolicyValue(int a_value)
+  {
+    _value = a_value;
+  }
+
+  /**
+   * Returns the ServantRetentionPolicyValue, matching the given integer constant.
+   *
+   * @param code one of _RETAIN, _NON_RETAIN.
+   * @return one of RETAIN, NON_RETAIN.
+   * @throws BAD_PARAM if the parameter is not one of the valid values.
+   */
+  public static ServantRetentionPolicyValue from_int(int code)
+  {
+    try
+      {
+        return enume [ code ];
+      }
+    catch (ArrayIndexOutOfBoundsException ex)
+      {
+        throw new BAD_OPERATION("Invalid enumeration code " + code);
+      }
+  }
+
+  /**
+   * Returns a short string representation.
+   * @return the name of the current enumeration value.
+   */
+  public String toString()
+  {
+    return state_names [ _value ];
+  }
+
+  /**
+   * Returns the integer code of the policy value.
+   * @return _RETAIN or _NON_RETAIN.
+   */
+  public int value()
+  {
+    return _value;
+  }
+}
\ No newline at end of file
diff --git a/libjava/classpath/org/omg/PortableServer/THREAD_POLICY_ID.java b/libjava/classpath/org/omg/PortableServer/THREAD_POLICY_ID.java
new file mode 100644
index 00000000000..ef0427dde3d
--- /dev/null
+++ b/libjava/classpath/org/omg/PortableServer/THREAD_POLICY_ID.java
@@ -0,0 +1,52 @@
+/* THREAD_POLICY_ID.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 org.omg.PortableServer;
+
+ /**
+ * Holds an integer {@link ThreadPolicy} identifier.
+ *
+ * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
+ */
+public interface THREAD_POLICY_ID
+{
+  /**
+   * Specifies the THREAD_POLICY_ID value, 16.
+   */
+  int value = 16;
+}