DOVE enhancements

9 files changed, 94 insertions, 25 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 1b845321761..12e040569fd 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,26 @@
+Wed Dec  9 13:26:50 1998  Chris Gill  <cdgill@cs.wustl.edu>
+
+        * orbsvcs/tests/Simulator/DOVEBrowser/DOVEBrowser.java
+          orbsvcs/tests/Simulator/DOVEBrowser/DOVEBrowserApplet.java
+          orbsvcs/tests/Simulator/DOVEBrowser/DemoCore.java
+          orbsvcs/tests/Simulator/DOVEBrowser/NS_Resolve.java
+          orbsvcs/tests/Simulator/DOVEBrowser/PushConsumer.java
+          orbsvcs/tests/Simulator/DOVEBrowser/PushConsumerFactory.java:
+
+	  Cleaned up some type names in that had changed when RtecScheduler.idl
+	  was brought up to CORBA standard (type names and element names must
+	  differ in more than just letter case).  
+
+	  Added support for -ORBnameserviceport on command line of the 
+	  compiled DOVEBrowser version.  Generalized command line option
+	  handling, fixed bug with using == instead of .equals for string
+	  comparison.
+
+        * orbsvcs/tests/Simulator/Event_Supplier/Event_Sup.dsp
+          orbsvcs/tests/Simulator/Event_Supplier/Logging_Sup.dsp: added -I 
+	  switch with relative path to TAO\orbsvcs\orbsvcs to tao_idl 
+	  invocation in the custom build step.
+
 1998-12-09  Nagarajan Surendran  <naga@polka.cs.wustl.edu>
 
 	* orbsvcs/orbsvcs/AV/AVStreams_i.cpp : Fixed warnings with
diff --git a/TAO/examples/Simulator/DOVEBrowser/DOVEBrowser.java b/TAO/examples/Simulator/DOVEBrowser/DOVEBrowser.java
index 99830e408e7..522cf2bf177 100644
--- a/TAO/examples/Simulator/DOVEBrowser/DOVEBrowser.java
+++ b/TAO/examples/Simulator/DOVEBrowser/DOVEBrowser.java
@@ -22,24 +22,54 @@ public class DOVEBrowser {
     super (); 
   }
   
