Mon Oct 29 01:37:04 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>

18 files changed, 91 insertions, 68 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index d06305302a1..337efeb962e 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,26 @@
+Mon Oct 29 01:37:04 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * examples/Hello/descriptors_RTCCM/rt-config-example.cdp:
+        * examples/Hello/descriptors_RTCCM/rt-example.cdp:
+        * examples/Hello/descriptors_ReDaC/deploymentplan.cdp:
+        * examples/Hello/descriptors_ReDaC/deploymentplan_add.cdp:
+        * examples/Hello/descriptors_ReDaC/deploymentplan_remove.cdp:
+        * examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp:
+        * examples/Hello/descriptors_events/flattened_deploymentplan_events_collocated.cdp:
+        * examples/Hello/descriptors_events/flattened_deploymentplan_federation.cdp:
+        * examples/Hello/descriptors_events/flattened_deploymentplan_federation_mcast.cdp:
+        * examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp.cdp:
+        * examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_collocated.cdp:
+        * examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_two_hosts.cdp:
+        * examples/Hello/descriptors_events/flattened_deploymentplan_multiple_senders.cdp:
+        * examples/Hello/descriptors_events/flattened_deploymentplan_with_filters.cdp:
+        * examples/Hello/descriptors_naming/deploymentplan_naming.cdp:
+        * examples/Hello/descriptors_shared_components/deploymentplan.cdp:
+        * examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp:
+
+          Recent changes to MPC files changed library names. As such,
+          the example was failing. Correct the library names in the files above.
+
 Sun Oct 28 19:11:39 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
 
         * examples/Hello/descriptors/DeploymentPlan.cdp:
diff --git a/CIAO/examples/Hello/descriptors_RTCCM/rt-config-example.cdp b/CIAO/examples/Hello/descriptors_RTCCM/rt-config-example.cdp
index 978aa8e024e..67f51f99fb9 100644
--- a/CIAO/examples/Hello/descriptors_RTCCM/rt-config-example.cdp
+++ b/CIAO/examples/Hello/descriptors_RTCCM/rt-config-example.cdp
@@ -132,7 +132,7 @@
     <name>Sender_exec</name>
     <source/>
     <node/>
-    <location>Sender_exec</location>
+    <location>Hello_Sender_exec</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -150,7 +150,7 @@
     <name>Sender_svnt</name>
     <source/>
     <node/>
-    <location>Sender_svnt</location>
+    <location>Hello_Sender_svnt</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -168,7 +168,7 @@
     <name>Receiver_exec</name>
     <source/>
     <node/>
-    <location>Receiver_exec</location>
+    <location>Hello_Receiver_exec</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -186,7 +186,7 @@
     <name>Receiver_svnt</name>
     <source/>
     <node/>
-    <location>Receiver_svnt</location>
+    <location>Hello_Receiver_svnt</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
diff --git a/CIAO/examples/Hello/descriptors_RTCCM/rt-example.cdp b/CIAO/examples/Hello/descriptors_RTCCM/rt-example.cdp
index 5ec9af5e86a..43b4bed5cec 100644
--- a/CIAO/examples/Hello/descriptors_RTCCM/rt-example.cdp
+++ b/CIAO/examples/Hello/descriptors_RTCCM/rt-example.cdp
@@ -188,7 +188,7 @@
     <name>Sender_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
-    <location>Sender_exec</location>
+    <location>Hello_Sender_exec</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -206,7 +206,7 @@
     <name>Sender_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
-    <location>Sender_svnt</location>
+    <location>Hello_Sender_svnt</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -224,7 +224,7 @@
     <name>Receiver_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
-    <location>Receiver_exec</location>
+    <location>Hello_Receiver_exec</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -242,7 +242,7 @@
     <name>Receiver_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
-    <location>Receiver_svnt</location>
+    <location>Hello_Receiver_svnt</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
diff --git a/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan.cdp b/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan.cdp
index e3228a95493..3a22547a08e 100644
--- a/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan.cdp
+++ b/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan.cdp
@@ -152,7 +152,7 @@
     <name>Sender_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
-    <location>Sender_exec</location>
+    <location>Hello_Sender_exec</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -167,7 +167,7 @@
   </artifact>
   
   <artifact id="Hello-Sender_svnt">
-    <name>Sender_svnt</name>
+    <name>Hello_Sender_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
     <location>Sender_svnt</location>
@@ -185,7 +185,7 @@
   </artifact>
   
   <artifact id="Hello-Receiver_exec">
-    <name>Receiver_exec</name>
+    <name>Hello_Receiver_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
     <location>Receiver_exec</location>
