[cp-patches] FYI: CORBA POA API fixes

[Meskauskas Audrius]

2005-07-23  Audrius Meskauskas  <address@hidden>

* org/omg/PortableServer/ServantLocatorOperations.java,
org/omg/PortableServer/ServantActivatorOperations.java:
Inherit from ServantManagerOperations.
* org/omg/PortableServer/CurrentOperations.java:
Inherit from org.omg.CORBA.CurrentOperations.
org/omg/PortableServer/ForwardRequestHelper.java: New file.

? gnu/javax/swing/plaf/gtk/icons/Thumbs.db
? org/omg/PortableServer/ForwardRequestHelper.java
Index: org/omg/PortableServer/CurrentOperations.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/org/omg/PortableServer/CurrentOperations.java,v
retrieving revision 1.1
diff -u -r1.1 CurrentOperations.java
--- org/omg/PortableServer/CurrentOperations.java       22 Jul 2005 16:57:47 
-0000      1.1
+++ org/omg/PortableServer/CurrentOperations.java       23 Jul 2005 16:39:28 
-0000
@@ -55,6 +55,7 @@
  * @author Audrius Meskauskas, Lithuania (address@hidden)
  */
 public interface CurrentOperations
+  extends org.omg.CORBA.CurrentOperations
 {
   /**
    * Returns the Id of the object currently being served. The returned
Index: org/omg/PortableServer/ServantActivatorOperations.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/org/omg/PortableServer/ServantActivatorOperations.java,v
retrieving revision 1.1
diff -u -r1.1 ServantActivatorOperations.java
--- org/omg/PortableServer/ServantActivatorOperations.java      22 Jul 2005 
16:57:47 -0000      1.1
+++ org/omg/PortableServer/ServantActivatorOperations.java      23 Jul 2005 
16:40:16 -0000
@@ -45,6 +45,7 @@
  * @author Audrius Meskauskas, Lithuania (address@hidden)
  */
 public interface ServantActivatorOperations
+  extends ServantManagerOperations
 {
   /**
    * This method is invoked whenever a servant for an object is deactivated,
Index: org/omg/PortableServer/ServantLocatorOperations.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/org/omg/PortableServer/ServantLocatorOperations.java,v
retrieving revision 1.1
diff -u -r1.1 ServantLocatorOperations.java
--- org/omg/PortableServer/ServantLocatorOperations.java        22 Jul 2005 
16:57:47 -0000      1.1
+++ org/omg/PortableServer/ServantLocatorOperations.java        23 Jul 2005 
16:39:56 -0000
@@ -46,6 +46,7 @@
  * @author Audrius Meskauskas, Lithuania (address@hidden)
  */
 public interface ServantLocatorOperations
+  extends ServantManagerOperations
 {
   /**
    * If the POA has the USE_SERVANT_MANAGER and NON_RETAIN policies, it

/* ForwardRequestHelper.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.PortableServer;

import gnu.CORBA.Poa.ForwardRequestHolder;

import org.omg.CORBA.Any;
import org.omg.CORBA.BAD_OPERATION;
import org.omg.CORBA.ORB;
import org.omg.CORBA.ObjectHelper;
import org.omg.CORBA.StructMember;
import org.omg.CORBA.TypeCode;
import org.omg.CORBA.portable.InputStream;
import org.omg.CORBA.portable.OutputStream;

/**
 * The helper operations for the exception address@hidden ForwardRequest}.
 *
 * @specnote The helper must be here and not in POA subpackage as it must
 * be discovered by the address@hidden ObjectCreator} when reading this remote
 * exception.
 *
 * @author Audrius Meskauskas, Lithuania (address@hidden)
 */
public abstract class ForwardRequestHelper
{
  /**
   * The cached typecode value, computed only once.
   */
  private static TypeCode typeCode;

  /**
   * Extract the ForwardRequest from given Any.
   * This method uses the ForwardRequestHolder.
   *
   * @throws BAD_OPERATION if the passed Any does not contain ForwardRequest.
   */
  public static ForwardRequest extract(Any any)
  {
    try
      {
        return ((ForwardRequestHolder) any.extract_Streamable()).value;
      }
    catch (ClassCastException cex)
      {
        BAD_OPERATION bad = new BAD_OPERATION("ForwardRequest expected");
        bad.initCause(cex);
        throw bad;
      }
  }

  /**
   * Get the ForwardRequest repository id.
   *
   * @return "ForwardRequest", always.
   */
  public static String id()
  {
    return "ForwardRequest";
  }

  /**
  * Insert the ForwardRequest into the given Any.
  * This method uses the ForwardRequestHolder.
  *
  * @param any the Any to insert into.
  * @param that the ForwardRequest to insert.
  */
  public static void insert(Any any, ForwardRequest that)
  {
    any.insert_Streamable(new ForwardRequestHolder(that));
  }

  /**
   * Read the exception from the CDR intput stream.
   *
   * @param input a org.omg.CORBA.portable stream to read from.
   */
  public static ForwardRequest read(InputStream input)
  {
    // Read the exception repository id.
    String id = input.read_string();
    ForwardRequest value = new ForwardRequest();

    value.forward_reference = input.read_Object();
    return value;
  }

  /**
   * Create the ForwardRequest typecode (structure,
   * named "ForwardRequest").
   * The typecode states that the structure contains the
   * following fields: forward_reference.
   */
  public static TypeCode type()
  {
    if (typeCode == null)
      {
        ORB orb = ORB.init();
        StructMember[] members = new StructMember[ 1 ];

        TypeCode field;

        field = ObjectHelper.type();
        members [ 0 ] = new StructMember("forward_reference", field, null);
        typeCode = orb.create_exception_tc(id(), "ForwardRequest", members);
      }
    return typeCode;
  }

  /**
   * Write the exception 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, ForwardRequest value)
  {
    // Write the exception repository id.
    output.write_string(id());
    output.write_Object(value.forward_reference);
  }
}