Sat Feb 21 19:53:18 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * ciao/ComponentServer/CIAO_Container_Impl.cpp:
        * ciao/Containers/Session/Session_Container.cpp:
          Small improvements to debug statements and nil usage

        * DAnCE/TargetManager/descriptors/run_test_TargetManager.pl
        * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl
        * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl
        * DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl
        * docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl
        * examples/BasicSP/descriptors/run_test.pl
        * examples/Display/descriptors/basicNodeDaemon.pl
        * examples/Display/descriptors/run_NodeDaemons.pl
        * examples/Display/descriptors/run_test_without_ns.pl
        * examples/Hello/descriptors/DeploymentPlan.cdp
        * examples/Hello/descriptors/run_NodeDaemons.pl
        * examples/Hello/descriptors/run_test.pl
        * examples/Hello/descriptors/run_test_without_ns.pl
        * examples/Hello/descriptors_RTCCM/rt_run_test.pl
        * examples/Null_Component/descriptors/run_test.pl
        * tests/Bug_2130_Regression/descriptors/run_test.pl
          Use DANCE_ROOT and dance_node_manager

10 files changed, 44 insertions, 44 deletions

diff --git a/CIAO/examples/BasicSP/descriptors/run_test.pl b/CIAO/examples/BasicSP/descriptors/run_test.pl
index 577f9d1432d..941e91d1ba3 100755
--- a/CIAO/examples/BasicSP/descriptors/run_test.pl
+++ b/CIAO/examples/BasicSP/descriptors/run_test.pl
@@ -10,7 +10,7 @@ use PerlACE::Run_Test;
 
 $CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
 $TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DAnCE = "$ENV{'CIAO_ROOT'}/DAnCE";
+$DAnCE = "$ENV{'DANCE_ROOT'}";
 $daemons_running = 0;
 $em_running = 0;
 $ns_running = 0;
diff --git a/CIAO/examples/Display/descriptors/basicNodeDaemon.pl b/CIAO/examples/Display/descriptors/basicNodeDaemon.pl
index 8a48fdd35dd..bd963c5d139 100755
--- a/CIAO/examples/Display/descriptors/basicNodeDaemon.pl
+++ b/CIAO/examples/Display/descriptors/basicNodeDaemon.pl
@@ -34,20 +34,20 @@ unlink $iorfile5;
 
 $CIAO_ROOT=$ENV{'CIAO_ROOT'};
 
