7 files changed, 307 insertions, 92 deletions

diff --git a/CIAO/RACE/descriptors/Domain.cdd b/CIAO/RACE/descriptors/Domain.cdd
index 3f47c3e3a34..7d0735c1715 100644
--- a/CIAO/RACE/descriptors/Domain.cdd
+++ b/CIAO/RACE/descriptors/Domain.cdd
@@ -4,7 +4,7 @@
   <UUID>BCB38121-9F67-4D0D-9363-65FF3AE0188A</UUID>
 
   <node>
-    <name>blade30</name>
+    <name>host2</name>
     <resource>
       <name>Processor</name>
       <resourceType>CPULoad</resourceType>
@@ -25,7 +25,7 @@
   </node>
 
   <node>
-    <name>blade31</name>
+    <name>host3</name>
     <resource>
       <name>Processor</name>
       <resourceType>CPULoad</resourceType>
@@ -46,7 +46,7 @@
   </node>
 
   <node>
-    <name>blade32</name>
+    <name>host4</name>
     <resource>
       <name>Processor</name>
       <resourceType>CPULoad</resourceType>
@@ -67,7 +67,7 @@
   </node>
 
   <node>
-    <name>blade33</name>
+    <name>host5</name>
     <resource>
       <name>Processor</name>
       <resourceType>CPULoad</resourceType>
@@ -88,7 +88,7 @@
   </node>
 
   <node>
-    <name>blade34</name>
+    <name>host6</name>
     <resource>
       <name>Processor</name>
       <resourceType>CPULoad</resourceType>
@@ -101,7 +101,7 @@
             <kind>tk_long</kind>
           </type>
           <value>
-            <long>0</long>
+            <long>100</long>
           </value>
         </value>
       </property>
@@ -109,7 +109,7 @@
   </node>
 
   <node>
-    <name>blade29</name>
+    <name>host1</name>
     <resource>
       <name>Processor</name>
       <resourceType>CPULoad</resourceType>
diff --git a/CIAO/RACE/descriptors/NodeDetails.dat b/CIAO/RACE/descriptors/NodeDetails.dat
index 7b8304bc6f6..bbc21f4c844 100644
--- a/CIAO/RACE/descriptors/NodeDetails.dat
+++ b/CIAO/RACE/descriptors/NodeDetails.dat
@@ -1,10 +1,6 @@
-blade29      corbaloc:iiop:localhost:50000/NodeManager
-blade30      corbaloc:iiop:localhost:50001/NodeManager
-blade31      corbaloc:iiop:localhost:50002/NodeManager
-blade32      corbaloc:iiop:localhost:50003/NodeManager
-blade33      corbaloc:iiop:localhost:50004/NodeManager
-blade34      corbaloc:iiop:localhost:50005/NodeManager
-blade35      corbaloc:iiop:localhost:50006/NodeManager
-blade36      corbaloc:iiop:localhost:50007/NodeManager
-blade37      corbaloc:iiop:localhost:50008/NodeManager
-blade38      corbaloc:iiop:localhost:50009/NodeManager
+host1      corbaloc:iiop:10.2.250.100:50002/NodeManager
+host2      corbaloc:iiop:10.2.250.100:50002/NodeManager
+host3      corbaloc:iiop:10.3.250.100:50003/NodeManager
+host4      corbaloc:iiop:10.4.250.100:50004/NodeManager
+host5      corbaloc:iiop:10.5.250.100:50005/NodeManager
+host6      corbaloc:iiop:10.6.250.100:50006/NodeManager
diff --git a/CIAO/RACE/descriptors/RACE.cdp b/CIAO/RACE/descriptors/RACE.cdp
index 71ca3966bb5..d4aea56f25e 100644
--- a/CIAO/RACE/descriptors/RACE.cdp
+++ b/CIAO/RACE/descriptors/RACE.cdp
@@ -117,7 +117,7 @@
 
   <instance id="_RACE_NetQoS.ComponentImplementations.RACE.RACE.Interactive_Input_Adapter">
     <name>_RACE_NetQoS.ComponentImplementations.RACE.RACE.Interactive_Input_Adapter</name>
-    <node>blade30</node>
+    <node>host2</node>
     <source/>
     <implementation>_73898E70-9FB1-4881-9313-A2DE181EE48E</implementation>
     <configProperty>
