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

        * examples/BasicSP/descriptors/BasicSP_Homed.cdp:
        * examples/BasicSP/descriptors/run_test.pl:
        * examples/Hello/descriptors/DeploymentPlan.cdp:
        * examples/Hello/descriptors/DeploymentPlan_without_ns.cdp:
        * examples/Hello/descriptors/run_test.pl:
        * examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl:
        * examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl:
        * examples/Hello/descriptors/run_test_alias.pl:
        * examples/Hello/descriptors/run_test_without_ns.pl:
        * examples/Null_Component/descriptors/Null_Homed.cdp:
        * examples/Null_Component/descriptors/run_test.pl:
        * examples/Null_Component/descriptors/run_test_without_ns.pl:
        * examples/Null_Component_Glfa/descriptors/Null_Homed.cdp:
        * examples/Null_Component_Glfa/descriptors/run_test.pl:
        * tests/Bug_2130_Regression/descriptors/run_test.pl:
        * tests/Bug_3769_Regression/descriptors/run_test.pl:
        * tests/Bug_3834_Regression/descriptors/run_test.pl:
        * tests/Bug_3834_Regression/descriptors/run_test_without_ns.pl:
        * tests/IDL_Test/Double_Inherited_Component/run_test.pl:

          Ported tests.

20 files changed, 265 insertions, 131 deletions

diff --git a/modules/CIAO/ChangeLog b/modules/CIAO/ChangeLog
index 02514e4d243..a1207a600dc 100644
--- a/modules/CIAO/ChangeLog
+++ b/modules/CIAO/ChangeLog
@@ -1,3 +1,27 @@
+Fri May 21 03:54:36 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * examples/BasicSP/descriptors/BasicSP_Homed.cdp:
+        * examples/BasicSP/descriptors/run_test.pl:
+        * examples/Hello/descriptors/DeploymentPlan.cdp:
+        * examples/Hello/descriptors/DeploymentPlan_without_ns.cdp:
+        * examples/Hello/descriptors/run_test.pl:
+        * examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl:
+        * examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl:
+        * examples/Hello/descriptors/run_test_alias.pl:
+        * examples/Hello/descriptors/run_test_without_ns.pl:
+        * examples/Null_Component/descriptors/Null_Homed.cdp:
+        * examples/Null_Component/descriptors/run_test.pl:
+        * examples/Null_Component/descriptors/run_test_without_ns.pl:
+        * examples/Null_Component_Glfa/descriptors/Null_Homed.cdp:
+        * examples/Null_Component_Glfa/descriptors/run_test.pl:
+        * tests/Bug_2130_Regression/descriptors/run_test.pl:
+        * tests/Bug_3769_Regression/descriptors/run_test.pl:
+        * tests/Bug_3834_Regression/descriptors/run_test.pl:
+        * tests/Bug_3834_Regression/descriptors/run_test_without_ns.pl:
+        * tests/IDL_Test/Double_Inherited_Component/run_test.pl:
+
+          Ported tests.
+
 Fri May 21 03:08:15 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * DAnCE/DAnCE/DAnCE_Utility.cpp:
diff --git a/modules/CIAO/examples/BasicSP/descriptors/BasicSP_Homed.cdp b/modules/CIAO/examples/BasicSP/descriptors/BasicSP_Homed.cdp
index cb705023256..d08969cc821 100644
--- a/modules/CIAO/examples/BasicSP/descriptors/BasicSP_Homed.cdp
+++ b/modules/CIAO/examples/BasicSP/descriptors/BasicSP_Homed.cdp
@@ -215,6 +215,17 @@
     <artifact xmi:idref="EC_ExecArtifact" />
     <artifact xmi:idref="EC_SvntArtifact" />
     <artifact xmi:idref="EC_StubArtifact" />
+    <execParameter>
+      <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>edu.vanderbilt.dre.CCM.HomedComponent</string>
+        </value>
+      </value>
+    </execParameter>
   </implementation>
   <implementation xmi:id="BMClosedEDComponentImplementation">
     <name>BMClosedEDComponentImplementation</name>
@@ -222,6 +233,17 @@
     <artifact xmi:idref="BMClosedED_ExecArtifact" />
     <artifact xmi:idref="BMClosedED_SvntArtifact" />
     <artifact xmi:idref="BMClosedED_StubArtifact" />
+    <execParameter>
+      <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>edu.vanderbilt.dre.CCM.HomedComponent</string>
+        </value>
+      </value>
+    </execParameter>
   </implementation>
   <implementation xmi:id="BMDeviceComponentImplementation">
     <name>BMDeviceComponentImplementation</name>
