2005-06-05 Audrius Meskauskas <AudriusA@Bioinformatics.org>

	* org\omg\CORBA\portable\ValueFactory.java (read_value): Changed
	parameter type to org.omg.CORBA_2_3.portable.InputStream.
	* org\omg\CosNaming\_BindingIteratorStub.java,
	* org\omg\CosNaming\_NamingContextStub.java: Fixed serialVersionUID.
	* org\omg\CORBA_2_3\portable\InputStream.java
	(read_value(BoxedValueHelper)): Implemented.
	* org\omg\CORBA_2_3\portable\OutputStream.java
	(write_abstract_interface):
	Changed parameter type to java.lang.Object.
	* org\omg\CORBA\portable\BoxedValueHelper.java:
	Moved wrongly placed bracket.
	* org\omg\CORBA\ParameterMode.java: Inherit from
	Serializable, IDLEntity and removing duplicated header.
	(_PARAM_IN, _PARAM_OUT, _PARAM_INOUT): Making final.
	* org\omg\Messaging\SyncScopeHelper.java (extract, id, insert,
	read, type, write): Making public.

Also, fixed my invalid ChangeLog entry at 2005-06-03 on org/omg/CORBA_2_3/portable.InputStream.java (read_value): .

9 files changed, 56 insertions, 57 deletions

diff --git a/ChangeLog b/ChangeLog
index 19a478017..7e0aa2393 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2005-06-05  Audrius Meskauskas <AudriusA@Bioinformatics.org>
+
+	* org\omg\CORBA\portable\ValueFactory.java (read_value): Changed 
+	parameter type to org.omg.CORBA_2_3.portable.InputStream.
+	* org\omg\CosNaming\_BindingIteratorStub.java,
+	* org\omg\CosNaming\_NamingContextStub.java: Fixed serialVersionUID.
+	* org\omg\CORBA_2_3\portable\InputStream.java 
+	(read_value(BoxedValueHelper)): Implemented.
+	* org\omg\CORBA_2_3\portable\OutputStream.java 
+	(write_abstract_interface): 
+	Changed parameter type to java.lang.Object.
+	* org\omg\CORBA\portable\BoxedValueHelper.java: 
+	Moved wrongly placed bracket.
+	* org\omg\CORBA\ParameterMode.java: Inherit from
+	Serializable, IDLEntity and removing duplicated header.
+	(_PARAM_IN, _PARAM_OUT, _PARAM_INOUT): Making final.
+	* org\omg\Messaging\SyncScopeHelper.java (extract, id, insert, 
+	read, type, write): Making public.
+	
 2005-06-05  Ka-Hing Cheung  <kahing@javabsp.org>
 
 	* javax/swing/event/TreeSelectionEvent.java
@@ -166,8 +185,8 @@
 	gnu/CORBA/GIOP/uncObjectInputStream/uncObjectOutputStream.java: New streams.
 	* org/omg/CORBA/ValueBaseHelper.java: Removing inner classes,
 	using uncObjectInputStream, uncObjectOutputStream instead.
-	* org/omg/CORBA_2_3/portable (read_value): Delegate call to 
-	ValueBaseHelper.
+	* org/omg/CORBA_2_3/portable.InputStream.java (read_value): 
+	Delegate call to ValueBaseHelper.
 
 2005-06-03  Audrius Meskauskas <AudriusA@Bioinformatics.org>
 
diff --git a/org/omg/CORBA/ParameterMode.java b/org/omg/CORBA/ParameterMode.java
index 592369895..8a743bd74 100644
--- a/org/omg/CORBA/ParameterMode.java
+++ b/org/omg/CORBA/ParameterMode.java
@@ -34,46 +34,12 @@ or based on this library.  If you modify this library, you may extend
 this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
-/* ParameterMode.java --
-   Copyright (C) 2005 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
 
 package org.omg.CORBA;
 
+import org.omg.CORBA.portable.IDLEntity;
+
+import java.io.Serializable;
 
 /**
  * Defines the parameter modes (the ways in that a method parameter
@@ -87,21 +53,27 @@ package org.omg.CORBA;
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public class ParameterMode
+  implements Serializable, IDLEntity
 {
   /**
+   * Use serialVersionUID (v1.4) for interoperability.
+   */
+  private static final long serialVersionUID = 1521598391932998229L;
+
+  /**
    * This value means that the parameter is an IN parameter.
    */
-  public static int _PARAM_IN = 0;
+  public static final int _PARAM_IN = 0;
 
   /**
    * This value means that the parameter is an OUT parameter.
    */
-  public static int _PARAM_OUT = 1;
+  public static final int _PARAM_OUT = 1;
 
   /**
    * This value means that the parameter is an INOUT parameter.
    */
-  public static int _PARAM_INOUT = 2;
+  public static final int _PARAM_INOUT = 2;
 
   /**
    * This value means that the parameter is an IN parameter.
diff --git a/org/omg/CORBA/portable/BoxedValueHelper.java b/org/omg/CORBA/portable/BoxedValueHelper.java
index 58c95e84c..2959e51a9 100644
--- a/org/omg/CORBA/portable/BoxedValueHelper.java
+++ b/org/omg/CORBA/portable/BoxedValueHelper.java
@@ -47,8 +47,8 @@ import java.io.Serializable;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public interface BoxedValueHelper {
-
+public interface BoxedValueHelper
+{
   /**
    * Get the repository id of this value type.
    *
@@ -72,5 +72,4 @@ public interface BoxedValueHelper {
    * @param value a value to write.
    */
   void write_value(OutputStream ostream, Serializable value);
-
 }
