Imported GNU Classpath 0.90

       * scripts/makemake.tcl: LocaleData.java moved to gnu/java/locale.

       * sources.am: Regenerated.
       * gcj/javaprims.h: Regenerated.
       * Makefile.in: Regenerated.
       * gcj/Makefile.in: Regenerated.
       * include/Makefile.in: Regenerated.
       * testsuite/Makefile.in: Regenerated.

       * gnu/java/lang/VMInstrumentationImpl.java: New override.
       * gnu/java/net/local/LocalSocketImpl.java: Likewise.
       * gnu/classpath/jdwp/VMMethod.java: Likewise.
       * gnu/classpath/jdwp/VMVirtualMachine.java: Update to latest
       interface.
       * java/lang/Thread.java: Add UncaughtExceptionHandler.
       * java/lang/reflect/Method.java: Implements GenericDeclaration and
       isSynthetic(),
       * java/lang/reflect/Field.java: Likewise.
       * java/lang/reflect/Constructor.java
       * java/lang/Class.java: Implements Type, GenericDeclaration,
       getSimpleName() and getEnclosing*() methods.
       * java/lang/Class.h: Add new public methods.
       * java/lang/Math.java: Add signum(), ulp() and log10().
       * java/lang/natMath.cc (log10): New function.
       * java/security/VMSecureRandom.java: New override.
       * java/util/logging/Logger.java: Updated to latest classpath
       version.
       * java/util/logging/LogManager.java: New override.


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

65 files changed, 198 insertions, 210 deletions

