2006-09-05 Audrius Meskauskas <AudriusA@Bioinformatics.org>

	gnu/CORBA/CDR/Vio.java,
	org/omg/CORBA_2_3/ORB.java,
	org/omg/CORBA_2_3/portable/InputStream.java,
	org/omg/CORBA_2_3/portable/OutputStream.java,
	org/omg/CosNaming/BindingIteratorHelper.java,
	org/omg/CosNaming/BindingTypeHelper.java,
	org/omg/CosNaming/NameComponentHelper.java,
	org/omg/CosNaming/NameHelper.java,
	org/omg/CosNaming/NamingContextExtHelper.java,
	org/omg/CosNaming/NamingContextExtPackage/AddressHelper.java,
	org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.java,
	org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHolder.java,
	org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.java,
	org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.java,
	org/omg/CosNaming/NamingContextHelper.java,
	org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java,
	org/omg/CosNaming/NamingContextPackage/InvalidName.java,
	org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java,
	org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java,
	org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java,
	org/omg/CosNaming/NamingContextPackage/NotFoundReasonHolder.java,
	org/omg/DynamicAny/AnySeqHelper.java,
	org/omg/DynamicAny/DynAnyFactoryHelper.java,
	org/omg/DynamicAny/DynAnyFactoryOperations.java,
	org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java,
	org/omg/DynamicAny/DynAnyHelper.java,
	org/omg/DynamicAny/DynAnyOperations.java,
	org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java,
	org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java,
	org/omg/DynamicAny/DynAnySeqHelper.java,
	org/omg/DynamicAny/DynArrayHelper.java,
	org/omg/DynamicAny/DynEnumHelper.java,
	org/omg/DynamicAny/DynFixedHelper.java,
	org/omg/DynamicAny/DynSequenceHelper.java,
	org/omg/DynamicAny/DynStructHelper.java,
	org/omg/DynamicAny/DynStructOperations.java,
	org/omg/DynamicAny/DynUnionHelper.java,
	org/omg/DynamicAny/DynValueHelper.java,
	org/omg/DynamicAny/NameDynAnyPairHelper.java,
	org/omg/DynamicAny/NameDynAnyPairSeqHelper.java,
	org/omg/IOP/CodecFactoryHelper.java,
	org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java,
	org/omg/IOP/CodecOperations.java,
	org/omg/IOP/CodecPackage/FormatMismatchHelper.java,
	org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java,
	org/omg/IOP/CodecPackage/TypeMismatchHelper.java,
	org/omg/IOP/ComponentIdHelper.java,
	org/omg/IOP/ExceptionDetailMessage.java,
	org/omg/IOP/MultipleComponentProfileHelper.java,
	org/omg/IOP/ProfileIdHelper.java,
	org/omg/IOP/ServiceContextListHelper.java,
	org/omg/IOP/ServiceIdHelper.java,
	org/omg/IOP/TAG_CODE_SETS.java,
	org/omg/PortableInterceptor/ClientRequestInfoOperations.java,
	org/omg/PortableInterceptor/ClientRequestInterceptorOperations.java,
	org/omg/PortableInterceptor/CurrentHelper.java,
	org/omg/PortableInterceptor/IORInfo.java,
	org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java,
	org/omg/PortableInterceptor/ORBIdHelper.java,
	org/omg/PortableInterceptor/ORBInitInfoOperations.java,
	org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java,
	org/omg/PortableInterceptor/ORBInitializerOperations.java,
	org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java,
	org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java,
	org/omg/PortableInterceptor/RequestInfoOperations.java,
	org/omg/PortableInterceptor/ServerIdHelper.java,
	org/omg/PortableInterceptor/ServerRequestInfoOperations.java,
	org/omg/PortableInterceptor/ServerRequestInterceptorOperations.java,
	org/omg/PortableServer/AdapterActivatorOperations.java,
	org/omg/PortableServer/CurrentHelper.java,
	org/omg/PortableServer/CurrentPackage/NoContextHelper.java,
	org/omg/PortableServer/ForwardRequestHelper.java,
	org/omg/PortableServer/IdAssignmentPolicyValue.java,
	org/omg/PortableServer/IdUniquenessPolicyValue.java,
	org/omg/PortableServer/ImplicitActivationPolicyValue.java,
	org/omg/PortableServer/LifespanPolicyValue.java,
	org/omg/PortableServer/POA.java,
	org/omg/PortableServer/POAHelper.java,
	org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java,
	org/omg/PortableServer/POAManagerPackage/State.java,
	org/omg/PortableServer/POAOperations.java,
	org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java,
	org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java,
	org/omg/PortableServer/POAPackage/InvalidPolicy.java,
	org/omg/PortableServer/POAPackage/NoServantHelper.java,
	org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java,
	org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java,
	org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java,
	org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java,
	org/omg/PortableServer/POAPackage/WrongAdapterHelper.java,
	org/omg/PortableServer/POAPackage/WrongPolicyHelper.java,
	org/omg/PortableServer/RequestProcessingPolicyValue.java,
	org/omg/PortableServer/ServantActivatorHelper.java,
	org/omg/PortableServer/ServantLocatorHelper.java,
	org/omg/PortableServer/ServantLocatorOperations.java,
	org/omg/PortableServer/ServantRetentionPolicyValue.java,
	org/omg/PortableServer/ThreadPolicyValue.java,
	org/omg/PortableServer/_ServantActivatorStub.java,
	org/omg/PortableServer/_ServantLocatorStub.java,
	org/omg/PortableServer/portable/Delegate.java: Documentation fixes.

99 files changed, 251 insertions, 308 deletions

diff --git a/org/omg/CORBA_2_3/ORB.java b/org/omg/CORBA_2_3/ORB.java
index 82660fea7..0895b8037 100644
--- a/org/omg/CORBA_2_3/ORB.java
+++ b/org/omg/CORBA_2_3/ORB.java
@@ -1,5 +1,5 @@
 /* ORB.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,12 +38,14 @@ exception statement from your version. */
 
 package org.omg.CORBA_2_3;
 
+import javax.rmi.CORBA.Tie;
+
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.NO_IMPLEMENT;
 import org.omg.CORBA.portable.ValueFactory;
 
 /**
- * This class should provide the {@link org.omg.CORBA.ORB) ORB extensions,
+ * This class should provide the {@link org.omg.CORBA.ORB}) ORB extensions,
  * defined in the OMG CORBA version 2.3 specification. However in the
  * Sun's API specification is written that this functionality is not
  * implemented at least at least till 1.4 inclusive.
@@ -93,10 +95,9 @@ public abstract class ORB
    *
    * @param repository_id a repository id
    *
-   * @return never
    * @throws NO_IMPLEMENT, always.
    */
-  public void unregister_value_factory(String id)
+  public void unregister_value_factory(String repository_id)
   {
     throw new NO_IMPLEMENT();
   }
@@ -117,7 +118,7 @@ public abstract class ORB
   }
 
   /**
-   * This method is called by RMI-IIOP {@link javax.rmi.Tie#orb(ORB)},
+   * This method is called by RMI-IIOP {@link Tie#orb(ORB)},
    * passing <code>this</code> as parameter. The ORB will try to connect
    * that tie as one of its objects.
    */
diff --git a/org/omg/CORBA_2_3/portable/InputStream.java b/org/omg/CORBA_2_3/portable/InputStream.java
index 23055ef2d..349590eed 100644
--- a/org/omg/CORBA_2_3/portable/InputStream.java
+++ b/org/omg/CORBA_2_3/portable/InputStream.java
@@ -1,5 +1,5 @@
 /* InputStream.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -72,7 +72,7 @@ public abstract class InputStream
    *
    * As specified in OMG specification, this reads a single
    * boolean and then delegates either to {@link #read_Object()} (for false)
-   * or to {@link #read_Value()} (for true).
+   * or to {@link #read_value()} (for true).
    *
    * @return an abstract interface, unmarshaled from the stream.
    */
