[cp-patches] FYI: CORBA 1.5 API fixes

[Meskauskas Audrius]

This adds several missing 1.5 methods.

2005-11-13  Audrius Meskauskas  <address@hidden>

   * gnu/CORBA/Interceptor/gnuIorInfo.java (state): Made public.
   * gnu/CORBA/Interceptor/gnuServerRequestInfo.java
   (adapter_name, orb_id, server_id): New methods.
   * org/omg/PortableInterceptor/IORInfoOperations.java
   (state): New method.
   * org/omg/PortableInterceptor/ServerRequestInfoOperations.java
   (adapter_name, orb_id, server_id): New methods.

Index: gnu/CORBA/Interceptor/gnuIorInfo.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/CORBA/Interceptor/gnuIorInfo.java,v
retrieving revision 1.2
diff -u -r1.2 gnuIorInfo.java
--- gnu/CORBA/Interceptor/gnuIorInfo.java       11 Nov 2005 11:39:34 -0000      
1.2
+++ gnu/CORBA/Interceptor/gnuIorInfo.java       13 Nov 2005 09:40:36 -0000
@@ -115,7 +115,7 @@
   /**
    * Return the state of the object POA.
    */
-  short state()
+  public short state()
   {
     return (short) poa.the_POAManager().get_state().value();
   }
Index: gnu/CORBA/Interceptor/gnuServerRequestInfo.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/gnu/CORBA/Interceptor/gnuServerRequestInfo.java,v
retrieving revision 1.1
diff -u -r1.1 gnuServerRequestInfo.java
--- gnu/CORBA/Interceptor/gnuServerRequestInfo.java     28 Aug 2005 11:23:37 
-0000      1.1
+++ gnu/CORBA/Interceptor/gnuServerRequestInfo.java     13 Nov 2005 09:53:02 
-0000
@@ -42,6 +42,7 @@
 import gnu.CORBA.GIOP.RequestHeader;
 import gnu.CORBA.ObjectCreator;
 import gnu.CORBA.Poa.gnuServantObject;
+import gnu.CORBA.OrbFunctional;
 import gnu.CORBA.Unexpected;
 import gnu.CORBA.gnuRequest;
 
@@ -453,4 +454,23 @@
       }
     return p;
   }
+
+  /** @inheritDoc */
+  public String[] adapter_name()
+  {
+    return m_object.poa.getReferenceTemplate().adapter_name();
+  }
+
+  /** @inheritDoc */
+  public String orb_id()
+  {
+    return m_object.orb.orb_id;
+  }
+
+  /** @inheritDoc */
+  public String server_id()
+  {
+    return OrbFunctional.server_id;
+  }
+  
 }
Index: org/omg/PortableInterceptor/IORInfoOperations.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/org/omg/PortableInterceptor/IORInfoOperations.java,v
retrieving revision 1.3
diff -u -r1.3 IORInfoOperations.java
--- org/omg/PortableInterceptor/IORInfoOperations.java  11 Nov 2005 11:39:34 
-0000      1.3
+++ org/omg/PortableInterceptor/IORInfoOperations.java  13 Nov 2005 09:40:54 
-0000
@@ -124,4 +124,15 @@
    * @see IORInterceptor_3_0Operations#adapter_manager_state_changed
    */
   public int manager_id();
+  
+  /**
+   * Get the state of the adapter manager.
+   * 
+   * @since 1.5
+   * 
+   * @return the state of the adapters to that the IOR being created belongs.
+   * One of the address@hidden HOLDING#value}, address@hidden 
DISCARDING#value},
+   * address@hidden INACTIVE#value} or address@hidden NON_EXISTENT#value}.
+   */
+  short state(); 
 }
Index: org/omg/PortableInterceptor/ServerRequestInfoOperations.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/org/omg/PortableInterceptor/ServerRequestInfoOperations.java,v
retrieving revision 1.1
diff -u -r1.1 ServerRequestInfoOperations.java
--- org/omg/PortableInterceptor/ServerRequestInfoOperations.java        28 Aug 
2005 11:23:37 -0000      1.1
+++ org/omg/PortableInterceptor/ServerRequestInfoOperations.java        13 Nov 
2005 09:49:44 -0000
@@ -216,7 +216,8 @@
  *
  * @author Audrius Meskauskas, Lithuania (address@hidden)
  */
-public interface ServerRequestInfoOperations extends RequestInfoOperations
+public interface ServerRequestInfoOperations
+  extends RequestInfoOperations
 {
   /**
    * Allows the interceptor to add service contexts to the request. Such added
@@ -231,9 +232,7 @@
    * @throws BAD_INV_ORDER minor 15 if the context with the same Id already
    * exists and replace=false.
    */
-  void add_reply_service_context(ServiceContext service_context,
-    boolean replace
-  );
+  void add_reply_service_context(ServiceContext service_context, boolean 
replace);
 
   /**
    * Get the identifier for the object adapter (POA).
@@ -257,14 +256,15 @@
    * @throws INV_POLICY minor 2 if no factory was registered to produce this
    * type of policy or the policy is otherwise invalid.
    */
-  Policy get_server_policy(int type) throws INV_POLICY;
+  Policy get_server_policy(int type)
+    throws INV_POLICY;
 
   /**
    * Get the exception to be returned to the client. If the returned Any cannot
    * not support holding of that exception, it holds
    * address@hidden org.omg.CORBA.UNKNOWN} minor 1 instead.
    *
-       * @return an Any, holding exception that has been thrown and will be 
returned
+   * @return an Any, holding exception that has been thrown and will be 
returned
    * to client.
    */
   Any sending_exception();
@@ -281,7 +281,8 @@
    * @see RequestInfoOperations#get_slot(int)
    * @see org.omg.PortableInterceptor#Current
    */
-  void set_slot(int id, Any data) throws InvalidSlot;
+  void set_slot(int id, Any data)
+    throws InvalidSlot;
 
   /**
    * Checks if the servant is the given repository id.
@@ -299,4 +300,27 @@
    * @return the repository id of the servant.
    */
   String target_most_derived_interface();
+
+  /**
+   * Returns the name of the adapter that is handling the current request.
+   * The name is returned as a string array, representing full path from
+   * the root poa till the current poa, for instance 
+   * {"RootPOA", "childPOA","grandchildPOA"}.
+   */
+  public String[] adapter_name();
+
+  /**
+   * Returns the id of the ORB that is handling the current request. The ORB
+   * id can be specified as the property org.omg.CORBA.ORBid when creating
+   * the ORB. 
+   */
+  public String orb_id();
+
+  /**
+   * Returs the id of the server that is handling the current request. The 
server
+   * id is the same for all POAs and ORBs in the current virtual machine and 
+   * can be set as the property org.omg.CORBA.ServerId when creating one of the
+   * ORBs.
+   */
+  public String server_id();
 }