@@ -203,7 +203,7 @@
   </artifact>
   
   <artifact id="Hello-Receiver_svnt">
-    <name>Receiver_svnt</name>
+    <name>Hello_Receiver_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
     <location>Receiver_svnt</location>
diff --git a/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_add.cdp b/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_add.cdp
index 90e5605aa8f..f76ef8f886a 100644
--- a/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_add.cdp
+++ b/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_add.cdp
@@ -194,7 +194,7 @@
 
   <!-- @@ Runtime library name must match exactly in "location" tag -->
   <artifact id="Hello-Sender_exec">
-    <name>Sender_exec</name>
+    <name>Hello_Sender_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
     <location>Sender_exec</location>
@@ -212,7 +212,7 @@
   </artifact>
   
   <artifact id="Hello-Sender_svnt">
-    <name>Sender_svnt</name>
+    <name>Hello_Sender_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
     <location>Sender_svnt</location>
@@ -230,7 +230,7 @@
   </artifact>
   
   <artifact id="Hello-Receiver_exec">
-    <name>Receiver_exec</name>
+    <name>Hello_Receiver_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
     <location>Receiver_exec</location>
@@ -248,7 +248,7 @@
   </artifact>
   
   <artifact id="Hello-Receiver_svnt">
-    <name>Receiver_svnt</name>
+    <name>Hello_Receiver_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
     <location>Receiver_svnt</location>
diff --git a/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_remove.cdp b/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_remove.cdp
index a2e600ecb27..af9f7f955b6 100644
--- a/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_remove.cdp
+++ b/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_remove.cdp
@@ -150,7 +150,7 @@
 
   <!-- @@ Runtime library name must match exactly in "location" tag -->
   <artifact id="Hello-Sender_exec">
-    <name>Sender_exec</name>
+    <name>Hello_Sender_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
     <location>Sender_exec</location>
@@ -168,7 +168,7 @@
   </artifact>
   
   <artifact id="Hello-Sender_svnt">
-    <name>Sender_svnt</name>
+    <name>Hello_Sender_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
     <location>Sender_svnt</location>
@@ -186,7 +186,7 @@
   </artifact>
   
   <artifact id="Hello-Receiver_exec">
-    <name>Receiver_exec</name>
+    <name>Hello_Receiver_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
     <location>Receiver_exec</location>
@@ -204,7 +204,7 @@
   </artifact>
   
   <artifact id="Hello-Receiver_svnt">
-    <name>Receiver_svnt</name>
+    <name>Hello_Receiver_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
     <location>Receiver_svnt</location>
diff --git a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp
index dc90216279a..6cf5fa6bcaa 100644
--- a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp
+++ b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp
@@ -178,7 +178,7 @@
     <name>Sender_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
-    <location>Sender_exec</location>
+    <location>Hello_Sender_exec</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -193,7 +193,7 @@
   </artifact>
   
   <artifact id="Hello-Sender_svnt">
-    <name>Sender_svnt</name>
+    <name>Hello_Sender_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
     <location>Sender_svnt</location>
@@ -214,7 +214,7 @@
     <name>Receiver_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
-    <location>Receiver_exec</location>
+    <location>Hello_Receiver_exec</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -229,7 +229,7 @@
   </artifact>
   
   <artifact id="Hello-Receiver_svnt">
-    <name>Receiver_svnt</name>
+    <name>Hello_Receiver_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
     <location>Receiver_svnt</location>
diff --git a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_events_collocated.cdp b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_events_collocated.cdp
index 7c9e2add562..79796d9177b 100644
--- a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_events_collocated.cdp
+++ b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_events_collocated.cdp
@@ -178,7 +178,7 @@
     <name>Sender_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
-    <location>Sender_exec</location>
+    <location>Hello_Sender_exec</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -196,7 +196,7 @@
     <name>Sender_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
-    <location>Sender_svnt</location>
+    <location>Hello_Sender_svnt</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -214,7 +214,7 @@
     <name>Receiver_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
-    <location>Receiver_exec</location>
+    <location>Hello_Receiver_exec</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -232,7 +232,7 @@
     <name>Receiver_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
-    <location>Receiver_svnt</location>
+    <location>Hello_Receiver_svnt</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
diff --git a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation.cdp b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation.cdp
index 55fcecd55dd..423f9f65a2f 100644
--- a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation.cdp
+++ b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation.cdp
@@ -151,7 +151,7 @@
     <name>Sender_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
-    <location>Sender_exec</location>
+    <location>Hello_Sender_exec</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -169,7 +169,7 @@
     <name>Sender_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
