Fri May 21 13:56:01 UTC 2010 William Otte <wotte@zifnab>

        * .:
          Merged in locality_manager branch.  details to follow:
        

6 files changed, 12 insertions, 12 deletions

diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl
index f15d7b4f0cb..54b94bd73b5 100755
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl
+++ b/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/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl
index c28adced639..0b8c9d7f9d5 100755
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl
+++ b/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/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl
index 522972bf6f2..d4ea507d6d2 100755
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl
+++ b/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/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl
index 09a8a098e5e..739dd17cd40 100755
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl
+++ b/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/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl
index c73fc8e11a7..35a6b25f641 100755
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl
+++ b/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/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl
index 40764f5b852..1f2098b0a8b 100755
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl
+++ b/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";