@@ -93,7 +93,7 @@ public abstract class InputStream
    *
    * As specified in OMG specification, this reads a single
    * boolean and then delegates either to {@link #read_Object(Class)} (for false)
-   * or to {@link #read_Value(Class)} (for true).
+   * or to {@link #read_value(Class)} (for true).
    *
    * @param clz a base class for the abstract interface.
    *
@@ -125,8 +125,6 @@ public abstract class InputStream
    * {@link #read_value(Class)} or {@link #read_value(Serializable)}
    * instead.
    *
-   * @param repository_id a repository id of the value type.
-   *
    * @return an value type structure, unmarshaled from the stream
    */
   public Serializable read_value()
diff --git a/org/omg/CORBA_2_3/portable/OutputStream.java b/org/omg/CORBA_2_3/portable/OutputStream.java
index 70f9a4913..f1369f782 100644
--- a/org/omg/CORBA_2_3/portable/OutputStream.java
+++ b/org/omg/CORBA_2_3/portable/OutputStream.java
@@ -1,5 +1,5 @@
 /* OutputStream.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,8 @@ package org.omg.CORBA_2_3.portable;
 import gnu.CORBA.CDR.Vio;
 
 import org.omg.CORBA.portable.BoxedValueHelper;
+import org.omg.CORBA.portable.CustomValue;
+import org.omg.CORBA.portable.StreamableValue;
 import org.omg.CORBA.portable.ValueBase;
 
 import java.io.Serializable;
@@ -92,7 +94,7 @@ public abstract class OutputStream
    * Writes a value type into the output stream.
    * 
    * The value type must implement either {@link CustomValue} (for user-defined
-   * writing method) or {@link StramableValue} (for standard writing using code,
+   * writing method) or {@link StreamableValue} (for standard writing using code,
    * generated by IDL compiler).
    * 
    * The written record will have a repository id, matching the class of the
@@ -109,7 +111,7 @@ public abstract class OutputStream
    * Write value to the stream using the boxed value helper.
    *
    * The value type must implement either {@link CustomValue}
-   * (for user-defined writing method) or {@link StramableValue}
+   * (for user-defined writing method) or {@link StreamableValue}
    * (for standard writing using code, generated by IDL compiler).
    *
    * @param value a value to write.
@@ -129,7 +131,7 @@ public abstract class OutputStream
    * writing two Id inheritance hierarchy.
    *
    * The value type must implement either {@link CustomValue}
-   * (for user-defined writing method) or {@link StramableValue}
+   * (for user-defined writing method) or {@link StreamableValue}
    * (for standard writing using code, generated by IDL compiler).
    *
    * @param value a value type object to write.
@@ -144,7 +146,7 @@ public abstract class OutputStream
    * repository id.
    * 
    * The value type must implement either {@link CustomValue} (for user-defined
-   * writing method) or {@link StramableValue} (for standard writing using code,
+   * writing method) or {@link StreamableValue} (for standard writing using code,
    * generated by IDL compiler).
    * 
    * @param repository_id a repository id of the value type.
diff --git a/org/omg/CosNaming/BindingIteratorHelper.java b/org/omg/CosNaming/BindingIteratorHelper.java
index cb17d5748..5430905e5 100644
--- a/org/omg/CosNaming/BindingIteratorHelper.java
+++ b/org/omg/CosNaming/BindingIteratorHelper.java
@@ -1,5 +1,5 @@
 /* BindingIteratorHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -44,7 +44,6 @@ import gnu.CORBA.OrbRestricted;
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.BAD_PARAM;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.Delegate;
 import org.omg.CORBA.portable.InputStream;
@@ -126,15 +125,13 @@ public abstract class BindingIteratorHelper
    * performed to verify that the object actually supports the requested type.
    * The {@link BAD_OPERATION} will be thrown if unsupported operations are
    * invoked on the new returned reference, but no failure is expected at the
-   * time of the unchecked_narrow.
+   * time of the unchecked_narrow. See OMG issue 4158.
    * 
    * @param obj the object to cast.
    * 
    * @return the casted binding iterator.
    * 
    * @since 1.5 
-   * 
-   * @see OMG issue 4158.
    */
   public static BindingIterator unchecked_narrow(org.omg.CORBA.Object obj)
   {
diff --git a/org/omg/CosNaming/BindingTypeHelper.java b/org/omg/CosNaming/BindingTypeHelper.java
index 8f456ee70..542f3e0e9 100644
--- a/org/omg/CosNaming/BindingTypeHelper.java
+++ b/org/omg/CosNaming/BindingTypeHelper.java
@@ -1,5 +1,5 @@
 /* BindingTypeHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -43,7 +43,6 @@ import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
diff --git a/org/omg/CosNaming/NameComponentHelper.java b/org/omg/CosNaming/NameComponentHelper.java
index 8127aa01d..0f7e73b45 100644
--- a/org/omg/CosNaming/NameComponentHelper.java
+++ b/org/omg/CosNaming/NameComponentHelper.java
@@ -1,5 +1,5 @@
 /* NameComponentHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -81,7 +81,7 @@ public abstract class NameComponentHelper
 
   /**
    * Get the repository Id of the {@link NameComponent}.
-   * @return
+   * @return "IDL:omg.org/CosNaming/NameComponent:1.0"
    */
   public static String id()
   {
diff --git a/org/omg/CosNaming/NameHelper.java b/org/omg/CosNaming/NameHelper.java
index f66fa4f09..d1dafb960 100644
--- a/org/omg/CosNaming/NameHelper.java
+++ b/org/omg/CosNaming/NameHelper.java
@@ -1,5 +1,5 @@
 /* NameHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -43,7 +43,6 @@ import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
diff --git a/org/omg/CosNaming/NamingContextExtHelper.java b/org/omg/CosNaming/NamingContextExtHelper.java
index aca0e9dfd..98d0b4a8c 100644
--- a/org/omg/CosNaming/NamingContextExtHelper.java
+++ b/org/omg/CosNaming/NamingContextExtHelper.java
@@ -1,5 +1,5 @@
 /* NamingContextExtHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -44,7 +44,6 @@ import gnu.CORBA.OrbRestricted;
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.BAD_PARAM;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.Delegate;
 import org.omg.CORBA.portable.InputStream;
@@ -127,15 +126,13 @@ public abstract class NamingContextExtHelper
    * performed to verify that the object actually supports the requested type.
    * The {@link BAD_OPERATION} will be thrown if unsupported operations are
    * invoked on the new returned reference, but no failure is expected at the
-   * time of the unchecked_narrow.
+   * time of the unchecked_narrow. See OMG issue 4158.
    * 
    * @param obj the object to cast.
    * 
    * @return the casted NamingContextExt
    * 
    * @since 1.5 
-   * 
-   * @see OMG issue 4158.
    */
   public static NamingContextExt unchecked_narrow(org.omg.CORBA.Object obj)
   {
diff --git a/org/omg/CosNaming/NamingContextExtPackage/AddressHelper.java b/org/omg/CosNaming/NamingContextExtPackage/AddressHelper.java
index 810460744..8333ff826 100644
--- a/org/omg/CosNaming/NamingContextExtPackage/AddressHelper.java
+++ b/org/omg/CosNaming/NamingContextExtPackage/AddressHelper.java
@@ -1,5 +1,5 @@
 /* AddressHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -45,7 +45,6 @@ import org.omg.CORBA.ORB;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
-import org.omg.CORBA.portable.Streamable;
 
 /**
  * Helper operations for address. Address is directly mapped into
diff --git a/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.java b/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.java
index c7f3849a0..ea17473e3 100644
--- a/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.java
+++ b/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.java
@@ -1,5 +1,5 @@
 /* InvalidAddressHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,7 +41,6 @@ package org.omg.CosNaming.NamingContextExtPackage;
 import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.StructMember;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
diff --git a/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHolder.java b/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHolder.java
index 114919462..5ded186a6 100644
--- a/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHolder.java
+++ b/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHolder.java
@@ -1,5 +1,5 @@
 /* InvalidAddressHolder.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -42,6 +42,7 @@ import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
 import org.omg.CORBA.portable.Streamable;
+import org.omg.CosNaming.NamingContextPackage.NotEmpty;
 
 /**
  * The holder for the exception {@link InvalidAddress}.
diff --git a/org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.java b/org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.java
index 06faa2ff9..f020cef82 100644
--- a/org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.java
+++ b/org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.java
@@ -1,5 +1,5 @@
 /* StringNameHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,11 +41,9 @@ package org.omg.CosNaming.NamingContextExtPackage;
 import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
-import org.omg.CORBA.portable.Streamable;
 
 /**
  * Helper operations for the string name.
diff --git a/org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.java b/org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.java
index 173bb989e..b565530e5 100644
--- a/org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.java
+++ b/org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.java
@@ -1,5 +1,5 @@
 /* URLStringHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,7 +41,6 @@ package org.omg.CosNaming.NamingContextExtPackage;
 import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
diff --git a/org/omg/CosNaming/NamingContextHelper.java b/org/omg/CosNaming/NamingContextHelper.java
index 48b90c25a..6bbd0729f 100644
--- a/org/omg/CosNaming/NamingContextHelper.java
+++ b/org/omg/CosNaming/NamingContextHelper.java
@@ -1,5 +1,5 @@
 /* NamingContextHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -44,7 +44,6 @@ import gnu.CORBA.OrbRestricted;
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.BAD_PARAM;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.Delegate;
 import org.omg.CORBA.portable.InputStream;
@@ -135,15 +134,11 @@ public abstract class NamingContextHelper
    * to verify that the object actually supports the requested type. The
    * {@link BAD_OPERATION} will be thrown if unsupported operations are invoked
    * on the new returned reference, but no failure is expected at the time of
-   * the unchecked_narrow.
+   * the unchecked_narrow. See OMG issue 4158.
    * 
    * @param obj the object to cast.
    * 
    * @return the casted NamingContext.
-   * 
-   * @since 1.5 
-   * 
-   * @see OMG issue 4158.
    */
   public static NamingContext unchecked_narrow(org.omg.CORBA.Object obj)
   {
diff --git a/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java b/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java
index f43111cb2..1eaf50d12 100644
--- a/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java
+++ b/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java
@@ -1,5 +1,5 @@
 /* AlreadyBoundHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -43,7 +43,6 @@ import gnu.CORBA.OrbRestricted;
 
 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.TypeCode;
 import org.omg.CORBA.portable.InputStream;
diff --git a/org/omg/CosNaming/NamingContextPackage/InvalidName.java b/org/omg/CosNaming/NamingContextPackage/InvalidName.java
index 90ca3a5c5..59784ea1b 100644
--- a/org/omg/CosNaming/NamingContextPackage/InvalidName.java
+++ b/org/omg/CosNaming/NamingContextPackage/InvalidName.java
@@ -1,5 +1,5 @@
 /* InvalidName.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,7 +40,6 @@ package org.omg.CosNaming.NamingContextPackage;
 
 import org.omg.CORBA.UserException;
 import org.omg.CORBA.portable.IDLEntity;
-import org.omg.CosNaming.NameComponent;
 
 /**
  * The exception is thrown if the name has the zero length or is otherwise
diff --git a/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java b/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java
index 5893332b8..b5a428cac 100644
--- a/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java
+++ b/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java
@@ -1,5 +1,5 @@
 /* InvalidNameHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -43,7 +43,6 @@ import gnu.CORBA.OrbRestricted;
 
 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.TypeCode;
 import org.omg.CORBA.portable.InputStream;
diff --git a/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java b/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java
index a9b802f95..c4e06c39c 100644
--- a/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java
+++ b/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java
@@ -1,5 +1,5 @@
 /* NotEmptyHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -43,7 +43,6 @@ import gnu.CORBA.OrbRestricted;
 
 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.TypeCode;
 import org.omg.CORBA.portable.InputStream;
diff --git a/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java b/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java
index 9d44dcbf3..ddc7701a5 100644
--- a/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java
+++ b/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java
@@ -1,5 +1,5 @@
 /* NotFoundReasonHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -43,7 +43,6 @@ import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
diff --git a/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHolder.java b/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHolder.java
index fc41b1833..a18801c66 100644
--- a/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHolder.java
+++ b/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHolder.java
@@ -1,5 +1,5 @@
 /* NotFoundReasonHolder.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -81,7 +81,9 @@ public final class NotFoundReasonHolder
 
   /**
    * Get the type code of {@link NotFoundReason}.
-   * @return
+   * 
+   * @return the typecode of enumeration, allowed value names being
+   *         "missing_node", "not_context" and "not_object"
    */
   public TypeCode _type()
   {
diff --git a/org/omg/DynamicAny/AnySeqHelper.java b/org/omg/DynamicAny/AnySeqHelper.java
index ddf1422ff..31ed2ba02 100644
--- a/org/omg/DynamicAny/AnySeqHelper.java
+++ b/org/omg/DynamicAny/AnySeqHelper.java
@@ -1,5 +1,5 @@
 /* AnySeqHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,7 @@ package org.omg.DynamicAny;
 import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
+import org.omg.CORBA.AnySeqHolder;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.TCKind;
 import org.omg.CORBA.TypeCode;
diff --git a/org/omg/DynamicAny/DynAnyFactoryHelper.java b/org/omg/DynamicAny/DynAnyFactoryHelper.java
index 97b54873f..612ba71c3 100644
--- a/org/omg/DynamicAny/DynAnyFactoryHelper.java
+++ b/org/omg/DynamicAny/DynAnyFactoryHelper.java
@@ -1,5 +1,5 @@
 /* DynAnyFactoryHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -42,9 +42,9 @@ package org.omg.DynamicAny;
 import gnu.CORBA.Minor;
 import gnu.CORBA.OrbRestricted;
 
+import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.TypeCode;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.Any;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.MARSHAL;
@@ -88,15 +88,13 @@ public abstract class DynAnyFactoryHelper
    * Narrow the given object to the DynAnyFactory. For the objects that are
    * always local, this operation does not differ from the ordinary
    * {@link #narrow} (ClassCastException will be thrown if narrowing something
-   * different).
+   * different). See also OMG issue 4158.
    * 
    * @param obj the object to cast.
    * 
    * @return the casted DynAnyFactory.
    * 
    * @since 1.5 
-   * 
-   * @see OMG issue 4158.
    */
   public static DynAnyFactory unchecked_narrow(org.omg.CORBA.Object obj)
   {
@@ -163,7 +161,7 @@ public abstract class DynAnyFactoryHelper
    * This should read DynAnyFactory from the CDR input stream, but (following
    * the JDK 1.5 API) it does not.
    * 
-   * @param input a org.omg.CORBA.portable stream to read from.
+   * @param output a org.omg.CORBA.portable stream to write into.
    * 
    * @specenote Sun throws the same exception.
    * 
diff --git a/org/omg/DynamicAny/DynAnyFactoryOperations.java b/org/omg/DynamicAny/DynAnyFactoryOperations.java
index 058e36958..c3cd919ad 100644
--- a/org/omg/DynamicAny/DynAnyFactoryOperations.java
+++ b/org/omg/DynamicAny/DynAnyFactoryOperations.java
@@ -1,5 +1,5 @@
 /* DynAnyFactoryOperations.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.DynamicAny;
 
 import org.omg.CORBA.Any;
+import org.omg.CORBA.TCKind;
 import org.omg.CORBA.TypeCode;
 import org.omg.DynamicAny.DynAnyFactoryPackage.InconsistentTypeCode;
 
@@ -83,7 +84,7 @@ public interface DynAnyFactoryOperations
    * </tr>
    * <tr>
    * <td>{@link Any}</td>
-   * <td>{@link Any} with no value and typecode of kind {@link TCKind.tk_null}</td>
+   * <td>{@link Any} with no value and typecode of kind {@link TCKind#tk_null}</td>
    * <td>{@link DynAny}</td>
    * </tr>
    * <tr>
diff --git a/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java b/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java
index 96dbb5fb6..018417226 100644
--- a/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java
+++ b/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java
@@ -1,5 +1,5 @@
 /* InconsistentTypeCodeHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,7 +46,6 @@ 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;
diff --git a/org/omg/DynamicAny/DynAnyHelper.java b/org/omg/DynamicAny/DynAnyHelper.java
index a238bf48b..315cddbd2 100644
--- a/org/omg/DynamicAny/DynAnyHelper.java
+++ b/org/omg/DynamicAny/DynAnyHelper.java
@@ -1,5 +1,5 @@
 /* DynAnyHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,9 +41,9 @@ package org.omg.DynamicAny;
 
 import gnu.CORBA.OrbRestricted;
 
+import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.TypeCode;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.Any;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.MARSHAL;
@@ -86,15 +86,13 @@ public abstract class DynAnyHelper
    * Narrow the given object to the DynAny. For the objects that are
    * always local, this operation does not differ from the ordinary
    * {@link #narrow} (ClassCastException will be thrown if narrowing something
-   * different).
+   * different). See also OMG issue 4158.
    * 
    * @param obj the object to cast.
    * 
    * @return the casted DynAny.
    * 
    * @since 1.5 
-   * 
-   * @see OMG issue 4158.
    */
   public static DynAny unchecked_narrow(org.omg.CORBA.Object obj)
   {
@@ -160,7 +158,7 @@ public abstract class DynAnyHelper
    * This should read DynAny from the CDR input stream, but (following the JDK
    * 1.5 API) it does not.
    * 
-   * @param input a org.omg.CORBA.portable stream to read from.
+   * @param output a org.omg.CORBA.portable stream to write into.
    * 
    * @specenote Sun throws the same exception.
    * 
diff --git a/org/omg/DynamicAny/DynAnyOperations.java b/org/omg/DynamicAny/DynAnyOperations.java
index 0e743136d..2660014bd 100644
--- a/org/omg/DynamicAny/DynAnyOperations.java
+++ b/org/omg/DynamicAny/DynAnyOperations.java
@@ -1,5 +1,5 @@
 /* DynAnyOperations.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 This file is part of GNU Classpath.
 
 GNU Classpath is free software; you can redistribute it and/or modify
@@ -263,7 +263,7 @@ public interface DynAnyOperations
    * Insert the {@link Any} value into the enclosed {@link Any} inside this
    * DynAny.
    *
-   * @param a_x the value being inserted.
+   * @param an_any the value being inserted.
    * @throws InvalidValue if the value type does not match the typecode of the
    * enclosed {@link Any}.
    */
@@ -452,7 +452,7 @@ public interface DynAnyOperations
                throws InvalidValue, TypeMismatch;
 
   /**
-   * Advances the internal pointer, described in the {@link current_component},
+   * Advances the internal pointer, described in the {@link #current_component},
    * one position forward.
    *
    * @return true if the pointer now points to the new component, false if there
@@ -462,13 +462,13 @@ public interface DynAnyOperations
   boolean next();
 
   /**
-   * Moves the internal pointer, described in the {@link current_component}, to
+   * Moves the internal pointer, described in the {@link #current_component}, to
    * the first component.
    */
   void rewind();
 
   /**
-   * Moves the internal pointer, described in the {@link current_component}, to
+   * Moves the internal pointer, described in the {@link #current_component}, to
    * the given position.
    *
    * @param p the number of the internal component on that the internal pointer
diff --git a/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java b/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java
index 0258d3589..d27ad6a6b 100644
--- a/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java
+++ b/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java
@@ -1,5 +1,5 @@
 /* InvalidValueHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,7 +46,6 @@ 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;
diff --git a/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java b/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java
index 244a98aa0..7d4fc8789 100644
--- a/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java
+++ b/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java
@@ -1,5 +1,5 @@
 /* TypeMismatchHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,7 +46,6 @@ 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;
diff --git a/org/omg/DynamicAny/DynAnySeqHelper.java b/org/omg/DynamicAny/DynAnySeqHelper.java
index 66208ea19..f7550fd79 100644
--- a/org/omg/DynamicAny/DynAnySeqHelper.java
+++ b/org/omg/DynamicAny/DynAnySeqHelper.java
@@ -1,5 +1,5 @@
 /* DynAnySeq.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -51,7 +51,7 @@ import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
 
 /**
- * A helper operations for the array of {@link DynAny} ({@link DynAnySeq}).
+ * A helper operations for the array of {@link DynAny} (DynAny[]).
  * Following the 1.5 JDK specifications, DynAny (and hence an sequence of
  * DynAny's) is always a local object, so the two methods of this helper
  * ({@link #read} and {@link #write} are not in use, always throwing
@@ -133,7 +133,7 @@ public abstract class DynAnySeqHelper
    * The method should write this object to the CDR input stream, but
    * (following the JDK 1.5 API) it does not.
    *
-   * @param input a org.omg.CORBA.portable stream to read from.
+   * @param output a org.omg.CORBA.portable stream to write into.
    *
    * @specenote Sun throws the same exception.
    *
diff --git a/org/omg/DynamicAny/DynArrayHelper.java b/org/omg/DynamicAny/DynArrayHelper.java
index 26824d747..4cd3e3a52 100644
--- a/org/omg/DynamicAny/DynArrayHelper.java
+++ b/org/omg/DynamicAny/DynArrayHelper.java
@@ -1,5 +1,5 @@
 /* DynArrayHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,9 +40,9 @@ package org.omg.DynamicAny;
 
 import gnu.CORBA.OrbRestricted;
 
+import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.TypeCode;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.Any;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.MARSHAL;
@@ -85,16 +85,14 @@ public abstract class DynArrayHelper
    * Narrow the given object to the DynArray. For the objects that are
    * always local, this operation does not differ from the ordinary
    * {@link #narrow} (ClassCastException will be thrown if narrowing something
-   * different).
+   * different). See OMG issue 4158.
    * 
    * @param obj the object to cast.
    * 
    * @return the casted DynArray.
    * 
    * @since 1.5 
-   * 
-   * @see OMG issue 4158.
-   */
+   */ 
   public static DynArray unchecked_narrow(org.omg.CORBA.Object obj)
   {
     return narrow(obj);
@@ -159,7 +157,7 @@ public abstract class DynArrayHelper
    * This should read DynArray from the CDR input stream, but (following the JDK
    * 1.5 API) it does not.
    * 
-   * @param input a org.omg.CORBA.portable stream to read from.
+   * @param output a org.omg.CORBA.portable stream to write into.
    * 
    * @specenote Sun throws the same exception.
    * 
diff --git a/org/omg/DynamicAny/DynEnumHelper.java b/org/omg/DynamicAny/DynEnumHelper.java
index 9af2e1194..da63e844f 100644
--- a/org/omg/DynamicAny/DynEnumHelper.java
+++ b/org/omg/DynamicAny/DynEnumHelper.java
@@ -1,5 +1,5 @@
 /* DynEnumHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,9 +41,9 @@ package org.omg.DynamicAny;
 
 import gnu.CORBA.OrbRestricted;
 
+import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.TypeCode;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.Any;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.MARSHAL;
@@ -86,15 +86,13 @@ public abstract class DynEnumHelper
    * Narrow the given object to the DynEnum. For the objects that are
    * always local, this operation does not differ from the ordinary
    * {@link #narrow} (ClassCastException will be thrown if narrowing something
-   * different).
+   * different). See OMG issue 4158.
    * 
    * @param obj the object to cast.
    * 
    * @return the casted DynEnum.
    * 
    * @since 1.5 
-   * 
-   * @see OMG issue 4158.
    */
   public static DynEnum unchecked_narrow(org.omg.CORBA.Object obj)
   {
@@ -160,7 +158,7 @@ public abstract class DynEnumHelper
    * This should read DynEnum from the CDR input stream, but (following the JDK
    * 1.5 API) it does not.
    * 
-   * @param input a org.omg.CORBA.portable stream to read from.
+   * @param output a org.omg.CORBA.portable stream to write into.
    * 
    * @specenote Sun throws the same exception.
    * 
diff --git a/org/omg/DynamicAny/DynFixedHelper.java b/org/omg/DynamicAny/DynFixedHelper.java
index 4471bb26b..e730d43bb 100644
--- a/org/omg/DynamicAny/DynFixedHelper.java
+++ b/org/omg/DynamicAny/DynFixedHelper.java
@@ -1,5 +1,5 @@
 /* DynFixedHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,9 +41,9 @@ package org.omg.DynamicAny;
 
 import gnu.CORBA.OrbRestricted;
 
+import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.TypeCode;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.Any;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.MARSHAL;
@@ -86,15 +86,13 @@ public abstract class DynFixedHelper
    * Narrow the given object to the DynFixed. For the objects that are
    * always local, this operation does not differ from the ordinary
    * {@link #narrow} (ClassCastException will be thrown if narrowing something
-   * different).
+   * different). See OMG issue 4158.
    * 
    * @param obj the object to cast.
    * 
    * @return the casted DynFixed.
    * 
    * @since 1.5 
-   * 
-   * @see OMG issue 4158.
    */
   public static DynFixed unchecked_narrow(org.omg.CORBA.Object obj)
   {
@@ -160,7 +158,7 @@ public abstract class DynFixedHelper
    * This should read DynFixed from the CDR input stream, but (following the JDK
    * 1.5 API) it does not.
    * 
-   * @param input a org.omg.CORBA.portable stream to read from.
+   * @param output a org.omg.CORBA.portable stream to write into.
    * 
    * @specenote Sun throws the same exception.
    * 
diff --git a/org/omg/DynamicAny/DynSequenceHelper.java b/org/omg/DynamicAny/DynSequenceHelper.java
index 0aa7cdd2a..f330108b0 100644
--- a/org/omg/DynamicAny/DynSequenceHelper.java
+++ b/org/omg/DynamicAny/DynSequenceHelper.java
@@ -1,5 +1,5 @@
 /* DynSequenceHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,9 +40,9 @@ package org.omg.DynamicAny;
 
 import gnu.CORBA.OrbRestricted;
 
+import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.TypeCode;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.Any;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.MARSHAL;
@@ -85,15 +85,13 @@ public abstract class DynSequenceHelper
    * Narrow the given object to the DynSequence. For the objects that are
    * always local, this operation does not differ from the ordinary
    * {@link #narrow} (ClassCastException will be thrown if narrowing something
-   * different).
+   * different). See OMG issue 4158.
    * 
    * @param obj the object to cast.
    * 
    * @return the casted DynSequence.
    * 
    * @since 1.5 
-   * 
-   * @see OMG issue 4158.
    */
   public static DynSequence unchecked_narrow(org.omg.CORBA.Object obj)
   {
@@ -159,7 +157,7 @@ public abstract class DynSequenceHelper
    * This should read DynSequence from the CDR input stream, but (following the
    * JDK 1.5 API) it does not.
    * 
-   * @param input a org.omg.CORBA.portable stream to read from.
+   * @param output a org.omg.CORBA.portable stream to write into.
    * 
    * @specenote Sun throws the same exception.
    * 
diff --git a/org/omg/DynamicAny/DynStructHelper.java b/org/omg/DynamicAny/DynStructHelper.java
index c683260f6..077b7d098 100644
--- a/org/omg/DynamicAny/DynStructHelper.java
+++ b/org/omg/DynamicAny/DynStructHelper.java
@@ -1,5 +1,5 @@
 /* DynStructHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,9 +40,9 @@ package org.omg.DynamicAny;
 
 import gnu.CORBA.OrbRestricted;
 
+import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.TypeCode;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.Any;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.MARSHAL;
@@ -85,15 +85,13 @@ public abstract class DynStructHelper
    * Narrow the given object to the DynStruct. For the objects that are
    * always local, this operation does not differ from the ordinary
    * {@link #narrow} (ClassCastException will be thrown if narrowing something
-   * different).
+   * different). See OMG issue 4158.
    * 
    * @param obj the object to cast.
    * 
    * @return the casted DynStruct.
    * 
    * @since 1.5 
-   * 
-   * @see OMG issue 4158.
    */
   public static DynStruct unchecked_narrow(org.omg.CORBA.Object obj)
   {
@@ -159,7 +157,7 @@ public abstract class DynStructHelper
    * This should read DynStruct from the CDR input stream, but (following the
    * JDK 1.5 API) it does not.
    * 
-   * @param input a org.omg.CORBA.portable stream to read from.
+   * @param output a org.omg.CORBA.portable stream to write into.
    * 
    * @specenote Sun throws the same exception.
    * 
diff --git a/org/omg/DynamicAny/DynStructOperations.java b/org/omg/DynamicAny/DynStructOperations.java
index 3b5af1710..03524b2f9 100644
--- a/org/omg/DynamicAny/DynStructOperations.java
+++ b/org/omg/DynamicAny/DynStructOperations.java
@@ -1,5 +1,5 @@
 /* DynStructOperations.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 This file is part of GNU Classpath.
 
 GNU Classpath is free software; you can redistribute it and/or modify
@@ -101,7 +101,7 @@ public interface DynStructOperations
    * @specnote The name-based value assignment is not supported by Sun's jdk
    * 1.4.
    *
-   * @param an array of NameDynValuePair's, each defining a single field in the
+   * @param value an array of NameDynValuePair's, each defining a single field in the
    * structure.
    *
    * @throws TypeMismatch if the member of the passed array has a different type
@@ -125,7 +125,7 @@ public interface DynStructOperations
    * @specnote The name-based value assignment is not supported by Sun's jdk
    * 1.4.
    *
-   * @param an array of NameValuePair's, each defining a single field in the
+   * @param value an array of NameValuePair's, each defining a single field in the
    * structure.
    *
    * @throws TypeMismatch if the member of the passed array has a different type
diff --git a/org/omg/DynamicAny/DynUnionHelper.java b/org/omg/DynamicAny/DynUnionHelper.java
index e868ea412..f1016d078 100644
--- a/org/omg/DynamicAny/DynUnionHelper.java
+++ b/org/omg/DynamicAny/DynUnionHelper.java
@@ -1,5 +1,5 @@
 /* DynUnionHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,9 +40,9 @@ package org.omg.DynamicAny;
 
 import gnu.CORBA.OrbRestricted;
 
+import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.TypeCode;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.Any;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.MARSHAL;
@@ -85,15 +85,13 @@ public abstract class DynUnionHelper
    * Narrow the given object to the DynUnion. For the objects that are
    * always local, this operation does not differ from the ordinary
    * {@link #narrow} (ClassCastException will be thrown if narrowing something
-   * different).
+   * different). See OMG issue 4158.
    * 
    * @param obj the object to cast.
    * 
    * @return the casted DynUnion.
    * 
    * @since 1.5 
-   * 
-   * @see OMG issue 4158.
    */
   public static DynUnion unchecked_narrow(org.omg.CORBA.Object obj)
   {
@@ -159,7 +157,7 @@ public abstract class DynUnionHelper
    * This should read DynUnion from the CDR input stream, but (following the JDK
    * 1.5 API) it does not.
    * 
-   * @param input a org.omg.CORBA.portable stream to read from.
+   * @param output a org.omg.CORBA.portable stream to write into.
    * 
    * @specenote Sun throws the same exception.
    * 
diff --git a/org/omg/DynamicAny/DynValueHelper.java b/org/omg/DynamicAny/DynValueHelper.java
index ad75bc31f..17d9bbc5a 100644
--- a/org/omg/DynamicAny/DynValueHelper.java
+++ b/org/omg/DynamicAny/DynValueHelper.java
@@ -1,5 +1,5 @@
 /* DynValueHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,9 +40,9 @@ package org.omg.DynamicAny;
 
 import gnu.CORBA.OrbRestricted;
 
+import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.TypeCode;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.Any;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.MARSHAL;
@@ -85,15 +85,13 @@ public abstract class DynValueHelper
    * Narrow the given object to the DynValue. For the objects that are
    * always local, this operation does not differ from the ordinary
    * {@link #narrow} (ClassCastException will be thrown if narrowing something
-   * different).
+   * different). See OMG issue 4158.
    * 
    * @param obj the object to cast.
    * 
    * @return the casted DynValue.
    * 
    * @since 1.5 
-   * 
-   * @see OMG issue 4158.
    */
   public static DynValue unchecked_narrow(org.omg.CORBA.Object obj)
   {
@@ -159,7 +157,7 @@ public abstract class DynValueHelper
    * This should read DynValue from the CDR input stream, but (following the JDK
    * 1.5 API) it does not.
    * 
-   * @param input a org.omg.CORBA.portable stream to read from.
+   * @param output a org.omg.CORBA.portable stream to write into.
    * 
    * @specenote Sun throws the same exception.
    * 
diff --git a/org/omg/DynamicAny/NameDynAnyPairHelper.java b/org/omg/DynamicAny/NameDynAnyPairHelper.java
index a9d9edba7..4e133a513 100644
--- a/org/omg/DynamicAny/NameDynAnyPairHelper.java
+++ b/org/omg/DynamicAny/NameDynAnyPairHelper.java
@@ -1,5 +1,5 @@
 /* NameDynAnyPairHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -151,7 +151,7 @@ public abstract class NameDynAnyPairHelper
    * The method should write this object to the CDR input stream, but
    * (following the JDK 1.5 API) it does not.
    *
-   * @param input a org.omg.CORBA.portable stream to read from.
+   * @param output a org.omg.CORBA.portable stream to write into.
    *
    * @specenote Sun throws the same exception.
    *
diff --git a/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java b/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java
index 56e6104ec..817ed8a70 100644
--- a/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java
+++ b/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java
@@ -1,5 +1,5 @@
 /* NameDynAnyPairSeq.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -52,7 +52,7 @@ import org.omg.CORBA.portable.OutputStream;
 
 /**
  * A helper operations for the array of {@link NameDynAnyPair}
- * ({@link NameDynAnyPairSeq}).
+ * (NameDynAnyPair[]).
  *
  * Following the 1.5 JDK specifications, DynAny (and hence the sequence
  * of structures, containing DynAny) is always a local object.
@@ -132,7 +132,7 @@ public abstract class NameDynAnyPairSeqHelper
    * The method should write this object to the CDR input stream, but
    * (following the JDK 1.5 API) it does not.
    *
-   * @param input a org.omg.CORBA.portable stream to read from.
+   * @param output a org.omg.CORBA.portable stream to write into.
    *
    * @specenote Sun throws the same exception.
    *
diff --git a/org/omg/IOP/CodecFactoryHelper.java b/org/omg/IOP/CodecFactoryHelper.java
index 89404f7d5..d3dc40935 100644
--- a/org/omg/IOP/CodecFactoryHelper.java
+++ b/org/omg/IOP/CodecFactoryHelper.java
@@ -1,5 +1,5 @@
 /* CodecFactoryHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,10 +41,10 @@ package org.omg.IOP;
 import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
+import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.CompletionStatus;
 import org.omg.CORBA.MARSHAL;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -120,15 +120,13 @@ public abstract class CodecFactoryHelper
    * Narrow the given object to the CodecFactory. For the objects that are
    * always local, this operation does not differ from the ordinary
    * {@link #narrow} (ClassCastException will be thrown if narrowing something
-   * different).
+   * different). See OMG issue 4158.
    * 
    * @param obj the object to cast.
    * 
    * @return the casted CodecFactory.
    * 
    * @since 1.5 
-   * 
-   * @see OMG issue 4158.
    */
   public static CodecFactory unchecked_narrow(org.omg.CORBA.Object obj)
   {
@@ -141,7 +139,7 @@ public abstract class CodecFactoryHelper
    *
    * @specnote Suns implementation (1.4) throws this exception either.
    *
-   * @throws {@link MARSHAL}, minor code 0 and incomplete, always.
+   * @throws MARSHAL, minor code 0 and incomplete, always.
    */
   public static CodecFactory read(InputStream input)
   {
@@ -154,7 +152,7 @@ public abstract class CodecFactoryHelper
    *
    * @specnote Suns implementation (1.4) throws this exception either.
    *
-   * @throws {@link MARSHAL}, minor code 0 and incomplete, always.
+   * @throws MARSHAL, minor code 0 and incomplete, always.
    */
   public static void write(OutputStream output, CodecFactory value)
   {
diff --git a/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java b/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java
index 8861e43da..2110f0d5b 100644
--- a/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java
+++ b/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java
@@ -1,5 +1,5 @@
 /* UnknownEncodingHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -45,7 +45,6 @@ import gnu.CORBA.OrbRestricted;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.Any;
 import org.omg.CORBA.TypeCode;
-import org.omg.CORBA.TCKind;
 import org.omg.CORBA.StructMember;
 
 import org.omg.CORBA.portable.InputStream;
diff --git a/org/omg/IOP/CodecOperations.java b/org/omg/IOP/CodecOperations.java
index 3dfae1207..873f54607 100644
--- a/org/omg/IOP/CodecOperations.java
+++ b/org/omg/IOP/CodecOperations.java
@@ -1,5 +1,5 @@
 /* CodecOperations.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -66,7 +66,7 @@ public interface CodecOperations
    * by this {@link Codec} (wide char and wide string are not supported
    * by ENCODING_CDR_ENCAPS v 1.0).
    *
-   * @see decode(byte[])
+   * @see #decode(byte[])
    */
   byte[] encode(Any that)
          throws InvalidTypeForEncoding;
@@ -83,7 +83,7 @@ public interface CodecOperations
    *
    * @throws FormatMismatch on the invalid structure of the byte array.
    *
-   * @see encode(Any)
+   * @see #encode(Any)
    */
   Any decode(byte[] them)
       throws FormatMismatch;
@@ -96,7 +96,7 @@ public interface CodecOperations
   * @return the array, containing the encoded value alone (no preceeding
   * typecode).
   *
-  * @see decode_value(byte[], TypeCode)
+  * @see #decode_value(byte[], TypeCode)
   */
   byte[] encode_value(Any that_value)
                throws InvalidTypeForEncoding;
@@ -119,7 +119,7 @@ public interface CodecOperations
    * @throws TypeMismatch if discovered that the the byte array defines a
    * different structure.
    *
-   * @see encode_value(Any)
+   * @see #encode_value(Any)
    */
   Any decode_value(byte[] them, TypeCode type)
             throws FormatMismatch, TypeMismatch;
diff --git a/org/omg/IOP/CodecPackage/FormatMismatchHelper.java b/org/omg/IOP/CodecPackage/FormatMismatchHelper.java
index 2a9295ae8..020975617 100644
--- a/org/omg/IOP/CodecPackage/FormatMismatchHelper.java
+++ b/org/omg/IOP/CodecPackage/FormatMismatchHelper.java
@@ -1,5 +1,5 @@
 /* FormatMismatchHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,7 +46,6 @@ 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;
diff --git a/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java b/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java
index e2a8c9057..246a1b93f 100644
--- a/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java
+++ b/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java
@@ -1,5 +1,5 @@
 /* InvalidTypeForEncodingHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,7 +46,6 @@ 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;
diff --git a/org/omg/IOP/CodecPackage/TypeMismatchHelper.java b/org/omg/IOP/CodecPackage/TypeMismatchHelper.java
index 432e84d24..88e00a243 100644
--- a/org/omg/IOP/CodecPackage/TypeMismatchHelper.java
+++ b/org/omg/IOP/CodecPackage/TypeMismatchHelper.java
@@ -1,5 +1,5 @@
 /* TypeMismatchHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,7 +46,6 @@ 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;
diff --git a/org/omg/IOP/ComponentIdHelper.java b/org/omg/IOP/ComponentIdHelper.java
index 35ffd9a69..f94187698 100644
--- a/org/omg/IOP/ComponentIdHelper.java
+++ b/org/omg/IOP/ComponentIdHelper.java
@@ -1,5 +1,5 @@
 /* ComponentIdHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -43,7 +43,6 @@ import gnu.CORBA.OrbRestricted;
 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;
diff --git a/org/omg/IOP/ExceptionDetailMessage.java b/org/omg/IOP/ExceptionDetailMessage.java
index 167ab1ac7..92a068cba 100644
--- a/org/omg/IOP/ExceptionDetailMessage.java
+++ b/org/omg/IOP/ExceptionDetailMessage.java
@@ -1,5 +1,5 @@
 /* ExceptionDetailMessage.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -44,7 +44,7 @@ package org.omg.IOP;
  * USER_EXCEPTION reply status, as the alternative to the stack trace
  * that might contain sensitive or unwanted information. The service
  * context contains the CDR-encapsulated wide string, usually
- * returned by {@link Exception#getMessage}.
+ * returned by {@link Exception#getMessage()}.
  * </p><p>
  * The applications may also send the more comprehensive UnknownExceptionInfo
  * ( = 9 ) service context that contains the thrown exception, written
diff --git a/org/omg/IOP/MultipleComponentProfileHelper.java b/org/omg/IOP/MultipleComponentProfileHelper.java
index 1c04ec54f..6a941dee6 100644
--- a/org/omg/IOP/MultipleComponentProfileHelper.java
+++ b/org/omg/IOP/MultipleComponentProfileHelper.java
@@ -1,5 +1,5 @@
 /* MultipleComponentProfileHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -44,7 +44,6 @@ import gnu.CORBA.OrbRestricted;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.Any;
 import org.omg.CORBA.TypeCode;
-import org.omg.CORBA.TCKind;
 import org.omg.CORBA.BAD_OPERATION;
 
 import org.omg.CORBA.portable.OutputStream;
@@ -52,7 +51,7 @@ import org.omg.CORBA.portable.InputStream;
 
  /**
  * A helper operations for the array of {@link TaggedComponent}
- * ({@link MultipleComponentProfile}).
+ * (MultipleComponentProfile).
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
diff --git a/org/omg/IOP/ProfileIdHelper.java b/org/omg/IOP/ProfileIdHelper.java
index 340fa27d5..362b2dff3 100644
--- a/org/omg/IOP/ProfileIdHelper.java
+++ b/org/omg/IOP/ProfileIdHelper.java
@@ -1,5 +1,5 @@
 /* ProfileIdHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -43,7 +43,6 @@ import gnu.CORBA.OrbRestricted;
 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;
diff --git a/org/omg/IOP/ServiceContextListHelper.java b/org/omg/IOP/ServiceContextListHelper.java
index 7875db29e..9de0b6ffd 100644
--- a/org/omg/IOP/ServiceContextListHelper.java
+++ b/org/omg/IOP/ServiceContextListHelper.java
@@ -1,5 +1,5 @@
 /* ServiceContextListHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -43,21 +43,20 @@ import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
 
 /**
 * The helper operations for the
-* CORBA object {@link ServiceContext[]}.
+* CORBA object {@link ServiceContext}[].
 *
 * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
 */
 public abstract class ServiceContextListHelper
 {
   /**
-   * Get the type code of the {@link ServiceContext[]}.
+   * Get the type code of the {@link ServiceContext}[].
    */
   public static TypeCode type()
   {
diff --git a/org/omg/IOP/ServiceIdHelper.java b/org/omg/IOP/ServiceIdHelper.java
index 084dbd06d..9c4cbbe4a 100644
--- a/org/omg/IOP/ServiceIdHelper.java
+++ b/org/omg/IOP/ServiceIdHelper.java
@@ -1,5 +1,5 @@
 /* ServiceIdHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -43,7 +43,6 @@ import gnu.CORBA.OrbRestricted;
 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;
diff --git a/org/omg/IOP/TAG_CODE_SETS.java b/org/omg/IOP/TAG_CODE_SETS.java
index cc7752483..07c5c9c32 100644
--- a/org/omg/IOP/TAG_CODE_SETS.java
+++ b/org/omg/IOP/TAG_CODE_SETS.java
@@ -1,5 +1,5 @@
 /* TAG_CODE_SETS.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -44,7 +44,7 @@ package org.omg.IOP;
  * profile provides information about the native and supported encodings
  * for the "narrow" (usually 8 bit) and "wide" (usually 16 bit) characters.
  * In Gnu Classpath implementation the class, responsible for providing
- * this information is {@link gnu.CORBA.CharSets_OSF}.
+ * this information is {@link gnu.CORBA.GIOP.CharSets_OSF}.
  * </p>
  * <p>
  * If this profile is missing, it is assumed, that the "narrow" characters
diff --git a/org/omg/PortableInterceptor/ClientRequestInfoOperations.java b/org/omg/PortableInterceptor/ClientRequestInfoOperations.java
index 73efa122f..e4d70211a 100644
--- a/org/omg/PortableInterceptor/ClientRequestInfoOperations.java
+++ b/org/omg/PortableInterceptor/ClientRequestInfoOperations.java
@@ -1,5 +1,5 @@
 /* ClientRequestInfoOperations.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableInterceptor;
 
 import org.omg.CORBA.Any;
+import org.omg.CORBA.BAD_INV_ORDER;
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.INV_POLICY;
 import org.omg.CORBA.Policy;
@@ -285,8 +286,6 @@ public interface ClientRequestInfoOperations extends RequestInfoOperations
    * @param type the type of the policy being requested.
    *
    * @return should return the policy that applies to this operation.
-   *
-   * @throws NO_IMPLEMENT always.
    */
   Policy get_request_policy(int type) throws INV_POLICY;
 
diff --git a/org/omg/PortableInterceptor/ClientRequestInterceptorOperations.java b/org/omg/PortableInterceptor/ClientRequestInterceptorOperations.java
index 4a60b77f5..efd98707b 100644
--- a/org/omg/PortableInterceptor/ClientRequestInterceptorOperations.java
+++ b/org/omg/PortableInterceptor/ClientRequestInterceptorOperations.java
@@ -1,5 +1,5 @@
 /* ClientRequestInterceptorOperations.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.PortableInterceptor;
 
+import org.omg.CORBA.SystemException;
+
 
 /**
  * Defines operations, applicable to the client side request interceptor. The
diff --git a/org/omg/PortableInterceptor/CurrentHelper.java b/org/omg/PortableInterceptor/CurrentHelper.java
index e453f6010..88ab0e270 100644
--- a/org/omg/PortableInterceptor/CurrentHelper.java
+++ b/org/omg/PortableInterceptor/CurrentHelper.java
@@ -1,5 +1,5 @@
 /* CurrentHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -42,13 +42,12 @@ import gnu.CORBA.Minor;
 import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
+import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.MARSHAL;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
-import org.omg.PortableServer.ServantActivator;
 
 /**
  * The helper operations for the CORBA object {@link Current}.
@@ -123,15 +122,13 @@ public abstract class CurrentHelper
    * Narrow the given object to the Current. For the objects that are
    * always local, this operation does not differ from the ordinary
    * {@link #narrow} (ClassCastException will be thrown if narrowing something
-   * different).
+   * different). See also OMG issue 4158.
    * 
    * @param obj the object to cast.
    * 
    * @return the casted Current.
    * 
    * @since 1.5 
-   * 
-   * @see OMG issue 4158.
    */
   public static Current unchecked_narrow(org.omg.CORBA.Object obj)
   {
diff --git a/org/omg/PortableInterceptor/IORInfo.java b/org/omg/PortableInterceptor/IORInfo.java
index 9495d79ec..ec7235102 100644
--- a/org/omg/PortableInterceptor/IORInfo.java
+++ b/org/omg/PortableInterceptor/IORInfo.java
@@ -1,5 +1,5 @@
 /* IORInfo.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,7 +46,7 @@ import java.io.Serializable;
  * Provides the server-side ORB service possibility to add components to the new
  * IOR being created. Also, provides access to policies, applicable to the
  * object, referenced by that IOR. The ORB passes an instance of IORInfo as a
- * parameter to {@link IORInterceptor#establish_components}.
+ * parameter to {@link IORInterceptorOperations#establish_components}.
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
diff --git a/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java b/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java
index 926974f1a..71fb928f7 100644
--- a/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java
+++ b/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java
@@ -1,5 +1,5 @@
 /* IORInterceptor_3_0Helper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -44,7 +44,6 @@ import gnu.CORBA.OrbRestricted;
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.BAD_PARAM;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.Delegate;
 import org.omg.CORBA.portable.InputStream;
diff --git a/org/omg/PortableInterceptor/ORBIdHelper.java b/org/omg/PortableInterceptor/ORBIdHelper.java
index 8332845a6..6b73b1151 100644
--- a/org/omg/PortableInterceptor/ORBIdHelper.java
+++ b/org/omg/PortableInterceptor/ORBIdHelper.java
@@ -1,5 +1,5 @@
 /* ORBIdHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -58,7 +58,7 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class ORBIdHelper
 {
   /**
-   * Insert the ORB Id into Any (uses {@link Any.insert_string}).
+   * Insert the ORB Id into Any (uses {@link Any#insert_string}).
    *
    * @param a the Any to insert into.
    * @param that the string to insert.
@@ -69,7 +69,7 @@ public abstract class ORBIdHelper
   }
 
   /**
-   * Extract the ORB Id from Any ((uses {@link Any.extract_string}).
+   * Extract the ORB Id from Any ((uses {@link Any#extract_string}).
    *
    * @param a the Any to extract from.
    */
@@ -107,7 +107,7 @@ public abstract class ORBIdHelper
   }
 
   /**
-   * Calls {@link OutputStream#write_string()}.
+   * Calls {@link OutputStream#write_string(String)}.
    *
    * @param output the stream to write into.
    * @param value the string (ORB Id) value to write.
diff --git a/org/omg/PortableInterceptor/ORBInitInfoOperations.java b/org/omg/PortableInterceptor/ORBInitInfoOperations.java
index 7b545ff81..16710a08a 100644
--- a/org/omg/PortableInterceptor/ORBInitInfoOperations.java
+++ b/org/omg/PortableInterceptor/ORBInitInfoOperations.java
@@ -1,5 +1,5 @@
 /* ORBInitInfoOperations.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.PortableInterceptor;
 
+import org.omg.CORBA.BAD_INV_ORDER;
+import org.omg.CORBA.ORB;
 import org.omg.IOP.CodecFactory;
 import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName;
 
@@ -90,7 +92,7 @@ public interface ORBInitInfoOperations
     throws DuplicateName;
 
   /**
-   * Allocate a slot on a {@link PortableInterceptor.Current}. While slots can
+   * Allocate a slot on a {@link Current} of this interceptor. While slots can
    * be allocated by this method, they cannot be initialized.
    * {@link CurrentOperations#get_slot} and {@link CurrentOperations#set_slot}
    * throw {@link org.omg.CORBA.BAD_INV_ORDER} while called from the interceptor
@@ -103,8 +105,8 @@ public interface ORBInitInfoOperations
   /**
    * Returns the arguments passed to the ORB.init.
    *
-   * @return the first parameter, passed to the method
-   * {@link org.omg.CORBA.ORB#init}.
+   * @return the first parameter, passed to the methods from the group
+   * org.omg.CORBA.ORB#init(String[], ...).
    */
   String[] arguments();
 
@@ -127,7 +129,7 @@ public interface ORBInitInfoOperations
 
   /**
    * Register the initial reference. The registered object will be accessible by
-   * the {@link ORB.resolve_initial_references} under the object_name.
+   * the {@link ORB#resolve_initial_references} under the object_name.
    *
    * @param object_name the name of the object to register.
    * @param object the object to register.
diff --git a/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java b/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java
index a87a3b747..329fcf564 100644
--- a/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java
+++ b/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java
@@ -1,5 +1,5 @@
 /* InvalidNameHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,7 +46,6 @@ 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;
diff --git a/org/omg/PortableInterceptor/ORBInitializerOperations.java b/org/omg/PortableInterceptor/ORBInitializerOperations.java
index 90c2325f2..d5dd771fd 100644
--- a/org/omg/PortableInterceptor/ORBInitializerOperations.java
+++ b/org/omg/PortableInterceptor/ORBInitializerOperations.java
@@ -1,5 +1,5 @@
 /* ORBInitializerOperations.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -67,7 +67,7 @@ public interface ORBInitializerOperations
    * @param info the object describing ORB being created and containing methods
    * to register the interceptor.
    *
-   * @see ORBInitInfoOperations#register_initial_references
+   * @see ORBInitInfoOperations#register_initial_reference
    */
   void post_init(ORBInitInfo info);
 }
\ No newline at end of file
diff --git a/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java b/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java
index 72c864811..b9a237dce 100644
--- a/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java
+++ b/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java
@@ -1,5 +1,5 @@
 /* ObjectReferenceFactoryHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -44,7 +44,6 @@ import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.ValueMember;
 import org.omg.CORBA.portable.InputStream;
diff --git a/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java b/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java
index 014c11308..0ea54ea5f 100644
--- a/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java
+++ b/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java
@@ -1,5 +1,5 @@
 /* ObjectReferenceTemplateHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -43,7 +43,6 @@ import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.VM_ABSTRACT;
 import org.omg.CORBA.ValueMember;
diff --git a/org/omg/PortableInterceptor/RequestInfoOperations.java b/org/omg/PortableInterceptor/RequestInfoOperations.java
index f865a14d2..10b9662a6 100644
--- a/org/omg/PortableInterceptor/RequestInfoOperations.java
+++ b/org/omg/PortableInterceptor/RequestInfoOperations.java
@@ -1,5 +1,5 @@
 /* RequestInfoOperations.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,6 +40,7 @@ package org.omg.PortableInterceptor;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_PARAM;
+import org.omg.CORBA.NO_RESOURCES;
 import org.omg.CORBA.TypeCode;
 import org.omg.Dynamic.Parameter;
 import org.omg.IOP.ServiceContext;
@@ -182,7 +183,7 @@ public interface RequestInfoOperations
    * the client. However up till JDK 1.5 inclusive this method always returns
    * SYNC_WITH_TRANSPORT.
    *
-   * @return {@link org.omg.Messaging.SYNC_WITH_TRANSPORT.value (1), always.
+   * @return {@link org.omg.Messaging.SYNC_WITH_TRANSPORT#value} (1), always.
    *
    * @specnote as defined in the Suns 1.5 JDK API.
    */
diff --git a/org/omg/PortableInterceptor/ServerIdHelper.java b/org/omg/PortableInterceptor/ServerIdHelper.java
index e4f8fe9c2..84ffdfa8e 100644
--- a/org/omg/PortableInterceptor/ServerIdHelper.java
+++ b/org/omg/PortableInterceptor/ServerIdHelper.java
@@ -1,5 +1,5 @@
 /* ServerIdHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -58,7 +58,7 @@ import org.omg.CORBA.portable.OutputStream;
 public abstract class ServerIdHelper
 {
   /**
-   * Insert the Server Id into Any (uses {@link Any.insert_string}).
+   * Insert the Server Id into Any (uses {@link Any#insert_string}).
    *
    * @param a the Any to insert into.
    * @param that the string to insert.
@@ -69,7 +69,7 @@ public abstract class ServerIdHelper
   }
 
   /**
-   * Extract the Server Id from Any ((uses {@link Any.extract_string}).
+   * Extract the Server Id from Any ((uses {@link Any#extract_string}).
    *
    * @param a the Any to extract from.
    */
@@ -107,7 +107,7 @@ public abstract class ServerIdHelper
   }
 
   /**
-   * Calls {@link OutputStream#write_string()}.
+   * Calls {@link OutputStream#write_string(String)}.
    *
    * @param output the stream to write into.
    * @param value the string (Server Id) value to write.
diff --git a/org/omg/PortableInterceptor/ServerRequestInfoOperations.java b/org/omg/PortableInterceptor/ServerRequestInfoOperations.java
index a9ee7d920..52de9d824 100644
--- a/org/omg/PortableInterceptor/ServerRequestInfoOperations.java
+++ b/org/omg/PortableInterceptor/ServerRequestInfoOperations.java
@@ -1,5 +1,5 @@
 /* ServerRequestInfoOperations.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableInterceptor;
 
 import org.omg.CORBA.Any;
+import org.omg.CORBA.BAD_INV_ORDER;
 import org.omg.CORBA.INV_POLICY;
 import org.omg.CORBA.Policy;
 import org.omg.IOP.ServiceContext;
@@ -287,7 +288,7 @@ public interface ServerRequestInfoOperations
   /**
    * Checks if the servant is the given repository id.
    *
-   * @param the repository id to compare.
+   * @param id the repository id to compare.
    *
    * @return true if the servant repository id matches the parameter, false
    * otherwise.
diff --git a/org/omg/PortableInterceptor/ServerRequestInterceptorOperations.java b/org/omg/PortableInterceptor/ServerRequestInterceptorOperations.java
index b57ca28f7..ccba1a76e 100644
--- a/org/omg/PortableInterceptor/ServerRequestInterceptorOperations.java
+++ b/org/omg/PortableInterceptor/ServerRequestInterceptorOperations.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.PortableInterceptor;
 
+import org.omg.CORBA.SystemException;
+
 
 /**
  * Defines operations, applicable to the server side request interceptor. The
@@ -50,16 +52,16 @@ public interface ServerRequestInterceptorOperations
 {
   /**
    * ORB calls this method before invoking the servant manager. Operation
-       * parameters are not available at this point. The interceptor has possibility
+   * parameters are not available at this point. The interceptor has possibility
    * to forward the request by throwing {@link ForwardRequest}.
-   *
-       * @throws SystemException if it does, the receive_request_service_contexts is
-       * not called for the subsequent interceptors, calling send_exception instead.
-   * The completion status of such exception must be COMPLETED_NO.
-   *
+   * 
+   * @throws SystemException if it does, the receive_request_service_contexts is
+   *           not called for the subsequent interceptors, calling
+   *           send_exception instead. The completion status of such exception
+   *           must be COMPLETED_NO.
    * @throws ForwardRequest to forward the invocation to another target. The
-   * receive_request_service_contexts is not called for the subsequent
-   * interceptors, calling send_other instead.
+   *           receive_request_service_contexts is not called for the subsequent
+   *           interceptors, calling send_other instead.
    */
   void receive_request_service_contexts(ServerRequestInfo info)
     throws ForwardRequest;
diff --git a/org/omg/PortableServer/AdapterActivatorOperations.java b/org/omg/PortableServer/AdapterActivatorOperations.java
index dcf7edd04..d1091852e 100644
--- a/org/omg/PortableServer/AdapterActivatorOperations.java
+++ b/org/omg/PortableServer/AdapterActivatorOperations.java
@@ -1,5 +1,5 @@
 /* AdapterActivatorOperations.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package org.omg.PortableServer;
 
+import org.omg.CORBA.OBJECT_NOT_EXIST;
+
 
 /**
  * Defines the operations, applicable to the AdapterActivator.
diff --git a/org/omg/PortableServer/CurrentHelper.java b/org/omg/PortableServer/CurrentHelper.java
index 3afbf669b..f201e38bc 100644
--- a/org/omg/PortableServer/CurrentHelper.java
+++ b/org/omg/PortableServer/CurrentHelper.java
@@ -1,5 +1,5 @@
 /* CurrentHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,9 +41,9 @@ package org.omg.PortableServer;
 import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
+import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.NO_IMPLEMENT;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
diff --git a/org/omg/PortableServer/CurrentPackage/NoContextHelper.java b/org/omg/PortableServer/CurrentPackage/NoContextHelper.java
index 02c74c535..4a2a9a6a0 100644
--- a/org/omg/PortableServer/CurrentPackage/NoContextHelper.java
+++ b/org/omg/PortableServer/CurrentPackage/NoContextHelper.java
@@ -1,5 +1,5 @@
 /* NoContextHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,7 +46,6 @@ 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;
diff --git a/org/omg/PortableServer/ForwardRequestHelper.java b/org/omg/PortableServer/ForwardRequestHelper.java
index b30a2abeb..d5d5751b9 100644
--- a/org/omg/PortableServer/ForwardRequestHelper.java
+++ b/org/omg/PortableServer/ForwardRequestHelper.java
@@ -1,5 +1,5 @@
 /* ForwardRequestHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,6 +39,7 @@ exception statement from your version. */
 package org.omg.PortableServer;
 
 import gnu.CORBA.Minor;
+import gnu.CORBA.ObjectCreator;
 import gnu.CORBA.OrbRestricted;
 import gnu.CORBA.Poa.ForwardRequestHolder;
 
diff --git a/org/omg/PortableServer/IdAssignmentPolicyValue.java b/org/omg/PortableServer/IdAssignmentPolicyValue.java
index ac81d389c..cc6f3962a 100644
--- a/org/omg/PortableServer/IdAssignmentPolicyValue.java
+++ b/org/omg/PortableServer/IdAssignmentPolicyValue.java
@@ -1,5 +1,5 @@
 /* IdAssignmentPolicyValue.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,7 @@ package org.omg.PortableServer;
 import gnu.CORBA.Minor;
 
 import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.portable.IDLEntity;
 
 import java.io.Serializable;
diff --git a/org/omg/PortableServer/IdUniquenessPolicyValue.java b/org/omg/PortableServer/IdUniquenessPolicyValue.java
index c0f281249..0294ee209 100644
--- a/org/omg/PortableServer/IdUniquenessPolicyValue.java
+++ b/org/omg/PortableServer/IdUniquenessPolicyValue.java
@@ -1,5 +1,5 @@
 /* IdUniquenessPolicyValue.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,7 @@ package org.omg.PortableServer;
 import gnu.CORBA.Minor;
 
 import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.portable.IDLEntity;
 
 import java.io.Serializable;
diff --git a/org/omg/PortableServer/ImplicitActivationPolicyValue.java b/org/omg/PortableServer/ImplicitActivationPolicyValue.java
index 9d81d5fab..6631424c4 100644
--- a/org/omg/PortableServer/ImplicitActivationPolicyValue.java
+++ b/org/omg/PortableServer/ImplicitActivationPolicyValue.java
@@ -1,5 +1,5 @@
 /* ImplicitActivationPolicyValue.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,7 @@ package org.omg.PortableServer;
 import gnu.CORBA.Minor;
 
 import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.portable.IDLEntity;
 
 import java.io.Serializable;
diff --git a/org/omg/PortableServer/LifespanPolicyValue.java b/org/omg/PortableServer/LifespanPolicyValue.java
index 117eb5a3c..e1ab856b0 100644
--- a/org/omg/PortableServer/LifespanPolicyValue.java
+++ b/org/omg/PortableServer/LifespanPolicyValue.java
@@ -1,5 +1,5 @@
 /* LifespanPolicyValue.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,7 @@ package org.omg.PortableServer;
 import gnu.CORBA.Minor;
 
 import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.portable.IDLEntity;
 
 import java.io.Serializable;
diff --git a/org/omg/PortableServer/POA.java b/org/omg/PortableServer/POA.java
index 863a12bf8..624d658da 100644
--- a/org/omg/PortableServer/POA.java
+++ b/org/omg/PortableServer/POA.java
@@ -1,5 +1,5 @@
 /* POA.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -55,8 +55,8 @@ import org.omg.CORBA.portable.IDLEntity;
  * strategies are possible.
  * </p>
  *
- * @see org.omg.CORBA.ORB.resolve_initial_references
- * @see POAOperations.servant_to_reference
+ * @see org.omg.CORBA.ORB#resolve_initial_references
+ * @see POAOperations#servant_to_reference
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
diff --git a/org/omg/PortableServer/POAHelper.java b/org/omg/PortableServer/POAHelper.java
index d6a951be5..122cfb304 100644
--- a/org/omg/PortableServer/POAHelper.java
+++ b/org/omg/PortableServer/POAHelper.java
@@ -1,5 +1,5 @@
 /* POAHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,9 +41,9 @@ package org.omg.PortableServer;
 import gnu.CORBA.Minor;
 import gnu.CORBA.OrbRestricted;
 
+import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.TypeCode;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.Any;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.MARSHAL;
@@ -139,7 +139,7 @@ public abstract class POAHelper
    * it doesnot. The jdk 1.5 API specification defines that POA cannot be
    * exported.
    *
-   * @param input a org.omg.CORBA.portable stream to read from.
+   * @param output a org.omg.CORBA.portable stream to write into.
    *
    * @specenote Sun throws the same exception.
    *
diff --git a/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java b/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java
index e23d11997..e6a3068af 100644
--- a/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java
+++ b/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java
@@ -46,7 +46,6 @@ 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;
diff --git a/org/omg/PortableServer/POAManagerPackage/State.java b/org/omg/PortableServer/POAManagerPackage/State.java
index 9e856098b..b32d420a8 100644
--- a/org/omg/PortableServer/POAManagerPackage/State.java
+++ b/org/omg/PortableServer/POAManagerPackage/State.java
@@ -1,5 +1,5 @@
 /* State.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,8 @@ package org.omg.PortableServer.POAManagerPackage;
 import gnu.CORBA.Minor;
 
 import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.BAD_PARAM;
+import org.omg.CORBA.TRANSIENT;
 import org.omg.CORBA.portable.IDLEntity;
 
 import java.io.Serializable;
@@ -54,7 +56,7 @@ import java.io.Serializable;
  * 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
+ * receive the {@link TRANSIENT} system exception, with standard
  * minor code 1. This mode is needed for flow control, when the system is
  * flooded with requests.
  * </li>
diff --git a/org/omg/PortableServer/POAOperations.java b/org/omg/PortableServer/POAOperations.java
index 1c22ceed2..58d062d2b 100644
--- a/org/omg/PortableServer/POAOperations.java
+++ b/org/omg/PortableServer/POAOperations.java
@@ -1,5 +1,5 @@
 /* POAOperations.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,11 @@ exception statement from your version. */
 
 package org.omg.PortableServer;
 
+import org.omg.CORBA.BAD_INV_ORDER;
+import org.omg.CORBA.BAD_PARAM;
+import org.omg.CORBA.OBJ_ADAPTER;
 import org.omg.CORBA.Policy;
+import org.omg.CORBA.TRANSIENT;
 import org.omg.PortableServer.POAPackage.AdapterAlreadyExists;
 import org.omg.PortableServer.POAPackage.AdapterNonExistent;
 import org.omg.PortableServer.POAPackage.InvalidPolicy;
@@ -107,7 +111,7 @@ public interface POAOperations
    * the Active Object Map using this Id a a key. If the servant
    * activator is set, its incarnate method will be called. In this case,
    * the passed servant in this method can be null; in this case, the servant,
-   * returned by {@link ServantLocatorOperations#incarnate} will
+   * returned by {@link ServantActivatorOperations#incarnate} will
    * be used.
    *
    * @param a_servant a servant that would serve the object with the
@@ -129,7 +133,7 @@ public interface POAOperations
    * object with the provided Object Id. If the servant activator is
    * set, its incarnate method will be called. In this case,
    * the passed servant in this method can be null; in this case, the servant,
-   * returned by {@link ServantLocatorOperations#incarnate} will
+   * returned by {@link ServantActivatorOperations#incarnate} will
    * be used.
    *
    * @param an_Object_Id an object id for the given object.
@@ -241,7 +245,7 @@ public interface POAOperations
   /**
    * Set a servant manager for this POA.
    *
-   * @param a servant manager being set. If the RETAIN policy applies, the
+   * @param a_manager servant manager being set. If the RETAIN policy applies, the
    * manager must implement a {@link ServantActivator}. If the NON_RETAIN
    * policy applies, the manager must implement a {@link ServantLocator}.
    *
@@ -298,7 +302,7 @@ public interface POAOperations
    * @param the_Object_Id the object id.
    *
    * @throws ObjectNotActive if there is no active object with such Id.
-   * @throws WrongPolicy. This method requires either RETAIN or
+   * @throws WrongPolicy This method requires either RETAIN or
    * USE_DEFAULT_SERVANT policies and reaises the WrongPolicy if none of them
    * apply to this POA.
    */
@@ -328,7 +332,7 @@ public interface POAOperations
    *
    * @throws ObjectNotActive if none of the conditions above are satisfied.
    * @throws WrongAdapter if the object reference was not created with this POA.
-   * @throws WrongPolicy. This method requires either RETAIN or
+   * @throws WrongPolicy This method requires either RETAIN or
    * USE_DEFAULT_SERVANT policies and reaises the WrongPolicy if none of them
    * apply to this POA.
    */
@@ -408,7 +412,7 @@ public interface POAOperations
   /**
   * Set the adapter activator for this POA.
   *
-  * @param the activator being set.
+  * @param activator the activator being set.
   */
   void the_activator(AdapterActivator activator);
 
@@ -437,7 +441,7 @@ public interface POAOperations
    * <p> Destroy this POA and all descendant POAs. The destroyed POAs can be
    * later re-created via {@link AdapterActivator} or by invoking
    * {@link #create_POA}.
-   * This differs from {@link PoaManagerOperations#deactivate} that does
+   * This differs from {@link POAManagerOperations#deactivate} that does
    * not allow recreation of the deactivated POAs. After deactivation,
    * recreation is only possible if the POAs were later destroyed.
    * </p><p>
@@ -462,7 +466,7 @@ public interface POAOperations
   /**
    * Create the IdUniquenessPolicy policy.
    *
-   * @param value states which one Id uniqueness policy will apply.
+   * @param a_value states which one Id uniqueness policy will apply.
    *
    * @return the created policy.
    */
@@ -471,7 +475,7 @@ public interface POAOperations
   /**
    * Create the ImplicitActivationPolicy policy.
    *
-   * @param value states which one activation policy will apply.
+   * @param a_value states which one activation policy will apply.
    *
    * @return the created policy.
    */
@@ -480,7 +484,7 @@ public interface POAOperations
   /**
    * Create the LifespanPolicy policy.
    *
-   * @param value states which one object lifespan policy will apply.
+   * @param a_value states which one object lifespan policy will apply.
    *
    * @return the created policy.
    */
@@ -489,7 +493,7 @@ public interface POAOperations
   /**
    * Create the RequestProcessingPolicy policy.
    *
-   * @param value states which one request processing policy will apply.
+   * @param a_value states which one request processing policy will apply.
    *
    * @return the created policy.
    */
@@ -498,7 +502,7 @@ public interface POAOperations
   /**
    * Create the ServantRetentionPolicy policy.
    *
-   * @param value states which one servant retention policy will apply.
+   * @param a_value states which one servant retention policy will apply.
    *
    * @return the created policy.
    */
@@ -507,7 +511,7 @@ public interface POAOperations
   /**
    * Create the ThreadPolicy policy.
    *
-   * @param value states which one thread policy will apply.
+   * @param a_value states which one thread policy will apply.
    *
    * @return the created policy.
    */
diff --git a/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java b/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java
index f616637ae..6476eeaa5 100644
--- a/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java
+++ b/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java
@@ -1,5 +1,5 @@
 /* AdapterAlreadyExistsHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,7 +46,6 @@ 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;
diff --git a/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java b/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java
index bad920a5a..1c007fb43 100644
--- a/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java
+++ b/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java
@@ -1,5 +1,5 @@
 /* AdapterNonExistentHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,7 +46,6 @@ 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;
diff --git a/org/omg/PortableServer/POAPackage/InvalidPolicy.java b/org/omg/PortableServer/POAPackage/InvalidPolicy.java
index 51ef615fb..470d9af4a 100644
--- a/org/omg/PortableServer/POAPackage/InvalidPolicy.java
+++ b/org/omg/PortableServer/POAPackage/InvalidPolicy.java
@@ -69,7 +69,7 @@ public final class InvalidPolicy
 
   /**
    * Create InvalidPolicy with no explaining
-   * message and leaving {@link index} with default 0 value.
+   * message and leaving {@link #index} with default 0 value.
    */
   public InvalidPolicy()
   {
@@ -77,7 +77,7 @@ public final class InvalidPolicy
 
   /**
    * Create the InvalidPolicy with explaining
-   * message and initialisintg {@link index} to the passed value.
+   * 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.
@@ -90,7 +90,7 @@ public final class InvalidPolicy
 
   /**
    * Create the InvalidPolicy without explaining
-   * message and initialisintg {@link index} to the passed value.
+   * message and initialisintg {@link #index} to the passed value.
    *
    * @param a_index a value for index.
    */
diff --git a/org/omg/PortableServer/POAPackage/NoServantHelper.java b/org/omg/PortableServer/POAPackage/NoServantHelper.java
index b9afb8ed7..56e8c4d16 100644
--- a/org/omg/PortableServer/POAPackage/NoServantHelper.java
+++ b/org/omg/PortableServer/POAPackage/NoServantHelper.java
@@ -1,5 +1,5 @@
 /* NoServantHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,7 +46,6 @@ 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;
diff --git a/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java b/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java
index bf5e9cd9e..7f2e1484c 100644
--- a/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java
+++ b/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java
@@ -1,5 +1,5 @@
 /* ObjectAlreadyActiveHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,7 +46,6 @@ 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;
diff --git a/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java b/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java
index 2f5867cbd..4cdf80891 100644
--- a/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java
+++ b/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java
@@ -1,5 +1,5 @@
 /* ObjectNotActiveHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,7 +46,6 @@ 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;
diff --git a/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java b/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java
index 33ca06674..30b0b52d0 100644
--- a/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java
+++ b/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java
@@ -1,5 +1,5 @@
 /* ServantAlreadyActiveHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,7 +46,6 @@ 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;
diff --git a/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java b/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java
index e86f4e948..f77ecfc50 100644
--- a/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java
+++ b/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java
@@ -1,5 +1,5 @@
 /* ServantNotActiveHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,7 +46,6 @@ 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;
diff --git a/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java b/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java
index 7650014c1..f1181fe61 100644
--- a/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java
+++ b/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java
@@ -1,5 +1,5 @@
 /* WrongAdapterHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,7 +46,6 @@ 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;
diff --git a/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java b/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java
index a9e7fc594..bd09c2e96 100644
--- a/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java
+++ b/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java
@@ -1,5 +1,5 @@
 /* WrongPolicyHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,7 +46,6 @@ 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;
diff --git a/org/omg/PortableServer/RequestProcessingPolicyValue.java b/org/omg/PortableServer/RequestProcessingPolicyValue.java
index 0b1ce4d0b..2f22e3090 100644
--- a/org/omg/PortableServer/RequestProcessingPolicyValue.java
+++ b/org/omg/PortableServer/RequestProcessingPolicyValue.java
@@ -1,5 +1,5 @@
 /* RequestProcessingPolicyValue.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,7 @@ package org.omg.PortableServer;
 import gnu.CORBA.Minor;
 
 import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.portable.IDLEntity;
 
 import java.io.Serializable;
diff --git a/org/omg/PortableServer/ServantActivatorHelper.java b/org/omg/PortableServer/ServantActivatorHelper.java
index e1c4f09c8..48598aa20 100644
--- a/org/omg/PortableServer/ServantActivatorHelper.java
+++ b/org/omg/PortableServer/ServantActivatorHelper.java
@@ -1,5 +1,5 @@
 /* ServantActivatorHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -45,7 +45,6 @@ import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.MARSHAL;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -121,15 +120,13 @@ public abstract class ServantActivatorHelper
    * Narrow the given object to the ServantActivator. For the objects that are
    * always local, this operation does not differ from the ordinary
    * {@link #narrow} (ClassCastException will be thrown if narrowing something
-   * different).
+   * different). See OMG issue 4158.
    * 
    * @param obj the object to cast.
    * 
    * @return the casted ServantActivator.
    * 
    * @since 1.5 
-   * 
-   * @see OMG issue 4158.
    */
   public static ServantActivator unchecked_narrow(org.omg.CORBA.Object obj)
   {
diff --git a/org/omg/PortableServer/ServantLocatorHelper.java b/org/omg/PortableServer/ServantLocatorHelper.java
index 7bb933f7b..467464791 100644
--- a/org/omg/PortableServer/ServantLocatorHelper.java
+++ b/org/omg/PortableServer/ServantLocatorHelper.java
@@ -1,5 +1,5 @@
 /* ServantLocatorHelper.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -43,8 +43,8 @@ import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.MARSHAL;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
@@ -121,15 +121,13 @@ public abstract class ServantLocatorHelper
    * Narrow the given object to the ServantLocator. For the objects that are
    * always local, this operation does not differ from the ordinary
    * {@link #narrow} (ClassCastException will be thrown if narrowing something
-   * different).
+   * different). See OMG issue 4158.
    * 
    * @param obj the object to cast.
    * 
    * @return the casted ServantLocator.
    * 
    * @since 1.5
-   * 
-   * @see OMG issue 4158.
    */
   public static ServantLocator unchecked_narrow(org.omg.CORBA.Object obj)
   {
diff --git a/org/omg/PortableServer/ServantLocatorOperations.java b/org/omg/PortableServer/ServantLocatorOperations.java
index 6ed214e2f..58448c1af 100644
--- a/org/omg/PortableServer/ServantLocatorOperations.java
+++ b/org/omg/PortableServer/ServantLocatorOperations.java
@@ -1,5 +1,5 @@
 /* ServantLocatorOperations.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -60,7 +60,7 @@ public interface ServantLocatorOperations
    * @param operation the name of the method or operation being invoked.
    * @param cookie_holder the holder where the servant manager can store
    * an arbitrary java.lang.Object. This object will be later passed as a
-   * <code>cookie</code> parameter for {@link postinvoke}, to create tie
+   * <code>cookie</code> parameter for {@link #postinvoke}, to create tie
    * between preinvoke and postinvoke. The application should <i>not</i>
    * suppose that each call of preinvoke is followed by the subsequent
    * postinvoke for the same invocation; under multi threaded policy these
diff --git a/org/omg/PortableServer/ServantRetentionPolicyValue.java b/org/omg/PortableServer/ServantRetentionPolicyValue.java
index 0b6ecf62f..607df1293 100644
--- a/org/omg/PortableServer/ServantRetentionPolicyValue.java
+++ b/org/omg/PortableServer/ServantRetentionPolicyValue.java
@@ -1,5 +1,5 @@
 /* ServantRetentionPolicyValue.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,7 @@ package org.omg.PortableServer;
 import gnu.CORBA.Minor;
 
 import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.portable.IDLEntity;
 
 import java.io.Serializable;
diff --git a/org/omg/PortableServer/ThreadPolicyValue.java b/org/omg/PortableServer/ThreadPolicyValue.java
index 5c771a7d6..2ba1b8e82 100644
--- a/org/omg/PortableServer/ThreadPolicyValue.java
+++ b/org/omg/PortableServer/ThreadPolicyValue.java
@@ -1,5 +1,5 @@
 /* ThreadPolicyValue.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,7 @@ package org.omg.PortableServer;
 import gnu.CORBA.Minor;
 
 import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.portable.IDLEntity;
 
 import java.io.Serializable;
diff --git a/org/omg/PortableServer/_ServantActivatorStub.java b/org/omg/PortableServer/_ServantActivatorStub.java
index 6f9071593..f323f6d38 100644
--- a/org/omg/PortableServer/_ServantActivatorStub.java
+++ b/org/omg/PortableServer/_ServantActivatorStub.java
@@ -1,5 +1,5 @@
 /* _ServantActivatorStub.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,18 +38,10 @@ exception statement from your version. */
 
 package org.omg.PortableServer;
 
-import org.omg.CORBA.MARSHAL;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.ObjectHelper;
-import org.omg.CORBA.portable.ApplicationException;
-import org.omg.CORBA.portable.Delegate;
-import org.omg.CORBA.portable.InputStream;
-import org.omg.CORBA.portable.ObjectImpl;
-import org.omg.CORBA.portable.OutputStream;
-import org.omg.CORBA.portable.RemarshalException;
-
 import java.io.Serializable;
 
+import org.omg.CORBA.portable.ObjectImpl;
+
 /**
  * <p>This ServantActivator stub is an optional base for the
  * servant activators. This stub cannot accept remote invocations, as
diff --git a/org/omg/PortableServer/_ServantLocatorStub.java b/org/omg/PortableServer/_ServantLocatorStub.java
index 8234ba2c7..9f142e1e8 100644
--- a/org/omg/PortableServer/_ServantLocatorStub.java
+++ b/org/omg/PortableServer/_ServantLocatorStub.java
@@ -1,5 +1,5 @@
 /* _ServantLocatorStub.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
diff --git a/org/omg/PortableServer/portable/Delegate.java b/org/omg/PortableServer/portable/Delegate.java
index 70e05e7bf..3c61122b7 100644
--- a/org/omg/PortableServer/portable/Delegate.java
+++ b/org/omg/PortableServer/portable/Delegate.java
@@ -1,5 +1,5 @@
 /* DelegateOperations.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -55,11 +55,11 @@ public interface Delegate
   /**
   * Returns the root POA of the ORB instance, associated with this servant.
   * It is the same POA that would be returned by resolving the initial
-  * reference "RootPOA" for that orb. The default {@link Servant#default_POA}
+  * reference "RootPOA" for that orb. The default {@link Servant#_default_POA()}
   * method forwards call to the delegate can be overridden to
   * obtain the alternative default POA.
   *
-  * @see ORB.resolve_initial_references
+  * @see ORB#resolve_initial_references
   */
   POA default_POA(Servant a_servant);