ChangeLogTag: Wed Feb 4 19:07:27 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>

4 files changed, 30 insertions, 24 deletions

diff --git a/flat/CIAO/ChangeLog b/flat/CIAO/ChangeLog
index 9d244ed08d0..d7d0b6ea28b 100644
--- a/flat/CIAO/ChangeLog
+++ b/flat/CIAO/ChangeLog
@@ -1,33 +1,41 @@
+Wed Feb  4 19:07:27 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
+        * DAnCE/NodeManager/Node_Manager_Module.cpp:
+        * examples/Hello/descriptors/run_test.pl:
+
+          fixing nameservice support. 
+        
 Wed Feb  4 01:26:49 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * CIAO_TAO.mwc:
         * CIAO_TAO_DAnCE.mwc:
-        
+
           Added TAO_ROOT/utils.
-        
+
         * DAnCE/ExecutionManager/ExecutionManager_Module.cpp:
         * DAnCE/NodeManager/NodeManager_Impl.cpp:
         * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
-        
-          Logging changes. 
-        
+
+          Logging changes.
+
         * DAnCE/NodeApplication/ComponentAttributesSetter.cpp:
         * DAnCE/NodeManager/Node_Manager_Module.cpp:
-        
-          Compile fixes. 
-        
+
+          Compile fixes.
+
         * DAnCE/NodeApplication/Name_Utilities.cpp:
-        
-          Fixed segmentation faults. 
-        
+
+          Fixed segmentation faults.
+
         * DAnCE/tests/MocksTest/MockTest.mpc:
-        
-          Disabled. 
-        
+
+          Disabled.
+
         * examples/Hello/descriptors/run_test.pl:
-        
-          Fixes to use correct binaries and arguments.   This test now runs. 
-        
+
+          Fixes to use correct binaries and arguments.   This test now runs.
+
 Tue Feb  3 14:24:17 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * DAnCE/ExecutionManager/ExecutionManager_Module.cpp:
diff --git a/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
index c4dae455ef3..b8ef873ccad 100644
--- a/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
+++ b/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
@@ -1371,7 +1371,7 @@ NodeApplication_Impl::get_instance_type (const Deployment::Properties& prop) con
         }
     }
 
-  DANCE_ERROR ((LM_ERROR, DLINFO  "NodeApplication_Impl::get_instance_type - "
+  DANCE_ERROR ((LM_INFO, DLINFO  "NodeApplication_Impl::get_instance_type - "
                 "Unable to determine instance type\n"));
   return eInvalid;
 }
diff --git a/flat/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp b/flat/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
index 380d9a595d1..62c837b67dd 100644
--- a/flat/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
+++ b/flat/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
@@ -110,7 +110,7 @@ DAnCE_NodeManager_Module::parse_args (int argc, ACE_TCHAR * argv[])
   get_opts.long_option (ACE_TEXT("timeout"), 't', ACE_Get_Opt::ARG_REQUIRED);
   get_opts.long_option (ACE_TEXT("domain-nc"), 'd', ACE_Get_Opt::ARG_REQUIRED);
   get_opts.long_option (ACE_TEXT("help"), 'h', ACE_Get_Opt::NO_ARG);
-  get_opts.long_option (ACE_TEXT("instance-nc"), ACE_Get_Opt::ARG_OPTIONAL);
+  get_opts.long_option (ACE_TEXT("instance-nc"), ACE_Get_Opt::ARG_REQUIRED);
 
   //get_opts.long_option ("help", '?');
 
@@ -204,7 +204,7 @@ DAnCE_NodeManager_Module::parse_args (int argc, ACE_TCHAR * argv[])
               this->options_.server_args_ = get_opts.opt_arg ();
             }
           else if (ACE_OS::strcmp (get_opts.long_option (),
-                                   "instance-nc"))
+                                   "instance-nc") == 0)
             {
               if (get_opts.opt_arg () == 0)
                 {
diff --git a/flat/CIAO/examples/Hello/descriptors/run_test.pl b/flat/CIAO/examples/Hello/descriptors/run_test.pl
index 02b7e48d8d6..d54b6c494d0 100755
--- a/flat/CIAO/examples/Hello/descriptors/run_test.pl
+++ b/flat/CIAO/examples/Hello/descriptors/run_test.pl
@@ -75,10 +75,8 @@ sub run_node_daemons {
       $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
 
       $d_cmd = "$DAnCE/bin/dance_node_manager";
-      $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -d 30";
-      
-      print "$d_param";
-
+      $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --instance-nc corbaloc:rir:/NameService";
+      print "$d_param\n";
       $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param);
       $result = $Daemons[$i]->Spawn ();
       push(@processes, $Daemons[$i]);