@@ -157,7 +157,7 @@
 
   <instance id="_RACE_NetQoS.ComponentImplementations.RACE.RACE.Controller">
     <name>_RACE_NetQoS.ComponentImplementations.RACE.RACE.Controller</name>
-    <node>blade29</node>
+    <node>host1</node>
     <source/>
     <implementation>_D98AF36F-11FA-43A4-8FAD-C14A461437FF</implementation>
     <configProperty>
@@ -175,7 +175,7 @@
 
   <instance id="_RACE_NetQoS.ComponentImplementations.RACE.RACE.TargetManagerImpl">
     <name>_RACE_NetQoS.ComponentImplementations.RACE.RACE.TargetManagerImpl</name>
-    <node>blade29</node>
+    <node>host1</node>
     <source/>
     <implementation>_CA363CD1-4E23-4A4B-B25B-C38B939E2B25</implementation>
     <configProperty>
@@ -193,7 +193,7 @@
 
   <instance id="_RACE_NetQoS.ComponentImplementations.RACE.RACE.Central_Monitor">
     <name>_RACE_NetQoS.ComponentImplementations.RACE.RACE.Central_Monitor</name>
-    <node>blade29</node>
+    <node>host1</node>
     <source/>
     <implementation>_198AF36F-11FA-43A4-8FAD-C14A461437EE</implementation>
     <configProperty>
@@ -222,42 +222,42 @@
 
   <instance id="_RACE_NetQoS.ComponentImplementations.RACE.RACE.OutputManager.Output_Manager">
     <name>_RACE_NetQoS.ComponentImplementations.RACE.RACE.OutputManager.Output_Manager</name>
-    <node>blade30</node>
+    <node>host2</node>
     <source/>
     <implementation>_A22015F9-9BC9-4767-A861-FAFF737E074B</implementation>
   </instance>
 
   <instance id="_RACE_NetQoS.ComponentImplementations.RACE.RACE.OutputManager.DAnCE_Output_Adapter">
     <name>_RACE_NetQoS.ComponentImplementations.RACE.RACE.OutputManager.DAnCE_Output_Adapter</name>
-    <node>blade30</node>
+    <node>host2</node>
     <source/>
     <implementation>_219DB379-DB2E-44D2-8308-D91FC5A42A9D</implementation>
   </instance>
 
   <instance id="_RACE_NetQoS.ComponentImplementations.RACE.RACE.PlanAnalyzerAssembly.Plan_Analyzer">
     <name>_RACE_NetQoS.ComponentImplementations.RACE.RACE.PlanAnalyzerAssembly.Plan_Analyzer</name>
-    <node>blade30</node>
+    <node>host2</node>
     <source/>
     <implementation>_5D6641D2-640C-4F80-B055-10DC69C7A636</implementation>
   </instance>
 
   <instance id="_RACE_NetQoS.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.Planner_ManagerImplementation">
     <name>_RACE_NetQoS.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.Planner_ManagerImplementation</name>
-    <node>blade30</node>
+    <node>host2</node>
     <source/>
     <implementation>_FD120510-765E-4B02-803D-7DADF3F5E4E6</implementation>
   </instance>
 
   <instance id="_RACE_NetQoS.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.StaticPlannerImplementation">
     <name>_RACE_NetQoS.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.StaticPlannerImplementation</name>
-    <node>blade30</node>
+    <node>host2</node>
     <source/>
     <implementation>_38C5B64C-72FD-48FF-B095-260669E2A488</implementation>
   </instance>
 
   <instance id="_RACE_NetQoS.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.NetQoSPlannerImplementation">
     <name>_RACE_NetQoS.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.NetQoSPlannerImplementation</name>
-    <node>blade30</node>
+    <node>host2</node>
     <source/>
     <implementation>_CF52A30B-EDE4-4BB4-9ADA-DB40D7C54926</implementation>
     <configProperty>
