Import GNU Classpath (classpath-0_97_2-release).

libjava/

2008-06-28  Matthias Klose  <doko@ubuntu.com>

        Import GNU Classpath (classpath-0_97_2-release).

        * Regenerate class and header files.
        * Regenerate auto* files.
        * gcj/javaprims.h: Define jobjectRefType.
        * jni.cc (_Jv_JNI_GetObjectRefType): New (stub only).
        (_Jv_JNIFunctions): Initialize GetObjectRefType.
        * gnu/classpath/jdwp/VMVirtualMachine.java,
        java/security/VMSecureRandom.java: Merge from classpath.
        * HACKING: Fix typo.
        * ChangeLog-2007: New file.
        * configure.ac: Set JAVAC, pass --disable-regen-headers to classpath.

libjava/classpath/

2008-06-28  Matthias Klose  <doko@ubuntu.com>

        * m4/ac_prog_javac.m4: Disable check for JAVAC, when
        not configured with --enable-java-maintainer-mode.
        * aclocal.m4, configure: Regenerate.
        * native/jni/gstreamer-peer/Makefile.am: Do not link with
        libclasspathnative.
        * native/jni/gstreamer-peer/Makefile.in: Regenerate.
        * tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting
        JCOMPILER, drop flags not understood by gcj.

From-SVN: r137223

38 files changed, 41 insertions, 75 deletions

