Fri May 21 03:57:04 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>

* connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: * connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl: * connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl: * connectors/ami4ccm/tests/InterInArgs/descriptors/run_test.pl: * connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl: * connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl: * connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl: * connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl: * connectors/ami4ccm/tests/OneProcess/descriptors/run_test_one.pl: * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: * connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl: * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl: * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl: * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl: * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl: * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl: * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl: * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl: * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl: * connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl: * connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl: * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl: * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: * connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl: * connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl: * connectors/dds4ccm/tests/ContentFilteredTopic/descriptors/run_test.pl: * connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl: * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl: * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl: * connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl: * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl: * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl: * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl: * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl: * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl: * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl: * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: * connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl: * connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl: * connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl: * connectors/dds4ccm/tests/QueryFilterListenEvent/descriptors/run_test.pl: * connectors/dds4ccm/tests/QueryFilterListenState/descriptors/run_test.pl: * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl: * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl: * connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl: * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl: * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl: * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl: * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl: * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl: * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl: * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl: * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl: * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl: * connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl: Ported tests.
author: William R. Otte <wotte@dre.vanderbilt.edu> 2010-05-21 03:58:33 +0000
committer: William R. Otte <wotte@dre.vanderbilt.edu> 2010-05-21 03:58:33 +0000
commit: cbdf27ac57d327fd072299b73d3433e6a8063763 (patch)
tree: c0d98f3810fbed4066237747a551f88b8cc46024
parent: 22aec7775d61ccf1d11fc9f8ada0f9e26f2c1b8d (diff)
download: ATCD-cbdf27ac57d327fd072299b73d3433e6a8063763.tar.gz
68 files changed, 199 insertions, 127 deletions
diff --git a/modules/CIAO/ChangeLog b/modules/CIAO/ChangeLog
index a1207a600dc..d0f126ad654 100644
--- a/modules/CIAO/ChangeLog
+++ b/modules/CIAO/ChangeLog
@@ -1,3 +1,75 @@
+Fri May 21 03:57:04 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl:
+        * connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl:
+        * connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl:
+        * connectors/ami4ccm/tests/InterInArgs/descriptors/run_test.pl:
+        * connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl:
+        * connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl:
+        * connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl:
+        * connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl:
+        * connectors/ami4ccm/tests/OneProcess/descriptors/run_test_one.pl:
+        * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl:
+        * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl:
+        * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl:
+        * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl:
+        * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl:
+        * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl:
+        * connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl:
+        * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl:
+        * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl:
+        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl:
+        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl:
+        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl:
+        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl:
+        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl:
+        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl:
+        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl:
+        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl:
+        * connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl:
+        * connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/ContentFilteredTopic/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/QueryFilterListenEvent/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/QueryFilterListenState/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl:
+        * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl:
+
+          Ported tests.
+        
 Fri May 21 03:54:36 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * examples/BasicSP/descriptors/BasicSP_Homed.cdp:
