From 5d5fde9f2629d2d0be3b35e491f2d4a0ba1e8f22 Mon Sep 17 00:00:00 2001 From: dengg Date: Wed, 1 Nov 2006 23:07:45 +0000 Subject: --- .../ciao-events-example-collocated.ced | 14 ++ .../descriptors_events/ciao-events-example.ced | 7 - .../ciao-events-federation-udp-collocated.ced | 47 ++++ .../flattened_deploymentplan_events.cdp | 2 +- .../flattened_deploymentplan_events_collocated.cdp | 260 +++++++++++++++++++++ .../flattened_deploymentplan_federation_udp.cdp | 15 ++ ...ed_deploymentplan_federation_udp_collocated.cdp | 246 +++++++++++++++++++ .../descriptors_events/run_NodeDaemons_svc_conf.pl | 2 +- 8 files changed, 584 insertions(+), 9 deletions(-) create mode 100644 CIAO/examples/Hello/descriptors_events/ciao-events-example-collocated.ced create mode 100644 CIAO/examples/Hello/descriptors_events/ciao-events-federation-udp-collocated.ced create mode 100644 CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_events_collocated.cdp create mode 100644 CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_collocated.cdp diff --git a/CIAO/examples/Hello/descriptors_events/ciao-events-example-collocated.ced b/CIAO/examples/Hello/descriptors_events/ciao-events-example-collocated.ced new file mode 100644 index 00000000000..1166a034caf --- /dev/null +++ b/CIAO/examples/Hello/descriptors_events/ciao-events-example-collocated.ced @@ -0,0 +1,14 @@ + + + + ES_01 + SenderNode + RTEC + svc.conf + + + diff --git a/CIAO/examples/Hello/descriptors_events/ciao-events-example.ced b/CIAO/examples/Hello/descriptors_events/ciao-events-example.ced index 9ee5b20ccc0..1166a034caf 100644 --- a/CIAO/examples/Hello/descriptors_events/ciao-events-example.ced +++ b/CIAO/examples/Hello/descriptors_events/ciao-events-example.ced @@ -10,12 +10,5 @@ RTEC svc.conf - - - ES_02 - SenderNode - RTEC - svc.conf - diff --git a/CIAO/examples/Hello/descriptors_events/ciao-events-federation-udp-collocated.ced b/CIAO/examples/Hello/descriptors_events/ciao-events-federation-udp-collocated.ced new file mode 100644 index 00000000000..89e85b5b21d --- /dev/null +++ b/CIAO/examples/Hello/descriptors_events/ciao-events-federation-udp-collocated.ced @@ -0,0 +1,47 @@ + + + + + + ES_01 + SenderNode + RTEC + dummy.conf + + + + addr_serv_0 + 1234 +
localhost
+
+ + + upd_sender_1 + addr_serv_0 + +
+ + + ES_02 + SenderNode + RTEC + dummy.conf + + + addr_serv_1 + 1234 +
localhost
+
+ + upd_receiver_1 + addr_serv_1 + false + 1234 + +
+ +
diff --git a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp index c8e5ec022b4..37a56bbfa7e 100644 --- a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp +++ b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp @@ -102,7 +102,7 @@ Hello-Receiver-idd - SenderNode + ReceiverNode Hello-Receiver-mdd diff --git a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_events_collocated.cdp b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_events_collocated.cdp new file mode 100644 index 00000000000..cb04f7306df --- /dev/null +++ b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_events_collocated.cdp @@ -0,0 +1,260 @@ + + + + Hello_Plan_UUID_0001 + + + + c0965470-7b83-11d9-9669-0800200c9a66 + + IDL:BasicSP/EC:1.0 + + read_message + IDL:Hello/ReadMessage:1.0 + IDL:Hello/ReadMessage:1.0 + false + false + true + false + SimplexReceptacle + + + + + Hello-Sender-mdd + + Hello-Sender_exec + Hello-Sender_svnt + + + + + Hello-Receiver-mdd + + Hello-Receiver_exec + Hello-Receiver_svnt + + + + + Hello-Sender-idd + SenderNode + + Hello-Sender-mdd + + + + ComponentIOR + + + tk_string + + + Sender.ior + + + + + + + local_message + + + tk_string + + + This is a test message passed in through XML. + + + + + + + color + + + tk_enum + + COLOR_SELECTION + IDL:Hello/COLOR_SELECTION:1.0 + empty + white + red + yellow + + + + yellow + + + + + + + Hello-Receiver-idd + SenderNode + + Hello-Receiver-mdd + + ComponentIOR + + + tk_string + + + Receiver.ior + + + + + + + + hello_facet_connection + + push_message + Facet + Hello-Sender-idd + + + read_message + SimplexReceptacle + Hello-Receiver-idd + + + + + + + hello_event_ec_publisher_connection + + click_out + EventPublisher + Hello-Sender-idd + + + ES_01 + + + + + hello_event_ec_consumer_connection + + click_in + EventConsumer + Hello-Receiver-idd + + + ES_01 + + + + + + Sender_exec + + + Sender_DnC_exec + + entryPoint + + + tk_string + + + createSenderHome_Impl + + + + + + + Sender_svnt + + + Sender_DnC_svnt + + entryPoint + + + tk_string + + + create_Hello_SenderHome_Servant + + + + + + + Receiver_exec + + + Receiver_DnC_exec + + entryPoint + + + tk_string + + + createReceiverHome_Impl + + + + + + + Receiver_svnt + + + Receiver_DnC_svnt + + entryPoint + + + tk_string + + + create_Hello_ReceiverHome_Servant + + + + + + + CIAOEvents + + + tk_string + + + ciao-events-example-collocated.ced + + + + 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 f52555ca19b..2c20ad6d061 100644 --- a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp.cdp +++ b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp.cdp @@ -119,7 +119,21 @@ + + hello_facet_connection + + push_message + Facet + Hello-Sender-idd + + + read_message + SimplexReceptacle + Hello-Receiver-idd + + + hello_event_ec_publisher_connection @@ -132,6 +146,7 @@ + hello_event_ec_consumer_connection 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 new file mode 100644 index 00000000000..54550749406 --- /dev/null +++ b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_collocated.cdp @@ -0,0 +1,246 @@ + + + + Hello_Plan_UUID_0001 + + + + c0965470-7b83-11d9-9669-0800200c9a66 + + IDL:BasicSP/EC:1.0 + + read_message + IDL:Hello/ReadMessage:1.0 + IDL:Hello/ReadMessage:1.0 + false + false + true + false + SimplexReceptacle + + + + + Hello-Sender-mdd + + Hello-Sender_exec + Hello-Sender_svnt + + + + + Hello-Receiver-mdd + + Hello-Receiver_exec + Hello-Receiver_svnt + + + + + + Hello-Sender-idd + SenderNode + + Hello-Sender-mdd + + + + ComponentIOR + + + tk_string + + + Sender.ior + + + + + + + local_message + + + tk_string + + + This is a test message passed in through XML. + + + + + + + color + + + tk_enum + + COLOR_SELECTION + IDL:Hello/COLOR_SELECTION:1.0 + empty + white + red + yellow + + + + yellow + + + + + + + Hello-Receiver-idd + SenderNode + + Hello-Receiver-mdd + + ComponentIOR + + + tk_string + + + Receiver.ior + + + + + + + hello_facet_connection + + push_message + Facet + Hello-Sender-idd + + + read_message + SimplexReceptacle + Hello-Receiver-idd + + + + + + hello_event_ec_publisher_connection + + click_out + EventPublisher + Hello-Sender-idd + + + ES_01 + + + + + + hello_event_ec_consumer_connection + + click_in + EventConsumer + Hello-Receiver-idd + + + ES_02 + + + + + + Sender_exec + + + Sender_DnC_exec + + entryPoint + + + tk_string + + + createSenderHome_Impl + + + + + + + Sender_svnt + + + Sender_DnC_svnt + + entryPoint + + + tk_string + + + create_Hello_SenderHome_Servant + + + + + + + Receiver_exec + + + Receiver_DnC_exec + + entryPoint + + + tk_string + + + createReceiverHome_Impl + + + + + + + Receiver_svnt + + + Receiver_DnC_svnt + + entryPoint + + + tk_string + + + create_Hello_ReceiverHome_Servant + + + + + + + CIAOEvents + + + tk_string + + + ciao-events-federation-udp-collocated.ced + + + + diff --git a/CIAO/examples/Hello/descriptors_events/run_NodeDaemons_svc_conf.pl b/CIAO/examples/Hello/descriptors_events/run_NodeDaemons_svc_conf.pl index dcd0eb229ba..0b9ba5c4b6a 100755 --- a/CIAO/examples/Hello/descriptors_events/run_NodeDaemons_svc_conf.pl +++ b/CIAO/examples/Hello/descriptors_events/run_NodeDaemons_svc_conf.pl @@ -7,7 +7,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' $ACE_ROOT=$ENV{'ACE_ROOT'}; -use lib "../../../../../bin"; +use lib "$ENV{'ACE_ROOT'}/bin"; use PerlACE::Run_Test; $status = 0; -- cgit v1.2.1