diff --git a/libjava/classpath/gnu/CORBA/BigDecimalHelper.java b/libjava/classpath/gnu/CORBA/BigDecimalHelper.java
index f1e1dd6b42c..119db045f0f 100644
--- a/libjava/classpath/gnu/CORBA/BigDecimalHelper.java
+++ b/libjava/classpath/gnu/CORBA/BigDecimalHelper.java
@@ -45,7 +45,6 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
-import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.TypeCodePackage.BadKind;
 
 /**
@@ -128,9 +127,6 @@ public class BigDecimalHelper
    * 
    * @param out a stream to write into.
    * @param x a big decimal to write.
-   * @param digits a number of the decimal digits in the record
-   * being written. For the smaller
-   * numbers, zeroes are added to the left.
    *
    * @throws IOException if the stream write method throws one.
    * @throws BadKind if this BigDecimal has more digits than
diff --git a/libjava/classpath/gnu/CORBA/ByteArrayComparator.java b/libjava/classpath/gnu/CORBA/ByteArrayComparator.java
index 8491154638d..e601399dffb 100644
--- a/libjava/classpath/gnu/CORBA/ByteArrayComparator.java
+++ b/libjava/classpath/gnu/CORBA/ByteArrayComparator.java
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package gnu.CORBA;
 
-import java.util.Arrays;
 import java.util.Comparator;
 
 /**
diff --git a/libjava/classpath/gnu/CORBA/CDR/AbstractCdrInput.java b/libjava/classpath/gnu/CORBA/CDR/AbstractCdrInput.java
index 866ec2cc945..f582c31bd18 100644
--- a/libjava/classpath/gnu/CORBA/CDR/AbstractCdrInput.java
+++ b/libjava/classpath/gnu/CORBA/CDR/AbstractCdrInput.java
@@ -195,9 +195,9 @@ public abstract class AbstractCdrInput
    * Set the Big Endian or Little Endian encoding. The stream reads Big Endian
    * by default.
    * 
-   * @param use_little_endian if true, the stream expect the multi-byte data in
-   * the form "less significant byte first" (Little Endian). This is the
-   * opposite to the java standard (Big Endian).
+   * @param use_big_endian if true, the stream expect the multi-byte data in
+   * the form "most significant byte first" (Big Endian). This is the
+   * java standard.
    */
   public void setBigEndian(boolean use_big_endian)
   {
@@ -208,7 +208,7 @@ public abstract class AbstractCdrInput
   /**
    * Get the used encoding.
    * 
-   * @param true for Big Endian, false for Little Endian.
+   * @return true for Big Endian, false for Little Endian.
    */
   public boolean isBigEndian()
   {
@@ -654,7 +654,7 @@ public abstract class AbstractCdrInput
 
         byte[] r = new byte[l];
         int n = 0;
-        reading: while (n < r.length)
+        while (n < r.length)
           {
             n += read(r, n, r.length - n);
           }
diff --git a/libjava/classpath/gnu/CORBA/CDR/AbstractCdrOutput.java b/libjava/classpath/gnu/CORBA/CDR/AbstractCdrOutput.java
index 7b4d5ec58ff..7f3e3ab0daf 100644
--- a/libjava/classpath/gnu/CORBA/CDR/AbstractCdrOutput.java
+++ b/libjava/classpath/gnu/CORBA/CDR/AbstractCdrOutput.java
@@ -291,7 +291,7 @@ public abstract class AbstractCdrOutput
 
   /**
    * Write a single byte.
-   * @param a byte to write (low 8 bits are written).
+   * @param n byte to write (low 8 bits are written).
    */
   public void write(int n)
   {
@@ -497,7 +497,7 @@ public abstract class AbstractCdrOutput
    * Writes the lower bytes of the passed array members.
    *
    * @param chars an array
-   * @param offsets offset
+   * @param offset offset
    * @param length length
    */
   public void write_char_array(char[] chars, int offset, int length)
diff --git a/libjava/classpath/gnu/CORBA/CDR/HeadlessInput.java b/libjava/classpath/gnu/CORBA/CDR/HeadlessInput.java
index 0c18dafb195..273ecea5024 100644
--- a/libjava/classpath/gnu/CORBA/CDR/HeadlessInput.java
+++ b/libjava/classpath/gnu/CORBA/CDR/HeadlessInput.java
@@ -104,7 +104,7 @@ public class HeadlessInput
   /**
    * Create an instance, reading from the given buffer.
    * 
-   * @param a_stram a stream from where the data will be read.
+   * @param a_stream a stream from where the data will be read.
    * @param inheritSettings a stream from that endian and other settings are
    * inherited.
    */
@@ -151,7 +151,7 @@ public class HeadlessInput
     else
       {
         subsequentCalls = true;
-        Serializable value = (Serializable) Vio.readValue(this, NONE, null,
+        Serializable value = Vio.readValue(this, NONE, null,
           null, repository_id, null, null);
         return value;
       }
@@ -167,7 +167,7 @@ public class HeadlessInput
     else
       {
         subsequentCalls = true;
-        value = (Serializable) Vio.readValue(this, NONE, value, null, null,
+        value = Vio.readValue(this, NONE, value, null, null,
           null, null);
         return value;
       }
@@ -186,7 +186,7 @@ public class HeadlessInput
           {
             subsequentCalls = true;
             Serializable value = (Serializable) Vio.instantiateAnyWay(clz);
-            value = (Serializable) Vio.readValue(this, NONE, value, null, null,
+            value = Vio.readValue(this, NONE, value, null, null,
               null, null);
             return value;
           }
diff --git a/libjava/classpath/gnu/CORBA/CDR/LittleEndianInputStream.java b/libjava/classpath/gnu/CORBA/CDR/LittleEndianInputStream.java
index 02cfa08ae8e..a439b658b44 100644
--- a/libjava/classpath/gnu/CORBA/CDR/LittleEndianInputStream.java
+++ b/libjava/classpath/gnu/CORBA/CDR/LittleEndianInputStream.java
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package gnu.CORBA.CDR;
 
-import java.io.DataInput;
 import java.io.EOFException;
 import java.io.FilterInputStream;
 import java.io.IOException;
diff --git a/libjava/classpath/gnu/CORBA/CDR/Vio.java b/libjava/classpath/gnu/CORBA/CDR/Vio.java
index 28f1c5672f6..67a69b87458 100644
--- a/libjava/classpath/gnu/CORBA/CDR/Vio.java
+++ b/libjava/classpath/gnu/CORBA/CDR/Vio.java
@@ -637,7 +637,7 @@ public abstract class Vio
               r = new byte[chunk_size + 256];
 
             n = 0;
-            reading: while (n < chunk_size)
+            while (n < chunk_size)
               n += input.read(r, n, chunk_size - n);
             output.write(r, 0, n);
           }
diff --git a/libjava/classpath/gnu/CORBA/CDR/gnuRuntime.java b/libjava/classpath/gnu/CORBA/CDR/gnuRuntime.java
index 774c92816ae..929dc72ec8a 100644
--- a/libjava/classpath/gnu/CORBA/CDR/gnuRuntime.java
+++ b/libjava/classpath/gnu/CORBA/CDR/gnuRuntime.java
@@ -167,7 +167,7 @@ public class gnuRuntime
    * @param a_id a repository Id, if only one Id was specified in the stream.
    * @param a_ids a repository Ids, if the multiple Ids were specified in te
    * stream.
-   * @param a_codabase a codebase, if it was specified in the stream.
+   * @param a_codebase a codebase, if it was specified in the stream.
    */
   public gnuRuntime(String a_codebase, Object a_target)
   {
diff --git a/libjava/classpath/gnu/CORBA/CollocatedOrbs.java b/libjava/classpath/gnu/CORBA/CollocatedOrbs.java
index fc1e513efec..51ad836231c 100644
--- a/libjava/classpath/gnu/CORBA/CollocatedOrbs.java
+++ b/libjava/classpath/gnu/CORBA/CollocatedOrbs.java
@@ -44,10 +44,6 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 
-import org.omg.CORBA.LocalObject;
-import org.omg.CORBA.portable.Delegate;
-import org.omg.CORBA.portable.ObjectImpl;
-
 /**
  * This class provides support for the direct method invocations without
  * involving the network in the case when both ORBs run on the same java
diff --git a/libjava/classpath/gnu/CORBA/Connected_objects.java b/libjava/classpath/gnu/CORBA/Connected_objects.java
index 53ef2dd17d9..655dbe38844 100644
--- a/libjava/classpath/gnu/CORBA/Connected_objects.java
+++ b/libjava/classpath/gnu/CORBA/Connected_objects.java
@@ -109,7 +109,7 @@ public class Connected_objects
   /**
    * Get the record of the stored object.
    *
-   * @param object the stored object
+   * @param stored_object the stored object
    *
    * @return the record about the stored object, null if
    * this object is not stored here.
@@ -141,7 +141,7 @@ public class Connected_objects
    * generated automatically.
    *
    * @param object the object to add.
-   * @param port, on that the ORB will be listening to the remote
+   * @param port on that the ORB will be listening to the remote
    * invocations.
    *
    * @return the newly created object record.
diff --git a/libjava/classpath/gnu/CORBA/DynAn/DivideableAny.java b/libjava/classpath/gnu/CORBA/DynAn/DivideableAny.java
index c96cbedc73b..63fe117f4de 100644
--- a/libjava/classpath/gnu/CORBA/DynAn/DivideableAny.java
+++ b/libjava/classpath/gnu/CORBA/DynAn/DivideableAny.java
@@ -38,8 +38,6 @@ exception statement from your version. */
 
 package gnu.CORBA.DynAn;
 
-import gnu.CORBA.TypeKindNamer;
-
 import org.omg.CORBA.Any;
 import org.omg.CORBA.CompletionStatus;
 import org.omg.CORBA.ORB;
diff --git a/libjava/classpath/gnu/CORBA/DynAn/gnuDynArray.java b/libjava/classpath/gnu/CORBA/DynAn/gnuDynArray.java
index 825cd0a5638..dc056adff9b 100644
--- a/libjava/classpath/gnu/CORBA/DynAn/gnuDynArray.java
+++ b/libjava/classpath/gnu/CORBA/DynAn/gnuDynArray.java
@@ -46,7 +46,6 @@ import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.TCKind;
 import org.omg.CORBA.TypeCode;
-import org.omg.CORBA.TypeCodePackage.BadKind;
 import org.omg.CORBA.portable.Streamable;
 import org.omg.DynamicAny.DynAny;
 import org.omg.DynamicAny.DynAnyFactoryPackage.InconsistentTypeCode;
diff --git a/libjava/classpath/gnu/CORBA/DynAn/gnuDynUnion.java b/libjava/classpath/gnu/CORBA/DynAn/gnuDynUnion.java
index ef5aed64512..3cd8efe18f4 100644
--- a/libjava/classpath/gnu/CORBA/DynAn/gnuDynUnion.java
+++ b/libjava/classpath/gnu/CORBA/DynAn/gnuDynUnion.java
@@ -271,7 +271,6 @@ public class gnuDynUnion
 
 
         // Get the discriminator variant.
-        Variants:
         for (int i = 0; i < final_type.member_count(); i++)
           {
             if (final_type.member_label(i).equal(da))
@@ -392,7 +391,6 @@ public class gnuDynUnion
 
 
         // Get the discriminator variant.
-        Variants:
         for (int i = 0; i < final_type.member_count(); i++)
           {
             if (final_type.member_label(i).equal(da))
diff --git a/libjava/classpath/gnu/CORBA/EmptyExceptionHolder.java b/libjava/classpath/gnu/CORBA/EmptyExceptionHolder.java
index 8fc8697a4f3..6f84da8e5ea 100644
--- a/libjava/classpath/gnu/CORBA/EmptyExceptionHolder.java
+++ b/libjava/classpath/gnu/CORBA/EmptyExceptionHolder.java
@@ -39,10 +39,8 @@ exception statement from your version. */
 package gnu.CORBA;
 
 import org.omg.CORBA.BAD_OPERATION;
-import org.omg.CORBA.NO_IMPLEMENT;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.UNKNOWN;
-import org.omg.CORBA.UnknownUserException;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
 import org.omg.CORBA.portable.Streamable;
diff --git a/libjava/classpath/gnu/CORBA/GIOP/CancelHeader.java b/libjava/classpath/gnu/CORBA/GIOP/CancelHeader.java
index 9f4de0d87d9..40f373721c7 100644
--- a/libjava/classpath/gnu/CORBA/GIOP/CancelHeader.java
+++ b/libjava/classpath/gnu/CORBA/GIOP/CancelHeader.java
@@ -55,16 +55,16 @@ public abstract class CancelHeader
   public int request_id;
 
   /**
-   * Write the header.
+   * Read the header.
    *
-   * @param out a stream to write to.
+   * @param input a stream to read from.
    */
   public abstract void read(InputStream input);
 
   /**
    * Write the header.
    *
-   * @param out a stream to write to.
+   * @param output a stream to write to.
    */
   public abstract void write(OutputStream output);
 }
diff --git a/libjava/classpath/gnu/CORBA/GIOP/CodeSetServiceContext.java b/libjava/classpath/gnu/CORBA/GIOP/CodeSetServiceContext.java
index ab565db3797..81412e0298e 100644
--- a/libjava/classpath/gnu/CORBA/GIOP/CodeSetServiceContext.java
+++ b/libjava/classpath/gnu/CORBA/GIOP/CodeSetServiceContext.java
@@ -41,8 +41,6 @@ package gnu.CORBA.GIOP;
 import gnu.CORBA.CDR.AbstractCdrInput;
 import gnu.CORBA.CDR.AbstractCdrOutput;
 import gnu.CORBA.IOR;
-import gnu.CORBA.IOR.CodeSets_profile;
-
 import java.io.IOException;
 
 /**
diff --git a/libjava/classpath/gnu/CORBA/GIOP/MessageHeader.java b/libjava/classpath/gnu/CORBA/GIOP/MessageHeader.java
index 0252838581d..cac2405fc77 100644
--- a/libjava/classpath/gnu/CORBA/GIOP/MessageHeader.java
+++ b/libjava/classpath/gnu/CORBA/GIOP/MessageHeader.java
@@ -398,7 +398,7 @@ public class MessageHeader
         if (service != null)
           service.setSoTimeout(to_read);
 
-        reading: while (n < r.length)
+        while (n < r.length)
           {
             n += source.read(r, n, r.length - n);
           }
@@ -426,7 +426,7 @@ public class MessageHeader
                 int dn;
 
                 n = 0;
-                reading: while (n < h2.message_size)
+                while (n < h2.message_size)
                   {
                     dn = source.read(r, 0, h2.message_size - n);
 
diff --git a/libjava/classpath/gnu/CORBA/GIOP/v1_0/CancelHeader.java b/libjava/classpath/gnu/CORBA/GIOP/v1_0/CancelHeader.java
index 6e3650c4ba9..1158492235c 100644
--- a/libjava/classpath/gnu/CORBA/GIOP/v1_0/CancelHeader.java
+++ b/libjava/classpath/gnu/CORBA/GIOP/v1_0/CancelHeader.java
@@ -51,9 +51,9 @@ public class CancelHeader
   extends gnu.CORBA.GIOP.CancelHeader
 {
   /**
-   * Write the header.
+   * Read the header.
    *
-   * @param out a stream to write to.
+   * @param input a stream to read from.
    */
   public void read(InputStream input)
   {
@@ -63,7 +63,7 @@ public class CancelHeader
   /**
    * Write the header.
    *
-   * @param out a stream to write to.
+   * @param output a stream to write to.
    */
   public void write(OutputStream output)
   {
diff --git a/libjava/classpath/gnu/CORBA/IOR.java b/libjava/classpath/gnu/CORBA/IOR.java
index 917e1983289..5e13aecabd3 100644
--- a/libjava/classpath/gnu/CORBA/IOR.java
+++ b/libjava/classpath/gnu/CORBA/IOR.java
@@ -385,7 +385,7 @@ public class IOR
   /**
    * Parse the provided stringifed reference.
    *
-   * @param stringified_reference, in the form of IOR:nnnnnn.....
+   * @param stringified_reference in the form of IOR:nnnnnn.....
    *
    * @return the parsed IOR
    *
diff --git a/libjava/classpath/gnu/CORBA/Interceptor/IORInterceptors.java b/libjava/classpath/gnu/CORBA/Interceptor/IORInterceptors.java
index 2b77de58e0e..d8dcabf120f 100644
--- a/libjava/classpath/gnu/CORBA/Interceptor/IORInterceptors.java
+++ b/libjava/classpath/gnu/CORBA/Interceptor/IORInterceptors.java
@@ -42,7 +42,6 @@ import org.omg.CORBA.OBJ_ADAPTER;
 import org.omg.CORBA.OMGVMCID;
 import org.omg.PortableInterceptor.IORInfo;
 import org.omg.PortableInterceptor.IORInterceptor;
-import org.omg.PortableInterceptor.IORInterceptorOperations;
 import org.omg.PortableInterceptor.IORInterceptor_3_0Operations;
 import org.omg.PortableInterceptor.ObjectReferenceTemplate;
 
diff --git a/libjava/classpath/gnu/CORBA/Interceptor/Registrator.java b/libjava/classpath/gnu/CORBA/Interceptor/Registrator.java
index 4bb895bb376..e0ce16a1496 100644
--- a/libjava/classpath/gnu/CORBA/Interceptor/Registrator.java
+++ b/libjava/classpath/gnu/CORBA/Interceptor/Registrator.java
@@ -142,7 +142,7 @@ public class Registrator extends LocalObject implements ORBInitInfo
    * Create the interceptor collection from the given properties, using the
    * agreed naming convention.
    *
-   * @param orb the ORB being initialised.
+   * @param an_orb the ORB being initialised.
    * @param props the cumulated set of properties where the orb initializer
    * pattern is searched.
    * @param an_args the argument string array, passed to ORB.init.
diff --git a/libjava/classpath/gnu/CORBA/IorDelegate.java b/libjava/classpath/gnu/CORBA/IorDelegate.java
index 8eb43aa7d69..a2c5a0469be 100644
--- a/libjava/classpath/gnu/CORBA/IorDelegate.java
+++ b/libjava/classpath/gnu/CORBA/IorDelegate.java
@@ -58,8 +58,6 @@ import org.omg.PortableInterceptor.ForwardRequest;
 
 import java.io.IOException;
 
-import java.net.Socket;
-
 /**
  * The Classpath implementation of the {@link Delegate} functionality in the
  * case, when the object was constructed from an IOR object. The IOR can be
@@ -87,8 +85,6 @@ public class IorDelegate extends SimpleDelegate
    * @param operation the method name
    * @param parameters the method parameters
    * @param returns the return value holder
-   * @param exceptions the exceptions that can be thrown by the method
-   * @param ctx_list the context list (null allowed)
    *
    * @return the created request.
    */
@@ -175,7 +171,7 @@ public class IorDelegate extends SimpleDelegate
     throws ApplicationException, RemarshalException
   {
     StreamBasedRequest request = (StreamBasedRequest) output;
-    Forwardings: while (true)
+    while (true)
       {
         try
           {
diff --git a/libjava/classpath/gnu/CORBA/NamingService/NameParser.java b/libjava/classpath/gnu/CORBA/NamingService/NameParser.java
index aa922b96a54..205ad8bec84 100644
--- a/libjava/classpath/gnu/CORBA/NamingService/NameParser.java
+++ b/libjava/classpath/gnu/CORBA/NamingService/NameParser.java
@@ -62,7 +62,6 @@ import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLDecoder;
-import java.util.ArrayList;
 import java.util.StringTokenizer;
 
 /**
diff --git a/libjava/classpath/gnu/CORBA/NamingService/NameTransformer.java b/libjava/classpath/gnu/CORBA/NamingService/NameTransformer.java
index d717b9d4011..7109fdb93e1 100644
--- a/libjava/classpath/gnu/CORBA/NamingService/NameTransformer.java
+++ b/libjava/classpath/gnu/CORBA/NamingService/NameTransformer.java
@@ -63,7 +63,7 @@ public class NameTransformer
    * representation. See {@link #toString(NameComponent)} for the
    * description of this format.
    *
-   * @param name the string form of the name.
+   * @param a_name the string form of the name.
    *
    * @return the array form of the name.
    *
diff --git a/libjava/classpath/gnu/CORBA/ObjectCreator.java b/libjava/classpath/gnu/CORBA/ObjectCreator.java
index 5937e76b31e..939d6923326 100644
--- a/libjava/classpath/gnu/CORBA/ObjectCreator.java
+++ b/libjava/classpath/gnu/CORBA/ObjectCreator.java
@@ -111,7 +111,7 @@ public class ObjectCreator
    * mapped to the local java class. The omg.org domain must be mapped into the
    * object in either org/omg or gnu/CORBA namespace.
    * 
-   * @param IDL name
+   * @param idl name
    * @return instantiated object instance or null if no such available.
    */
   public static java.lang.Object createObject(String idl, String suffix)
diff --git a/libjava/classpath/gnu/CORBA/OrbFocused.java b/libjava/classpath/gnu/CORBA/OrbFocused.java
index a0f9993c1a0..572acbc1131 100644
--- a/libjava/classpath/gnu/CORBA/OrbFocused.java
+++ b/libjava/classpath/gnu/CORBA/OrbFocused.java
@@ -185,7 +185,7 @@ public class OrbFocused
             p = (portServer) portServers.get(i);
             if (p.s_port == port)
               {
-                return (portServer) p;
+                return p;
               }
           }
         // The server is not yet instantiated. Instantiate.
diff --git a/libjava/classpath/gnu/CORBA/OrbFunctional.java b/libjava/classpath/gnu/CORBA/OrbFunctional.java
index bfb5e3d86c1..8fddc66270c 100644
--- a/libjava/classpath/gnu/CORBA/OrbFunctional.java
+++ b/libjava/classpath/gnu/CORBA/OrbFunctional.java
@@ -855,7 +855,7 @@ public class OrbFunctional extends OrbRestricted
    * internet address and port. With this information, the object can be found
    * by another ORB, possibly located on remote computer.
    *
-   * @param the CORBA object
+   * @param forObject CORBA object
    * @return the object IOR representation.
    *
    * @throws BAD_PARAM if the object has not been previously connected to this
@@ -1040,7 +1040,7 @@ public class OrbFunctional extends OrbRestricted
    * computer, possibly running a different (not necessary java) CORBA
    * implementation.
    * 
-   * @param ior the object IOR representation string.
+   * @param an_ior the object IOR representation string.
    * 
    * @return the found CORBA object.
    * @see object_to_string(org.omg.CORBA.Object)
diff --git a/libjava/classpath/gnu/CORBA/OrbRestricted.java b/libjava/classpath/gnu/CORBA/OrbRestricted.java
index c34584995a6..4ae50b1a3a1 100644
--- a/libjava/classpath/gnu/CORBA/OrbRestricted.java
+++ b/libjava/classpath/gnu/CORBA/OrbRestricted.java
@@ -65,7 +65,6 @@ import org.omg.CORBA.UnionMember;
 import org.omg.CORBA.portable.OutputStream;
 import org.omg.CORBA.portable.ValueFactory;
 import org.omg.PortableInterceptor.ClientRequestInterceptorOperations;
-import org.omg.PortableInterceptor.IORInterceptorOperations;
 import org.omg.PortableInterceptor.IORInterceptor_3_0Operations;
 import org.omg.PortableInterceptor.ServerRequestInterceptorOperations;
 
diff --git a/libjava/classpath/gnu/CORBA/Poa/AOM.java b/libjava/classpath/gnu/CORBA/Poa/AOM.java
index 70e787af151..f8820bff83b 100644
--- a/libjava/classpath/gnu/CORBA/Poa/AOM.java
+++ b/libjava/classpath/gnu/CORBA/Poa/AOM.java
@@ -163,7 +163,7 @@ public class AOM
    * Get the record of the stored object. If the object is mapped several times
    * under the different keys, one of the mappings is used.
    * 
-   * @param object the stored object
+   * @param stored_object the stored object
    * 
    * @return the record about the stored object, null if this object is not
    * stored here.
diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuPOA.java b/libjava/classpath/gnu/CORBA/Poa/gnuPOA.java
index 0dbca7cfbde..82e520904f1 100644
--- a/libjava/classpath/gnu/CORBA/Poa/gnuPOA.java
+++ b/libjava/classpath/gnu/CORBA/Poa/gnuPOA.java
@@ -421,7 +421,7 @@ public class gnuPOA
    * or adding the returned instance to any possible table.
    *
    * @param child_name the name of the poa being created.
-   * @param manager the poa manager (never null).
+   * @param a_manager the poa manager (never null).
    * @param policies the array of policies.
    * @param an_orb the ORB for this POA.
    *
@@ -1239,7 +1239,7 @@ public class gnuPOA
    * @param x the aom entry, where the object is replaced by value, returned by
    * servant activator (if not null).
    * 
-   * @param key the object key.
+   * @param object_key the object key.
    * 
    * @param a_servant the servant that was passed as a parameter in the
    * activation method.
@@ -1317,7 +1317,7 @@ public class gnuPOA
   /**
   * Set the adapter activator for this POA.
   *
-  * @param the activator being set.
+  * @param an_activator the activator being set.
   */
   public void the_activator(AdapterActivator an_activator)
   {
diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuPOAManager.java b/libjava/classpath/gnu/CORBA/Poa/gnuPOAManager.java
index 7710306b748..28f4ecd281f 100644
--- a/libjava/classpath/gnu/CORBA/Poa/gnuPOAManager.java
+++ b/libjava/classpath/gnu/CORBA/Poa/gnuPOAManager.java
@@ -41,7 +41,6 @@ package gnu.CORBA.Poa;
 import org.omg.CORBA.BAD_INV_ORDER;
 import org.omg.CORBA.LocalObject;
 import org.omg.PortableInterceptor.NON_EXISTENT;
-import org.omg.PortableInterceptor.ObjectReferenceTemplate;
 import org.omg.PortableServer.POAManager;
 import org.omg.PortableServer.POAManagerPackage.AdapterInactive;
 import org.omg.PortableServer.POAManagerPackage.State;
@@ -89,9 +88,9 @@ public class gnuPOAManager
    * Turns the associated POAs into active state, allowing them to receive
    * and process requests.
    *
-   * @throws if the POAs are in the inactive state. If once inactivated,
-   * the POA cannot be activated again. This method can only be called
-   * to leave the holding or discarding state.
+   * @throws AdapterInactive if the POAs are in the inactive state.
+   * If once inactivated, the POA cannot be activated again. This
+   * method can only be called to leave the holding or discarding state.
    */
   public void activate()
                 throws AdapterInactive
diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuServantObject.java b/libjava/classpath/gnu/CORBA/Poa/gnuServantObject.java
index 77b0ff46792..115f4f850fb 100644
--- a/libjava/classpath/gnu/CORBA/Poa/gnuServantObject.java
+++ b/libjava/classpath/gnu/CORBA/Poa/gnuServantObject.java
@@ -785,7 +785,7 @@ public class gnuServantObject extends ObjectImpl
    * assumed equal if they are connected to the same orb and poa under the same
    * Id, regardless of they delegates.
    *
-   * @param another instance to check.
+   * @param other instance to check.
    * @return
    */
   public boolean _is_equivalent(org.omg.CORBA.Object other)
diff --git a/libjava/classpath/gnu/CORBA/ServiceRequestAdapter.java b/libjava/classpath/gnu/CORBA/ServiceRequestAdapter.java
index a6f7aa52b8d..c55405cedf6 100644
--- a/libjava/classpath/gnu/CORBA/ServiceRequestAdapter.java
+++ b/libjava/classpath/gnu/CORBA/ServiceRequestAdapter.java
@@ -41,7 +41,6 @@ package gnu.CORBA;
 import gnu.CORBA.CDR.BufferedCdrOutput;
 
 import org.omg.CORBA.ARG_IN;
-import org.omg.CORBA.ARG_INOUT;
 import org.omg.CORBA.ARG_OUT;
 import org.omg.CORBA.Any;
 import org.omg.CORBA.Bounds;
diff --git a/libjava/classpath/gnu/CORBA/gnuContextList.java b/libjava/classpath/gnu/CORBA/gnuContextList.java
index 68584c3891c..592eb2c2cac 100644
--- a/libjava/classpath/gnu/CORBA/gnuContextList.java
+++ b/libjava/classpath/gnu/CORBA/gnuContextList.java
@@ -38,8 +38,6 @@ exception statement from your version. */
 
 package gnu.CORBA;
 
-import java.util.ArrayList;
-
 import org.omg.CORBA.Bounds;
 import org.omg.CORBA.ContextList;
 
diff --git a/libjava/classpath/gnu/CORBA/gnuExceptionList.java b/libjava/classpath/gnu/CORBA/gnuExceptionList.java
index 5f0c0c9f50d..06ddf8d717a 100644
--- a/libjava/classpath/gnu/CORBA/gnuExceptionList.java
+++ b/libjava/classpath/gnu/CORBA/gnuExceptionList.java
@@ -38,8 +38,6 @@ exception statement from your version. */
 
 package gnu.CORBA;
 
-import java.util.ArrayList;
-
 import org.omg.CORBA.Bounds;
 import org.omg.CORBA.ExceptionList;
 import org.omg.CORBA.TypeCode;
diff --git a/libjava/classpath/gnu/CORBA/gnuRequest.java b/libjava/classpath/gnu/CORBA/gnuRequest.java
index 0b3338d3437..3ec2a797f0f 100644
--- a/libjava/classpath/gnu/CORBA/gnuRequest.java
+++ b/libjava/classpath/gnu/CORBA/gnuRequest.java
@@ -83,12 +83,10 @@ import org.omg.PortableInterceptor.ClientRequestInterceptorOperations;
 import org.omg.PortableInterceptor.ForwardRequest;
 import org.omg.PortableInterceptor.InvalidSlot;
 
-import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import java.net.BindException;
 import java.net.Socket;
 
 import java.util.ArrayList;
diff --git a/libjava/classpath/gnu/CORBA/typecodes/FixedTypeCode.java b/libjava/classpath/gnu/CORBA/typecodes/FixedTypeCode.java
index c5fae63bd28..af7f46ecfce 100644
--- a/libjava/classpath/gnu/CORBA/typecodes/FixedTypeCode.java
+++ b/libjava/classpath/gnu/CORBA/typecodes/FixedTypeCode.java
@@ -109,7 +109,7 @@ public class FixedTypeCode
   /**
    * Get the number of digits in thid BigDecimal
    *
-   * @param x a BigDecimal to check.
+   * @param number a BigDecimal to check.
    */
   public static int countDigits(BigDecimal number)
   {
diff --git a/libjava/classpath/gnu/CORBA/typecodes/RecursiveTypeCode.java b/libjava/classpath/gnu/CORBA/typecodes/RecursiveTypeCode.java
index 0e6ac375e50..8ec2f5474d0 100644
--- a/libjava/classpath/gnu/CORBA/typecodes/RecursiveTypeCode.java
+++ b/libjava/classpath/gnu/CORBA/typecodes/RecursiveTypeCode.java
@@ -63,7 +63,7 @@ public class RecursiveTypeCode
    * Create a typecode that serves as a placeholder for
    * the typecode with the given id.
    *
-   * @param id the Id of the type for that this type serves as a
+   * @param an_id the Id of the type for that this type serves as a
    * placeholder.
    */
   public RecursiveTypeCode(String an_id)