diff --git a/CIAO/RACE/descriptors/RACE_NetQoS.cdp b/CIAO/RACE/descriptors/RACE_NetQoS.cdp
index 71ca3966bb5..d4aea56f25e 100644
--- a/CIAO/RACE/descriptors/RACE_NetQoS.cdp
+++ b/CIAO/RACE/descriptors/RACE_NetQoS.cdp
@@ -117,7 +117,7 @@
 
   <instance id="_RACE_NetQoS.ComponentImplementations.RACE.RACE.Interactive_Input_Adapter">
     <name>_RACE_NetQoS.ComponentImplementations.RACE.RACE.Interactive_Input_Adapter</name>
-    <node>blade30</node>
+    <node>host2</node>
     <source/>
     <implementation>_73898E70-9FB1-4881-9313-A2DE181EE48E</implementation>
     <configProperty>
@@ -157,7 +157,7 @@
 
   <instance id="_RACE_NetQoS.ComponentImplementations.RACE.RACE.Controller">
     <name>_RACE_NetQoS.ComponentImplementations.RACE.RACE.Controller</name>
-    <node>blade29</node>
+    <node>host1</node>
     <source/>
     <implementation>_D98AF36F-11FA-43A4-8FAD-C14A461437FF</implementation>
     <configProperty>
@@ -175,7 +175,7 @@
 
   <instance id="_RACE_NetQoS.ComponentImplementations.RACE.RACE.TargetManagerImpl">
     <name>_RACE_NetQoS.ComponentImplementations.RACE.RACE.TargetManagerImpl</name>
-    <node>blade29</node>
+    <node>host1</node>
     <source/>
     <implementation>_CA363CD1-4E23-4A4B-B25B-C38B939E2B25</implementation>
     <configProperty>
@@ -193,7 +193,7 @@
 
   <instance id="_RACE_NetQoS.ComponentImplementations.RACE.RACE.Central_Monitor">
     <name>_RACE_NetQoS.ComponentImplementations.RACE.RACE.Central_Monitor</name>
-    <node>blade29</node>
+    <node>host1</node>
     <source/>
     <implementation>_198AF36F-11FA-43A4-8FAD-C14A461437EE</implementation>
     <configProperty>
@@ -222,42 +222,42 @@
 
   <instance id="_RACE_NetQoS.ComponentImplementations.RACE.RACE.OutputManager.Output_Manager">
     <name>_RACE_NetQoS.ComponentImplementations.RACE.RACE.OutputManager.Output_Manager</name>
-    <node>blade30</node>
+    <node>host2</node>
     <source/>
     <implementation>_A22015F9-9BC9-4767-A861-FAFF737E074B</implementation>
   </instance>
 
   <instance id="_RACE_NetQoS.ComponentImplementations.RACE.RACE.OutputManager.DAnCE_Output_Adapter">
     <name>_RACE_NetQoS.ComponentImplementations.RACE.RACE.OutputManager.DAnCE_Output_Adapter</name>
-    <node>blade30</node>
+    <node>host2</node>
     <source/>
     <implementation>_219DB379-DB2E-44D2-8308-D91FC5A42A9D</implementation>
   </instance>
 
   <instance id="_RACE_NetQoS.ComponentImplementations.RACE.RACE.PlanAnalyzerAssembly.Plan_Analyzer">
     <name>_RACE_NetQoS.ComponentImplementations.RACE.RACE.PlanAnalyzerAssembly.Plan_Analyzer</name>
-    <node>blade30</node>
+    <node>host2</node>
     <source/>
     <implementation>_5D6641D2-640C-4F80-B055-10DC69C7A636</implementation>
   </instance>
 
   <instance id="_RACE_NetQoS.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.Planner_ManagerImplementation">
     <name>_RACE_NetQoS.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.Planner_ManagerImplementation</name>
-    <node>blade30</node>
+    <node>host2</node>
     <source/>
     <implementation>_FD120510-765E-4B02-803D-7DADF3F5E4E6</implementation>
   </instance>
 
   <instance id="_RACE_NetQoS.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.StaticPlannerImplementation">
     <name>_RACE_NetQoS.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.StaticPlannerImplementation</name>
-    <node>blade30</node>
+    <node>host2</node>
     <source/>
     <implementation>_38C5B64C-72FD-48FF-B095-260669E2A488</implementation>
   </instance>
 
   <instance id="_RACE_NetQoS.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.NetQoSPlannerImplementation">
     <name>_RACE_NetQoS.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.NetQoSPlannerImplementation</name>
