ChangeLogTag: Mon Oct 29 16:40:08 UTC 2007 Friedhelm Wolf <fwolf@dre.vanderbilt.edu>

21 files changed, 45 insertions, 37 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 337efeb962e..9a059adb94d 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,11 @@
+Mon Oct 29 16:40:08 UTC 2007  Friedhelm Wolf  <fwolf@dre.vanderbilt.edu>
+
+        * examples/Hello/descriptors_events:
+        
+          Renamed deployment descriptor files and corrected some entries,
+          according to recent changes in library names of the Hello example,
+          so that the tests succeed.
+
 Mon Oct 29 01:37:04 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
 
         * examples/Hello/descriptors_RTCCM/rt-config-example.cdp:
diff --git a/CIAO/docs/tutorials/Quoter/Simple/descriptors/Plan.cdp b/CIAO/docs/tutorials/Quoter/Simple/descriptors/Plan.cdp
index b32b3ddfd4a..07e74086329 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/descriptors/Plan.cdp
+++ b/CIAO/docs/tutorials/Quoter/Simple/descriptors/Plan.cdp
@@ -24,7 +24,7 @@
     <node>Broker</node>
     <source/>
     <implementation>_7205655C-4CBD-42BE-A0F1-870705A77D77</implementation>
-    <configProperty>
+    <Configproperty>
       <name>ComponentIOR</name>
       <value>
         <type>
diff --git a/CIAO/examples/Hello/descriptors_events/README b/CIAO/examples/Hello/descriptors_events/README
index 698cfc2dd5b..924893bbf2c 100644
--- a/CIAO/examples/Hello/descriptors_events/README
+++ b/CIAO/examples/Hello/descriptors_events/README
@@ -36,7 +36,7 @@ existing test cases:
 --------------------
 
 ./ciao-events-example.ced
-./flattened_deploymentplan_events.cdp 
+./deploymentplan_events.cdp 
 ./run_test_simple.pl
 
 	Uses the standard event service and connects one sender to one 
@@ -46,7 +46,7 @@ existing test cases:
 	SenderNode[Sender --> ES] --> ReceiverNode[Receiver]
 
 ./ciao-events-example-collocated.ced
-./flattened_deploymentplan_events_collocated.cdp 
+./deploymentplan_events_collocated.cdp 
 ./run_test_collocated.pl:
 
 	This example modifies the standard example by deploying all components
@@ -54,7 +54,7 @@ existing test cases:
 	SenderNode[Sender --> ES --> Receiver]
 
 ./ciao-events-example-with-federation.ced
-./flattened_deploymentplan_federation.cdp
+./deploymentplan_federation.cdp
 ./run_test_federated.pl:
 
 	In this example, two Event Services ES_01 and ES_02 are federated.
@@ -73,7 +73,7 @@ existing test cases:
 	)
 
 ./ciao-events-example-with-filters.ced
-./flattened_deploymentplan_with_filters.cdp
+./deploymentplan_with_filters.cdp
 ./run_test_filtered.pl:
 
 	This example applies a filter to the EventService connection on the
@@ -82,7 +82,7 @@ existing test cases:
 	SenderNode[Sender --> ES -{Filter}-> Receiver]
 
 ./ciao-events-federation-mcast.ced
-./flattened_deploymentplan_federation_mcast.cdp
+./deploymentplan_federation_mcast.cdp
 ./run_test_multicast.pl:
 
 	To test collocated use of multicast federation of event channels
@@ -103,7 +103,7 @@ existing test cases:
 	)
 
 ./ciao-events-federation-udp.ced
-./flattened_deploymentplan_federation_udp.cdp
+./deploymentplan_federation_udp.cdp
 ./run_test_udp.pl:
 
 	In this example, udp communication is used to send the event
@@ -112,7 +112,7 @@ existing test cases:
 	    ReceiverNode[udp_receiver --> ES_02 --> Receiver]
 
 ./ciao-events-federation-udp-collocated.ced
-./flattened_deploymentplan_federation_udp_collocated.cdp
+./deploymentplan_federation_udp_collocated.cdp
 ./run_test_udp_collocated.pl:
 
 	Same example, as the above udp example, but deployed on a