-    <location>Sender_svnt</location>
+    <location>Hello_Sender_svnt</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -187,7 +187,7 @@
     <name>Receiver_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
-    <location>Receiver_exec</location>
+    <location>Hello_Receiver_exec</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -205,7 +205,7 @@
     <name>Receiver_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
-    <location>Receiver_svnt</location>
+    <location>Hello_Receiver_svnt</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
diff --git a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation_mcast.cdp b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation_mcast.cdp
index 18a18bf509f..4bfddce8258 100644
--- a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation_mcast.cdp
+++ b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation_mcast.cdp
@@ -149,7 +149,7 @@
     <name>Sender_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
-    <location>Sender_exec</location>
+    <location>Hello_Sender_exec</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -167,7 +167,7 @@
     <name>Sender_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
-    <location>Sender_svnt</location>
+    <location>Hello_Sender_svnt</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -185,7 +185,7 @@
     <name>Receiver_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
-    <location>Receiver_exec</location>
+    <location>Hello_Receiver_exec</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -203,7 +203,7 @@
     <name>Receiver_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
-    <location>Receiver_svnt</location>
+    <location>Hello_Receiver_svnt</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
diff --git a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp.cdp b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp.cdp
index 7031742061d..da56329de07 100644
--- a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp.cdp
+++ b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp.cdp
@@ -164,7 +164,7 @@
     <name>Sender_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
-    <location>Sender_exec</location>
+    <location>Hello_Sender_exec</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -179,7 +179,7 @@
   </artifact>
   
   <artifact id="Hello-Sender_svnt">
-    <name>Sender_svnt</name>
+    <name>Hello_Sender_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
     <location>Sender_svnt</location>
@@ -197,7 +197,7 @@
   </artifact>
   
   <artifact id="Hello-Receiver_exec">
-    <name>Receiver_exec</name>
+    <name>Hello_Receiver_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
     <location>Receiver_exec</location>
@@ -215,7 +215,7 @@
   </artifact>
   
   <artifact id="Hello-Receiver_svnt">
-    <name>Receiver_svnt</name>
+    <name>Hello_Receiver_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
     <location>Receiver_svnt</location>
diff --git a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_collocated.cdp b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_collocated.cdp
index 0caff3e7e62..885f20c83bc 100644
--- a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_collocated.cdp
+++ b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_collocated.cdp
@@ -164,7 +164,7 @@
     <name>Sender_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
-    <location>Sender_exec</location>
+    <location>Hello_Sender_exec</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -182,7 +182,7 @@
     <name>Sender_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
-    <location>Sender_svnt</location>
+    <location>Hello_Sender_svnt</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -200,7 +200,7 @@
     <name>Receiver_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
-    <location>Receiver_exec</location>
+    <location>Hello_Receiver_exec</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -215,7 +215,7 @@
   </artifact>
   
   <artifact id="Hello-Receiver_svnt">
-    <name>Receiver_svnt</name>
+    <name>Hello_Receiver_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
     <location>Receiver_svnt</location>
diff --git a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_two_hosts.cdp b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_two_hosts.cdp
index 0efe1168fdb..d7a0c7fcf00 100644
--- a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_two_hosts.cdp
+++ b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_two_hosts.cdp
@@ -164,7 +164,7 @@
     <name>Sender_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
-    <location>Sender_exec</location>
+    <location>Hello_Sender_exec</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -182,7 +182,7 @@
     <name>Sender_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
-    <location>Sender_svnt</location>
+    <location>Hello_Sender_svnt</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -200,7 +200,7 @@
     <name>Receiver_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
-    <location>Receiver_exec</location>
+    <location>Hello_Receiver_exec</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -218,7 +218,7 @@
     <name>Receiver_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
-    <location>Receiver_svnt</location>
+    <location>Hello_Receiver_svnt</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
diff --git a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_multiple_senders.cdp b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_multiple_senders.cdp
index 8bc10061efb..c7c532d0f30 100644
--- a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_multiple_senders.cdp
+++ b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_multiple_senders.cdp
@@ -310,7 +310,7 @@
 
   <!-- @@ Runtime library name must match exactly in "location" tag -->
   <artifact id="Hello-Sender_exec">
-    <name>Sender_exec</name>
+    <name>Hello_Sender_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
     <location>Sender_exec</location>
@@ -328,7 +328,7 @@
   </artifact>
   
   <artifact id="Hello-Sender_svnt">
-    <name>Sender_svnt</name>
+    <name>Hello_Sender_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
     <location>Sender_svnt</location>
@@ -346,7 +346,7 @@
   </artifact>
   
   <artifact id="Hello-Receiver_exec">