-    <node>blade30</node>
+    <node>host2</node>
     <source/>
     <implementation>_CF52A30B-EDE4-4BB4-9ADA-DB40D7C54926</implementation>
     <configProperty>
diff --git a/CIAO/RACE/descriptors/RT1H.cdp b/CIAO/RACE/descriptors/RT1H.cdp
index 906a49dd3a8..b31319013d5 100644
--- a/CIAO/RACE/descriptors/RT1H.cdp
+++ b/CIAO/RACE/descriptors/RT1H.cdp
@@ -417,11 +417,11 @@
     <artifact>_3600FD54-B079-4520-971B-7D3E99F96539</artifact>
   </implementation>
 
-  <instance id="_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.EnvDetector1">
-    <name>_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.EnvDetector1</name>
-    <node>blade33</node>
+  <instance id="_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Config_Op">
+    <name>_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Config_Op</name>
+    <node>host3</node>
     <source/>
-    <implementation>_A8181747-270E-43FF-B723-50825AA8EA74</implementation>
+    <implementation>_2D19FD96-440B-48D4-8D68-4E9B466B2BCC</implementation>
     <configProperty>
       <name>ComponentIOR</name>
       <value>
@@ -429,17 +429,17 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Env_Detector.ior</string>
+          <string>Config_Op.ior</string>
         </value>
       </value>
     </configProperty>
   </instance>
 
-  <instance id="_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.EnvDetector2">
-    <name>_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.EnvDetector2</name>
-    <node>blade33</node>
+  <instance id="_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Effector2">
+    <name>_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Effector2</name>
+    <node>host4</node>
     <source/>
-    <implementation>_A8181747-270E-43FF-B723-50825AA8EA74</implementation>
+    <implementation>_8D45FC0E-C3DD-4671-926D-A08430B37D37</implementation>
     <configProperty>
       <name>ComponentIOR</name>
       <value>
@@ -447,17 +447,17 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Env_Detector.ior</string>
+          <string>Effectory_Secondary.ior</string>
         </value>
       </value>
     </configProperty>
   </instance>
 
-  <instance id="_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.EnvDetector3">
-    <name>_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.EnvDetector3</name>
-    <node>blade33</node>
+  <instance id="_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Effector3">
+    <name>_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Effector3</name>
+    <node>host4</node>
     <source/>
-    <implementation>_A8181747-270E-43FF-B723-50825AA8EA74</implementation>
+    <implementation>_8D45FC0E-C3DD-4671-926D-A08430B37D37</implementation>
     <configProperty>
       <name>ComponentIOR</name>
       <value>
@@ -465,17 +465,17 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Env_Detector.ior</string>
+          <string>Effectory_Secondary.ior</string>
         </value>
       </value>
     </configProperty>
   </instance>
 
-  <instance id="_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.EnvDetector4">
-    <name>_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.EnvDetector4</name>
-    <node>blade33</node>
+  <instance id="_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Effector4">
+    <name>_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Effector4</name>
+    <node>host4</node>
     <source/>
-    <implementation>_A8181747-270E-43FF-B723-50825AA8EA74</implementation>
+    <implementation>_8D45FC0E-C3DD-4671-926D-A08430B37D37</implementation>
     <configProperty>
       <name>ComponentIOR</name>
       <value>
@@ -483,17 +483,17 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Env_Detector.ior</string>
+          <string>Effectory_Secondary.ior</string>
         </value>
       </value>
     </configProperty>
   </instance>
 
-  <instance id="_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Effector3">
-    <name>_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Effector3</name>
-    <node>blade32</node>
+  <instance id="_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Effector_Main">
+    <name>_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Effector_Main</name>
+    <node>host4</node>
     <source/>
-    <implementation>_8D45FC0E-C3DD-4671-926D-A08430B37D37</implementation>
+    <implementation>_05FAFE3F-76B3-4C6E-A86B-0225B9E76909</implementation>
     <configProperty>
       <name>ComponentIOR</name>
       <value>
@@ -501,17 +501,17 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Effectory_Secondary.ior</string>
+          <string>Effectory_Main.ior</string>
         </value>
       </value>
     </configProperty>
   </instance>
 