@@ -121,7 +121,7 @@ existing test cases:
 	    udp_receiver --> ES_02 --> Receiver]
 
 ./ciao-events-federation-udp-two-hosts.ced
-./flattened_deploymentplan_federation_udp_two_hosts.cdp
+./deploymentplan_federation_udp_two_hosts.cdp
 
 	this test is not yet automated, because the nodes are
 	supposed to be deployed on two different host machines:
@@ -130,7 +130,7 @@ existing test cases:
 	        ReceiverNode[udp_receiver --> ES_02 --> ReceiverNode]
 
 ./ciao-events-example.ced
-./flattened_deploymentplan_multiple_senders.cdp
+./deploymentplan_multiple_senders.cdp
 ./run_test_multiple_senders.pl:
 
 	This example extends the standard example by adding two more sender
diff --git a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp b/CIAO/examples/Hello/descriptors_events/deploymentplan_events.cdp
index 6cf5fa6bcaa..a64e501402f 100644
--- a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp
+++ b/CIAO/examples/Hello/descriptors_events/deploymentplan_events.cdp
@@ -196,7 +196,7 @@
     <name>Hello_Sender_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
-    <location>Sender_svnt</location>
+    <location>Hello_Sender_svnt</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -232,7 +232,7 @@
     <name>Hello_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_events_collocated.cdp b/CIAO/examples/Hello/descriptors_events/deploymentplan_events_collocated.cdp
index 79796d9177b..79796d9177b 100644
--- a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_events_collocated.cdp
+++ b/CIAO/examples/Hello/descriptors_events/deploymentplan_events_collocated.cdp
diff --git a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation.cdp b/CIAO/examples/Hello/descriptors_events/deploymentplan_federation.cdp
index 423f9f65a2f..423f9f65a2f 100644
--- a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation.cdp
+++ b/CIAO/examples/Hello/descriptors_events/deploymentplan_federation.cdp
diff --git a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation_mcast.cdp b/CIAO/examples/Hello/descriptors_events/deploymentplan_federation_mcast.cdp
index 4bfddce8258..4bfddce8258 100644
--- a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation_mcast.cdp
+++ b/CIAO/examples/Hello/descriptors_events/deploymentplan_federation_mcast.cdp
diff --git a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp.cdp b/CIAO/examples/Hello/descriptors_events/deploymentplan_federation_udp.cdp
index da56329de07..7ee891285a8 100644
--- a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp.cdp
+++ b/CIAO/examples/Hello/descriptors_events/deploymentplan_federation_udp.cdp
@@ -182,7 +182,7 @@
     <name>Hello_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>Hello_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>Hello_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_collocated.cdp b/CIAO/examples/Hello/descriptors_events/deploymentplan_federation_udp_collocated.cdp
index 885f20c83bc..0d254e2214e 100644
--- a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_collocated.cdp
+++ b/CIAO/examples/Hello/descriptors_events/deploymentplan_federation_udp_collocated.cdp
@@ -218,7 +218,7 @@
     <name>Hello_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_two_hosts.cdp b/CIAO/examples/Hello/descriptors_events/deploymentplan_federation_udp_two_hosts.cdp
index d7a0c7fcf00..d7a0c7fcf00 100644
--- a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_two_hosts.cdp
+++ b/CIAO/examples/Hello/descriptors_events/deploymentplan_federation_udp_two_hosts.cdp
diff --git a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_multiple_senders.cdp b/CIAO/examples/Hello/descriptors_events/deploymentplan_multiple_senders.cdp
index c7c532d0f30..ff2ac89bf8f 100644
--- a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_multiple_senders.cdp
+++ b/CIAO/examples/Hello/descriptors_events/deploymentplan_multiple_senders.cdp
@@ -313,7 +313,7 @@
     <name>Hello_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>
@@ -321,7 +321,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>createSenderHome_Impl</string>
+          <string>create_Hello_SenderHome_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -331,7 +331,7 @@
     <name>Hello_Sender_svnt</name>
     <source><!-- @@ Not sure --></source>
     <node><!-- blank --></node>
-    <location>Sender_svnt</location>
+    <location>Hello_Sender_svnt</location>
     <execParameter>
       <name>entryPoint</name>
       <value>