\ No newline at end of file
diff --git a/org/omg/CORBA/portable/ValueFactory.java b/org/omg/CORBA/portable/ValueFactory.java
index b2532e5c5..6f279d6bc 100644
--- a/org/omg/CORBA/portable/ValueFactory.java
+++ b/org/omg/CORBA/portable/ValueFactory.java
@@ -58,5 +58,5 @@ public interface ValueFactory
    * @return a created value type, intialised with the data from
    * the stream.
    */
-  Serializable read_value(InputStream from_stream);
+  Serializable read_value(org.omg.CORBA_2_3.portable.InputStream from_stream);
 }
\ No newline at end of file
diff --git a/org/omg/CORBA_2_3/portable/InputStream.java b/org/omg/CORBA_2_3/portable/InputStream.java
index 48953dfa4..80441592c 100644
--- a/org/omg/CORBA_2_3/portable/InputStream.java
+++ b/org/omg/CORBA_2_3/portable/InputStream.java
@@ -40,6 +40,7 @@ package org.omg.CORBA_2_3.portable;
 
 import org.omg.CORBA.MARSHAL;
 import org.omg.CORBA.ValueBaseHelper;
+import org.omg.CORBA.portable.BoxedValueHelper;
 
 import java.io.Serializable;
 
@@ -186,4 +187,9 @@ public abstract class InputStream
     return ((org.omg.CORBA_2_3.ORB) orb()).lookup_value_factory(repository_id)
             .read_value(this);
   }
+
+  public Serializable read_value(BoxedValueHelper helper)
+  {
+    return helper.read_value(this);
+  }
 }
\ No newline at end of file
diff --git a/org/omg/CORBA_2_3/portable/OutputStream.java b/org/omg/CORBA_2_3/portable/OutputStream.java
index bc317a662..bc1cef2be 100644
--- a/org/omg/CORBA_2_3/portable/OutputStream.java
+++ b/org/omg/CORBA_2_3/portable/OutputStream.java
@@ -73,20 +73,23 @@ public abstract class OutputStream
    * the boolean discriminator (false for objects, true for value types).
    *
    * The object from value is separated by fact that all values implement
-   * the {@link ValueBase} interface.
+   * the {@link ValueBase} interface. Also, the passed parameter is treated
+   * as value it it does not implement CORBA Object.
    *
    * @param an_interface an abstract interface to write.
    */
-  public void write_abstract_interface(org.omg.CORBA.Object an_interface)
+  public void write_abstract_interface(java.lang.Object an_interface)
   {
-    boolean isValue = an_interface instanceof ValueBase;
+    boolean isValue =
+      an_interface instanceof ValueBase ||
+      (!(an_interface instanceof org.omg.CORBA.Object));
 
     write_boolean(isValue);
 
     if (isValue)
       write_value((ValueBase) an_interface);
     else
-      write_Object(an_interface);
+      write_Object((org.omg.CORBA.Object) an_interface);
   }
 
   /**
diff --git a/org/omg/CosNaming/_BindingIteratorStub.java b/org/omg/CosNaming/_BindingIteratorStub.java
index aca7fda38..9d1ed6745 100644
--- a/org/omg/CosNaming/_BindingIteratorStub.java
+++ b/org/omg/CosNaming/_BindingIteratorStub.java
@@ -59,7 +59,7 @@ public class _BindingIteratorStub
   /**
    * Use serialVersionUID (v1.4) for interoperability.
    */
-  private static final long serialVersionUID = 359397876031922059L;
+  private static final long serialVersionUID = 8969257760771186704L;
 
   /**
    * The object can be destroyed only once.
diff --git a/org/omg/CosNaming/_NamingContextStub.java b/org/omg/CosNaming/_NamingContextStub.java
index 6e3e934bc..c028375ab 100644
--- a/org/omg/CosNaming/_NamingContextStub.java
+++ b/org/omg/CosNaming/_NamingContextStub.java
@@ -72,7 +72,7 @@ public class _NamingContextStub
   /**
    * Use serialVersionUID (v1.4) for interoperability.
    */
-  private static final long serialVersionUID = -389233044945385889L;
+  private static final long serialVersionUID = 6835430958405349379L;
 
   /**
    * Create the naming context stub.
diff --git a/org/omg/Messaging/SyncScopeHelper.java b/org/omg/Messaging/SyncScopeHelper.java
index 2916d07ed..e2e8e792a 100644
--- a/org/omg/Messaging/SyncScopeHelper.java
+++ b/org/omg/Messaging/SyncScopeHelper.java
@@ -65,7 +65,7 @@ public class SyncScopeHelper
   /**
    * Delegates call to {@link Any.extract_short()}.
    */
-  static short extract(Any a)
+  public static short extract(Any a)
   {
     return a.extract_short();
   }
@@ -75,7 +75,7 @@ public class SyncScopeHelper
    *
    * @return "IDL:omg.org/Messaging/SyncScope:1.0", always.
    */
-  static String id()
+  public static String id()
   {
     return "IDL:omg.org/Messaging/SyncScope:1.0";
   }
@@ -83,7 +83,7 @@ public class SyncScopeHelper
   /**
    * Delegates call to {@link Any.insert_short(short)}.
    */
-  static void insert(Any a, short that)
+  public static void insert(Any a, short that)
   {
     a.insert_short(that);
   }
@@ -91,7 +91,7 @@ public class SyncScopeHelper
   /**
    * Delegates call to {@link InputStream.read_short()}.
    */
-  static short read(InputStream istream)
+  public static short read(InputStream istream)
   {
     return istream.read_short();
   }
@@ -102,7 +102,7 @@ public class SyncScopeHelper
    *
    * @return a typecode of synchronization scope.
    */
-  static TypeCode type()
+  public static TypeCode type()
   {
     recordTypeCode r = new recordTypeCode(TCKind.tk_alias);
     r.setName("SyncScope");