Tue Jan 31 21:29:06 UTC 2006 William Otte <wotte@dre.vanderbilt.edu>

3 files changed, 12 insertions, 2 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index cbbbae9972f..1236af2ed2d 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jan 31 21:29:06 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
+
+        * examples/Hello/descriptors/run_test.pl
+        
+          Updated to force naming service to not use multicast, instead
+          using NameServiceIOR environment variable.
+
 Tue Jan 31 15:11:29 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
 
         * RACE/Controller/Component/Controller.mpc
diff --git a/TAO/CIAO/examples/Hello/descriptors/run_test.pl b/TAO/CIAO/examples/Hello/descriptors/run_test.pl
index 6336f70e5d5..29de67e58b8 100755
--- a/TAO/CIAO/examples/Hello/descriptors/run_test.pl
+++ b/TAO/CIAO/examples/Hello/descriptors/run_test.pl
@@ -98,7 +98,7 @@ delete_ior_files ();
 
 # Invoke naming service
 
-$NS = new PerlACE::Process ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 1 -o $nsior");
+$NS = new PerlACE::Process ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 0 -ORBEndpoint iiop://localhost:60003 -o ns.ior");
 
 $NS->Spawn ();
 
@@ -111,6 +111,9 @@ if (PerlACE::waitforfile_timed ($nsior, 10) == -1)
     exit 1;
 }
 
+# Set up NamingService environment
+$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
+
 # Invoke node daemons.
 print "Invoking node daemons\n";
 $status = run_node_daemons ();
diff --git a/TAO/CIAO/examples/Hello/descriptors/run_test_without_ns.pl b/TAO/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
index 52752b21eba..59956eb7815 100755
--- a/TAO/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
+++ b/TAO/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
@@ -13,7 +13,7 @@ $DAnCE = "$ENV{'ACE_ROOT'}/TAO/CIAO/DAnCE";
 $daemons_running = 0;
 $em_running = 0;
 $daemons = 2;
-@ports = ( 30000, 40000 );
+@ports = ( 60001, 60002 );
 @iorfiles = ( "NodeApp1.ior", "NodeApp2.ior" );
 $status = 0;
 $dat_file = "NodeManagerMap.dat";