-  <instance id="_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Effector2">
-    <name>_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Effector2</name>
-    <node>blade32</node>
+  <instance id="_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.EnvDetector1">
+    <name>_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.EnvDetector1</name>
+    <node>host5</node>
     <source/>
-    <implementation>_8D45FC0E-C3DD-4671-926D-A08430B37D37</implementation>
+    <implementation>_A8181747-270E-43FF-B723-50825AA8EA74</implementation>
     <configProperty>
       <name>ComponentIOR</name>
       <value>
@@ -519,17 +519,17 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Effectory_Secondary.ior</string>
+          <string>Env_Detector.ior</string>
         </value>
       </value>
     </configProperty>
   </instance>
 
-  <instance id="_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Effector4">
-    <name>_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Effector4</name>
-    <node>blade32</node>
+  <instance id="_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.EnvDetector2">
+    <name>_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.EnvDetector2</name>
+    <node>host5</node>
     <source/>
-    <implementation>_8D45FC0E-C3DD-4671-926D-A08430B37D37</implementation>
+    <implementation>_A8181747-270E-43FF-B723-50825AA8EA74</implementation>
     <configProperty>
       <name>ComponentIOR</name>
       <value>
@@ -537,17 +537,17 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Effectory_Secondary.ior</string>
+          <string>Env_Detector.ior</string>
         </value>
       </value>
     </configProperty>
   </instance>
 
-  <instance id="_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Planner_Three">
-    <name>_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Planner_Three</name>
-    <node>blade30</node>
+  <instance id="_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.EnvDetector3">
+    <name>_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.EnvDetector3</name>
+    <node>host5</node>
     <source/>
-    <implementation>_A7DAA16F-D455-4C63-92CE-05B98DD34B15</implementation>
+    <implementation>_A8181747-270E-43FF-B723-50825AA8EA74</implementation>
     <configProperty>
       <name>ComponentIOR</name>
       <value>
@@ -555,17 +555,17 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Planner_Three.ior</string>
+          <string>Env_Detector.ior</string>
         </value>
       </value>
     </configProperty>
   </instance>
 
-  <instance id="_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Planner_One">
-    <name>_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Planner_One</name>
-    <node>blade33</node>
+  <instance id="_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.EnvDetector4">
+    <name>_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.EnvDetector4</name>
+    <node>host5</node>
     <source/>
-    <implementation>_DA5C3C13-030E-4971-A0BF-8631563EFDF3</implementation>
+    <implementation>_A8181747-270E-43FF-B723-50825AA8EA74</implementation>
     <configProperty>
       <name>ComponentIOR</name>
       <value>
@@ -573,17 +573,17 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Planner_One.ior</string>
+          <string>Env_Detector.ior</string>
         </value>
       </value>
     </configProperty>
   </instance>
 
-  <instance id="_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Effector_Main">
-    <name>_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Effector_Main</name>
-    <node>blade32</node>
+  <instance id="_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Planner_One">
+    <name>_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Planner_One</name>
+    <node>host5</node>
     <source/>
-    <implementation>_05FAFE3F-76B3-4C6E-A86B-0225B9E76909</implementation>
+    <implementation>_DA5C3C13-030E-4971-A0BF-8631563EFDF3</implementation>
     <configProperty>
       <name>ComponentIOR</name>
       <value>
@@ -591,17 +591,17 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Effectory_Main.ior</string>
+          <string>Planner_One.ior</string>
         </value>
       </value>
     </configProperty>
   </instance>
 
-  <instance id="_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Config_Op">
-    <name>_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Config_Op</name>
-    <node>blade31</node>
+  <instance id="_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Planner_Three">
+    <name>_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Planner_Three</name>
+    <node>host2</node>
     <source/>
-    <implementation>_2D19FD96-440B-48D4-8D68-4E9B466B2BCC</implementation>
+    <implementation>_A7DAA16F-D455-4C63-92CE-05B98DD34B15</implementation>
     <configProperty>
       <name>ComponentIOR</name>
       <value>
@@ -609,7 +609,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Config_Op.ior</string>
+          <string>Planner_Three.ior</string>
         </value>
       </value>
     </configProperty>
@@ -2028,4 +2028,16 @@
     </execParameter>
   </artifact>
 
