Mon Nov 1 11:58:16 UTC 2010 Marijke Hengstmengel <mhengstmengelt@remedy.nl>

* tests/Bug_2130_Regression/descriptors/TestNodeManagerMap.cdd: * tests/Bug_3834_Regression/descriptors/NodeMap.cdd: * tests/DAnCE/Progressive_Deployments/NodeManagerMap.cdd: * examples/Hello/descriptors/Aliased_Map.cdd: * examples/Hello/descriptors/NodeManagerMap.cdd: * examples/Hello/descriptors/NodeMap.cdd: * examples/BasicSP/descriptors/BasicSP.cdd: * examples/Display/descriptors/NodeManagerMap.cdd: * examples/DevGuideExamples/Messenger/descriptors/ApplicationNodeMap.cdd: * examples/Null_Component/descriptors/NodeMap.cdd: * tests/Bug_2130_Regression/descriptors/run_test.pl: * tests/Bug_3834_Regression/descriptors/run_test_without_ns.pl: * tests/DAnCE/Progressive_Deployments/run_test.pl: * connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl: * examples/Hello/descriptors/run_test_alias.pl: * examples/Hello/descriptors/run_test_shs.pl: * examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl: * examples/Hello/descriptors/run_test_without_ns.pl: * examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl: * examples/Hello/descriptors/run_test.pl: * examples/BasicSP/descriptors/run_test.pl: * examples/Display/descriptors/run_test_without_ns.pl: * examples/DevGuideExamples/Messenger/descriptors/run_test.pl: * examples/Null_Component/descriptors/run_test_without_ns.pl: Use of *.cdd files i.o. *.dat files. * tests/Bug_2130_Regression/descriptors/TestNodeManagerMap.dat: * tests/Bug_3834_Regression/descriptors/NodeMap.dat: * tests/Bug_3769_Regression/descriptors/NodeMap.dat: * tests/DAnCE/Progressive_Deployments/NodeManagerMap.dat: * connectors/dds4ccm/examples/Large_Deployment/descriptors/NodeManagerMap.dat: * examples/Hello/descriptors/NodeManagerMap.dat: * examples/Hello/descriptors/NodeMap.dat: * examples/Hello/descriptors/Aliased_Map.dat: * examples/Display/descriptors/NodeManagerMap.dat: * examples/DevGuideExamples/Messenger/descriptors/ApplicationNodeMap.dat: * examples/Null_Component/descriptors/NodeMap.dat: Remove datfile NodeManager
author: Marijke Hengstmengel <MHengstmengel@users.noreply.github.com> 2010-11-01 12:02:50 +0000
committer: Marijke Hengstmengel <MHengstmengel@users.noreply.github.com> 2010-11-01 12:02:50 +0000
commit: aaf5f5821ebe31719a409da48022346c1e57e329 (patch)
tree: a4467415b6e89d20193b60d5da92c0ea8315c054 /CIAO/examples
parent: 518b8ad01ef9d3449f40b4c0182336de874c295e (diff)
download: ATCD-aaf5f5821ebe31719a409da48022346c1e57e329.tar.gz
23 files changed, 414 insertions, 38 deletions
diff --git a/CIAO/examples/BasicSP/descriptors/BasicSP.cdd b/CIAO/examples/BasicSP/descriptors/BasicSP.cdd
new file mode 100644
index 00000000000..f2908214933
--- /dev/null
+++ b/CIAO/examples/BasicSP/descriptors/BasicSP.cdd
@@ -0,0 +1,91 @@
+<Deployment:domain 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">
+
+  <UUID>83D02FE2-A0BD-11DF-A038-005056C00008</UUID>
+
+  <label/>
+
+  <node>
+    <name>EC</name>
+    <label/>
+    <resource>
+      <name>Node Address</name>
+      <resourceType>edu.vanderbilt.dre.DAnCE.NodeAddress</resourceType>
+      <property>
+        <name>edu.vanderbilt.dre.DAnCE.StringIOR</name>
+        <kind>Attribute</kind>
+        <dynamic>false</dynamic>
+        <value>
+          <type>
+            <kind>tk_string</kind>
+          </type>
+          <value>
+            <string>corbaloc:iiop:localhost:10000</string>
+          </value>
+        </value>
+      </property>
+    </resource>
+  </node>
+  <node>
+    <name>BMDisplay</name>
+    <label/>
+    <resource>
+      <name>Node Address</name>
+      <resourceType>edu.vanderbilt.dre.DAnCE.NodeAddress</resourceType>
+      <property>
+        <name>edu.vanderbilt.dre.DAnCE.StringIOR</name>
+        <kind>Attribute</kind>
+        <dynamic>false</dynamic>
+        <value>
+          <type>
+            <kind>tk_string</kind>
+          </type>
+          <value>
+            <string>corbaloc:iiop:localhost:20000</string>
+          </value>
+        </value>
+      </property>
+    </resource>
+  </node>
+  <node>
+     <name>BMClosedED</name>
+    <label/>
+    <resource>
+      <name>Node Address</name>
+      <resourceType>edu.vanderbilt.dre.DAnCE.NodeAddress</resourceType>
+      <property>
+        <name>edu.vanderbilt.dre.DAnCE.StringIOR</name>
+        <kind>Attribute</kind>
+        <dynamic>false</dynamic>
+        <value>
+          <type>
+            <kind>tk_string</kind>
+          </type>
+          <value>
+            <string>corbaloc:iiop:localhost:30000</string>
+          </value>
+        </value>
+      </property>
+    </resource>
+  </node>
+  <node>
+     <name>BMDevice</name>
+    <label/>
+    <resource>
+      <name>Node Address</name>
+      <resourceType>edu.vanderbilt.dre.DAnCE.NodeAddress</resourceType>
+      <property>
+        <name>edu.vanderbilt.dre.DAnCE.StringIOR</name>
+        <kind>Attribute</kind>
+        <dynamic>false</dynamic>
+        <value>
+          <type>
+            <kind>tk_string</kind>
+          </type>
+          <value>
+            <string>corbaloc:iiop:localhost:40000</string>
+          </value>
+        </value>
+      </property>
+    </resource>
+  </node>
+</Deployment:domain>
diff --git a/CIAO/examples/BasicSP/descriptors/run_test.pl b/CIAO/examples/BasicSP/descriptors/run_test.pl
index 8656e10fe7c..b29958950cf 100755
--- a/CIAO/examples/BasicSP/descriptors/run_test.pl
+++ b/CIAO/examples/BasicSP/descriptors/run_test.pl
@@ -24,7 +24,7 @@ $daemons = 4;
 
 $status = 0;
 