diff --git a/modules/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl b/modules/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl
index 766e82d9590..6a5d3bb0da6 100755
--- a/modules/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl
@@ -100,7 +100,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -110,7 +110,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl b/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl
index b450136def5..ead8b3b8afe 100644
--- a/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/ami4ccm/tests/DelReplyH/descriptors/run_test.pl
@@ -100,7 +100,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -110,7 +110,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl b/modules/CIAO/connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl
index 4ba745a3d22..f583ed31878 100644
--- a/modules/CIAO/connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl
@@ -100,7 +100,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -110,7 +110,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/ami4ccm/tests/InterInArgs/descriptors/run_test.pl b/modules/CIAO/connectors/ami4ccm/tests/InterInArgs/descriptors/run_test.pl
index 2153984dbdd..c555924db17 100644
--- a/modules/CIAO/connectors/ami4ccm/tests/InterInArgs/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/ami4ccm/tests/InterInArgs/descriptors/run_test.pl
@@ -100,7 +100,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -110,7 +110,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl b/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl
index 2153984dbdd..c555924db17 100644
--- a/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl
@@ -100,7 +100,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -110,7 +110,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl b/modules/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl
index 2153984dbdd..c555924db17 100644
--- a/modules/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl
@@ -100,7 +100,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -110,7 +110,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl b/modules/CIAO/connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl
index b450136def5..ead8b3b8afe 100644
--- a/modules/CIAO/connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl
@@ -100,7 +100,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -110,7 +110,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl
index 2153984dbdd..c555924db17 100644
--- a/modules/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/run_test.pl
@@ -100,7 +100,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -110,7 +110,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/run_test_one.pl b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/run_test_one.pl
index e6d9179bdbd..0d5ef6e4adf 100644
--- a/modules/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/run_test_one.pl
+++ b/modules/CIAO/connectors/ami4ccm/tests/OneProcess/descriptors/run_test_one.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl b/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl
index f15d7b4f0cb..54b94bd73b5 100755
--- a/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl
+++ b/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl b/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl
index c28adced639..0b8c9d7f9d5 100755
--- a/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl
+++ b/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl b/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl
index 522972bf6f2..d4ea507d6d2 100755
--- a/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl
+++ b/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl
@@ -103,7 +103,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -113,7 +113,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl b/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl
index 09a8a098e5e..739dd17cd40 100755
--- a/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl
+++ b/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl b/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl
index c73fc8e11a7..35a6b25f641 100755
--- a/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl
+++ b/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl
index 40764f5b852..1f2098b0a8b 100755
--- a/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl
index 63828079c7c..99cf3cb0504 100755
--- a/modules/CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl
@@ -105,7 +105,7 @@ sub kill_open_processes {
         $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -115,7 +115,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --instance-nc corbaloc:rir:/NameService --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl
index 44cd3fa00c0..b7569c5d050 100755
--- a/modules/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl
index 6ab7070d719..b89b9e9fe20 100755
--- a/modules/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl b/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl
index 7adaac62e2d..91c3431eb52 100755
--- a/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl
+++ b/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl
@@ -109,7 +109,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl b/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl
index f210522bace..377748951fc 100755
--- a/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl
+++ b/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl
@@ -109,7 +109,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl b/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl
index 7e84b92407a..bdda59a0c92 100755
--- a/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl
+++ b/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl
@@ -109,7 +109,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl b/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl
index 62fc97da27d..741091518cf 100755
--- a/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl
+++ b/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl
@@ -109,7 +109,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl b/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl
index 26a273dd7b7..f6bfd970501 100755
--- a/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl
+++ b/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl
@@ -109,7 +109,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl b/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl
index 8fa41296ab7..f5424baf6f8 100755
--- a/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl
+++ b/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl
@@ -109,7 +109,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl b/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl
index d178bdf4359..50d9bfa01fe 100755
--- a/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl
+++ b/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl
@@ -109,7 +109,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl
index 943d0e31404..d055a5c2788 100755
--- a/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl
index 615c0ae0375..2d26ee24371 100644
--- a/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl
@@ -99,7 +99,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 
@@ -110,7 +110,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl
index 3eee53ba374..a8e2d629a76 100644
--- a/modules/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl
@@ -103,7 +103,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -113,7 +113,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl
index b611e355ec0..d6d101e660c 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl
@@ -100,7 +100,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -110,7 +110,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl
index b2a5229d554..f268769e6f6 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl
index 5d0ab35419d..ebadabec718 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl
index 66cc403a1fb..8da823fbf05 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl
index 4d9ba95b5f7..62c0e785b5b 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl
index 708c17b2051..7b00c89a61f 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/descriptors/run_test.pl
index 1aa3dcbec66..93c8e48a909 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl
index 3ca8a0ee149..58d757ad63f 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl
index b2a5229d554..f268769e6f6 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl
index d897a3911e9..34a642b693c 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl
index e39d6647174..8e3d2319d68 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl
index 3ca8a0ee149..58d757ad63f 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl
index 3ca8a0ee149..58d757ad63f 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl
index ddeee753cf7..6f8d90928dd 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl
index b2a5229d554..f268769e6f6 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl
index ddeee753cf7..6f8d90928dd 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl
index b51ae16243d..3e9d6f53dea 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl
index 9734de1093a..e4ea54ee190 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl
index 4ea0f211542..aa5e72be47d 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl
index b2a5229d554..f268769e6f6 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl
index c26f639fb6d..150824a4932 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl
@@ -99,7 +99,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 
@@ -110,7 +110,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl
index 82e952240b7..a69f6626029 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
     delete_ior_files ();
 }
 
@@ -112,7 +112,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl
index 708c17b2051..7b00c89a61f 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/descriptors/run_test.pl
index ddeee753cf7..6f8d90928dd 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenEvent/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/descriptors/run_test.pl
index ddeee753cf7..6f8d90928dd 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/QueryFilterListenState/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl
index 997852c0618..b9ce56fc32c 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl
index 66cc403a1fb..8da823fbf05 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl
index 66cc403a1fb..8da823fbf05 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl
index 66cc403a1fb..8da823fbf05 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl
index b51ae16243d..3e9d6f53dea 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl
index 5a57844e894..0b4a8ad3db9 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl
index c1a88c75f90..b25efb7e313 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl b/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl
index b7b2c12ee80..e41935a32d5 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl
index 5d0ab35419d..ebadabec718 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl
index 3ca8a0ee149..58d757ad63f 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl
index 58d28e2d477..2ede410c447 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl
index 7a20e61732d..f3aaf2add8d 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl
index 97e2bf434c6..5deb13ea7c7 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl
index d7266527ff7..9cfab7e4a8b 100755
--- a/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl
+++ b/modules/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl
@@ -101,7 +101,7 @@ sub kill_open_processes {
         $NS->Kill (); $NS->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 sub run_node_daemons {
@@ -111,7 +111,7 @@ sub run_node_daemons {
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+        $node_app = "$DANCE_ROOT/bin/dance_locality_manager";
 
         $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
author	William R. Otte <wotte@dre.vanderbilt.edu>	2010-05-21 03:58:33 +0000
committer	William R. Otte <wotte@dre.vanderbilt.edu>	2010-05-21 03:58:33 +0000
commit	cbdf27ac57d327fd072299b73d3433e6a8063763 (patch)
tree	c0d98f3810fbed4066237747a551f88b8cc46024
parent	22aec7775d61ccf1d11fc9f8ada0f9e26f2c1b8d (diff)
download	ATCD-cbdf27ac57d327fd072299b73d3433e6a8063763.tar.gz