[cp-patches] FYI: CORBA 1.3 corner fixes

[Meskauskas Audrius]

Here is the fix of the last two minor shortcomings in org.omg.CORBA 1.3 API.

One SerialVersionUID was missing and the last missing helper can be added.
As it is still not Thursday and the change is rather small, I thin I commit.

The remaining 1.3 incompatibility in org.omg.CosNaming is resulted by 
disagreements between 1.2 and 1.3 API specifications. Now it is 1.2 and 
not 1.3 compatible.

2005-06-28  Audrius Meskauskas  <address@hidden>

* org/omg/CORBA/_IDLTypeStub.java: Added SerialVersionUID.
org/omg/CORBA/PolicyTypeHelper.java: New file.

? org/omg/CORBA/PolicyTypeHelper.java
Index: org/omg/CORBA/_IDLTypeStub.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/_IDLTypeStub.java,v
retrieving revision 1.1
diff -u -r1.1 _IDLTypeStub.java
--- org/omg/CORBA/_IDLTypeStub.java     7 Jun 2005 22:38:15 -0000       1.1
+++ org/omg/CORBA/_IDLTypeStub.java     28 Jun 2005 11:45:18 -0000
@@ -47,6 +47,8 @@
 import org.omg.CORBA.portable.OutputStream;
 import org.omg.CORBA.portable.RemarshalException;
 
+import java.io.Serializable;
+
 /**
  * The stub for the IDL type. This stub can be used to access the
  * remote IDL type object, if its IOR is known. To create the
@@ -57,9 +59,14 @@
  */
 public class _IDLTypeStub
   extends ObjectImpl
-  implements IDLType
+  implements IDLType, Serializable
 {
   /**
+  * Use serialVersionUID (v1.4) for interoperability.
+  */
+  private static final long serialVersionUID = 9150293942452453626L;
+
+  /**
    * Create the instance of the IDL type stub without
    * the set delegate. The delegate must be set anyway before calling
    * any remote method.

/* PolicyTypeHelper.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.Any;
import org.omg.CORBA.BAD_OPERATION;
import org.omg.CORBA.ORB;
import org.omg.CORBA.StructMember;
import org.omg.CORBA.TCKind;
import org.omg.CORBA.TypeCode;
import org.omg.CORBA.portable.InputStream;
import org.omg.CORBA.portable.OutputStream;

/**
* A helper operations for the policy type. A policy type is an integer
* constant and needs no helper, but the one is included to
* to facilitate the automated code handling.
*
* @specnote In this implementation, this class is not in use. Its "logical"
* place would be address@hidden ORB}, having the PolicyType type. These 
parameters
* are declarded as <coe>int</code> in the ORB interface.
*
* @author Audrius Meskauskas, Lithuania (address@hidden)
*/
public abstract class PolicyTypeHelper
{
  /**
   * Create the PolicyType typecode (alias of CORBA ulong, named "PolicyType".
   */
  public static TypeCode type()
  {
    ORB orb = ORB.init();
    return orb.create_alias_tc(id(), "PolicyType",
                               orb.get_primitive_tc(TCKind.tk_ulong)
                              );
  }

  /**
  * Insert the int into the given Any.
  */
  public static void insert(Any any, int that)
  {
    any.insert_ulong(that);
  }

  /**
   * Extract the int from given Any.
   *
   * @throws BAD_OPERATION if the passed Any does not contain int.
   */
  public static int extract(Any any)
  {
    return any.extract_ulong();
  }

  /**
   * Get the int repository id.
   *
   * @return "IDL:omg.org/CORBA/PolicyType:1.0", always.
   */
  public static String id()
  {
    return "IDL:omg.org/CORBA/PolicyType:1.0";
  }

  /**
   * Read the int (policy type) from the CDR intput stream.
   *
   * @param input a org.omg.CORBA.portable stream to read from.
   */
  public static int read(InputStream input)
  {
    return input.read_ulong();
  }

  /**
   * Write the int (policy type) to the CDR output stream.
   *
   * @param output a org.omg.CORBA.portable stream stream to write into.
   * @param value a value to write.
   */
  public static void write(OutputStream output, int value)
  {
    output.write_ulong(value);
  }
}