@@ -349,7 +349,7 @@
     <name>Hello_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>
@@ -357,7 +357,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>createReceiverHome_Impl</string>
+          <string>create_Hello_ReceiverHome_Impl</string>
         </value>
       </value>
     </execParameter>
diff --git a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters.cdp b/CIAO/examples/Hello/descriptors_events/deploymentplan_with_filters.cdp
index 72b8673f6f1..7f776924945 100644
--- a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters.cdp
+++ b/CIAO/examples/Hello/descriptors_events/deploymentplan_with_filters.cdp
@@ -232,7 +232,7 @@
     <name>Hello_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>
diff --git a/CIAO/examples/Hello/descriptors_events/run_test.pl b/CIAO/examples/Hello/descriptors_events/run_test.pl
index 8fb9ff76fb9..f01bafa0505 100755
--- a/CIAO/examples/Hello/descriptors_events/run_test.pl
+++ b/CIAO/examples/Hello/descriptors_events/run_test.pl
@@ -9,38 +9,38 @@ use RunEventTest;
 
 # run_test_simple
 $result = RunEventTest::run_test (
-                 "flattened_deploymentplan_events.cdp", 
+                 "deploymentplan_events.cdp", 
                  "NodeManagerMap.dat");
 
 # run_test_collocated
 $result += RunEventTest::run_test (
-		 "flattened_deploymentplan_events_collocated.cdp", 
+		 "deploymentplan_events_collocated.cdp", 
 		 "NodeManagerMap_collocated.dat");
 
 # run_test_federated
 $result += RunEventTest::run_test (
-                 "flattened_deploymentplan_federation.cdp",
+                 "deploymentplan_federation.cdp",
                  "NodeManagerMap_collocated.dat");
 
 # run_test_filtered
 $result += RunEventTest::run_test (
-                 "flattened_deploymentplan_with_filters.cdp", 
+                 "deploymentplan_with_filters.cdp", 
                  "NodeManagerMap_collocated.dat");
  
 # run_test_multicast
 # this test is not running successfully and is therefore skipped here
 #$result += RunEventTest::run_test (
-#                 "flattened_deploymentplan_federation_mcast.cdp", 
+#                 "deploymentplan_federation_mcast.cdp", 
 #                 "NodeManagerMap_collocated.dat");
 
 # run_test_udp
 $result += RunEventTest::run_test (
-                 "flattened_deploymentplan_federation_udp.cdp", 
+                 "deploymentplan_federation_udp.cdp", 
                  "NodeManagerMap.dat");
 
 # run_test_udp_collocated
 $result += RunEventTest::run_test (
-                 "flattened_deploymentplan_federation_udp_collocated.cdp", 
+                 "deploymentplan_federation_udp_collocated.cdp", 
                  "NodeManagerMap_collocated.dat");
 
 # run_test_multiple_senders is not yet integrated
diff --git a/CIAO/examples/Hello/descriptors_events/run_test_collocated.pl b/CIAO/examples/Hello/descriptors_events/run_test_collocated.pl
index 4dfb0080e2b..c7d3e7c3dc4 100755
--- a/CIAO/examples/Hello/descriptors_events/run_test_collocated.pl
+++ b/CIAO/examples/Hello/descriptors_events/run_test_collocated.pl
@@ -8,5 +8,5 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use RunEventTest;
 
 exit RunEventTest::run_test (
-       "flattened_deploymentplan_events_collocated.cdp", 
+       "deploymentplan_events_collocated.cdp", 
        "NodeManagerMap_collocated.dat");
diff --git a/CIAO/examples/Hello/descriptors_events/run_test_federated.pl b/CIAO/examples/Hello/descriptors_events/run_test_federated.pl
index 42f46be55ec..9d08455ce2e 100755
--- a/CIAO/examples/Hello/descriptors_events/run_test_federated.pl
+++ b/CIAO/examples/Hello/descriptors_events/run_test_federated.pl
@@ -8,5 +8,5 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use RunEventTest;
 
 exit RunEventTest::run_test (
-       "flattened_deploymentplan_federation.cdp",
+       "deploymentplan_federation.cdp",
        "NodeManagerMap_collocated.dat");
