ChangeLogTag: Tue Feb 3 14:24:17 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>

5 files changed, 27 insertions, 15 deletions

diff --git a/flat/CIAO/ChangeLog b/flat/CIAO/ChangeLog
index 347a61b1e62..de2c25b3605 100644
--- a/flat/CIAO/ChangeLog
+++ b/flat/CIAO/ChangeLog
@@ -1,3 +1,12 @@
+Tue Feb  3 14:24:17 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * DAnCE/ExecutionManager/ExecutionManager_Module.cpp:
+        * DAnCE/NodeManager/Node_Manager_Module.cpp:
+        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp:
+        * examples/Hello/descriptors/run_test.pl:
+        
+          Migrating changes to a new workspace. 
+        
 Mon Jan 12 17:41:29 UTC 2009  Abdullah Sowayan  <sowayan@gmail.com>
 
         * DAnCE/NodeApplication/ComponentAttributesSetter.cpp:
diff --git a/flat/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp b/flat/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp
index 5bd905c117f..7a33a060763 100644
--- a/flat/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp
+++ b/flat/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp
@@ -33,7 +33,7 @@ namespace DAnCE
       if (ior_output_file_)
         {
           ACE_OS::fprintf (ior_output_file_,
-                           "%C",
+                           "%s",
                            ior);
           ACE_OS::fclose (ior_output_file_);
           DANCE_DEBUG ( (LM_TRACE, "[%M] EM's ior was written into file \"%C\"\n", ior_file_name));
diff --git a/flat/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp b/flat/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
index 5c7e9a578af..a3ba092d8ff 100644
--- a/flat/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
+++ b/flat/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
@@ -36,7 +36,7 @@ namespace DAnCE
       if (ior_output_file_)
         {
           ACE_OS::fprintf (ior_output_file_,
-                           "%C",
+                           "%s",
                            ior);
           ACE_OS::fclose (ior_output_file_);
           return true;
@@ -536,8 +536,11 @@ DAnCE_NodeManager_Module::create_object (CORBA::ORB_ptr orb,
       if (0 != node_file.length ())
         {
           DANCE_DEBUG ((LM_TRACE,  DLINFO "DAnCE_NodeManager_Module::create_object - "
-                        "Writing node IOR to file.\n"));
-          DAnCE::Node_Manager::write_IOR (node_file.c_str (), ior.in ());
+                        "Writing node IOR %C to file %C.\n", node_file.c_str (), ior.in ()));
+          if (!DAnCE::Node_Manager::write_IOR (node_file.c_str (), ior.in ()))
+            DANCE_ERROR ((LM_ERROR, DLINFO "DAnCE_NodeManager_Module::create_object - "
+                          "Error: Unable to write IOR to file %C\n",
+                          node_file.c_str ()));
         }
 
       // Activate POA manager
diff --git a/flat/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp b/flat/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp
index 589546bf0fd..62041fce699 100644
--- a/flat/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp
+++ b/flat/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp
@@ -389,7 +389,7 @@ void Plan_Launcher_Base_Impl::usage(const ACE_TCHAR* program)
           ACE_TEXT ("-d|--read-cdr-plan <CDR_DEPLOYMENT_PLAN_URL>\n")
           ACE_TEXT ("-w|--write-cdr-plan <CDR_DEPLOYMENT_PLAN_URL>\n")
           ACE_TEXT ("-t|--plan-uuid <PLAN_UUID>\n")
-          ACE_TEXT ("-a|dam-ior <DOMAIN_APPLICATION_MANAGER_IOR>\n")
+                 //          ACE_TEXT ("-a|dam-ior <DOMAIN_APPLICATION_MANAGER_IOR>\n")
           //                    ACE_TEXT ("-n|--node-mgr : Use naming service to fetch EM\n")
           ACE_TEXT ("-q|--stop-plan : Stop the plan\n")
           ACE_TEXT ("-h|--help : Show this usage information\n")
diff --git a/flat/CIAO/examples/Hello/descriptors/run_test.pl b/flat/CIAO/examples/Hello/descriptors/run_test.pl
index 54c916a973e..d19d255f639 100755
--- a/flat/CIAO/examples/Hello/descriptors/run_test.pl
+++ b/flat/CIAO/examples/Hello/descriptors/run_test.pl
@@ -17,7 +17,7 @@ $ns_running = 0;
 $daemons = 2;
 @ports = ( 60001, 60002 );
 @iorfiles = ( "NodeApp1.ior", "NodeApp2.ior" );
-@nodenames = ( "SenderNode", "ReceiverNode" );
+@nodenames = ( "Sender", "Receiver" );
 $status = 0;
 $dat_file = "NodeManagerMap.dat";
 $cdp_file = "DeploymentPlan.cdp";
@@ -74,7 +74,7 @@ sub run_node_daemons {
       $iiop = "iiop://localhost:$port";
       $node_app = "$CIAO_ROOT/bin/ciao_component_server";
 
-      $d_cmd = "$CIAO_ROOT/bin/dance_node_manager";
+      $d_cmd = "$DAnCE/bin/dance_node_manager";
       $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -d 30";
 
       $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param);
@@ -82,9 +82,9 @@ sub run_node_daemons {
       push(@processes, $Daemons[$i]);
 
       if (PerlACE::waitforfile_timed ($iorfile,
-                          $PerlACE::wait_interval_for_process_creation) == -1) {
+                                      $PerlACE::wait_interval_for_process_creation) == -1) {
           print STDERR
-            "ERROR: The ior file of node daemon $i could not be found\n";
+            "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
           for (; $i >= 0; --$i) {
             $Daemons[$i]->Kill (); $Daemons[$i]->TimedWait (1);
           }
@@ -131,8 +131,8 @@ $daemons_running = 1;
 
 # Invoke execution manager.
 print "Invoking execution manager\n";
-$EM = new PerlACE::Process ("$DANCE_ROOT/bin/dance_execution_manager",
-                            "-o EM.ior --node-map $dat_file");
+$EM = new PerlACE::Process ("$DAnCE/bin/dance_execution_manager",
+                            "-eEM.ior --node-map $dat_file");
 $EM->Spawn ();
 
 if (PerlACE::waitforfile_timed ("EM.ior",
@@ -148,8 +148,8 @@ $em_running = 1;
 # Invoke executor - start the application -.
 print "Invoking executor - start the application -\n";
 $E =
-  new PerlACE::Process ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-p DeploymentPlan.cdp -k file://EM.ior -o DAM.ior");
+  new PerlACE::Process ("$DAnCE/bin/dance_plan_launcher",
+                        "-x DeploymentPlan.cdp -k file://EM.ior");
 
 $E->SpawnWaitKill (5000);
 
@@ -180,8 +180,8 @@ if ($result != 0) {
 # Invoke executor - stop the application -.
 print "Invoking executor - stop the application -\n";
 $E =
-  new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher",
-                        "-k file://EM.ior -i file://DAM.ior");
+  new PerlACE::Process ("$DAnCE/bin/dance_plan_launcher",
+                        "-k file://EM.ior -x DeploymentPlan.cdp -q");
 $E->SpawnWaitKill (3000);
 
 print "Executor returned.\n";