-  public void init (String nameServiceIOR, String[] args) {
+  public void init (String nameServiceIOR, String nameServicePort,
+                    String[] args) {
 
-    demoCore_ = new DemoCore (nameServiceIOR, args, null); 
+    demoCore_ = new DemoCore (nameServiceIOR, nameServicePort, args, null); 
     demoCore_.show ();
     demoCore_.run ();
   }
   
   public static void main (String[] args) {      
     String nameServiceIOR = null;
+    String nameServicePort = null;
+    int arg_index = 0;
 
-    if (args.length == 2) {
-      if (args[0] == "-ORBnameserviceior") {
-	nameServiceIOR = args[1];
+    // Loop through command line arguments, acting on relevant options
+    while (args.length > arg_index) 
+      {
+        System.out.println ("args.length [" + args.length + "] arg_index [" +
+                            arg_index + "]");
+        // Set the name service IOR
+        if ((args[arg_index].equals ("-ORBnameserviceior")) && 
+            (args.length > arg_index + 1)) 
+          {
+            System.out.println ("switch [" + args[arg_index] + "]");
+            System.out.println ("value [" + args[arg_index + 1] + "]");
+	    nameServiceIOR = args[arg_index + 1];
+            System.out.println ("nameServiceIOR [" + nameServiceIOR + "]");
+            arg_index += 2;
+          }
+        // Set the name service port
+        else if ((args[arg_index].equals ("-ORBnameserviceport")) &&
+                 (args.length > arg_index + 1))
+          {
+            System.out.println ("switch [" + args[arg_index] + "]");
+            System.out.println ("value [" + args[arg_index + 1] + "]");
+	    nameServicePort = args[arg_index + 1];
+            System.out.println ("nameServicePort [" + nameServicePort + "]");
+            arg_index += 2;
+          }
+        // Skip over anything else
+        else
+          {
+           System.out.println ("Skipping [" + args[arg_index] + "]");
+            arg_index ++;
+          }
       }
-    } 
     
     DOVEBrowser doveBrowser = new DOVEBrowser();
-    doveBrowser.init (nameServiceIOR, args);
+    doveBrowser.init (nameServiceIOR, nameServicePort, args);
   }  
 }
   
diff --git a/TAO/examples/Simulator/DOVEBrowser/DOVEBrowserApplet.java b/TAO/examples/Simulator/DOVEBrowser/DOVEBrowserApplet.java
index c55b90ca0de..efa59d65fdf 100644
--- a/TAO/examples/Simulator/DOVEBrowser/DOVEBrowserApplet.java
+++ b/TAO/examples/Simulator/DOVEBrowser/DOVEBrowserApplet.java
@@ -33,6 +33,7 @@ public class DOVEBrowserApplet extends java.applet.Applet {
     }
 
     demoCore_ = new DemoCore (nameServiceIOR_,  // name service IOR
+			      null,             // name service port
 			      null,             // args
 			      this);            // pointer to the applet
     demoCore_.show ();
diff --git a/TAO/examples/Simulator/DOVEBrowser/DemoCore.java b/TAO/examples/Simulator/DOVEBrowser/DemoCore.java
index 8c1c6ae0ff1..f23ac2c5901 100644
--- a/TAO/examples/Simulator/DOVEBrowser/DemoCore.java
+++ b/TAO/examples/Simulator/DOVEBrowser/DemoCore.java
@@ -30,7 +30,8 @@ public class DemoCore extends Frame {
   private GridBagConstraints constraints_;
 
   DemoCore (String nameServiceIOR, 
-	    String[] args, 
+	    String nameServicePort,
+            String[] args, 
 	    java.applet.Applet applet) {
     super ();
     
@@ -47,7 +48,8 @@ public class DemoCore extends Frame {
 
     // Instantiate the DataHandler and the PushConsumer
     dataHandler_ = new NavWeapDataHandler ();
-    pushConsumerFactory_ = new PushConsumerFactory (dataHandler_, nameServiceIOR, args, applet);
+    pushConsumerFactory_ = new PushConsumerFactory (dataHandler_, nameServiceIOR, 
+                                                    nameServicePort, args, applet);
 
     // List of Visualization Components
     vis_comp_list_ = new java.util.Vector();
diff --git a/TAO/examples/Simulator/DOVEBrowser/NS_Resolve.java b/TAO/examples/Simulator/DOVEBrowser/NS_Resolve.java
index b6a39e63dec..51eedd40742 100644
--- a/TAO/examples/Simulator/DOVEBrowser/NS_Resolve.java
+++ b/TAO/examples/Simulator/DOVEBrowser/NS_Resolve.java
@@ -24,8 +24,7 @@ import java.net.*;
 import java.io.*;
 
 
-
-public class NS_Resolve 
+public class NS_Resolve
 {
   
   private static final String ACE_DEFAULT_MULTICAST_ADDR = "224.9.9.2";
@@ -36,7 +35,21 @@ public class NS_Resolve
   private static final int TAO_SERVICEID_TRADINGSERVICE = 1;
 
   org.omg.CORBA.Object name_service_;
+  int nameServicePort_;
 
+  public NS_Resolve (String nameServicePort)
+    {
+      if (nameServicePort != null)
+        {
+          // If a name service port string was given, parse it
+          nameServicePort_ = Integer.parseInt (nameServicePort);
+        }
+      else
+        {
+          // Otherwise, just use the default TAO name service port
+          nameServicePort_ = TAO_DEFAULT_NAME_SERVER_REQUEST_PORT;
+        }
+    }
 
   public org.omg.CORBA.Object resolve_name_service (org.omg.CORBA.ORB orb)
     {
@@ -62,7 +75,7 @@ public class NS_Resolve
 	  socket_.setSoTimeout (3000);
 	  // Build a packet with the port number in it
 	  DatagramPacket  hello = new DatagramPacket(msg, msg.length,
-						     group, TAO_DEFAULT_NAME_SERVER_REQUEST_PORT);
+						     group, nameServicePort_);
 
 	  // Send the packet
 	  multicastsocket_.send (hello);
diff --git a/TAO/examples/Simulator/DOVEBrowser/PushConsumer.java b/TAO/examples/Simulator/DOVEBrowser/PushConsumer.java
index dae34295023..7ffab993441 100644
--- a/TAO/examples/Simulator/DOVEBrowser/PushConsumer.java
+++ b/TAO/examples/Simulator/DOVEBrowser/PushConsumer.java
@@ -102,15 +102,15 @@ public class PushConsumer extends RtecEventComm._PushConsumerImplBase
         rt_info_ = new RtecScheduler.handle_tHolder (scheduler_.create (name));
 
         scheduler_.set (rt_info_.value,
-                        RtecScheduler.Criticality.VERY_LOW_CRITICALITY,
+                        RtecScheduler.Criticality_t.VERY_LOW_CRITICALITY,
                         0L,
                         0L,
                         0L,
                         2500000,  // period
-                        RtecScheduler.Importance.VERY_LOW_IMPORTANCE,
+                        RtecScheduler.Importance_t.VERY_LOW_IMPORTANCE,
                         0L,
                         1,
-                        RtecScheduler.Info_Type.OPERATION);
+                        RtecScheduler.Info_Type_t.OPERATION);
 
 
         // Register for Notification and Shutdown events
diff --git a/TAO/examples/Simulator/DOVEBrowser/PushConsumerFactory.java b/TAO/examples/Simulator/DOVEBrowser/PushConsumerFactory.java
index a1eb99280be..831cfb33aaf 100644
--- a/TAO/examples/Simulator/DOVEBrowser/PushConsumerFactory.java
+++ b/TAO/examples/Simulator/DOVEBrowser/PushConsumerFactory.java
@@ -29,6 +29,7 @@ public class PushConsumerFactory {
 
   public PushConsumerFactory (DataHandler dataHandler, 
 			      String nameServiceIOR, 
+			      String nameServicePort, 
 			      String[] args,
 			      java.applet.Applet applet)
     {
@@ -55,7 +56,7 @@ public class PushConsumerFactory {
 	  
 	  if (nameServiceIOR == null) {  // only used when running via "java" or "vbj"     
 	    System.out.println ("Using the lookup protocol!");
-	    NS_Resolve ns_resolve_ = new NS_Resolve ();
+	    NS_Resolve ns_resolve_ = new NS_Resolve (nameServicePort);
 		naming_service_object_ = ns_resolve_.resolve_name_service (orb_);
 	  }
 	  else {
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.dsp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.dsp
index b853fe30aee..3599591ee7c 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.dsp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.dsp
@@ -17,12 +17,12 @@ CFG=Event_Sup - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Event_Sup - Win32 Release" (based on\

- "Win32 (x86) Console Application")

+!MESSAGE "Event_Sup - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Event_Sup - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -121,19 +121,19 @@ SOURCE=.\NavWeapC.h
 # Begin Source File

 

 SOURCE=.\NavWeap.idl

-USERDEP__NAVWE="..\$(InputName).idl"	

 

 !IF  "$(CFG)" == "Event_Sup - Win32 Release"

 

 !ELSEIF  "$(CFG)" == "Event_Sup - Win32 Debug"

 

+USERDEP__NAVWE="..\$(InputName).idl"	

 # Begin Custom Build

 InputPath=.\NavWeap.idl

 InputName=NavWeap

 

 BuildCmds= \

 	xcopy ..\$(InputName).idl \

-	..\..\..\..\..\bin\tao_idl $(InputName).idl \

+	..\..\..\..\..\bin\tao_idl -I ..\..\..\orbsvcs $(InputName).idl \

 	

 

 "$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.dsp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.dsp
index ee8686d30fa..3648b284374 100644
--- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.dsp
+++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.dsp
@@ -17,13 +17,12 @@ CFG=Logging_Sup - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Logging_Sup - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Logging_Sup - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

+!MESSAGE "Logging_Sup - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Logging_Sup - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -132,7 +131,7 @@ InputName=NavWeap
 

 BuildCmds= \

 	xcopy ..\$(InputName).idl \

-	..\..\..\..\..\bin\tao_idl $(InputName).idl \

+	..\..\..\..\..\bin\tao_idl  -I ..\..\..\orbsvcs $(InputName).idl \

 	

 

 "$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"