-$dat_file = "BasicSP.dat";
+$dat_file = "BasicSP.cdd";
 $cdp_file = "BasicSP_Unhomed.cdp";
 $controller_exec = "$CIAO_ROOT/examples/BasicSP/EC/controller";
 
@@ -187,7 +187,7 @@ $daemons_running = 1;
 # Invoke execution manager.
 print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
 $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --node-map $dat_file");
+                                    "-e$ior_emfile --cdd $dat_file");
 $EM->Spawn ();
 
 if ($tg_exe_man->WaitForFileTimed ($ior_embase,
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/ApplicationNodeMap.cdd b/CIAO/examples/DevGuideExamples/Messenger/descriptors/ApplicationNodeMap.cdd
new file mode 100644
index 00000000000..df1f318cff6
--- /dev/null
+++ b/CIAO/examples/DevGuideExamples/Messenger/descriptors/ApplicationNodeMap.cdd
@@ -0,0 +1,91 @@
+<Deployment:domain 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">
+
+  <UUID>83D02FE2-A0BD-11DF-A038-005056C00008</UUID>
+
+  <label/>
+
+  <node>
+    <name>Administrator_Node</name>
+    <label/>
+    <resource>
+      <name>Node Address</name>
+      <resourceType>edu.vanderbilt.dre.DAnCE.NodeAddress</resourceType>
+      <property>
+        <name>edu.vanderbilt.dre.DAnCE.StringIOR</name>
+        <kind>Attribute</kind>
+        <dynamic>false</dynamic>
+        <value>
+          <type>
+            <kind>tk_string</kind>
+          </type>
+          <value>
+            <string>corbaloc:iiop:localhost:11000</string>
+          </value>
+        </value>
+      </property>
+    </resource>
+  </node>
+  <node>
+    <name>First_Receiver_Node</name>
+    <label/>
+    <resource>
+      <name>Node Address</name>
+      <resourceType>edu.vanderbilt.dre.DAnCE.NodeAddress</resourceType>
+      <property>
+        <name>edu.vanderbilt.dre.DAnCE.StringIOR</name>
+        <kind>Attribute</kind>
+        <dynamic>false</dynamic>
+        <value>
+          <type>
+            <kind>tk_string</kind>
+          </type>
+          <value>
+            <string>corbaloc:iiop:localhost:22000</string>
+          </value>
+        </value>
+      </property>
+    </resource>
+  </node>
+ <node>
+    <name>Second_Receiver_Node</name>
+    <label/>
+    <resource>
+      <name>Node Address</name>
+      <resourceType>edu.vanderbilt.dre.DAnCE.NodeAddress</resourceType>
+      <property>
+        <name>edu.vanderbilt.dre.DAnCE.StringIOR</name>
+        <kind>Attribute</kind>
+        <dynamic>false</dynamic>
+        <value>
+          <type>
+            <kind>tk_string</kind>
+          </type>
+          <value>
+            <string>corbaloc:iiop:localhost:33000</string>
+          </value>
+        </value>
+      </property>
+    </resource>
+  </node>
+   <node>
+     <name>Messenger_Node</name>
+    <label/>
+    <resource>
+      <name>Node Address</name>
+      <resourceType>edu.vanderbilt.dre.DAnCE.NodeAddress</resourceType>
+      <property>
+        <name>edu.vanderbilt.dre.DAnCE.StringIOR</name>
+        <kind>Attribute</kind>
+        <dynamic>false</dynamic>
+        <value>
+          <type>
+            <kind>tk_string</kind>
+          </type>
+          <value>
+            <string>corbaloc:iiop:localhost:44000</string>
+          </value>
+        </value>
+      </property>
+    </resource>
+  </node>
+</Deployment:domain>
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/ApplicationNodeMap.dat b/CIAO/examples/DevGuideExamples/Messenger/descriptors/ApplicationNodeMap.dat
deleted file mode 100644
index 91fbbfd4d20..00000000000
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/ApplicationNodeMap.dat
+++ /dev/null
@@ -1,5 +0,0 @@
-Administrator_Node   corbaloc:iiop:localhost:11000/Administrator_Node.NodeManager
-First_Receiver_Node  corbaloc:iiop:localhost:22000/First_Receiver_Node.NodeManager
-Second_Receiver_Node corbaloc:iiop:localhost:33000/Second_Receiver_Node.NodeManager
-Messenger_Node       corbaloc:iiop:localhost:44000/Messenger_Node.NodeManager
-
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/run_test.pl b/CIAO/examples/DevGuideExamples/Messenger/descriptors/run_test.pl
index 8b4dcd571dd..42b63bc09f0 100755
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/run_test.pl
+++ b/CIAO/examples/DevGuideExamples/Messenger/descriptors/run_test.pl
@@ -59,7 +59,7 @@ if($Ret4 == -1) {
 }
 
 #Start an Execution Manager
-$EM = $tg->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$emior --node-map ApplicationNodeMap.dat");
+$EM = $tg->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-e$emior --cdd ApplicationNodeMap.cdd");
 
 $Ret5 = $EM->Spawn ();
 if($Ret5 == -1) {
diff --git a/CIAO/examples/Display/descriptors/NodeManagerMap.cdd b/CIAO/examples/Display/descriptors/NodeManagerMap.cdd
new file mode 100644
index 00000000000..078d6ca0a32
--- /dev/null
+++ b/CIAO/examples/Display/descriptors/NodeManagerMap.cdd
@@ -0,0 +1,50 @@
+<Deployment:domain 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">
+
+  <UUID>83D02FE2-A0BD-11DF-A038-005056C00008</UUID>
+
+  <label/>
+
+  <node>
+    <name>AirFrameDevice</name>
+    <label/>
+    <resource>
+      <name>Node Address</name>
+      <resourceType>edu.vanderbilt.dre.DAnCE.NodeAddress</resourceType>
+      <property>
+        <name>edu.vanderbilt.dre.DAnCE.StringIOR</name>
+        <kind>Attribute</kind>
+        <dynamic>false</dynamic>
+        <value>
+          <type>
+            <kind>tk_string</kind>
+          </type>
+          <value>
+            <string>corbaloc:iiop:localhost:10001</string>
+          </value>
+        </value>
+      </property>
+    </resource>
+  </node>
+  <node>
+    <name>TimerDevice</name>
+    <label/>
+    <resource>
+      <name>Node Address</name>
+      <resourceType>edu.vanderbilt.dre.DAnCE.NodeAddress</resourceType>
+      <property>
+        <name>edu.vanderbilt.dre.DAnCE.StringIOR</name>
+        <kind>Attribute</kind>
+        <dynamic>false</dynamic>
+        <value>
+          <type>
+            <kind>tk_string</kind>
+          </type>
+          <value>
+            <string>corbaloc:iiop:localhost:20001</string>
+          </value>
+        </value>
+      </property>
+    </resource>
+  </node>
+
+</Deployment:domain>
diff --git a/CIAO/examples/Display/descriptors/NodeManagerMap.dat b/CIAO/examples/Display/descriptors/NodeManagerMap.dat
deleted file mode 100644
index ac5c9a6486d..00000000000
--- a/CIAO/examples/Display/descriptors/NodeManagerMap.dat
+++ /dev/null
@@ -1,2 +0,0 @@
-AirFrameDevice corbaloc:iiop:localhost:10001/NodeManager
-TimerDevice  corbaloc:iiop:localhost:20001/NodeManager
-\ No newline at end of file
diff --git a/CIAO/examples/Display/descriptors/run_test_without_ns.pl b/CIAO/examples/Display/descriptors/run_test_without_ns.pl
index ab67a157341..87334b25da6 100755
--- a/CIAO/examples/Display/descriptors/run_test_without_ns.pl
+++ b/CIAO/examples/Display/descriptors/run_test_without_ns.pl
@@ -17,7 +17,7 @@ $daemons = 2;
 @iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
 @iorfiles = 0;
 $status = 0;
-$dat_file = "NodeManagerMap.dat";
+$dat_file = "NodeManagerMap.cdd";
 $controller_exec = "$CIAO_ROOT/examples/Display/RateGen/controller";
 
 $E = 0;
@@ -117,7 +117,7 @@ if ($status != 0) {
 # Invoke execution manager.
 print "Invoking execution manager\n";
 $EM = $tg->CreateProcess ("$CIAO_ROOT/bin/dance_execution_manager",
-                            "-o $ior_emfile -i $dat_file");
+                            "-o $ior_emfile -i -cdd $dat_file");
 $EM->Spawn ();
 
 if ($tg->WaitForFileTimed($ior_embase,
diff --git a/CIAO/examples/Hello/descriptors/Aliased_Map.cdd b/CIAO/examples/Hello/descriptors/Aliased_Map.cdd
new file mode 100644
index 00000000000..3a9fbdb0de7
--- /dev/null
+++ b/CIAO/examples/Hello/descriptors/Aliased_Map.cdd
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Deployment:domain 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">
+
+  <UUID>83D02FE2-A0BD-11DF-A038-005056C00008</UUID>
+
+  <label/>
+
+  <node>
+    <name>Alias</name>
+    <label/>
+    <resource>
+      <name>Node Address</name>
+      <resourceType>edu.vanderbilt.dre.DAnCE.NodeAddress</resourceType>
+      <property>
+        <name>edu.vanderbilt.dre.DAnCE.StringIOR</name>
+        <kind>Attribute</kind>
+        <dynamic>false</dynamic>
+        <value>
+          <type>
+            <kind>tk_string</kind>
+          </type>
+          <value>
+            <string>corbaloc:iiop:localhost:60001</string>
+          </value>
+        </value>
+      </property>
+    </resource>
+  </node>
+   <node>
+    <name>Alias</name>
+    <label/>
+    <resource>
+      <name>Node Address</name>
+      <resourceType>edu.vanderbilt.dre.DAnCE.NodeAddress</resourceType>
+      <property>
+        <name>edu.vanderbilt.dre.DAnCE.StringIOR</name>
+        <kind>Attribute</kind>
+        <dynamic>false</dynamic>
+        <value>
+          <type>
+            <kind>tk_string</kind>
+          </type>
+          <value>
+            <string>corbaloc:iiop:localhost:60002</string>
+          </value>
+        </value>
+      </property>
+    </resource>
+  </node>
+</Deployment:domain>
+\ No newline at end of file
diff --git a/CIAO/examples/Hello/descriptors/Aliased_Map.dat b/CIAO/examples/Hello/descriptors/Aliased_Map.dat
deleted file mode 100644
index 30e6930c2a3..00000000000
--- a/CIAO/examples/Hello/descriptors/Aliased_Map.dat
+++ /dev/null
@@ -1,2 +0,0 @@
-SenderNode      corbaloc:iiop:localhost:60001/Alias.NodeManager
-ReceiverNode    corbaloc:iiop:localhost:60001/Alias.NodeManager
-\ No newline at end of file
diff --git a/CIAO/examples/Hello/descriptors/NodeManagerMap.cdd b/CIAO/examples/Hello/descriptors/NodeManagerMap.cdd
new file mode 100644
index 00000000000..0bac35a3e21
--- /dev/null
+++ b/CIAO/examples/Hello/descriptors/NodeManagerMap.cdd
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Deployment:domain 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">
+
+  <UUID>83D02FE2-A0BD-11DF-A038-005056C00008</UUID>
+
+  <label/>
+
+  <node>
+    <name>SenderNode</name>
+    <label/>
+    <resource>
+      <name>Node Address</name>
+      <resourceType>edu.vanderbilt.dre.DAnCE.NodeAddress</resourceType>
+      <property>
+        <name>edu.vanderbilt.dre.DAnCE.StringIOR</name>
+        <kind>Attribute</kind>
+        <dynamic>false</dynamic>
+        <value>
+          <type>
+            <kind>tk_string</kind>
+          </type>
+          <value>
+            <string>corbaloc:iiop:localhost:60001</string>
+          </value>
+        </value>
+      </property>
+    </resource>
+  </node>
+   <node>
+    <name>ReceiverNode</name>
+    <label/>
+    <resource>
+      <name>Node Address</name>
+      <resourceType>edu.vanderbilt.dre.DAnCE.NodeAddress</resourceType>
+      <property>
+        <name>edu.vanderbilt.dre.DAnCE.StringIOR</name>
+        <kind>Attribute</kind>
+        <dynamic>false</dynamic>
+        <value>
+          <type>
+            <kind>tk_string</kind>
+          </type>
+          <value>
+            <string>corbaloc:iiop:localhost:60002</string>
+          </value>
+        </value>
+      </property>
+    </resource>
+  </node>
+</Deployment:domain>
+\ No newline at end of file
diff --git a/CIAO/examples/Hello/descriptors/NodeManagerMap.dat b/CIAO/examples/Hello/descriptors/NodeManagerMap.dat
deleted file mode 100644
index fb390806728..00000000000
--- a/CIAO/examples/Hello/descriptors/NodeManagerMap.dat
+++ /dev/null
@@ -1,4 +0,0 @@
-SenderNode      corbaloc:iiop:localhost:60001/Sender.NodeManager
-
-
-ReceiverNode    corbaloc:iiop:localhost:60002/Receiver.NodeManager
-\ No newline at end of file
diff --git a/CIAO/examples/Hello/descriptors/NodeMap.cdd b/CIAO/examples/Hello/descriptors/NodeMap.cdd
new file mode 100755
index 00000000000..a48f4bc245b
--- /dev/null
+++ b/CIAO/examples/Hello/descriptors/NodeMap.cdd
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Deployment:domain 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">
+
+  <UUID>83D02FE2-A0BD-11DF-A038-005056C00008</UUID>
+
+  <label/>
+
+  <node>
+    <name>NodeOne</name>
+    <label/>
+    <resource>
+      <name>Node Address</name>
+      <resourceType>edu.vanderbilt.dre.DAnCE.NodeAddress</resourceType>
+      <property>
+        <name>edu.vanderbilt.dre.DAnCE.StringIOR</name>
+        <kind>Attribute</kind>
+        <dynamic>false</dynamic>
+        <value>
+          <type>
+            <kind>tk_string</kind>
+          </type>
+          <value>
+            <string>corbaloc:iiop:localhost:60001</string>
+          </value>
+        </value>
+      </property>
+    </resource>
+  </node>
+</Deployment:domain>
diff --git a/CIAO/examples/Hello/descriptors/NodeMap.dat b/CIAO/examples/Hello/descriptors/NodeMap.dat
deleted file mode 100755
index 16cb0459657..00000000000
--- a/CIAO/examples/Hello/descriptors/NodeMap.dat
+++ /dev/null
@@ -1 +0,0 @@
-NodeOne      corbaloc:iiop:localhost:60001/NodeOne.NodeManager
diff --git a/CIAO/examples/Hello/descriptors/run_test.pl b/CIAO/examples/Hello/descriptors/run_test.pl
index dffd736af37..7d4fb2e9057 100755
--- a/CIAO/examples/Hello/descriptors/run_test.pl
+++ b/CIAO/examples/Hello/descriptors/run_test.pl
@@ -20,10 +20,9 @@ $nr_daemon = 2;
 @ports = ( 60001, 60002 );
 @iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
 @iorfiles = 0;
-@nodenames = ( "Sender", "Receiver" );
+@nodenames = ( "SenderNode", "ReceiverNode" );
 
 $status = 0;
-$dat_file = "NodeManagerMap.dat";
 $cdp_file = "DeploymentPlan.cdp";
 
 $controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter";
@@ -118,7 +117,7 @@ sub run_node_daemons {
         $node_app = $tg_daemons[$i]->GetArchDir("$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";
+        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
 
         print "Run dance_node_manager with $d_param\n";
 
@@ -181,7 +180,7 @@ $daemons_running = 1;
 # Invoke execution manager.
 print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
 $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --node-map $dat_file");
+                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
 $EM->Spawn ();
 
 if ($tg_exe_man->WaitForFileTimed ($ior_embase,
diff --git a/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl b/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl
index 7d4d6febd1e..ccf44c53969 100755
--- a/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl
+++ b/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl
@@ -21,7 +21,7 @@ $daemons = 1;
 @nodenames = ( "NodeOne" );
 
 $status = 0;
-$dat_file = "NodeMap.dat";
+$dat_file = "NodeMap.cdd";
 $cdp_file = "PlanLocality_DifferentProcesses.cdp";
 
 $controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter";
@@ -141,7 +141,7 @@ $daemons_running = 1;
 # Invoke execution manager.
 print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
 $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --node-map $dat_file");
+                                    "-e$ior_emfile --cdd $dat_file");
 $EM->Spawn ();
 
 if ($tg_exe_man->WaitForFileTimed ($ior_embase,
diff --git a/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl b/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl
index 9edeb1b8361..d32ce8cc057 100755
--- a/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl
+++ b/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl
@@ -21,7 +21,7 @@ $daemons = 1;
 @nodenames = ( "NodeOne" );
 
 $status = 0;
-$dat_file = "NodeMap.dat";
+$dat_file = "NodeMap.cdd";
 $cdp_file = "PlanLocality_SameProcess.cdp";
 
 $controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter";
@@ -141,7 +141,7 @@ $daemons_running = 1;
 # Invoke execution manager.
 print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
 $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --node-map $dat_file");
+                                    "-e$ior_emfile --cdd $dat_file");
 $EM->Spawn ();
 
 if ($tg_exe_man->WaitForFileTimed ($ior_embase,
diff --git a/CIAO/examples/Hello/descriptors/run_test_alias.pl b/CIAO/examples/Hello/descriptors/run_test_alias.pl
index 82a617fdf58..c5a44969fe2 100755
--- a/CIAO/examples/Hello/descriptors/run_test_alias.pl
+++ b/CIAO/examples/Hello/descriptors/run_test_alias.pl
@@ -23,7 +23,7 @@ $daemons = 1;
 @nodenames = ( "Alias" );
 
 $status = 0;
-$dat_file = "Aliased_Map.dat";
+$dat_file = "Aliased_Map.cdd";
 $cdp_file = "DeploymentPlan.cdp";
 
 $controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter";
@@ -181,7 +181,7 @@ $daemons_running = 1;
 # Invoke execution manager.
 print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
 $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --node-map $dat_file");
+                                    "-e$ior_emfile --cdd $dat_file");
 $EM->Spawn ();
 
 if ($tg_exe_man->WaitForFileTimed ($ior_embase,
diff --git a/CIAO/examples/Hello/descriptors/run_test_shs.pl b/CIAO/examples/Hello/descriptors/run_test_shs.pl
index 658b2f52fd0..f115d6b83da 100755
--- a/CIAO/examples/Hello/descriptors/run_test_shs.pl
+++ b/CIAO/examples/Hello/descriptors/run_test_shs.pl
@@ -20,10 +20,10 @@ $nr_daemon = 2;
 @ports = ( 60001, 60002 );
 @iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
 @iorfiles = 0;
-@nodenames = ( "Sender", "Receiver" );
+@nodenames = ( "SenderNode", "ReceiverNode" );
 
 $status = 0;
-$dat_file = "NodeManagerMap.dat";
+$dat_file = "NodeManagerMap.cdd";
 $cdp_file = "DeploymentPlan.cdp";
 
 $controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter";
@@ -216,7 +216,7 @@ $daemons_running = 1;
 # Invoke execution manager.
 print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
 $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --node-map $dat_file");
+                                    "-e$ior_emfile --cdd $dat_file");
 $EM->Spawn ();
 
 if ($tg_exe_man->WaitForFileTimed ($ior_embase,
diff --git a/CIAO/examples/Hello/descriptors/run_test_without_ns.pl b/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
index d9b367ca6f6..dcc4f99ffc5 100755
--- a/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
+++ b/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
@@ -18,10 +18,10 @@ $daemons = 2;
 @ports = ( 60001, 60002 );
 @iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
 @iorfiles = 0;
-@nodenames = ( "Sender", "Receiver" );
+@nodenames = ( "SenderNode", "ReceiverNode" );
 
 $status = 0;
-$dat_file = "NodeManagerMap.dat";
+$dat_file = "NodeManagerMap.cdd";
 $cdp_file = "DeploymentPlan_without_ns.cdp";
 
 $controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter";
@@ -141,7 +141,7 @@ $daemons_running = 1;
 # Invoke execution manager.
 print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
 $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --node-map $dat_file");
+                                    "-e$ior_emfile --cdd $dat_file");
 $EM->Spawn ();
 
 if ($tg_exe_man->WaitForFileTimed ($ior_embase,
diff --git a/CIAO/examples/Null_Component/descriptors/NodeMap.cdd b/CIAO/examples/Null_Component/descriptors/NodeMap.cdd
new file mode 100644
index 00000000000..a7edc4ca5e4
--- /dev/null
+++ b/CIAO/examples/Null_Component/descriptors/NodeMap.cdd
@@ -0,0 +1,31 @@
+<Deployment:domain 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">
+
+  <UUID>83D02FE2-A0BD-11DF-A038-005056C00008</UUID>
+
+  <label/>
+
+  <node>
+    <name>NodeOne</name>
+    <label/>
+    <resource>
+      <name>Node Address</name>
+      <resourceType>edu.vanderbilt.dre.DAnCE.NodeAddress</resourceType>
+      <property>
+        <name>edu.vanderbilt.dre.DAnCE.StringIOR</name>
+        <kind>Attribute</kind>
+        <dynamic>false</dynamic>
+        <value>
+          <type>
+            <kind>tk_string</kind>
+          </type>
+          <value>
+            <string>corbaloc:iiop:localhost:60001</string>
+          </value>
+        </value>
+      </property>
+    </resource>
+  </node>
+
+
+</Deployment:domain>
+
diff --git a/CIAO/examples/Null_Component/descriptors/NodeMap.dat b/CIAO/examples/Null_Component/descriptors/NodeMap.dat
deleted file mode 100644
index 56c6058252e..00000000000
--- a/CIAO/examples/Null_Component/descriptors/NodeMap.dat
+++ /dev/null
@@ -1 +0,0 @@
-NodeOne corbaloc:iiop:localhost:60001/NodeOne.NodeManager
diff --git a/CIAO/examples/Null_Component/descriptors/run_test_without_ns.pl b/CIAO/examples/Null_Component/descriptors/run_test_without_ns.pl
index 9d84c34e7d1..50c13b04c43 100755
--- a/CIAO/examples/Null_Component/descriptors/run_test_without_ns.pl
+++ b/CIAO/examples/Null_Component/descriptors/run_test_without_ns.pl
@@ -22,7 +22,7 @@ $nr_daemon = 1;
 @iorfiles = 0;
 @nodenames = ( "NodeOne" );
 
-$dat_file = "NodeMap.dat";
+$dat_file = "NodeMap.cdd";
 
 # ior files other than daemon
 $ior_embase = "EM.ior";
@@ -154,7 +154,7 @@ foreach $file (@files) {
     # Invoke execution manager.
     print "Invoking execution manager\n";
     $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile  --node-map $dat_file");
+                                    "-e$ior_emfile  --cdd $dat_file");
     $EM->Spawn ();
 
     if ($tg_exe_man->WaitForFileTimed ($ior_embase,
author	Marijke Hengstmengel <MHengstmengel@users.noreply.github.com>	2010-11-01 12:02:50 +0000
committer	Marijke Hengstmengel <MHengstmengel@users.noreply.github.com>	2010-11-01 12:02:50 +0000
commit	aaf5f5821ebe31719a409da48022346c1e57e329 (patch)
tree	a4467415b6e89d20193b60d5da92c0ea8315c054 /CIAO/examples
parent	518b8ad01ef9d3449f40b4c0182336de874c295e (diff)
download	ATCD-aaf5f5821ebe31719a409da48022346c1e57e329.tar.gz