@@ -229,6 +251,17 @@
     <artifact xmi:idref="BMDevice_ExecArtifact" />
     <artifact xmi:idref="BMDevice_SvntArtifact" />
     <artifact xmi:idref="BMDevice_StubArtifact" />
+    <execParameter>
+      <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>edu.vanderbilt.dre.CCM.HomedComponent</string>
+        </value>
+      </value>
+    </execParameter>
   </implementation>
   <implementation xmi:id="BMDisplayComponentImplementation">
     <name>BMDisplayComponentImplementation</name>
@@ -236,6 +269,17 @@
     <artifact xmi:idref="BMDisplay_ExecArtifact" />
     <artifact xmi:idref="BMDisplay_SvntArtifact" />
     <artifact xmi:idref="BMDisplay_StubArtifact" />
+    <execParameter>
+      <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>edu.vanderbilt.dre.CCM.HomedComponent</string>
+        </value>
+      </value>
+    </execParameter>
   </implementation>
   <instance xmi:id="ECHomeInstance">
     <name>ECHome</name>
@@ -272,7 +316,7 @@
     <source/>
     <implementation xmi:idref="ECComponentImplementation" />
     <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
+      <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name>
       <value>
         <type>
           <kind>tk_string</kind>
@@ -301,7 +345,7 @@
     <source/>
     <implementation xmi:idref="BMClosedEDComponentImplementation" />
     <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
+      <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name>
       <value>
         <type>
           <kind>tk_string</kind>
@@ -319,7 +363,7 @@
     <source/>
     <implementation xmi:idref="BMDeviceComponentImplementation" />
     <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
+      <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name>
       <value>
         <type>
           <kind>tk_string</kind>
@@ -337,7 +381,7 @@
     <source/>
     <implementation xmi:idref="BMDisplayComponentImplementation" />
     <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
+      <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name>
       <value>
         <type>
           <kind>tk_string</kind>
