2005-11-13 Audrius Meskauskas <AudriusA@Bioinformatics.org>

	* 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.

5 files changed, 73 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 867fc11e2..108e83432 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,16 @@
 
 2005-11-13  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
 
+	* 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.	
+
+2005-11-13  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
+
 	PR 24749
 	* javax/swing/plaf/basic/BasicTextUI.java (installDefaults):  
 	Call setSelectionColor. 
diff --git a/gnu/CORBA/Interceptor/gnuIorInfo.java b/gnu/CORBA/Interceptor/gnuIorInfo.java
index b552189a9..256a28cb5 100644
--- a/gnu/CORBA/Interceptor/gnuIorInfo.java
+++ b/gnu/CORBA/Interceptor/gnuIorInfo.java
@@ -115,7 +115,7 @@ public class gnuIorInfo extends LocalObject implements IORInfo
   /**
    * Return the state of the object POA.
    */
-  short state()
+  public short state()
   {
     return (short) poa.the_POAManager().get_state().value();
   }
diff --git a/gnu/CORBA/Interceptor/gnuServerRequestInfo.java b/gnu/CORBA/Interceptor/gnuServerRequestInfo.java
index 5f75f7687..8d5c681e7 100644
--- a/gnu/CORBA/Interceptor/gnuServerRequestInfo.java
+++ b/gnu/CORBA/Interceptor/gnuServerRequestInfo.java
@@ -42,6 +42,7 @@ import gnu.CORBA.GIOP.ReplyHeader;
 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 @@ public class gnuServerRequestInfo extends LocalObject
       }
     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;
+  }
+  
 }
\ No newline at end of file
diff --git a/org/omg/PortableInterceptor/IORInfoOperations.java b/org/omg/PortableInterceptor/IORInfoOperations.java
index 6cc374bfb..fdeb2973b 100644
--- a/org/omg/PortableInterceptor/IORInfoOperations.java
+++ b/org/omg/PortableInterceptor/IORInfoOperations.java
@@ -124,4 +124,15 @@ public interface IORInfoOperations
    * @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 {@link HOLDING#value}, {@link DISCARDING#value},
+   * {@link INACTIVE#value} or {@link NON_EXISTENT#value}.
+   */
+  short state(); 
 }
\ No newline at end of file
diff --git a/org/omg/PortableInterceptor/ServerRequestInfoOperations.java b/org/omg/PortableInterceptor/ServerRequestInfoOperations.java
index 7646253d1..a9ee7d920 100644
--- a/org/omg/PortableInterceptor/ServerRequestInfoOperations.java
+++ b/org/omg/PortableInterceptor/ServerRequestInfoOperations.java
@@ -216,7 +216,8 @@ import org.omg.IOP.ServiceContext;
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-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 @@ public interface ServerRequestInfoOperations extends RequestInfoOperations
    * @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 @@ public interface ServerRequestInfoOperations extends RequestInfoOperations
    * @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
    * {@link 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 @@ public interface ServerRequestInfoOperations extends RequestInfoOperations
    * @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 @@ public interface ServerRequestInfoOperations extends RequestInfoOperations
    * @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();
 }
\ No newline at end of file