diff options
| author | dengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-03-02 20:30:31 +0000 |
|---|---|---|
| committer | dengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-03-02 20:30:31 +0000 |
| commit | 7d0e58659cb420a53bbb2a835aea76352078ff5b (patch) | |
| tree | 7f141baa5b5ab7f1d587c89627c52aefd3ebe0a0 | |
| parent | 3048b26f6ab9d7ae5b4b7e10a0af1d7b5fa8bdeb (diff) | |
| download | ATCD-xsc_handler_2.tar.gz | |
Tue Mar 02 14:28:11 2005 Gan Deng <dengg@dre.vanderbilt.edu>xsc_handler_2
| -rw-r--r-- | TAO/CIAO/DAnCE/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay.idl | 1 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/examples/BasicSP/descriptors/HUDisplay.cid | 15 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/examples/BasicSP/descriptors/NavDisplay.ccd | 10 |
4 files changed, 36 insertions, 0 deletions
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 <dengg@dre.vanderbilt.edu> + + * 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 <dengg@dre.vanderbilt.edu> * 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 @@ <instance xmi:idref="a_GPS"/> </internalEndpoint> </connection> + <connection> <name>Airframe_NavDisplay</name> <internalEndpoint> @@ -67,6 +68,7 @@ <instance xmi:idref="a_Airframe"/> </internalEndpoint> </connection> + <connection> <name>NavDisplay_Airframe</name> <internalEndpoint> @@ -78,5 +80,18 @@ <instance xmi:idref="a_Airframe"/> </internalEndpoint> </connection> + + <connection> + <name>NavDisplay_Airframe_Uses_Multiple</name> + <internalEndpoint> + <portName>gather_data</portName> + <instance xmi:idref="a_NavDisplay"/> + </internalEndpoint> + <internalEndpoint> + <portName>dataout</portName> + <instance xmi:idref="a_Airframe"/> + </internalEndpoint> + </connection> + </assemblyImpl> </Deployment:ComponentImplementationDescription> 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 @@ <kind>SimplexReceptacle</kind> </port> + <port> + <name>gather_data</name> + <exclusiveProvider>false</exclusiveProvider> + <exclusiveUser>false</exclusiveUser> + <optional>false</optional> + <provider>false</provider> + <supportedType>IDL:BasicSP/ReadData:1.0</supportedType> + <specificType>IDL:BasicSP/ReadData:1.0</specificType> + <kind>MultiplexReceptacle</kind> + </port> </Deployment:ComponentInterfaceDescription> |