-$SV1 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
+$SV1 = new PerlACE::Process ("$DANCE_ROOT/bin/dance_node_manager",
                              "-ORBEndpoint iiop://localhost:10000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
-$SV2 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
+$SV2 = new PerlACE::Process ("$DANCE_ROOT/bin/dance_node_manager",
                              "-ORBEndpoint iiop://localhost:20000  -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
-$SV3 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
+$SV3 = new PerlACE::Process ("$DANCE_ROOT/bin/dance_node_manager",
                              "-ORBEndpoint iiop://localhost:30000  -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
-$SV4 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
+$SV4 = new PerlACE::Process ("$DANCE_ROOT/bin/dance_node_manager",
                              "-ORBEndpoint iiop://localhost:40000  -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
-                             
-$SV5 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
-                             "-ORBEndpoint iiop://localhost:50000  -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");                             
+
+$SV5 = new PerlACE::Process ("$DANCE_ROOT/bin/dance_node_manager",
+                             "-ORBEndpoint iiop://localhost:50000  -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 $SV1->Spawn ();
 $SV2->Spawn ();
 $SV3->Spawn ();
diff --git a/CIAO/examples/Display/descriptors/run_NodeDaemons.pl b/CIAO/examples/Display/descriptors/run_NodeDaemons.pl
index bc17b0972fd..3e01d7bc260 100755
--- a/CIAO/examples/Display/descriptors/run_NodeDaemons.pl
+++ b/CIAO/examples/Display/descriptors/run_NodeDaemons.pl
@@ -28,10 +28,10 @@ unlink $iorfile2;
 
 $CIAO_ROOT=$ENV{'CIAO_ROOT'};
 
-$SV1 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
+$SV1 = new PerlACE::Process ("$DANCE_ROOT/bin/dance_node_manager",
                              "-ORBEndpoint iiop://localhost:10001 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
-$SV2 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
+$SV2 = new PerlACE::Process ("$DANCE_ROOT/bin/dance_node_manager",
                              "-ORBEndpoint iiop://localhost:20001 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
 $SV1->Spawn ();
diff --git a/CIAO/examples/Display/descriptors/run_test_without_ns.pl b/CIAO/examples/Display/descriptors/run_test_without_ns.pl
index f170e905fd3..bb090fceda1 100755
--- a/CIAO/examples/Display/descriptors/run_test_without_ns.pl
+++ b/CIAO/examples/Display/descriptors/run_test_without_ns.pl
@@ -61,7 +61,7 @@ sub run_node_daemons {
       $iiop = "iiop://localhost:$port";
       $node_app = "$CIAO_ROOT/bin/NodeApplication";
 
-      $d_cmd = "$CIAO_ROOT/bin/NodeManager";
+      $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
       $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile -d 30";
 
       $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param);
@@ -105,7 +105,7 @@ if (PerlACE::waitforfile_timed ("EM.ior",
                         $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR
       "ERROR: The ior file of execution manager could not be found\n";
-    kill_open_processes (); 
+    kill_open_processes ();
     exit 1;
 }
 
@@ -116,21 +116,21 @@ print "Invoking executor - start the application -\n";
 $E =
   new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher",
                         "-p flattened_deploymentplan.cdp -k file://EM.ior -o DAM.ior");
- 
+
 $E->SpawnWaitKill (5000);
 
 if (PerlACE::waitforfile_timed (
       "GPS.ior",
       $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: The ior file of GPS could not be found\n";
-    kill_open_processes (); 
+    kill_open_processes ();
     exit 1;
 }
 
 if (PerlACE::waitforfile_timed ("RateGen.ior",
                         $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: The ior file of RateGen could not be found\n";
-    kill_open_processes (); 
+    kill_open_processes ();
     exit 1;
 }
 
diff --git a/CIAO/examples/Hello/descriptors/DeploymentPlan.cdp b/CIAO/examples/Hello/descriptors/DeploymentPlan.cdp
index 8d22e0ea906..f61789b5558 100644
--- a/CIAO/examples/Hello/descriptors/DeploymentPlan.cdp
+++ b/CIAO/examples/Hello/descriptors/DeploymentPlan.cdp
@@ -298,7 +298,7 @@
       </value>
     </configProperty>
   </instance>
-  
+
   <connection>
     <name>MessageConnection</name>
     <internalEndpoint>
@@ -336,26 +336,26 @@
     <name>Hello_Receiver_exec</name>
     <source/>
     <node/>
-    <location>Hello_Receiver_exec</location>
+    <location>../Receiver/Hello_Receiver_exec</location>
   </artifact>
   <artifact xmi:id="Hello_Receiver_SvntArtifact">
     <name>Hello_Receiver_svnt</name>
     <source/>
     <node/>
-    <location>Hello_Receiver_svnt</location>
+    <location>../Receiver/Hello_Receiver_svnt</location>
   </artifact>
 
   <artifact xmi:id="Hello_Sender_ExecArtifact">
     <name>Hello_Sender_exec</name>
     <source/>
     <node/>
-    <location>Hello_Sender_exec</location>
+    <location>../Sender/Hello_Sender_exec</location>
   </artifact>
   <artifact xmi:id="Hello_Sender_SvntArtifact">
     <name>Hello_Sender_svnt</name>
     <source/>
     <node/>
-    <location>Hello_Sender_svnt</location>
+    <location>../Sender/Hello_Sender_svnt</location>
   </artifact>
 
 </Deployment:DeploymentPlan>
diff --git a/CIAO/examples/Hello/descriptors/run_NodeDaemons.pl b/CIAO/examples/Hello/descriptors/run_NodeDaemons.pl
index 5e9d3b95b46..e16b1c604c3 100644
--- a/CIAO/examples/Hello/descriptors/run_NodeDaemons.pl
+++ b/CIAO/examples/Hello/descriptors/run_NodeDaemons.pl
@@ -28,10 +28,10 @@ unlink $iorfile2;
 
 $CIAO_ROOT=$ENV{'CIAO_ROOT'};
 
-$SV1 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
+$SV1 = new PerlACE::Process ("$DANCE_ROOT/bin/dance_node_manager",
                              "-ORBEndpoint iiop://localhost:60001 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication -d 1000");
 
-$SV2 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager",
+$SV2 = new PerlACE::Process ("$DANCE_ROOT/bin/dance_node_manager",
                              "-ORBEndpoint iiop://localhost:60002 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication -d 1000");
 
 $SV1->Spawn ();
diff --git a/CIAO/examples/Hello/descriptors/run_test.pl b/CIAO/examples/Hello/descriptors/run_test.pl
index 81811665eff..bb2aac25384 100755
--- a/CIAO/examples/Hello/descriptors/run_test.pl
+++ b/CIAO/examples/Hello/descriptors/run_test.pl
@@ -10,7 +10,7 @@ use PerlACE::Run_Test;
 
 $CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
 $TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DAnCE = "$ENV{'CIAO_ROOT'}/DAnCE";
+$DAnCE = "$ENV{'DANCE_ROOT'}";
 $daemons_running = 0;
 $em_running = 0;
 $ns_running = 0;
diff --git a/CIAO/examples/Hello/descriptors/run_test_without_ns.pl b/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
index 97fa00644b1..834ba2e87b1 100755
--- a/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
+++ b/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
@@ -8,7 +8,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{'ACE_ROOT'}/bin";
 use PerlACE::Run_Test;
 $CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$DAnCE = "$ENV{'CIAO_ROOT'}/DAnCE";
+$DAnCE = "$ENV{'DANCE_ROOT'}";
 
 $daemons_running = 0;
 $em_running = 0;
@@ -60,7 +60,7 @@ sub run_node_daemons {
       $iiop = "iiop://localhost:$port";
       $node_app = "$CIAO_ROOT/bin/NodeApplication";
 
-      $d_cmd = "$CIAO_ROOT/bin/NodeManager";
+      $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
       $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile -d 30";
 
       $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param);
diff --git a/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl b/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl
index fa9c22c7345..114605639d5 100755
--- a/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl
+++ b/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl
@@ -60,7 +60,7 @@ sub run_node_daemons {
       $iiop = "iiop://localhost:$port";
       $node_app = "$CIAO_ROOT/bin/NodeApplication";
 
-      $d_cmd = "$CIAO_ROOT/bin/NodeManager";
+      $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
 
       # NON-RT
 #      $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile";
@@ -109,7 +109,7 @@ if (PerlACE::waitforfile_timed ("EM.ior",
                         $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR
       "ERROR: The ior file of execution manager could not be found\n";
-    kill_open_processes (); 
+    kill_open_processes ();
     exit 1;
 }
 
@@ -120,21 +120,21 @@ print "Invoking executor - start the application -\n";
 $E =
   new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher",
                         "-p rt-example.cdp -k file://EM.ior -o DAM.ior");
- 
+
 $E->SpawnWaitKill (5000);
 
 if (PerlACE::waitforfile_timed (
       "Receiver.ior",
       $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: The ior file of receiver could not be found\n";
-    kill_open_processes (); 
+    kill_open_processes ();
     exit 1;
 }
 
 if (PerlACE::waitforfile_timed ("Sender.ior",
                         $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: The ior file of sender could not be found\n";
-    kill_open_processes (); 
+    kill_open_processes ();
     exit 1;
 }
 
diff --git a/CIAO/examples/Null_Component/descriptors/run_test.pl b/CIAO/examples/Null_Component/descriptors/run_test.pl
index 76b37e5a3bf..4122f0c8304 100755
--- a/CIAO/examples/Null_Component/descriptors/run_test.pl
+++ b/CIAO/examples/Null_Component/descriptors/run_test.pl
@@ -10,7 +10,7 @@ use PerlACE::Run_Test;
 
 $CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
 $TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DAnCE = "$ENV{'CIAO_ROOT'}/DAnCE";
+$DAnCE = "$ENV{'DANCE_ROOT'}";
 $daemons_running = 0;
 $em_running = 0;
 $ns_running = 0;
@@ -101,12 +101,12 @@ if ($#ARGV == -1)
 foreach $file (@files) {
     print "Starting test for deployment $file\n";
     delete_ior_files ();
-    
+
     print STDERR "Starting Naming Service\n";
-    
+
     $NS = new PerlACE::Process ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 0 -ORBEndpoint iiop://localhost:60003 -o ns.ior");
     $NS->Spawn ();
-    
+
     if (PerlACE::waitforfile_timed ($nsior, $PerlACE::wait_interval_for_process_creation) == -1)
     {
         print STDERR "ERROR: cannot find naming service IOR file\n";
@@ -117,8 +117,8 @@ foreach $file (@files) {
 
 # Set up NamingService environment
     $ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-    
-    
+
+
 # Invoke node daemons.
     print "Invoking node daemons\n";
     $status = run_node_daemons ();
@@ -128,15 +128,15 @@ foreach $file (@files) {
         kill_open_processes ();
         exit 1;
     }
-    
+
     $daemons_running = 1;
-    
+
     # Invoke execution manager.
     print "Invoking execution manager\n";
     $EM = new PerlACE::Process ("$DAnCE/bin/dance_execution_manager",
                                 "-eEM.ior --domain-nc corbaloc:rir:/NameService");
     $EM->Spawn ();
-    
+
     if (PerlACE::waitforfile_timed ("EM.ior",
                                     $PerlACE::wait_interval_for_process_creation) == -1) {
         print STDERR
@@ -144,7 +144,7 @@ foreach $file (@files) {
         kill_open_processes ();
         exit 1;
     }
-    
+
     $em_running = 1;
 
 # Invoke executor - start the application -.
@@ -152,22 +152,22 @@ foreach $file (@files) {
     $E =
 	new PerlACE::Process ("$DAnCE/bin/dance_plan_launcher",
 			      "-x $file -k file://EM.ior");
-    
+
     $E->SpawnWaitKill (5000);
-    
+
     if ($status != 0)
     {
         print "ERROR: dance_plan_launcher returned an error code while deploying $file\n";
         $retval = -1;
     }
-    
+
     # Invoke executor - stop the application -.
     print "Invoking executor - stop the application -\n";
     $E =
 	new PerlACE::Process ("$DAnCE/bin/dance_plan_launcher",
 			      "-k file://EM.ior -x $file -q");
     $E->SpawnWaitKill (3000);
-    
+
     print "Executor returned.\n";
 
     delete_ior_files ();