diff --git a/libjava/classpath/org/omg/CORBA/ACTIVITY_COMPLETED.java b/libjava/classpath/org/omg/CORBA/ACTIVITY_COMPLETED.java
index ea234e620c8..5fb03533a96 100644
--- a/libjava/classpath/org/omg/CORBA/ACTIVITY_COMPLETED.java
+++ b/libjava/classpath/org/omg/CORBA/ACTIVITY_COMPLETED.java
@@ -1,5 +1,5 @@
 /* ACTIVITY_COMPLETED.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 java.io.Serializable;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public class ACTIVITY_COMPLETED
+public final class ACTIVITY_COMPLETED
   extends SystemException
   implements Serializable
 {
@@ -63,7 +63,7 @@ public class ACTIVITY_COMPLETED
   /**
    * Creates ACTIVITY_COMPLETED with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reason the explaining message.
+   * @param message the explaining message.
    */
   public ACTIVITY_COMPLETED(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/ACTIVITY_REQUIRED.java b/libjava/classpath/org/omg/CORBA/ACTIVITY_REQUIRED.java
index c0c72b524b1..eeec38254d3 100644
--- a/libjava/classpath/org/omg/CORBA/ACTIVITY_REQUIRED.java
+++ b/libjava/classpath/org/omg/CORBA/ACTIVITY_REQUIRED.java
@@ -1,5 +1,5 @@
 /* ACTIVITY_REQUIRED.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -49,7 +49,7 @@ import java.io.Serializable;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public class ACTIVITY_REQUIRED
+public final class ACTIVITY_REQUIRED
   extends SystemException
   implements Serializable
 {
@@ -61,7 +61,7 @@ public class ACTIVITY_REQUIRED
   /**
    * Creates ACTIVITY_REQUIRED with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reason the explaining message.
+   * @param message the explaining message.
    */
   public ACTIVITY_REQUIRED(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/BAD_CONTEXT.java b/libjava/classpath/org/omg/CORBA/BAD_CONTEXT.java
index 139262d6428..398da9e5957 100644
--- a/libjava/classpath/org/omg/CORBA/BAD_CONTEXT.java
+++ b/libjava/classpath/org/omg/CORBA/BAD_CONTEXT.java
@@ -1,5 +1,5 @@
 /* BAD_CONTEXT.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;
  * 
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class BAD_CONTEXT
+public final class BAD_CONTEXT
   extends SystemException
   implements Serializable
 {
@@ -58,7 +58,7 @@ public class BAD_CONTEXT
   /**
    * Creates a BAD_CONTEXT with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public BAD_CONTEXT(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/BAD_INV_ORDER.java b/libjava/classpath/org/omg/CORBA/BAD_INV_ORDER.java
index 0f585cd91aa..9390600b73d 100644
--- a/libjava/classpath/org/omg/CORBA/BAD_INV_ORDER.java
+++ b/libjava/classpath/org/omg/CORBA/BAD_INV_ORDER.java
@@ -1,5 +1,5 @@
 /* BAD_INV_ORDER.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,7 @@ import java.io.Serializable;
  * 
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class BAD_INV_ORDER
+public final class BAD_INV_ORDER
   extends SystemException
   implements Serializable
 {
@@ -57,7 +57,7 @@ public class BAD_INV_ORDER
   /**
    * Creates a BAD_INV_ORDER with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public BAD_INV_ORDER(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/BAD_OPERATION.java b/libjava/classpath/org/omg/CORBA/BAD_OPERATION.java
index 2649f2a6dc4..b8489072481 100755
--- a/libjava/classpath/org/omg/CORBA/BAD_OPERATION.java
+++ b/libjava/classpath/org/omg/CORBA/BAD_OPERATION.java
@@ -1,5 +1,5 @@
 /* BAD_OPERATION.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -114,7 +114,7 @@ import java.io.Serializable;
  * 
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class BAD_OPERATION
+public final class BAD_OPERATION
   extends SystemException
   implements Serializable
 {
@@ -127,7 +127,7 @@ public class BAD_OPERATION
    * Creates a BAD_OPERATION with the default minor code of 0, completion state
    * COMPLETED_NO and the given explaining message.
    * 
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public BAD_OPERATION(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/BAD_PARAM.java b/libjava/classpath/org/omg/CORBA/BAD_PARAM.java
index 848f43b43d9..2102193e5d2 100644
--- a/libjava/classpath/org/omg/CORBA/BAD_PARAM.java
+++ b/libjava/classpath/org/omg/CORBA/BAD_PARAM.java
@@ -1,5 +1,5 @@
 /* BAD_PARAM.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -45,14 +45,14 @@ import java.io.Serializable;
  * illegal.
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class BAD_PARAM
+public final class BAD_PARAM
   extends SystemException
   implements Serializable
 {
   /**
    * Creates BAD_PARAM with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public BAD_PARAM(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/BAD_QOS.java b/libjava/classpath/org/omg/CORBA/BAD_QOS.java
index ba8a0df3248..c7ceb692470 100644
--- a/libjava/classpath/org/omg/CORBA/BAD_QOS.java
+++ b/libjava/classpath/org/omg/CORBA/BAD_QOS.java
@@ -1,5 +1,5 @@
 /* BAD_QOS.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -48,7 +48,7 @@ import java.io.Serializable;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public class BAD_QOS
+public final class BAD_QOS
   extends SystemException
   implements Serializable
 {
@@ -60,7 +60,7 @@ public class BAD_QOS
   /**
    * Creates BAD_QOS with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reason the explaining message.
+   * @param message the explaining message.
    */
   public BAD_QOS(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/BAD_TYPECODE.java b/libjava/classpath/org/omg/CORBA/BAD_TYPECODE.java
index 96ad21ef9e5..8aa5eb59ca5 100644
--- a/libjava/classpath/org/omg/CORBA/BAD_TYPECODE.java
+++ b/libjava/classpath/org/omg/CORBA/BAD_TYPECODE.java
@@ -1,5 +1,5 @@
 /* BAD_TYPECODE.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;
  * 
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class BAD_TYPECODE
+public final class BAD_TYPECODE
   extends SystemException
   implements Serializable
 {
@@ -58,7 +58,7 @@ public class BAD_TYPECODE
   /**
    * Creates a BAD_TYPECODE with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public BAD_TYPECODE(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/CODESET_INCOMPATIBLE.java b/libjava/classpath/org/omg/CORBA/CODESET_INCOMPATIBLE.java
index 41ccaf49248..fc285baff3d 100644
--- a/libjava/classpath/org/omg/CORBA/CODESET_INCOMPATIBLE.java
+++ b/libjava/classpath/org/omg/CORBA/CODESET_INCOMPATIBLE.java
@@ -1,5 +1,5 @@
 /* CODESET_INCOMPATIBLE.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -43,16 +43,16 @@ import java.io.Serializable;
 /**
  * Raised when client and server are unable to reach any consensus on which
  * code set should be used to represent the characters. This happens when
- * neither server nor client cannot convert from the native code set of the
+ * neither server nor client can convert from the native code set of the
  * corresponding side, there is no shared codeset from that both sides could
- * convert and additionally the client and server* native sets are too
- * different to communicate anyway without the massive data loss.
+ * convert and additionally the client and server native code sets are too
+ * different to communicate anyway without massive data loss.
  *
  * @since 1.5
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public class CODESET_INCOMPATIBLE
+public final class CODESET_INCOMPATIBLE
   extends SystemException
   implements Serializable
 {
@@ -64,7 +64,7 @@ public class CODESET_INCOMPATIBLE
   /**
    * Creates CODESET_INCOMPATIBLE with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reason the explaining message.
+   * @param message the explaining message.
    */
   public CODESET_INCOMPATIBLE(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/COMM_FAILURE.java b/libjava/classpath/org/omg/CORBA/COMM_FAILURE.java
index 3c50441326f..047d20e6c11 100644
--- a/libjava/classpath/org/omg/CORBA/COMM_FAILURE.java
+++ b/libjava/classpath/org/omg/CORBA/COMM_FAILURE.java
@@ -1,5 +1,5 @@
 /* COMM_FAILURE.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;
  * 
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class COMM_FAILURE
+public final class COMM_FAILURE
   extends SystemException
   implements Serializable
 {
@@ -58,7 +58,7 @@ public class COMM_FAILURE
   /**
    * Creates a COMM_FAILURE with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public COMM_FAILURE(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/CompletionStatus.java b/libjava/classpath/org/omg/CORBA/CompletionStatus.java
index 1ddcca2877a..52f6f078d00 100644
--- a/libjava/classpath/org/omg/CORBA/CompletionStatus.java
+++ b/libjava/classpath/org/omg/CORBA/CompletionStatus.java
@@ -1,5 +1,5 @@
 /* CompletionStatus.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -49,7 +49,7 @@ import org.omg.CORBA.portable.IDLEntity;
  * when the exception has been thrown.
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class CompletionStatus
+public final class CompletionStatus
   implements Serializable, IDLEntity
 {
   /**
diff --git a/libjava/classpath/org/omg/CORBA/CurrentHolder.java b/libjava/classpath/org/omg/CORBA/CurrentHolder.java
index 83e5365d6a3..c7c1b32d291 100644
--- a/libjava/classpath/org/omg/CORBA/CurrentHolder.java
+++ b/libjava/classpath/org/omg/CORBA/CurrentHolder.java
@@ -1,5 +1,5 @@
 /* CurrentHolder.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -47,7 +47,7 @@ import org.omg.CORBA.portable.Streamable;
 *
 * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
 */
-public class CurrentHolder
+public final class CurrentHolder
   implements Streamable
 {
   /**
@@ -56,7 +56,7 @@ public class CurrentHolder
   public Current value;
 
   /**
-   * Create the unitialised instance, leaving the value field
+   * Create the uninitialised instance, leaving the value field
    * with default <code>null</code> value.
    */
   public CurrentHolder()
@@ -74,7 +74,7 @@ public class CurrentHolder
   }
 
   /**
-   * Fill in the {@link value} by data from the CDR stream.
+   * Fill in the {@link #value} by data from the CDR stream.
    *
    * @param input the org.omg.CORBA.portable stream to read.
    */
diff --git a/libjava/classpath/org/omg/CORBA/DATA_CONVERSION.java b/libjava/classpath/org/omg/CORBA/DATA_CONVERSION.java
index 7261aae4684..7ca83f3c2d6 100644
--- a/libjava/classpath/org/omg/CORBA/DATA_CONVERSION.java
+++ b/libjava/classpath/org/omg/CORBA/DATA_CONVERSION.java
@@ -1,5 +1,5 @@
 /* DATA_CONVERSION.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 @@ import java.io.Serializable;
  * 
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class DATA_CONVERSION
+public final class DATA_CONVERSION
   extends SystemException
   implements Serializable
 {
@@ -78,7 +78,7 @@ public class DATA_CONVERSION
   /**
    * Creates a DATA_CONVERSION with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public DATA_CONVERSION(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/DynAnyPackage/Invalid.java b/libjava/classpath/org/omg/CORBA/DynAnyPackage/Invalid.java
index dc66bea654b..cc232c4ead2 100644
--- a/libjava/classpath/org/omg/CORBA/DynAnyPackage/Invalid.java
+++ b/libjava/classpath/org/omg/CORBA/DynAnyPackage/Invalid.java
@@ -1,5 +1,5 @@
 /* Invalid.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -49,7 +49,7 @@ import org.omg.CORBA.portable.IDLEntity;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class Invalid
+public final class Invalid
   extends UserException
   implements Serializable, IDLEntity
 {
diff --git a/libjava/classpath/org/omg/CORBA/DynAnyPackage/InvalidSeq.java b/libjava/classpath/org/omg/CORBA/DynAnyPackage/InvalidSeq.java
index ef0179e9da2..0904866ca7a 100644
--- a/libjava/classpath/org/omg/CORBA/DynAnyPackage/InvalidSeq.java
+++ b/libjava/classpath/org/omg/CORBA/DynAnyPackage/InvalidSeq.java
@@ -1,5 +1,5 @@
 /* InvalidSeq.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -48,7 +48,7 @@ import org.omg.CORBA.portable.IDLEntity;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class InvalidSeq
+public final class InvalidSeq
   extends UserException
   implements Serializable, IDLEntity
 {
diff --git a/libjava/classpath/org/omg/CORBA/DynAnyPackage/InvalidValue.java b/libjava/classpath/org/omg/CORBA/DynAnyPackage/InvalidValue.java
index 0c5ddf96d46..c2c4394ad46 100644
--- a/libjava/classpath/org/omg/CORBA/DynAnyPackage/InvalidValue.java
+++ b/libjava/classpath/org/omg/CORBA/DynAnyPackage/InvalidValue.java
@@ -1,5 +1,5 @@
 /* InvalidValue.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -48,7 +48,7 @@ import org.omg.CORBA.portable.IDLEntity;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class InvalidValue
+public final class InvalidValue
   extends UserException
   implements Serializable, IDLEntity
 {
diff --git a/libjava/classpath/org/omg/CORBA/DynAnyPackage/TypeMismatch.java b/libjava/classpath/org/omg/CORBA/DynAnyPackage/TypeMismatch.java
index f4e9877c505..f1dfd5d41fa 100644
--- a/libjava/classpath/org/omg/CORBA/DynAnyPackage/TypeMismatch.java
+++ b/libjava/classpath/org/omg/CORBA/DynAnyPackage/TypeMismatch.java
@@ -1,5 +1,5 @@
 /* TypeMismatch.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -48,7 +48,7 @@ import org.omg.CORBA.portable.IDLEntity;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class TypeMismatch
+public final class TypeMismatch
   extends UserException
   implements Serializable, IDLEntity
 {
diff --git a/libjava/classpath/org/omg/CORBA/FREE_MEM.java b/libjava/classpath/org/omg/CORBA/FREE_MEM.java
index 5de665cb8a0..ec1aa082928 100644
--- a/libjava/classpath/org/omg/CORBA/FREE_MEM.java
+++ b/libjava/classpath/org/omg/CORBA/FREE_MEM.java
@@ -1,5 +1,5 @@
 /* FREE_MEM.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,11 @@ package org.omg.CORBA;
 import java.io.Serializable;
 
 /**
- * Means errors, related to freing the allocated memory.
+ * Means errors, related to freeing the allocated memory.
  * 
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class FREE_MEM
+public final class FREE_MEM
   extends SystemException
   implements Serializable
 {
@@ -57,7 +57,7 @@ public class FREE_MEM
   /**
    * Creates a FREE_MEM with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public FREE_MEM(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/IMP_LIMIT.java b/libjava/classpath/org/omg/CORBA/IMP_LIMIT.java
index e61681c3293..b36d69e0ca6 100644
--- a/libjava/classpath/org/omg/CORBA/IMP_LIMIT.java
+++ b/libjava/classpath/org/omg/CORBA/IMP_LIMIT.java
@@ -1,5 +1,5 @@
 /* IMP_LIMIT.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,12 +41,12 @@ package org.omg.CORBA;
 import java.io.Serializable;
 
 /**
- * Means that the server have reached some implementation limit
+ * Means that the server has reached some implementation limit
  * (too many clients, too many references, too long parameters and so on).
  * 
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class IMP_LIMIT
+public final class IMP_LIMIT
   extends SystemException
   implements Serializable
 {
@@ -58,7 +58,7 @@ public class IMP_LIMIT
   /**
    * Creates a IMP_LIMIT with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public IMP_LIMIT(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/INITIALIZE.java b/libjava/classpath/org/omg/CORBA/INITIALIZE.java
index f697e583368..b42739accc1 100644
--- a/libjava/classpath/org/omg/CORBA/INITIALIZE.java
+++ b/libjava/classpath/org/omg/CORBA/INITIALIZE.java
@@ -1,5 +1,5 @@
 /* INITIALIZE.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,11 @@ package org.omg.CORBA;
 import java.io.Serializable;
 
 /**
- * Mans that the server cannot be initialized because of the some reason.
+ * Means that the server cannot be initialized because of the some reason.
  * 
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class INITIALIZE
+public final class INITIALIZE
   extends SystemException
   implements Serializable
 {
@@ -57,7 +57,7 @@ public class INITIALIZE
   /**
    * Creates a INITIALIZE with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public INITIALIZE(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/INTERNAL.java b/libjava/classpath/org/omg/CORBA/INTERNAL.java
index a49041e57a9..b8be638359e 100644
--- a/libjava/classpath/org/omg/CORBA/INTERNAL.java
+++ b/libjava/classpath/org/omg/CORBA/INTERNAL.java
@@ -1,5 +1,5 @@
 /* INTERNAL.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,11 @@ package org.omg.CORBA;
 import java.io.Serializable;
 
 /**
- * Means the internal failure in ORB.
+ * Means an internal failure in the ORB.
  * 
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class INTERNAL
+public final class INTERNAL
   extends SystemException
   implements Serializable
 {
@@ -57,7 +57,7 @@ public class INTERNAL
   /**
    * Creates a INTERNAL with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public INTERNAL(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/INTF_REPOS.java b/libjava/classpath/org/omg/CORBA/INTF_REPOS.java
index e879c0b1eff..b7b6fe3fd98 100644
--- a/libjava/classpath/org/omg/CORBA/INTF_REPOS.java
+++ b/libjava/classpath/org/omg/CORBA/INTF_REPOS.java
@@ -1,5 +1,5 @@
 /* INTF_REPOS.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,7 @@ import java.io.Serializable;
  * 
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class INTF_REPOS
+public final class INTF_REPOS
   extends SystemException
   implements Serializable
 {
@@ -57,7 +57,7 @@ public class INTF_REPOS
   /**
    * Creates a INTF_REPOS with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public INTF_REPOS(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/INVALID_ACTIVITY.java b/libjava/classpath/org/omg/CORBA/INVALID_ACTIVITY.java
index ae1d92dd7b5..eb4f69af1b6 100644
--- a/libjava/classpath/org/omg/CORBA/INVALID_ACTIVITY.java
+++ b/libjava/classpath/org/omg/CORBA/INVALID_ACTIVITY.java
@@ -1,5 +1,5 @@
 /* INVALID_ACTIVITY.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -49,7 +49,7 @@ import java.io.Serializable;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public class INVALID_ACTIVITY
+public final class INVALID_ACTIVITY
   extends SystemException
   implements Serializable
 {
@@ -61,7 +61,7 @@ public class INVALID_ACTIVITY
   /**
    * Creates INVALID_ACTIVITY with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reason the explaining message.
+   * @param message the explaining message.
    */
   public INVALID_ACTIVITY(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/INVALID_TRANSACTION.java b/libjava/classpath/org/omg/CORBA/INVALID_TRANSACTION.java
index 98cef83044f..08082d1f52c 100644
--- a/libjava/classpath/org/omg/CORBA/INVALID_TRANSACTION.java
+++ b/libjava/classpath/org/omg/CORBA/INVALID_TRANSACTION.java
@@ -1,5 +1,5 @@
 /* INVALID_TRANSACTION.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,7 @@ import java.io.Serializable;
  * 
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class INVALID_TRANSACTION
+public final class INVALID_TRANSACTION
   extends SystemException
   implements Serializable
 {
@@ -57,7 +57,7 @@ public class INVALID_TRANSACTION
   /**
    * Creates a INVALID_TRANSACTION with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public INVALID_TRANSACTION(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/INV_FLAG.java b/libjava/classpath/org/omg/CORBA/INV_FLAG.java
index 7766a3cd058..92b1cd12fee 100644
--- a/libjava/classpath/org/omg/CORBA/INV_FLAG.java
+++ b/libjava/classpath/org/omg/CORBA/INV_FLAG.java
@@ -1,5 +1,5 @@
 /* INV_FLAG.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,7 @@ import java.io.Serializable;
  * 
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class INV_FLAG
+public final class INV_FLAG
   extends SystemException
   implements Serializable
 {
@@ -57,7 +57,7 @@ public class INV_FLAG
   /**
    * Creates a INV_FLAG with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public INV_FLAG(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/INV_IDENT.java b/libjava/classpath/org/omg/CORBA/INV_IDENT.java
index ca61a0a2412..89a59448d5e 100644
--- a/libjava/classpath/org/omg/CORBA/INV_IDENT.java
+++ b/libjava/classpath/org/omg/CORBA/INV_IDENT.java
@@ -1,5 +1,5 @@
 /* INV_IDENT.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,7 @@ import java.io.Serializable;
  * 
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class INV_IDENT
+public final class INV_IDENT
   extends SystemException
   implements Serializable
 {
@@ -57,7 +57,7 @@ public class INV_IDENT
   /**
    * Creates a INV_IDENT with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public INV_IDENT(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/INV_OBJREF.java b/libjava/classpath/org/omg/CORBA/INV_OBJREF.java
index ca8e059d484..8b6368b7726 100644
--- a/libjava/classpath/org/omg/CORBA/INV_OBJREF.java
+++ b/libjava/classpath/org/omg/CORBA/INV_OBJREF.java
@@ -1,5 +1,5 @@
 /* INV_OBJREF.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,7 @@ import java.io.Serializable;
  * 
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class INV_OBJREF
+public final class INV_OBJREF
   extends SystemException
   implements Serializable
 {
@@ -57,7 +57,7 @@ public class INV_OBJREF
   /**
    * Creates a INV_OBJREF with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public INV_OBJREF(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/INV_POLICY.java b/libjava/classpath/org/omg/CORBA/INV_POLICY.java
index f4ff245cf24..5b74e500aa4 100644
--- a/libjava/classpath/org/omg/CORBA/INV_POLICY.java
+++ b/libjava/classpath/org/omg/CORBA/INV_POLICY.java
@@ -1,5 +1,5 @@
 /* INV_POLICY.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -47,7 +47,7 @@ import java.io.Serializable;
  * 
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class INV_POLICY
+public final class INV_POLICY
   extends SystemException
   implements Serializable
 {
@@ -59,7 +59,7 @@ public class INV_POLICY
   /**
    * Creates a INV_POLICY with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public INV_POLICY(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/MARSHAL.java b/libjava/classpath/org/omg/CORBA/MARSHAL.java
index 2cd92f5a626..b031acfd328 100644
--- a/libjava/classpath/org/omg/CORBA/MARSHAL.java
+++ b/libjava/classpath/org/omg/CORBA/MARSHAL.java
@@ -1,5 +1,5 @@
 /* MARSHAL.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -268,7 +268,7 @@ import java.io.Serializable;
  * 
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class MARSHAL
+public final class MARSHAL
   extends SystemException
   implements Serializable
 {
@@ -281,7 +281,7 @@ public class MARSHAL
    * Creates a MARSHAL with the default minor code of 0, completion state
    * COMPLETED_NO and the given explaining message.
    * 
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public MARSHAL(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/NO_IMPLEMENT.java b/libjava/classpath/org/omg/CORBA/NO_IMPLEMENT.java
index 7ffbca49dd9..1041f200702 100644
--- a/libjava/classpath/org/omg/CORBA/NO_IMPLEMENT.java
+++ b/libjava/classpath/org/omg/CORBA/NO_IMPLEMENT.java
@@ -1,5 +1,5 @@
 /* NO_IMPLEMENT.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;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class NO_IMPLEMENT
+public final class NO_IMPLEMENT
   extends SystemException
   implements Serializable
 {
@@ -58,7 +58,7 @@ public class NO_IMPLEMENT
   /**
    * Creates a NO_IMPLEMENT with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public NO_IMPLEMENT(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/NO_MEMORY.java b/libjava/classpath/org/omg/CORBA/NO_MEMORY.java
index e09b4f1afac..276cb54f5a5 100644
--- a/libjava/classpath/org/omg/CORBA/NO_MEMORY.java
+++ b/libjava/classpath/org/omg/CORBA/NO_MEMORY.java
@@ -1,5 +1,5 @@
 /* NO_MEMORY.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,7 @@ import java.io.Serializable;
  * 
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class NO_MEMORY
+public final class NO_MEMORY
   extends SystemException
   implements Serializable
 {
@@ -57,7 +57,7 @@ public class NO_MEMORY
   /**
    * Creates a NO_MEMORY with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public NO_MEMORY(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/NO_PERMISSION.java b/libjava/classpath/org/omg/CORBA/NO_PERMISSION.java
index dbeaa33eb04..8e781842d71 100644
--- a/libjava/classpath/org/omg/CORBA/NO_PERMISSION.java
+++ b/libjava/classpath/org/omg/CORBA/NO_PERMISSION.java
@@ -1,5 +1,5 @@
 /* NO_PERMISSION.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,7 @@ import java.io.Serializable;
  * 
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class NO_PERMISSION
+public final class NO_PERMISSION
   extends SystemException
   implements Serializable
 {
@@ -57,7 +57,7 @@ public class NO_PERMISSION
   /**
    * Creates a NO_PERMISSION with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public NO_PERMISSION(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/NO_RESOURCES.java b/libjava/classpath/org/omg/CORBA/NO_RESOURCES.java
index 013bdb674ce..14981b3aa77 100644
--- a/libjava/classpath/org/omg/CORBA/NO_RESOURCES.java
+++ b/libjava/classpath/org/omg/CORBA/NO_RESOURCES.java
@@ -1,5 +1,5 @@
 /* NO_RESOURCES.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -76,7 +76,7 @@ import java.io.Serializable;
  * 
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public class NO_RESOURCES
+public final class NO_RESOURCES
   extends SystemException
   implements Serializable
 {
@@ -89,7 +89,7 @@ public class NO_RESOURCES
    * Creates a NO_RESOURCES with the default minor code of 0, completion state
    * COMPLETED_NO and the given explaining message.
    * 
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public NO_RESOURCES(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/NO_RESPONSE.java b/libjava/classpath/org/omg/CORBA/NO_RESPONSE.java
index 0c31cfbee78..afed988526d 100644
--- a/libjava/classpath/org/omg/CORBA/NO_RESPONSE.java
+++ b/libjava/classpath/org/omg/CORBA/NO_RESPONSE.java
@@ -1,5 +1,5 @@
 /* NO_RESPONSE.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;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class NO_RESPONSE
+public final class NO_RESPONSE
   extends SystemException
   implements Serializable
 {
@@ -58,7 +58,7 @@ public class NO_RESPONSE
   /**
    * Creates a NO_RESPONSE with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public NO_RESPONSE(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/OBJECT_NOT_EXIST.java b/libjava/classpath/org/omg/CORBA/OBJECT_NOT_EXIST.java
index aa8571dcb41..549ac64d1bf 100644
--- a/libjava/classpath/org/omg/CORBA/OBJECT_NOT_EXIST.java
+++ b/libjava/classpath/org/omg/CORBA/OBJECT_NOT_EXIST.java
@@ -1,5 +1,5 @@
 /* OBJECT_NOT_EXIST.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.CORBA;
 import java.io.Serializable;
 
 /**
- * Means an attempt to perform some operation of the deleted object.
+ * Means an attempt to perform some operation on a deleted object.
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class OBJECT_NOT_EXIST
+public final class OBJECT_NOT_EXIST
   extends SystemException
   implements Serializable
 {
@@ -56,7 +56,7 @@ public class OBJECT_NOT_EXIST
   /**
    * Creates a OBJECT_NOT_EXIST with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public OBJECT_NOT_EXIST(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/OBJ_ADAPTER.java b/libjava/classpath/org/omg/CORBA/OBJ_ADAPTER.java
index 36c54b28662..f1b25a4c4dc 100644
--- a/libjava/classpath/org/omg/CORBA/OBJ_ADAPTER.java
+++ b/libjava/classpath/org/omg/CORBA/OBJ_ADAPTER.java
@@ -1,5 +1,5 @@
 /* OBJ_ADAPTER.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,7 @@ import java.io.Serializable;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class OBJ_ADAPTER
+public final class OBJ_ADAPTER
   extends SystemException
   implements Serializable
 {
@@ -57,7 +57,7 @@ public class OBJ_ADAPTER
   /**
    * Creates a OBJ_ADAPTER with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public OBJ_ADAPTER(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/ORB.java b/libjava/classpath/org/omg/CORBA/ORB.java
index 06259fafa32..af05488280f 100644
--- a/libjava/classpath/org/omg/CORBA/ORB.java
+++ b/libjava/classpath/org/omg/CORBA/ORB.java
@@ -673,17 +673,7 @@ public abstract class ORB
    * @see #create_recursive_tc(String)
    * @see #create_sequence_tc(int, TypeCode)
    */
-  public TypeCode create_recursive_sequence_tc(int bound, int offset)
-  {
-    RecordTypeCode r = new RecordTypeCode(TCKind.tk_struct);
-    for (int i = 0; i < offset; i++)
-      r.add(new StructMember());
-
-    TypeCode recurs = new PrimitiveTypeCode(TCKind.tk_sequence);
-
-    r.add(new StructMember("", recurs, null));
-    return r;
-  }
+  public abstract TypeCode create_recursive_sequence_tc(int bound, int offset);
 
   /**
    * Create a typecode which serves as a placeholder for typcode, containing
@@ -789,10 +779,7 @@ public abstract class ORB
    * @throws NO_IMPLEMENT for the Singleton ORB, returned by
    * the parameterless {@link #init()}.
    */
-  public Context get_default_context()
-  {
-    return new gnuContext("", null);
-  }
+  public abstract Context get_default_context();
 
   /**
    * Return thg typecode, representing the given primitive object type.
diff --git a/libjava/classpath/org/omg/CORBA/ORBPackage/InconsistentTypeCode.java b/libjava/classpath/org/omg/CORBA/ORBPackage/InconsistentTypeCode.java
index e021a8a9f5c..7bb6a702af8 100644
--- a/libjava/classpath/org/omg/CORBA/ORBPackage/InconsistentTypeCode.java
+++ b/libjava/classpath/org/omg/CORBA/ORBPackage/InconsistentTypeCode.java
@@ -1,5 +1,5 @@
 /* InconsistentTypeCode.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.IDLEntity;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class InconsistentTypeCode
+public final class InconsistentTypeCode
   extends UserException
   implements IDLEntity, Serializable
 {
diff --git a/libjava/classpath/org/omg/CORBA/ORBPackage/InvalidName.java b/libjava/classpath/org/omg/CORBA/ORBPackage/InvalidName.java
index f2b78f47cf2..5594015cd1c 100644
--- a/libjava/classpath/org/omg/CORBA/ORBPackage/InvalidName.java
+++ b/libjava/classpath/org/omg/CORBA/ORBPackage/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.
 
@@ -51,7 +51,7 @@ import org.omg.CORBA.portable.IDLEntity;
  * which there is no initial reference.
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class InvalidName
+public final class InvalidName
   extends UserException
   implements IDLEntity, Serializable
 {
diff --git a/libjava/classpath/org/omg/CORBA/PERSIST_STORE.java b/libjava/classpath/org/omg/CORBA/PERSIST_STORE.java
index df17cefa9e9..1fdddf1d04c 100644
--- a/libjava/classpath/org/omg/CORBA/PERSIST_STORE.java
+++ b/libjava/classpath/org/omg/CORBA/PERSIST_STORE.java
@@ -1,5 +1,5 @@
 /* PERSIST_STORE.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,7 @@ import java.io.Serializable;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class PERSIST_STORE
+public final class PERSIST_STORE
   extends SystemException
   implements Serializable
 {
diff --git a/libjava/classpath/org/omg/CORBA/ParameterMode.java b/libjava/classpath/org/omg/CORBA/ParameterMode.java
index 73c6f574fb3..931a2e92780 100644
--- a/libjava/classpath/org/omg/CORBA/ParameterMode.java
+++ b/libjava/classpath/org/omg/CORBA/ParameterMode.java
@@ -1,5 +1,5 @@
 /* ParameterMode.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -78,17 +78,17 @@ public class ParameterMode
   /**
    * This value means that the parameter is an IN parameter.
    */
-  public static ParameterMode PARAM_IN = new ParameterMode(_PARAM_IN);
+  public static final ParameterMode PARAM_IN = new ParameterMode(_PARAM_IN);
 
   /**
    * This value means that the parameter is an OUT parameter.
    */
-  public static ParameterMode PARAM_OUT = new ParameterMode(_PARAM_OUT);
+  public static final ParameterMode PARAM_OUT = new ParameterMode(_PARAM_OUT);
 
   /**
    * This value means that the parameter is an INOUT parameter.
    */
-  public static ParameterMode PARAM_INOUT = new ParameterMode(_PARAM_INOUT);
+  public static final ParameterMode PARAM_INOUT = new ParameterMode(_PARAM_INOUT);
 
   /**
    * The value of this parameter mode instance.
diff --git a/libjava/classpath/org/omg/CORBA/ParameterModeHolder.java b/libjava/classpath/org/omg/CORBA/ParameterModeHolder.java
index 5c932b7d050..b6dc8fae7b4 100644
--- a/libjava/classpath/org/omg/CORBA/ParameterModeHolder.java
+++ b/libjava/classpath/org/omg/CORBA/ParameterModeHolder.java
@@ -1,5 +1,5 @@
 /* ParameterModeHolder.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,7 @@ package org.omg.CORBA;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class ParameterModeHolder
+public final class ParameterModeHolder
   implements org.omg.CORBA.portable.Streamable
 {
   /**
@@ -52,7 +52,7 @@ public class ParameterModeHolder
   public ParameterMode value;
 
   /**
-   * Create the unitialised instance.
+   * Create the uninitialised instance.
    */
   public ParameterModeHolder()
   {
@@ -68,7 +68,7 @@ public class ParameterModeHolder
   }
 
   /**
-   * Fill in the {@link value} by data from the CDR stream.
+   * Fill in the {@link #value} by data from the CDR stream.
    */
   public void _read(org.omg.CORBA.portable.InputStream in)
   {
diff --git a/libjava/classpath/org/omg/CORBA/PolicyError.java b/libjava/classpath/org/omg/CORBA/PolicyError.java
index 749868a992f..98d6079d8d1 100644
--- a/libjava/classpath/org/omg/CORBA/PolicyError.java
+++ b/libjava/classpath/org/omg/CORBA/PolicyError.java
@@ -1,5 +1,5 @@
 /* PolicyError.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 java.io.Serializable;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public class PolicyError
+public final class PolicyError
   extends UserException
   implements IDLEntity, Serializable
 {
@@ -69,7 +69,7 @@ public class PolicyError
   private static final long serialVersionUID = -9196809779974700103L;
 
   /**
-   * Constructs an unitialised instance of the policy error.
+   * Constructs an uninitialised instance of the policy error.
    */
   public PolicyError()
   {
diff --git a/libjava/classpath/org/omg/CORBA/PolicyErrorHolder.java b/libjava/classpath/org/omg/CORBA/PolicyErrorHolder.java
index 8e2c9a8d342..cc3cf68681a 100644
--- a/libjava/classpath/org/omg/CORBA/PolicyErrorHolder.java
+++ b/libjava/classpath/org/omg/CORBA/PolicyErrorHolder.java
@@ -1,5 +1,5 @@
 /* PolicyErrorHolder.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -48,7 +48,7 @@ import org.omg.CORBA.portable.Streamable;
 
 * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
 */
-public class PolicyErrorHolder implements Streamable
+public final class PolicyErrorHolder implements Streamable
 {
   /**
    * The stored PolicyError value.
@@ -56,7 +56,7 @@ public class PolicyErrorHolder implements Streamable
   public PolicyError value;
 
   /**
-   * Create the unitialised instance, leaving the value field
+   * Create the uninitialised instance, leaving the value field
    * with default <code>null</code> value.
    */
   public PolicyErrorHolder()
@@ -74,7 +74,7 @@ public class PolicyErrorHolder implements Streamable
   }
 
   /**
-   * Fill in the {@link value} by data from the CDR stream.
+   * Fill in the {@link #value} by data from the CDR stream.
    *
    * @param input the org.omg.CORBA.portable stream to read.
    */
diff --git a/libjava/classpath/org/omg/CORBA/PolicyHolder.java b/libjava/classpath/org/omg/CORBA/PolicyHolder.java
index e398cc14d7b..7dafbca6f60 100644
--- a/libjava/classpath/org/omg/CORBA/PolicyHolder.java
+++ b/libjava/classpath/org/omg/CORBA/PolicyHolder.java
@@ -1,5 +1,5 @@
 /* PolicyHolder.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -47,7 +47,7 @@ import org.omg.CORBA.portable.Streamable;
 *
 * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
 */
-public class PolicyHolder
+public final class PolicyHolder
   implements Streamable
 {
   /**
@@ -56,7 +56,7 @@ public class PolicyHolder
   public Policy value;
 
   /**
-   * Create the unitialised instance, leaving the value field
+   * Create the uninitialised instance, leaving the value field
    * with default <code>null</code> value.
    */
   public PolicyHolder()
@@ -74,7 +74,7 @@ public class PolicyHolder
   }
 
   /**
-   * Fill in the {@link value} by data from the CDR stream.
+   * Fill in the {@link #value} by data from the CDR stream.
    * Delegates work to {@link PolicyHelper}.
    *
    * @param input the org.omg.CORBA.portable stream to read.
diff --git a/libjava/classpath/org/omg/CORBA/PolicyListHolder.java b/libjava/classpath/org/omg/CORBA/PolicyListHolder.java
index 6c1b1cc9726..1b1d9da727c 100644
--- a/libjava/classpath/org/omg/CORBA/PolicyListHolder.java
+++ b/libjava/classpath/org/omg/CORBA/PolicyListHolder.java
@@ -1,5 +1,5 @@
 /* PolicyListHolder.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -43,11 +43,11 @@ import org.omg.CORBA.portable.OutputStream;
 import org.omg.CORBA.portable.Streamable;
 
 /**
-* A holder for the object {@link Policy[]}.
+* A holder for the object <code>Policy[]</code>.
 *
 * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
 */
-public class PolicyListHolder
+public final class PolicyListHolder
   implements Streamable
 {
   /**
@@ -56,7 +56,7 @@ public class PolicyListHolder
   public Policy[] value;
 
   /**
-   * Create the unitialised instance, leaving the value field
+   * Create the uninitialised instance, leaving the value field
    * with default <code>null</code> value.
    */
   public PolicyListHolder()
@@ -74,7 +74,7 @@ public class PolicyListHolder
   }
 
   /**
-   * Fill in the {@link value} by data from the CDR stream.
+   * Fill in the {@link #value} by data from the CDR stream.
    * Uses {@link PolicyListHelper}.
    *
    * @param input the org.omg.CORBA.portable stream to read.
diff --git a/libjava/classpath/org/omg/CORBA/REBIND.java b/libjava/classpath/org/omg/CORBA/REBIND.java
index 9480906cc4d..48a3ea42f62 100644
--- a/libjava/classpath/org/omg/CORBA/REBIND.java
+++ b/libjava/classpath/org/omg/CORBA/REBIND.java
@@ -1,5 +1,5 @@
 /* REBIND.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -48,7 +48,7 @@ import java.io.Serializable;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public class REBIND
+public final class REBIND
   extends SystemException
   implements Serializable
 {
@@ -60,7 +60,7 @@ public class REBIND
   /**
    * Creates REBIND with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reason the explaining message.
+   * @param message the explaining message.
    */
   public REBIND(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/SystemException.java b/libjava/classpath/org/omg/CORBA/SystemException.java
index dd193627900..127b918d37a 100644
--- a/libjava/classpath/org/omg/CORBA/SystemException.java
+++ b/libjava/classpath/org/omg/CORBA/SystemException.java
@@ -1,5 +1,5 @@
 /* SystemException.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,7 @@ import java.io.Serializable;
  * 
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class SystemException
+public abstract class SystemException
   extends RuntimeException
   implements Serializable
 {
diff --git a/libjava/classpath/org/omg/CORBA/TIMEOUT.java b/libjava/classpath/org/omg/CORBA/TIMEOUT.java
index 44ae8b31cb3..bdeae7b19b0 100644
--- a/libjava/classpath/org/omg/CORBA/TIMEOUT.java
+++ b/libjava/classpath/org/omg/CORBA/TIMEOUT.java
@@ -1,5 +1,5 @@
 /* TIMEOUT.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -47,7 +47,7 @@ import java.io.Serializable;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public class TIMEOUT
+public final class TIMEOUT
   extends SystemException
   implements Serializable
 {
@@ -59,7 +59,7 @@ public class TIMEOUT
   /**
    * Creates TIMEOUT with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reason the explaining message.
+   * @param message the explaining message.
    */
   public TIMEOUT(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/TRANSACTION_MODE.java b/libjava/classpath/org/omg/CORBA/TRANSACTION_MODE.java
index 5f1981ba408..fc72d3c6748 100644
--- a/libjava/classpath/org/omg/CORBA/TRANSACTION_MODE.java
+++ b/libjava/classpath/org/omg/CORBA/TRANSACTION_MODE.java
@@ -1,5 +1,5 @@
 /* TRANSACTION_MODE.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -48,7 +48,7 @@ import java.io.Serializable;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public class TRANSACTION_MODE
+public final class TRANSACTION_MODE
   extends SystemException
   implements Serializable
 {
@@ -60,7 +60,7 @@ public class TRANSACTION_MODE
   /**
    * Creates TRANSACTION_MODE with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reason the explaining message.
+   * @param message the explaining message.
    */
   public TRANSACTION_MODE(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/TRANSACTION_REQUIRED.java b/libjava/classpath/org/omg/CORBA/TRANSACTION_REQUIRED.java
index 66eedf4b937..3d6c55c526a 100644
--- a/libjava/classpath/org/omg/CORBA/TRANSACTION_REQUIRED.java
+++ b/libjava/classpath/org/omg/CORBA/TRANSACTION_REQUIRED.java
@@ -1,5 +1,5 @@
 /* TRANSACTION_REQUIRED.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,7 @@ import java.io.Serializable;
  * active transaction is required.
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class TRANSACTION_REQUIRED
+public final class TRANSACTION_REQUIRED
   extends SystemException
   implements Serializable
 {
@@ -57,7 +57,7 @@ public class TRANSACTION_REQUIRED
   /**
    * Creates a TRANSACTION_REQUIRED with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public TRANSACTION_REQUIRED(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/TRANSACTION_ROLLEDBACK.java b/libjava/classpath/org/omg/CORBA/TRANSACTION_ROLLEDBACK.java
index ce115c8ac4a..f7f4aabf2d5 100644
--- a/libjava/classpath/org/omg/CORBA/TRANSACTION_ROLLEDBACK.java
+++ b/libjava/classpath/org/omg/CORBA/TRANSACTION_ROLLEDBACK.java
@@ -1,5 +1,5 @@
 /* TRANSACTION_ROLLEDBACK.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;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class TRANSACTION_ROLLEDBACK
+public final class TRANSACTION_ROLLEDBACK
   extends SystemException
   implements Serializable
 {
@@ -58,7 +58,7 @@ public class TRANSACTION_ROLLEDBACK
   /**
    * Creates a TRANSACTION_ROLLEDBACK with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public TRANSACTION_ROLLEDBACK(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/TRANSACTION_UNAVAILABLE.java b/libjava/classpath/org/omg/CORBA/TRANSACTION_UNAVAILABLE.java
index dc808a23ce9..13ce17ebe6d 100644
--- a/libjava/classpath/org/omg/CORBA/TRANSACTION_UNAVAILABLE.java
+++ b/libjava/classpath/org/omg/CORBA/TRANSACTION_UNAVAILABLE.java
@@ -1,5 +1,5 @@
 /* TRANSACTION_UNAVAILABLE.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -48,7 +48,7 @@ import java.io.Serializable;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public class TRANSACTION_UNAVAILABLE
+public final class TRANSACTION_UNAVAILABLE
   extends SystemException
   implements Serializable
 {
@@ -60,7 +60,7 @@ public class TRANSACTION_UNAVAILABLE
   /**
    * Creates TRANSACTION_UNAVAILABLE with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reason the explaining message.
+   * @param message the explaining message.
    */
   public TRANSACTION_UNAVAILABLE(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/TRANSIENT.java b/libjava/classpath/org/omg/CORBA/TRANSIENT.java
index c2aa5cb3154..1dad9a1c4e7 100644
--- a/libjava/classpath/org/omg/CORBA/TRANSIENT.java
+++ b/libjava/classpath/org/omg/CORBA/TRANSIENT.java
@@ -1,5 +1,5 @@
 /* TRANSIENT.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,14 +46,14 @@ import java.io.Serializable;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class TRANSIENT
+public final class TRANSIENT
   extends SystemException
   implements Serializable
 {
   /**
    * Creates a TRANSIENT with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public TRANSIENT(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/TypeCodeHolder.java b/libjava/classpath/org/omg/CORBA/TypeCodeHolder.java
index bb293376d1f..0a3c4e370c8 100644
--- a/libjava/classpath/org/omg/CORBA/TypeCodeHolder.java
+++ b/libjava/classpath/org/omg/CORBA/TypeCodeHolder.java
@@ -1,5 +1,5 @@
 /* TypeCodeHolder.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.Streamable;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class TypeCodeHolder
+public final class TypeCodeHolder
   implements Streamable
 {
   /**
@@ -87,7 +87,7 @@ public class TypeCodeHolder
   }
 
   /**
-   * Fill in the {@link value } field by reading the required data
+   * Fill in the {@link #value} field by reading the required data
    * from the given stream. For <code>TypeCode</code>, the functionality
    * is delegated to
    * {@link org.omg.CORBA.portable.InputStream#read_TypeCode}.
@@ -109,7 +109,7 @@ public class TypeCodeHolder
   }
 
   /**
-   * Write the {@link value } field to the given stream.
+   * Write the {@link #value} field to the given stream.
    * For <code>TypeCode</code>, the functionality
    * is delegated to
    * {@link org.omg.CORBA.portable.OutputStream#write_TypeCode(TypeCode) }.
diff --git a/libjava/classpath/org/omg/CORBA/TypeCodePackage/BadKind.java b/libjava/classpath/org/omg/CORBA/TypeCodePackage/BadKind.java
index 8ca659d7f4d..d7f0ce5236e 100644
--- a/libjava/classpath/org/omg/CORBA/TypeCodePackage/BadKind.java
+++ b/libjava/classpath/org/omg/CORBA/TypeCodePackage/BadKind.java
@@ -1,5 +1,5 @@
 /* BadKind.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -49,7 +49,7 @@ import org.omg.CORBA.portable.IDLEntity;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class BadKind
+public final class BadKind
   extends UserException
   implements IDLEntity, Serializable
 {
diff --git a/libjava/classpath/org/omg/CORBA/TypeCodePackage/Bounds.java b/libjava/classpath/org/omg/CORBA/TypeCodePackage/Bounds.java
index 16954e034f1..364447cd9ca 100644
--- a/libjava/classpath/org/omg/CORBA/TypeCodePackage/Bounds.java
+++ b/libjava/classpath/org/omg/CORBA/TypeCodePackage/Bounds.java
@@ -1,5 +1,5 @@
 /* Bounds.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.IDLEntity;
  * 
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class Bounds
+public final class Bounds
   extends UserException
   implements IDLEntity, Serializable
 {
diff --git a/libjava/classpath/org/omg/CORBA/UNKNOWN.java b/libjava/classpath/org/omg/CORBA/UNKNOWN.java
index 60d3fc0b5c7..37b627aa38e 100644
--- a/libjava/classpath/org/omg/CORBA/UNKNOWN.java
+++ b/libjava/classpath/org/omg/CORBA/UNKNOWN.java
@@ -1,5 +1,5 @@
 /* UNKNOWN.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 @@ import java.io.Serializable;
  * Means that the operation implementation has thrown a non-CORBA exception.
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class UNKNOWN
+public final class UNKNOWN
   extends SystemException
   implements Serializable
 {
@@ -56,7 +56,7 @@ public class UNKNOWN
   /**
    * Creates a UNKNOWN with the default minor code of 0,
    * completion state COMPLETED_NO and the given explaining message.
-   * @param reasom the explaining message.
+   * @param message the explaining message.
    */
   public UNKNOWN(String message)
   {
diff --git a/libjava/classpath/org/omg/CORBA/UnionMember.java b/libjava/classpath/org/omg/CORBA/UnionMember.java
index 41afeb7da24..69e424cdb03 100644
--- a/libjava/classpath/org/omg/CORBA/UnionMember.java
+++ b/libjava/classpath/org/omg/CORBA/UnionMember.java
@@ -1,5 +1,5 @@
 /* UnionMember.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -47,7 +47,7 @@ import org.omg.CORBA.portable.IDLEntity;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class UnionMember
+public final class UnionMember
   implements IDLEntity, Serializable
 {
   /**
@@ -87,6 +87,7 @@ public class UnionMember
    * Creates a union member.
    *
    * @param a_name member name.
+   * @param a_label member label.
    * @param a_type member type code.
    * @param a_type_def member IDL type definition.
    */
diff --git a/libjava/classpath/org/omg/CORBA/UnknownUserException.java b/libjava/classpath/org/omg/CORBA/UnknownUserException.java
index 19efc0e3f30..3b33ffd337a 100644
--- a/libjava/classpath/org/omg/CORBA/UnknownUserException.java
+++ b/libjava/classpath/org/omg/CORBA/UnknownUserException.java
@@ -1,5 +1,5 @@
 /* UnknownUserException.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -47,11 +47,11 @@ import java.io.Serializable;
  * on remote side and returned by the server. The instance of this
  * class is returned by {@link Request#env()}.
  *
- * @see Environment#exception().
+ * @see Environment#exception()
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public class UnknownUserException
+public final class UnknownUserException
   extends UserException
   implements IDLEntity, Serializable
 {
diff --git a/libjava/classpath/org/omg/CORBA/UnknownUserExceptionHolder.java b/libjava/classpath/org/omg/CORBA/UnknownUserExceptionHolder.java
index d7b1ca006d4..0fa966982ec 100644
--- a/libjava/classpath/org/omg/CORBA/UnknownUserExceptionHolder.java
+++ b/libjava/classpath/org/omg/CORBA/UnknownUserExceptionHolder.java
@@ -1,5 +1,5 @@
 /* UnknownUserExceptionHolder.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -48,7 +48,7 @@ import org.omg.CORBA.portable.Streamable;
 
 * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
 */
-public class UnknownUserExceptionHolder implements Streamable
+public final class UnknownUserExceptionHolder implements Streamable
 {
   /**
    * The stored UnknownUserException value.
@@ -74,7 +74,7 @@ public class UnknownUserExceptionHolder implements Streamable
   }
 
   /**
-   * Fill in the {@link value} by data from the CDR stream.
+   * Fill in the {@link #value} by data from the CDR stream.
    *
    * @param input the org.omg.CORBA.portable stream to read.
    */
diff --git a/libjava/classpath/org/omg/CORBA/UserException.java b/libjava/classpath/org/omg/CORBA/UserException.java
index ac9b9fb3d02..edbd76e861f 100644
--- a/libjava/classpath/org/omg/CORBA/UserException.java
+++ b/libjava/classpath/org/omg/CORBA/UserException.java
@@ -1,5 +1,5 @@
 /* UserException.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 org.omg.CORBA.portable.IDLEntity;
  * The root class for CORBA IDL-defined user exceptions.
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class UserException
+public abstract class UserException
   extends Exception
   implements IDLEntity, Serializable
 {
@@ -59,7 +59,7 @@ public class UserException
   /**
    * Constructs a the exception.
    */
-  public UserException()
+  protected UserException()
   {
   }
 
@@ -67,7 +67,7 @@ public class UserException
    * Constructs the exception, explaining the reason of throwing it.
    * @param reason a string, explaining, why the exception has been thrown.
    */
-  public UserException(String reason)
+  protected UserException(String reason)
   {
     super(reason);
   }
diff --git a/libjava/classpath/org/omg/CORBA/ValueMember.java b/libjava/classpath/org/omg/CORBA/ValueMember.java
index f6bb70d3c8e..9323c86f9b5 100644
--- a/libjava/classpath/org/omg/CORBA/ValueMember.java
+++ b/libjava/classpath/org/omg/CORBA/ValueMember.java
@@ -1,5 +1,5 @@
 /* ValueMember.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -47,7 +47,7 @@ import java.io.Serializable;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class ValueMember
+public final class ValueMember
   implements Serializable, IDLEntity
 {
   /**
diff --git a/libjava/classpath/org/omg/CORBA/WrongTransactionHolder.java b/libjava/classpath/org/omg/CORBA/WrongTransactionHolder.java
index 103724f81dd..1ea3e025f94 100644
--- a/libjava/classpath/org/omg/CORBA/WrongTransactionHolder.java
+++ b/libjava/classpath/org/omg/CORBA/WrongTransactionHolder.java
@@ -1,5 +1,5 @@
 /* WrongTransactionHolder.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -48,7 +48,7 @@ import org.omg.CORBA.portable.Streamable;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public class WrongTransactionHolder implements Streamable
+public final class WrongTransactionHolder implements Streamable
 {
   /**
    * The stored WrongTransaction value.
@@ -74,7 +74,7 @@ public class WrongTransactionHolder implements Streamable
   }
 
   /**
-   * Fill in the {@link value} by data from the CDR stream.
+   * Fill in the {@link #value} by data from the CDR stream.
    *
    * @param input the org.omg.CORBA.portable stream to read.
    */
diff --git a/libjava/classpath/org/omg/CORBA/portable/RemarshalException.java b/libjava/classpath/org/omg/CORBA/portable/RemarshalException.java
index 7e6dbfee9fb..14836ea14ee 100644
--- a/libjava/classpath/org/omg/CORBA/portable/RemarshalException.java
+++ b/libjava/classpath/org/omg/CORBA/portable/RemarshalException.java
@@ -1,5 +1,5 @@
 /* RemarshalException.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -48,7 +48,7 @@ import java.io.Serializable;
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
-public class RemarshalException
+public final class RemarshalException
   extends Exception
   implements Serializable
 {