diff --git a/CIAO/examples/Hello/descriptors_events/run_test_filtered.pl b/CIAO/examples/Hello/descriptors_events/run_test_filtered.pl
index 279d3f49a80..d1371af7219 100755
--- a/CIAO/examples/Hello/descriptors_events/run_test_filtered.pl
+++ b/CIAO/examples/Hello/descriptors_events/run_test_filtered.pl
@@ -8,5 +8,5 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use RunEventTest;
 
 exit RunEventTest::run_test (
-       "flattened_deploymentplan_with_filters.cdp", 
+       "deploymentplan_with_filters.cdp", 
        "NodeManagerMap_collocated.dat");
diff --git a/CIAO/examples/Hello/descriptors_events/run_test_multicast.pl b/CIAO/examples/Hello/descriptors_events/run_test_multicast.pl
index efa397dc0a0..6d06589e3d2 100755
--- a/CIAO/examples/Hello/descriptors_events/run_test_multicast.pl
+++ b/CIAO/examples/Hello/descriptors_events/run_test_multicast.pl
@@ -8,5 +8,5 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use RunEventTest;
 
 exit RunEventTest::run_test (
-       "flattened_deploymentplan_federation_mcast.cdp", 
+       "deploymentplan_federation_mcast.cdp", 
        "NodeManagerMap_collocated.dat");
diff --git a/CIAO/examples/Hello/descriptors_events/run_test_multiple_senders.pl b/CIAO/examples/Hello/descriptors_events/run_test_multiple_senders.pl
index 64fc5d7b515..adac10d680c 100755
--- a/CIAO/examples/Hello/descriptors_events/run_test_multiple_senders.pl
+++ b/CIAO/examples/Hello/descriptors_events/run_test_multiple_senders.pl
@@ -20,7 +20,7 @@ $daemons = 2;
 @senderiors = ( "Sender01.ior", "Sender02.ior", "Sender03.ior");
 $status = 0;
 $dat_file = "NodeManagerMap.dat";
-$cdp_file = "flattened_deploymentplan_multiple_senders.cdp";
+$cdp_file = "deploymentplan_multiple_senders.cdp";
 $controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter";
 
 $nsior = PerlACE::LocalFile ("ns.ior");
diff --git a/CIAO/examples/Hello/descriptors_events/run_test_simple.pl b/CIAO/examples/Hello/descriptors_events/run_test_simple.pl
index 494649a95f4..c678aa29545 100755
--- a/CIAO/examples/Hello/descriptors_events/run_test_simple.pl
+++ b/CIAO/examples/Hello/descriptors_events/run_test_simple.pl
@@ -8,5 +8,5 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use RunEventTest;
 
 exit RunEventTest::run_test (
-       "flattened_deploymentplan_events.cdp", 
+       "deploymentplan_events.cdp", 
        "NodeManagerMap.dat");
diff --git a/CIAO/examples/Hello/descriptors_events/run_test_udp.pl b/CIAO/examples/Hello/descriptors_events/run_test_udp.pl
index aee7108ce46..c84f30dcd30 100755
--- a/CIAO/examples/Hello/descriptors_events/run_test_udp.pl
+++ b/CIAO/examples/Hello/descriptors_events/run_test_udp.pl
@@ -8,5 +8,5 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use RunEventTest;
 
 exit RunEventTest::run_test (
-       "flattened_deploymentplan_federation_udp.cdp", 
+       "deploymentplan_federation_udp.cdp", 
        "NodeManagerMap.dat");
diff --git a/CIAO/examples/Hello/descriptors_events/run_test_udp_collocated.pl b/CIAO/examples/Hello/descriptors_events/run_test_udp_collocated.pl
index 6c8f213b490..d45d68c238e 100755
--- a/CIAO/examples/Hello/descriptors_events/run_test_udp_collocated.pl
+++ b/CIAO/examples/Hello/descriptors_events/run_test_udp_collocated.pl
@@ -8,5 +8,5 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use RunEventTest;
 
 exit RunEventTest::run_test (
-       "flattened_deploymentplan_federation_udp_collocated.cdp", 
+       "deploymentplan_federation_udp_collocated.cdp", 
        "NodeManagerMap_collocated.dat");