From 7d0e58659cb420a53bbb2a835aea76352078ff5b Mon Sep 17 00:00:00 2001 From: dengg Date: Wed, 2 Mar 2005 20:30:31 +0000 Subject: Tue Mar 02 14:28:11 2005 Gan Deng --- TAO/CIAO/DAnCE/ChangeLog | 10 ++++++++++ TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay.idl | 1 + TAO/CIAO/DAnCE/examples/BasicSP/descriptors/HUDisplay.cid | 15 +++++++++++++++ .../DAnCE/examples/BasicSP/descriptors/NavDisplay.ccd | 10 ++++++++++ 4 files changed, 36 insertions(+) diff --git a/TAO/CIAO/DAnCE/ChangeLog b/TAO/CIAO/DAnCE/ChangeLog index 265b341bd98..484496a7115 100644 --- a/TAO/CIAO/DAnCE/ChangeLog +++ b/TAO/CIAO/DAnCE/ChangeLog @@ -1,3 +1,13 @@ +Tue Mar 02 14:28:11 2005 Gan Deng + + * BMDisplay/BMDisplay.idl + * descriptors/HUDisplay.cid + * descriptors/NavDisplay.ccd + + Added a multiplex receptacle to the BMDisplay component. + This is a place holder to test "users multipe" feature. + Modified descriptors to reflect this change as well. + Tue Mar 01 23:54:21 2005 Gan Deng * DomainApplicationManager/DomainApplicationManager_Impl.cpp diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay.idl b/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay.idl index cbeed950b07..ec53440630a 100644 --- a/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay.idl +++ b/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay.idl @@ -7,6 +7,7 @@ module BasicSP { consumes DataAvailable data_ready; uses ReadData comp_data; + uses multiple ReadData gather_data; }; home BMDisplayHome manages BMDisplay diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/descriptors/HUDisplay.cid b/TAO/CIAO/DAnCE/examples/BasicSP/descriptors/HUDisplay.cid index 3746e7cae24..0775f88dcf4 100644 --- a/TAO/CIAO/DAnCE/examples/BasicSP/descriptors/HUDisplay.cid +++ b/TAO/CIAO/DAnCE/examples/BasicSP/descriptors/HUDisplay.cid @@ -56,6 +56,7 @@ + Airframe_NavDisplay @@ -67,6 +68,7 @@ + NavDisplay_Airframe @@ -78,5 +80,18 @@ + + + NavDisplay_Airframe_Uses_Multiple + + gather_data + + + + dataout + + + + diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/descriptors/NavDisplay.ccd b/TAO/CIAO/DAnCE/examples/BasicSP/descriptors/NavDisplay.ccd index 175d4067000..efe970b7dd9 100644 --- a/TAO/CIAO/DAnCE/examples/BasicSP/descriptors/NavDisplay.ccd +++ b/TAO/CIAO/DAnCE/examples/BasicSP/descriptors/NavDisplay.ccd @@ -31,4 +31,14 @@ SimplexReceptacle + + gather_data + false + false + false + false + IDL:BasicSP/ReadData:1.0 + IDL:BasicSP/ReadData:1.0 + MultiplexReceptacle + -- cgit v1.2.1