diff --git a/modules/CIAO/examples/BasicSP/descriptors/run_test.pl b/modules/CIAO/examples/BasicSP/descriptors/run_test.pl
index 9c8519a60af..e6b310cd20f 100755
--- a/modules/CIAO/examples/BasicSP/descriptors/run_test.pl
+++ b/modules/CIAO/examples/BasicSP/descriptors/run_test.pl
@@ -106,7 +106,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 {
@@ -116,7 +116,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";
diff --git a/modules/CIAO/examples/Hello/descriptors/DeploymentPlan.cdp b/modules/CIAO/examples/Hello/descriptors/DeploymentPlan.cdp
index a8408215438..217dab0e06c 100644
--- a/modules/CIAO/examples/Hello/descriptors/DeploymentPlan.cdp
+++ b/modules/CIAO/examples/Hello/descriptors/DeploymentPlan.cdp
@@ -66,6 +66,17 @@
     <source/>
     <artifact xmi:idref="Hello_Receiver_ExecArtifact" />
     <artifact xmi:idref="Hello_Receiver_SvntArtifact" />
+    <execParameter>
+      <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>edu.vanderbilt.dre.CCM.HomedComponent</string>
+        </value>
+      </value>
+    </execParameter>
   </implementation>
 
   <implementation xmi:id="Hello_SenderHomeImplementation">
@@ -125,6 +136,17 @@
     <source/>
     <artifact xmi:idref="Hello_Sender_ExecArtifact" />
     <artifact xmi:idref="Hello_Sender_SvntArtifact" />
+    <execParameter>
+      <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>edu.vanderbilt.dre.CCM.HomedComponent</string>
+        </value>
+      </value>
+    </execParameter>
   </implementation>
 
   <instance xmi:id="Hello_ReceiverHomeInstance">
@@ -164,7 +186,7 @@
     <source/>
     <implementation xmi:idref="Hello_ReceiverComponentImplementation" />
     <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
+      <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name>
       <value>
         <type>
           <kind>tk_string</kind>
@@ -246,7 +268,7 @@
     <source/>
     <implementation xmi:idref="Hello_SenderComponentImplementation" />
     <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
+      <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name>
       <value>
         <type>
           <kind>tk_string</kind>
diff --git a/modules/CIAO/examples/Hello/descriptors/DeploymentPlan_without_ns.cdp b/modules/CIAO/examples/Hello/descriptors/DeploymentPlan_without_ns.cdp
index 6d5b3f05780..bc1bddd4c9d 100644
--- a/modules/CIAO/examples/Hello/descriptors/DeploymentPlan_without_ns.cdp
+++ b/modules/CIAO/examples/Hello/descriptors/DeploymentPlan_without_ns.cdp
@@ -66,6 +66,17 @@
     <source/>
     <artifact xmi:idref="Hello_Receiver_ExecArtifact" />
     <artifact xmi:idref="Hello_Receiver_SvntArtifact" />
+    <execParameter>
+      <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>edu.vanderbilt.dre.CCM.HomedComponent</string>
+        </value>
+      </value>
+    </execParameter>
   </implementation>
 
   <implementation xmi:id="Hello_SenderHomeImplementation">
@@ -125,6 +136,17 @@
     <source/>
     <artifact xmi:idref="Hello_Sender_ExecArtifact" />
     <artifact xmi:idref="Hello_Sender_SvntArtifact" />
+    <execParameter>
+      <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>edu.vanderbilt.dre.CCM.HomedComponent</string>
+        </value>
+      </value>
+    </execParameter>
   </implementation>
 
   <instance xmi:id="Hello_ReceiverHomeInstance">
@@ -153,7 +175,7 @@
     <source/>
     <implementation xmi:idref="Hello_ReceiverComponentImplementation" />
     <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
+      <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name>
       <value>
         <type>
           <kind>tk_string</kind>
@@ -202,7 +224,7 @@
     <source/>
     <implementation xmi:idref="Hello_SenderComponentImplementation" />
     <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
+      <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name>
       <value>
         <type>
           <kind>tk_string</kind>
diff --git a/modules/CIAO/examples/Hello/descriptors/run_test.pl b/modules/CIAO/examples/Hello/descriptors/run_test.pl
index d54efbaa8ff..496ee58a5b1 100755
--- a/modules/CIAO/examples/Hello/descriptors/run_test.pl
+++ b/modules/CIAO/examples/Hello/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";
diff --git a/modules/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl b/modules/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl
index b111f22402b..c88eae6fd42 100755
--- a/modules/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl
+++ b/modules/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl
@@ -89,7 +89,7 @@ sub kill_open_processes {
         $EM->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 
@@ -100,7 +100,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";
diff --git a/modules/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl b/modules/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl
index 4f095cab002..23c14752675 100755
--- a/modules/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl
+++ b/modules/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl
@@ -89,7 +89,7 @@ sub kill_open_processes {
         $EM->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 
@@ -100,7 +100,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";
diff --git a/modules/CIAO/examples/Hello/descriptors/run_test_alias.pl b/modules/CIAO/examples/Hello/descriptors/run_test_alias.pl
index 49b76becb98..dd8c35470e0 100755
--- a/modules/CIAO/examples/Hello/descriptors/run_test_alias.pl
+++ b/modules/CIAO/examples/Hello/descriptors/run_test_alias.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";
diff --git a/modules/CIAO/examples/Hello/descriptors/run_test_without_ns.pl b/modules/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
index 8208f174e41..eb95e82bec3 100755
--- a/modules/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
+++ b/modules/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
@@ -89,7 +89,7 @@ sub kill_open_processes {
         $EM->TimedWait (1);
     }
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 
@@ -100,7 +100,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";
diff --git a/modules/CIAO/examples/Null_Component/descriptors/Null_Homed.cdp b/modules/CIAO/examples/Null_Component/descriptors/Null_Homed.cdp
index 2332e2d346e..57d09cfb185 100644
--- a/modules/CIAO/examples/Null_Component/descriptors/Null_Homed.cdp
+++ b/modules/CIAO/examples/Null_Component/descriptors/Null_Homed.cdp
@@ -1,109 +1,120 @@
 <Deployment:DeploymentPlan
-  xmlns:Deployment="http://www.omg.org/Deployment"
-  xmlns:xmi="http://www.omg.org/XMI"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
+    xmlns:Deployment="http://www.omg.org/Deployment"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
   <label>Null_Homed</label>
   <UUID>Null_Homed</UUID>
-<implementation xmi:id="Null_ComponentHomeImplementation">
-  <name>Null_ComponentHomeImplementation</name>
-  <source/>
-  <artifact xmi:idref="Null_Component_ExecArtifact" />
-  <artifact xmi:idref="Null_Component_SvntArtifact" />
-  <execParameter>
-    <!-- entrypoint as exec parameter (see 10.6.1) -->
-    <name>home factory</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
+  <implementation xmi:id="Null_ComponentHomeImplementation">
+    <name>Null_ComponentHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="Null_Component_ExecArtifact" />
+    <artifact xmi:idref="Null_Component_SvntArtifact" />
+    <execParameter>
+      <!-- entrypoint as exec parameter (see 10.6.1) -->
+      <name>home factory</name>
       <value>
-        <string>create_Null_ComponentHome_Impl</string>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Null_ComponentHome_Impl</string>
+        </value>
       </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
       <value>
-        <string>create_Null_ComponentHome_Servant</string>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Null_ComponentHome_Servant</string>
+        </value>
       </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
       <value>
-        <string>Null_Component_svnt</string>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Null_Component_svnt</string>
+        </value>
       </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
       <value>
-        <string>Null_Component_exec</string>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Null_Component_exec</string>
+        </value>
       </value>
-    </value>
-  </execParameter>
-</implementation>
-<implementation xmi:id="Null_ComponentComponentImplementation">
-  <name>Null_ComponentComponentImplementation</name>
-  <source/>
-  <artifact xmi:idref="Null_Component_ExecArtifact" />
-  <artifact xmi:idref="Null_Component_SvntArtifact" />
-  <artifact xmi:idref="Null_Component_StubArtifact" />
-</implementation>    
+    </execParameter>
+  </implementation>
+  <implementation xmi:id="Null_ComponentComponentImplementation">
+    <name>Null_ComponentComponentImplementation</name>
+    <source/>
+    <artifact xmi:idref="Null_Component_ExecArtifact" />
+    <artifact xmi:idref="Null_Component_SvntArtifact" />
+    <artifact xmi:idref="Null_Component_StubArtifact" />
+    <execParameter>
+      <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>edu.vanderbilt.dre.CCM.HomedComponent</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>    
   <instance xmi:id="Null_ComponentHomeInstance">
-  <name>Null_ComponentHome</name>
-  <node>NodeOne</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Null_ComponentHomeImplementation" />
-</instance>
+    <name>Null_ComponentHome</name>
+    <node>NodeOne</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="Null_ComponentHomeImplementation" />
+  </instance>
   <instance xmi:id="Null_ComponentComponentInstance">
-  <name>Null_ComponentComponent</name>
-  <node>NodeOne</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Null_ComponentComponentImplementation" />
-  <configProperty>
-    <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
+    <name>Null_ComponentComponent</name>
+    <node>NodeOne</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="Null_ComponentComponentImplementation" />
+    <configProperty>
+      <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name>
       <value>
-        <string>Null_ComponentHome</string>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Null_ComponentHome</string>
+        </value>
       </value>
-    </value>
-  </configProperty>
-</instance>
+    </configProperty>
+  </instance>
   <artifact xmi:id="Null_Component_ExecArtifact">
-  <name>Null_Component_exec</name>
-  <source/>
-  <node/>
-  <location>Null_Component_exec</location>
-</artifact>
-<artifact xmi:id="Null_Component_SvntArtifact">
-  <name>Null_Component_svnt</name>
-  <source/>
-  <node/>
-  <location>Null_Component_svnt</location>
-</artifact>
-<artifact xmi:id="Null_Component_StubArtifact">
-  <name>Null_Component_stub</name>
-  <source/>
-  <node/>
-  <location>Null_Component_stub</location>
-</artifact>  
-</Deployment:DeploymentPlan>
\ No newline at end of file
+    <name>Null_Component_exec</name>
+    <source/>
+    <node/>
+    <location>Null_Component_exec</location>
+  </artifact>
+  <artifact xmi:id="Null_Component_SvntArtifact">
+    <name>Null_Component_svnt</name>
+    <source/>
+    <node/>
+    <location>Null_Component_svnt</location>
+  </artifact>
+  <artifact xmi:id="Null_Component_StubArtifact">
+    <name>Null_Component_stub</name>
+    <source/>
+    <node/>
+    <location>Null_Component_stub</location>
+  </artifact>  
+</Deployment:DeploymentPlan>
diff --git a/modules/CIAO/examples/Null_Component/descriptors/run_test.pl b/modules/CIAO/examples/Null_Component/descriptors/run_test.pl
index 1c854d88e2b..0b8c07ca7d8 100755
--- a/modules/CIAO/examples/Null_Component/descriptors/run_test.pl
+++ b/modules/CIAO/examples/Null_Component/descriptors/run_test.pl
@@ -100,7 +100,7 @@ sub kill_open_processes {
     }
 
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 
@@ -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 --instance-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/examples/Null_Component/descriptors/run_test_without_ns.pl b/modules/CIAO/examples/Null_Component/descriptors/run_test_without_ns.pl
index f56f270b47d..384f3893135 100755
--- a/modules/CIAO/examples/Null_Component/descriptors/run_test_without_ns.pl
+++ b/modules/CIAO/examples/Null_Component/descriptors/run_test_without_ns.pl
@@ -90,7 +90,7 @@ sub kill_open_processes {
     }
 
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 
@@ -101,7 +101,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";
diff --git a/modules/CIAO/examples/Null_Component_Glfa/descriptors/Null_Homed.cdp b/modules/CIAO/examples/Null_Component_Glfa/descriptors/Null_Homed.cdp
index 2332e2d346e..61521a0cc07 100644
--- a/modules/CIAO/examples/Null_Component_Glfa/descriptors/Null_Homed.cdp
+++ b/modules/CIAO/examples/Null_Component_Glfa/descriptors/Null_Homed.cdp
@@ -62,6 +62,17 @@
   <artifact xmi:idref="Null_Component_ExecArtifact" />
   <artifact xmi:idref="Null_Component_SvntArtifact" />
   <artifact xmi:idref="Null_Component_StubArtifact" />
+    <execParameter>
+      <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>edu.vanderbilt.dre.CCM.HomedComponent</string>
+        </value>
+      </value>
+    </execParameter>
 </implementation>    
   <instance xmi:id="Null_ComponentHomeInstance">
   <name>Null_ComponentHome</name>
@@ -77,7 +88,7 @@
   <source/>
   <implementation xmi:idref="Null_ComponentComponentImplementation" />
   <configProperty>
-    <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
+    <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name>
     <value>
       <type>
         <kind>tk_string</kind>
@@ -106,4 +117,4 @@
   <node/>
   <location>Null_Component_stub</location>
 </artifact>  
-</Deployment:DeploymentPlan>
\ No newline at end of file
+</Deployment:DeploymentPlan>
diff --git a/modules/CIAO/examples/Null_Component_Glfa/descriptors/run_test.pl b/modules/CIAO/examples/Null_Component_Glfa/descriptors/run_test.pl
index 1c854d88e2b..0b8c07ca7d8 100755
--- a/modules/CIAO/examples/Null_Component_Glfa/descriptors/run_test.pl
+++ b/modules/CIAO/examples/Null_Component_Glfa/descriptors/run_test.pl
@@ -100,7 +100,7 @@ sub kill_open_processes {
     }
 
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 
@@ -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 --instance-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl b/modules/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl
index d31d6f9c562..b3e0e10ddcd 100755
--- a/modules/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl
+++ b/modules/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl
@@ -86,7 +86,7 @@ sub kill_open_processes {
         $EM->Kill (); $EM->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 {
@@ -95,7 +95,7 @@ sub run_node_daemons {
         $iorfile = $iorfiles[$i];
         $port = $ports[$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 -o $iorfile -a \"-r\"";
diff --git a/modules/CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl b/modules/CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl
index 24b9dc6ec27..c9aad1fb892 100755
--- a/modules/CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl
+++ b/modules/CIAO/tests/Bug_3769_Regression/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 --instance-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/tests/Bug_3834_Regression/descriptors/run_test.pl b/modules/CIAO/tests/Bug_3834_Regression/descriptors/run_test.pl
index 1c854d88e2b..0b8c07ca7d8 100755
--- a/modules/CIAO/tests/Bug_3834_Regression/descriptors/run_test.pl
+++ b/modules/CIAO/tests/Bug_3834_Regression/descriptors/run_test.pl
@@ -100,7 +100,7 @@ sub kill_open_processes {
     }
 
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 
@@ -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 --instance-nc corbaloc:rir:/NameService";
diff --git a/modules/CIAO/tests/Bug_3834_Regression/descriptors/run_test_without_ns.pl b/modules/CIAO/tests/Bug_3834_Regression/descriptors/run_test_without_ns.pl
index 72c6fee30b6..a7daf9dfa2d 100755
--- a/modules/CIAO/tests/Bug_3834_Regression/descriptors/run_test_without_ns.pl
+++ b/modules/CIAO/tests/Bug_3834_Regression/descriptors/run_test_without_ns.pl
@@ -90,7 +90,7 @@ sub kill_open_processes {
     }
 
     # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
+    $tg_executor->KillAll ('dance_locality_manager');
 }
 
 
@@ -101,7 +101,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";
diff --git a/modules/CIAO/tests/IDL_Test/Double_Inherited_Component/run_test.pl b/modules/CIAO/tests/IDL_Test/Double_Inherited_Component/run_test.pl
index f2f1074d340..8b51fc6859e 100755
--- a/modules/CIAO/tests/IDL_Test/Double_Inherited_Component/run_test.pl
+++ b/modules/CIAO/tests/IDL_Test/Double_Inherited_Component/run_test.pl
@@ -103,7 +103,7 @@ sub kill_open_processes {
     }
     
     # in case the planlauncher wasn't able to shut everything down as supposed
-    $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";