README

4 files changed, 23 insertions, 17 deletions

diff --git a/TAO/examples/Simulator/DOVEBrowser/DOVEBrowser.java b/TAO/examples/Simulator/DOVEBrowser/DOVEBrowser.java
index a83ad81581d..c5165d9d1b7 100644
--- a/TAO/examples/Simulator/DOVEBrowser/DOVEBrowser.java
+++ b/TAO/examples/Simulator/DOVEBrowser/DOVEBrowser.java
@@ -18,9 +18,9 @@ public class DOVEBrowser  { //extends java.applet.Applet {
 
   DemoCore demoCore_;
   
-  public DOVEBrowser () {
+  public DOVEBrowser (String nameServiceIOR) {
     super ();
-    demoCore_ = new DemoCore ();   
+    demoCore_ = new DemoCore (nameServiceIOR);   
   }
   
   public void init () {
@@ -36,8 +36,13 @@ public class DOVEBrowser  { //extends java.applet.Applet {
   
   public static void main (String[] args)
     {
-      DOVEBrowser doveBrowser_ = new DOVEBrowser ();
-      doveBrowser_.init ();
+      String nameServiceIOR = null;
+      if (args[0] == "-ORBnameserviceior") {
+	nameServiceIOR = args[1];
+      }
+      
+      DOVEBrowser doveBrowser = new DOVEBrowser (nameServiceIOR);
+      doveBrowser.init ();
     }  
 }
   
diff --git a/TAO/examples/Simulator/DOVEBrowser/DemoCore.java b/TAO/examples/Simulator/DOVEBrowser/DemoCore.java
index 6e6467b8a6d..7303d3d7b19 100644
--- a/TAO/examples/Simulator/DOVEBrowser/DemoCore.java
+++ b/TAO/examples/Simulator/DOVEBrowser/DemoCore.java
@@ -29,7 +29,7 @@ public class DemoCore extends Frame {
   private GridBagLayout gridbag_;
   private GridBagConstraints constraints_;
 
-  DemoCore () {
+  DemoCore (String nameServiceIOR) {
     super ();
 
     setSize (600,400);
@@ -45,7 +45,7 @@ public class DemoCore extends Frame {
 
     // Instantiate the DataHandler and the PushConsumer
     dataHandler_ = new NavWeapDataHandler ();
-    pushConsumerFactory_ = new PushConsumerFactory (dataHandler_);
+    pushConsumerFactory_ = new PushConsumerFactory (dataHandler_, nameServiceIOR);
 
     // List of Visualization Components
     vis_comp_list_ = new java.util.Vector();
diff --git a/TAO/examples/Simulator/DOVEBrowser/PushConsumerFactory.java b/TAO/examples/Simulator/DOVEBrowser/PushConsumerFactory.java
index 37d30057c40..c2c2fbda5b2 100644
--- a/TAO/examples/Simulator/DOVEBrowser/PushConsumerFactory.java
+++ b/TAO/examples/Simulator/DOVEBrowser/PushConsumerFactory.java
@@ -27,7 +27,7 @@ public class PushConsumerFactory {
   private Weapons weapons_;
 
 
-  public PushConsumerFactory (DataHandler dataHandler) //, String name_service_ior, java.applet.Applet applet)
+  public PushConsumerFactory (DataHandler dataHandler, String nameServiceIOR) //, java.applet.Applet applet)
     {
       try {      
 	dataHandler_ = dataHandler;
@@ -35,12 +35,15 @@ public class PushConsumerFactory {
 	boa_ = orb_.BOA_init ();
 	
 	// Get the Naming Service initial reference
-	 
-        //naming_service_object_ = orb_.string_to_object (name_service_ior);
+	
+	if (nameServiceIOR == null) {      
+	  NS_Resolve ns_resolve_ = new NS_Resolve ();
+     	  naming_service_object_ = ns_resolve_.resolve_name_service (orb_);
+	}
+	else {
+	  naming_service_object_ = orb_.string_to_object (nameServiceIOR);
+	}
 
-	NS_Resolve ns_resolve_ = new NS_Resolve ();
-     
-	naming_service_object_ = ns_resolve_.resolve_name_service (orb_);
       } 
       catch(org.omg.CORBA.SystemException e) {
 	System.err.println ("Client constructur: Failure");
diff --git a/TAO/examples/Simulator/README b/TAO/examples/Simulator/README
index 56ad2f8b69c..b13820f1dd4 100644
--- a/TAO/examples/Simulator/README
+++ b/TAO/examples/Simulator/README
@@ -32,11 +32,8 @@ Requirements:
 		   
 
 !!RELEASE CHANGES: 
-	- Visibroker 3.2 instead of 3.1 (new naming conventions)
-	- No more customization of the RtecEventCommC.h file (bug is fixed)
-	- A different Weapons struct is now used, but it does not influence
-      the functionality.
 	- A first version of the DOVE MIB is now available.
+        - the DOVEBrowser accepts now the ORBnameserviceior parameter
 
 Parts of the Demo:
 
@@ -154,10 +151,11 @@ Starting:
 
 	DOVE Browser:
 		vbj DOVEBrowser
+                (also supported: vbj DOVEBrowser -ORBnameserviceior <IOR> ) 
 
 
 	DOVE MIB:
 		DOVEMIB -ORBport 10041 -f myfile -m 100
 
 		// -m 100 for storing the next 100 events
-		// -f myfile for the name of the file in which it will be stored
\ No newline at end of file
+		// -f myfile for the name of the file in which it will be stored