+  <infoProperty>
+    <name>CIAONetworkQoS</name>
+    <value>
+      <type>
+        <kind>tk_string</kind>
+      </type>
+      <value>
+        <string>RT1H_NetQoS.nqs</string>
+      </value>
+    </value>
+  </infoProperty>
+
 </Deployment:deploymentPlan>
diff --git a/CIAO/RACE/descriptors/RT1H_NetQoS.nqs b/CIAO/RACE/descriptors/RT1H_NetQoS.nqs
new file mode 100644
index 00000000000..007e673e329
--- /dev/null
+++ b/CIAO/RACE/descriptors/RT1H_NetQoS.nqs
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<CIAO:NetQoSRequirements xmlns:CIAO="http://www.dre.vanderbilt.edu/NetQoSRequirements" id="_ADD11D8D-63B6-45F3-A61F-E5E9A37DCDF8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.dre.vanderbilt.edu/NetQoSRequirements NetQoSRequirements.xsd">
+
+  <connectionQoS>
+    <connectionInfo>
+      <connectionName>situation_situation_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Planner_Three_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Planner_One</connectionName>
+      <client>_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Planner_Three</client>
+      <clientPortName>situation</clientPortName>
+      <server>_RT1H_NetQoS.ComponentImplementations.RT1H.RT1H.Planner_One</server>
+      <serverPortName>situation</serverPortName>
+    </connectionInfo>
+    <fwdBW>100</fwdBW>
+    <revBW>10</revBW>
+    <qos>BEST_EFFORT</qos>
+    <admissionPriority>NORMAL</admissionPriority>
+  </connectionQoS>
+
+</CIAO:NetQoSRequirements>
diff --git a/CIAO/RACE/descriptors/run_RACE_NetQoS.pl b/CIAO/RACE/descriptors/run_RACE_NetQoS.pl
new file mode 100755
index 00000000000..c127b607fc6
--- /dev/null
+++ b/CIAO/RACE/descriptors/run_RACE_NetQoS.pl
@@ -0,0 +1,189 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# run_test.pl,v 1.5 2006/01/31 21:54:08 wotte Exp
+# -*- perl -*-
+
+use lib "$ENV{'ACE_ROOT'}/bin";
+use PerlACE::Run_Test;
+
+$DAnCE = "$ENV{'CIAO_ROOT'}/DAnCE";
+$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
+$TAO_ROOT = "$ENV{'TAO_ROOT'}";
+$daemons_running = 0;
+$em_running = 0;
+$ns_running = 0;
+$daemons = 10;
+@ports = ( 50000, 50001, 50002, 50003, 50004,50005,50006,50007, 50008, 50009, 50010  );
+@iorfiles = ( "NodeApp1.ior", "NodeApp2.ior", "NodeApp3.ior", "NodeApp4.ior", "NodeApp5.ior","NodeApp6.ior","NodeApp7.ior", "NodeApp8.ior", "NodeApp9.ior", "NodeApp10.ior", "NodeApp11.ior" );
+$status = 0;
+$dat_file = "NodeDetails.dat";
+$cdp_file = "RACE.cdp";
+
+$nsior = PerlACE::LocalFile ("ns.ior");
+
+unlink $nsior;
+
+$E = 0;
+$EM = 0;
+
+# Delete if there are any .ior files.
+sub delete_ior_files {
+    for ($i = 0; $i < $daemons; ++$i) {
+        unlink $iorfiles[$i];
+    }
+    unlink PerlACE::LocalFile ("EM.ior");
+    unlink PerlACE::LocalFile ("Receiver.ior");
+    unlink PerlACE::LocalFile ("Sender.ior");
+    unlink PerlACE::LocalFile ("DAM.ior");
+    unlink PerlACE::LocalFile ("ns.ior");
+}
+
+sub kill_node_daemons {
+  for ($i = 0; $i < $daemons; ++$i) {
+    $Daemons[$i]->Kill (); $Daemons[$i]->TimedWait (1);
+  }
+}
+
+sub kill_open_processes {
+  if ($daemons_running == 1) {
+    kill_node_daemons ();
+  }
+
+  if ($em_running == 1) {
+    $EM->Kill ();
+    $EM->TimedWait (1);
+  }
+
+  if ($ns_running == 1) {
+    $NS->Kill ();
+    $NS->TimedWait (1);
+  }
+
+}
+
+sub run_node_daemons {
+  for ($i = 0; $i < $daemons; ++$i)
+  {
+      $iorfile = $iorfiles[$i];
+      $port = $ports[$i];
+
+      $iiop = "iiop://localhost:$port";
+      $node_app = "$DAnCE/NodeApplication/NodeApplication";
+
+      $d_cmd = "$DAnCE/NodeManager/NodeManager";
+      $d_param = "-n -ORBEndpoint $iiop -s $node_app -o $iorfile -d 30";
+
+      $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param);
+      $result = $Daemons[$i]->Spawn ();
+      push(@processes, $Daemons[$i]);
+
+      if (PerlACE::waitforfile_timed ($iorfile,
+                          $PerlACE::wait_interval_for_process_creation) == -1) {
+          print STDERR
+            "ERROR: The ior file of node daemon $i could not be found\n";
+          for (; $i > 0; --$i) {
+            $Daemons[$i]->Kill (); $Daemons[$i]->TimedWait (1);
+          }
+          return -1;
+      }
+  }
+  $daemons_running = 1;
+  return 0;
+}
+
+delete_ior_files ();
+
+# Invoke naming service
+
+$NS = new PerlACE::Process ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 1 -ORBEndpoint iiop://10.1.250.100:40003 -o ns.ior");
+
+$NS->Spawn ();
+
+ print STDERR "Starting Naming Service\n";
+
+ if (PerlACE::waitforfile_timed ($nsior, 10) == -1)
+ {
+     print STDERR "ERROR: cannot find naming service IOR file\n";
+     $NS->Kill ();
+     exit 1;
+ }
+
+# Set up NamingService environment
+$ENV{"NameServiceIOR"} = "corbaloc:iiop:10.1.250.100:40003/NameService";
+
+# Invoke node daemons.
+print "Invoking node daemons\n";
+#$status = run_node_daemons ();
+$Status = 0;
+
+if ($status != 0) {
+  print STDERR "ERROR: Unable to execute the node daemons\n";
+  exit 1;
+}
+
+$ns_running = 1;
+
+# Invoke execution manager.
+# print "Invoking execution manager\n";
+ $EM = new PerlACE::Process ("$DAnCE/ExecutionManager/Execution_Manager",
+                             "-n -o EM.ior -i $dat_file");
+ $EM->Spawn ();
+
+# if (PerlACE::waitforfile_timed ("EM.ior",
+#                         $PerlACE::wait_interval_for_process_creation) == -1) {
+#     print STDERR
+#       "ERROR: The ior file of execution manager could not be found\n";
+#     kill_open_processes ();
+#     exit 1;
+# }
+
+$em_running = 1;
+
+# print " Invoke executor - start the application -."
+print "Invoking executor - start the application -\n";
+$E =
+  new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher",
+                        "-p $cdp_file -n");
+
+$E->SpawnWaitKill (5000);
+
+#if (PerlACE::waitforfile_timed (
+#      "Receiver.ior",
+#      $PerlACE::wait_interval_for_process_creation) == -1) {
+#    print STDERR "ERROR: The ior file of receiver could not be found\n";
+#    kill_open_processes ();
+#    exit 1;
+#}
+
+#if (PerlACE::waitforfile_timed ("Sender.ior",
+#                        $PerlACE::wait_interval_for_process_creation) == -1) {
+#    print STDERR "ERROR: The ior file of sender could not be found\n";
+#    kill_open_processes ();
+#    exit 1;
+#}
+
+#print "Invoking the controller\n";
+#$controller = new PerlACE::Process ("$controller_exec", "-k file://Sender.ior");
+#$result = $controller->SpawnWaitKill (3000);
+
+#if ($result != 0) {
+#    print STDERR "ERROR: The controller returned $result\n";
+#    $status = 1;
+#}
+
+# Invoke executor - stop the application -.
+#print "Invoking executor - stop the application -\n";
+#$E =
+#  new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher",
+#                        "-k file://EM.ior -i file://DAM.ior");
+#$E->SpawnWaitKill (3000);
+
+print "Executor returned.\n";
+print "Shutting down rest of the processes.\n";
+
+delete_ior_files ();
+kill_open_processes ();
+
+exit $status;