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

	* gnu/CORBA/OrbFunctional.java (use_properties, set_parameters):
	Rewritten to support orb and server ids.
	* org/omg/CORBA/ORB.java,
	org/omg/PortableInterceptor/ObjectReferenceTemplate.java:
	Documentation update.

2 files changed, 24 insertions, 3 deletions

diff --git a/org/omg/CORBA/ORB.java b/org/omg/CORBA/ORB.java
index 52c0ad621..06259fafa 100644
--- a/org/omg/CORBA/ORB.java
+++ b/org/omg/CORBA/ORB.java
@@ -49,6 +49,7 @@ import gnu.CORBA.typecodes.RecordTypeCode;
 import gnu.CORBA.typecodes.RecursiveTypeCode;
 
 import org.omg.CORBA.ORBPackage.InconsistentTypeCode;
+import org.omg.PortableInterceptor.ObjectReferenceTemplate;
 
 import java.applet.Applet;
 
@@ -97,6 +98,21 @@ import java.util.Properties;
  * {@link #resolve_initial_references(String)}.</td>
  * </tr>
  * <tr>
+ * <td>org.omg.CORBA.ORBid</td>
+ * <td>Specifies the name (ORB Id) of this ORB. The ORB Id is later accessible
+ * by {@link ObjectReferenceTemplate#orb_id}. The default value includes the
+ * hashcode of the ORB instance that is normally different for each ORB. 
+ * </td>
+ * </tr>
+ * <tr>
+ * <td>org.omg.CORBA.ServerId</td>
+ * <td>Specifies the name (Server Id) of this server. This property assigns
+ * value to the <i>static</i> field, ensuring that all ORB's on the same jre
+ * have the same Server Id. It is normally set as the system property. The
+ * server Id is later accessible as {@link ObjectReferenceTemplate#server_id}.
+ * </td>
+ * </tr>
+ * <tr>
  * <td>gnu.CORBA.ListenerPort</td>
  * <td>Specifies that this ORB should serve all its objects on a single port
  * (for example, "1234") or on a specified port range (for example,
diff --git a/org/omg/PortableInterceptor/ObjectReferenceTemplate.java b/org/omg/PortableInterceptor/ObjectReferenceTemplate.java
index 99160ff44..666735e76 100644
--- a/org/omg/PortableInterceptor/ObjectReferenceTemplate.java
+++ b/org/omg/PortableInterceptor/ObjectReferenceTemplate.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package org.omg.PortableInterceptor;
 
-import org.omg.CORBA.portable.IDLEntity;
+import org.omg.PortableServer.POA;
 
 /**
  * Defines the identity of the portable object adapter ({@link POA}}. The
@@ -51,7 +51,10 @@ public interface ObjectReferenceTemplate
   extends ObjectReferenceFactory
 {
   /**
-   * Get the name of this adapter.
+   * Get the name of this adapter. This name can be set by specifying
+   * the org.omg.CORBA.ORBid property in the ORB.Init(.., Properties).
+   * The default value includes the hashcode of the ORB instance and hence
+   * should normally differ for each ORB.
    *
    * @return the name of adapter, represented in the form of the string array.
    */
@@ -65,7 +68,9 @@ public interface ObjectReferenceTemplate
   String orb_id();
 
   /**
-   * Get the server id of of this adapter.
+   * Get the server id of of this adapter. This name can be set by specifying
+   * the org.omg.CORBA.ServerId property in the ORB.Init(.., Properties) or
+   * in the system property. All ORB's on the same jre share the same value.
    *
    * @return the server id, represented in the form of string.
    */