-    <name>Receiver_exec</name>
+    <name>Hello_Receiver_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
     <location>Receiver_exec</location>
@@ -367,7 +367,7 @@
     <name>Receiver_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
-    <location>Receiver_svnt</location>
+    <location>Hello_Receiver_svnt</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
diff --git a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters.cdp b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters.cdp
index a5f5a0e0ea3..72b8673f6f1 100644
--- a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters.cdp
+++ b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters.cdp
@@ -196,7 +196,7 @@
     <name>Sender_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
-    <location>Sender_exec</location>
+    <location>Hello_Sender_exec</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -214,7 +214,7 @@
     <name>Sender_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
-    <location>Sender_svnt</location>
+    <location>Hello_Sender_svnt</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -229,7 +229,7 @@
   </artifact>
   
   <artifact id="Hello-Receiver_exec">
-    <name>Receiver_exec</name>
+    <name>Hello_Receiver_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
     <location>Receiver_exec</location>
@@ -250,7 +250,7 @@
     <name>Receiver_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
-    <location>Receiver_svnt</location>
+    <location>Hello_Receiver_svnt</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
diff --git a/CIAO/examples/Hello/descriptors_naming/deploymentplan_naming.cdp b/CIAO/examples/Hello/descriptors_naming/deploymentplan_naming.cdp
index 31f4518f3be..aa82731929c 100644
--- a/CIAO/examples/Hello/descriptors_naming/deploymentplan_naming.cdp
+++ b/CIAO/examples/Hello/descriptors_naming/deploymentplan_naming.cdp
@@ -167,7 +167,7 @@
 
   <!-- @@ Runtime library name must match exactly in "location" tag -->
   <artifact id="Hello-Sender_exec">
-    <name>Sender_exec</name>
+    <name>Hello_Sender_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
     <location>Sender_exec</location>
@@ -185,7 +185,7 @@
   </artifact>
   
   <artifact id="Hello-Sender_svnt">
-    <name>Sender_svnt</name>
+    <name>Hello_Sender_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
     <location>Sender_svnt</location>
@@ -203,7 +203,7 @@
   </artifact>
   
   <artifact id="Hello-Receiver_exec">
-    <name>Receiver_exec</name>
+    <name>Hello_Receiver_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
     <location>Receiver_exec</location>
@@ -221,7 +221,7 @@
   </artifact>
   
   <artifact id="Hello-Receiver_svnt">
-    <name>Receiver_svnt</name>
+    <name>Hello_Receiver_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
     <location>Receiver_svnt</location>
diff --git a/CIAO/examples/Hello/descriptors_shared_components/deploymentplan.cdp b/CIAO/examples/Hello/descriptors_shared_components/deploymentplan.cdp
index 3c40da9f038..72a1257c9a7 100644
--- a/CIAO/examples/Hello/descriptors_shared_components/deploymentplan.cdp
+++ b/CIAO/examples/Hello/descriptors_shared_components/deploymentplan.cdp
@@ -151,7 +151,7 @@
 
   <!-- @@ Runtime library name must match exactly in "location" tag -->
   <artifact id="Hello-Sender_exec">
-    <name>Sender_exec</name>
+    <name>Hello_Sender_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
     <location>Sender_exec</location>
@@ -172,7 +172,7 @@
     <name>Sender_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
-    <location>Sender_svnt</location>
+    <location>Hello_Sender_svnt</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -190,7 +190,7 @@
     <name>Receiver_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
-    <location>Receiver_exec</location>
+    <location>Hello_Receiver_exec</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -208,7 +208,7 @@
     <name>Receiver_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
-    <location>Receiver_svnt</location>
+    <location>Hello_Receiver_svnt</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
diff --git a/CIAO/examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp b/CIAO/examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp
index 85b97ec2435..912bab194c5 100644
--- a/CIAO/examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp
+++ b/CIAO/examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp
@@ -159,7 +159,7 @@
     <name>Sender_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
-    <location>Sender_exec</location>
+    <location>Hello_Sender_exec</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -177,7 +177,7 @@
     <name>Sender_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
-    <location>Sender_svnt</location>
+    <location>Hello_Sender_svnt</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -195,7 +195,7 @@
     <name>Receiver_exec</name>
     <source><!-- @@ Not sure about this--></source>
     <node><!-- blank --></node>
-    <location>Receiver_exec</location>
+    <location>Hello_Receiver_exec</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -213,7 +213,7 @@
     <name>Receiver_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
-    <location>Receiver_svnt</location>
+    <location>Hello_Receiver_svnt</location>
     <execParameter>
       <name>entryPoint</name>
       <value>