diff options
Diffstat (limited to 'CIAO/connectors/dds4ccm')
19 files changed, 37 insertions, 75 deletions
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl index 4fb52425ceb..281bda78bd2 100644 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl @@ -14,16 +14,9 @@ #pragma ciao lem "Connector/SL_Disabled_ConnectorE.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> TestTopic; -}; - module SL_Disabled { - connector SL_Disabled_Connector : ::CCM_DDS::TestTopic::DDS_State - { - }; + module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> SL_DisabledConnector; }; #endif /* SL_Disabled_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl index 69961d9a952..a3a939ec499 100644 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl @@ -14,7 +14,7 @@ module SL_Disabled { component Receiver { - port CCM_DDS::TestTopic::DDS_StateListen info_out; + port SL_DisabledConnector::DDS_StateListen info_out; }; }; diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp index 671c45eb08e..c3bfc84c5c7 100644 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp @@ -140,8 +140,8 @@ namespace CIAO_SL_Disabled_Receiver_Impl return ::CCM_DDS::CCM_PortStatusListener::_nil (); } - ::CCM_DDS::TestTopic::CCM_StateListener_ptr - Receiver_exec_i::get_info_out_data_listener (void) + ::SL_Disabled::SL_DisabledConnector::CCM_StateListener_ptr + Receiver_exec_i::get_info_out_data_listener (void) { return new StateListener_exec_i(this->no_operation_); } diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h index 8b5460e8057..12551c4d27a 100644 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h @@ -45,7 +45,7 @@ namespace CIAO_SL_Disabled_Receiver_Impl // StateListener_exec_i //============================================================ class RECEIVER_EXEC_Export StateListener_exec_i - : public virtual ::CCM_DDS::TestTopic::CCM_StateListener, + : public virtual ::SL_Disabled::SL_DisabledConnector::CCM_StateListener, public virtual ::CORBA::LocalObject { public: @@ -84,7 +84,7 @@ namespace CIAO_SL_Disabled_Receiver_Impl virtual ~Receiver_exec_i (void); // Port operations. - virtual ::CCM_DDS::TestTopic::CCM_StateListener_ptr + virtual ::SL_Disabled::SL_DisabledConnector::CCM_StateListener_ptr get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr @@ -103,7 +103,7 @@ namespace CIAO_SL_Disabled_Receiver_Impl private: ::SL_Disabled::CCM_Receiver_Context_var context_; - ::CCM_DDS::TestTopic::Reader_var reader_; + ::SL_Disabled::SL_DisabledConnector::Reader_var reader_; read_action_Generator * ticker_; CORBA::ULong rate_; diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl index c03faed763a..2316133c7ee 100644 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl @@ -16,7 +16,7 @@ module SL_Disabled { component Sender { - port CCM_DDS::TestTopic::DDS_Update test_topic_update; + port SL_DisabledConnector::DDS_Update test_topic_update; }; }; diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h index b5d37e7a059..37a81d94c70 100644 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h @@ -73,7 +73,7 @@ namespace CIAO_SL_Disabled_Sender_Impl pulse_Generator * ticker_; ::SL_Disabled::CCM_Sender_Context_var context_; - CCM_DDS::TestTopic::Updater_var updater_; + ::SL_Disabled::SL_DisabledConnector::Updater_var updater_; UPDATER_TEST test_nr_; Atomic_Boolean test_ok_; TestTopicSeq topic_seq_one_; diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/Plan.cdp index 9a086079ff7..d63595862dd 100644 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/Plan.cdp +++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SL_Disabled_SL_Disabled_Connector_Impl</string> + <string>create_SL_Disabled_SL_DisabledConnector_DDS_State_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SL_Disabled_SL_Disabled_Connector_Servant</string> + <string>create_SL_Disabled_SL_DisabledConnector_DDS_State_Servant</string> </value> </value> </execParameter> diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl index 493b3365380..a74dfa79159 100644 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl +++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl @@ -14,7 +14,7 @@ module SetConnectorAttribute { component SetConnectorAttributeComponent { - port SetConnectorAttributeTestConn::DDS_Write info_write; + port SetConnectorAttributeTestConnector::DDS_Write info_write; }; }; diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl index 53f741205e2..bbfe23ccdc7 100644 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl @@ -18,10 +18,7 @@ module SetConnectorAttribute { module ::CCM_DDS::Typed < ::SetConnectorAttributeTest, ::SetConnectorAttributeTestSeq> - SetConnectorAttributeTestConn; - connector SetConnectorAttribute_Connector : SetConnectorAttributeTestConn::DDS_Event - { - }; + SetConnectorAttributeTestConnector; }; #endif /* SetConnectorAttribute_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/Plan.cdp index a01302014d9..0b2fd7b689e 100644 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/Plan.cdp +++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SetConnectorAttribute_SetConnectorAttribute_Connector_Impl</string> + <string>create_SetConnectorAttribute_SetConnectorAttributeTestConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SetConnectorAttribute_SetConnectorAttribute_Connector_Servant</string> + <string>create_SetConnectorAttribute_SetConnectorAttributeTestConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl index 888ebbf77d8..719580a2827 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl @@ -17,9 +17,9 @@ module SharedDP { component SharedDPComponent { - port CCM_DDS::SharedDPTest1::DDS_Write write1; - port CCM_DDS::SharedDPTest2::DDS_Write write2; - port CCM_DDS::SharedDPTest3::DDS_Write write3; + port SharedDP_Connector1::SharedDPTest1Connector::DDS_Write write1; + port SharedDP_Connector2::SharedDPTest2Connector::DDS_Write write2; + port SharedDP_Connector3::SharedDPTest3Connector::DDS_Write write3; }; }; diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl index a81668b8a25..f1f2c60548e 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl @@ -14,16 +14,9 @@ #pragma ciao lem "Connector1/Connector1E.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::SharedDPTest1, ::SharedDPTest1Seq> SharedDPTest1; -}; - module SharedDP_Connector1 { - connector Connector1 : ::CCM_DDS::SharedDPTest1::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::SharedDPTest1, ::SharedDPTest1Seq> SharedDPTest1Connector; }; diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl index fbb5820b808..a7e45ebdf75 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl @@ -14,16 +14,9 @@ #pragma ciao lem "Connector2/Connector2E.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::SharedDPTest2, ::SharedDPTest2Seq> SharedDPTest2; -}; - module SharedDP_Connector2 { - connector Connector2 : ::CCM_DDS::SharedDPTest2::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::SharedDPTest2, ::SharedDPTest2Seq> SharedDPTest2Connector; }; #endif /* SHARED_DP_CONNECTOR2_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl index 29e798d9350..75494f4ddc2 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl @@ -14,16 +14,9 @@ #pragma ciao lem "Connector3/Connector3E.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::SharedDPTest3, ::SharedDPTest3Seq> SharedDPTest3; -}; - module SharedDP_Connector3 { - connector Connector3 : ::CCM_DDS::SharedDPTest3::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::SharedDPTest3, ::SharedDPTest3Seq> SharedDPTest3Connector; }; #endif /* SHARED_DP_CONNECTOR3_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp index a8991de43aa..751ca832e2e 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp @@ -18,7 +18,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SharedDP_Connector1_Connector1_Impl</string> + <string>create_SharedDP_Connector1_SharedDPTest1Connector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -29,7 +29,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SharedDP_Connector1_Connector1_Servant</string> + <string>create_SharedDP_Connector1_SharedDPTest1Connector_DDS_Event_Servant</string> </value> </value> </execParameter> @@ -69,7 +69,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SharedDP_Connector2_Connector2_Impl</string> + <string>create_SharedDP_Connector2_SharedDPTest2Connector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -80,7 +80,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SharedDP_Connector2_Connector2_Servant</string> + <string>create_SharedDP_Connector2_SharedDPTest2Connector_DDS_Event_Servant</string> </value> </value> </execParameter> @@ -120,7 +120,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SharedDP_Connector3_Connector3_Impl</string> + <string>create_SharedDP_Connector3_SharedDPTest3Connector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -131,7 +131,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SharedDP_Connector3_Connector3_Servant</string> + <string>create_SharedDP_Connector3_SharedDPTest3Connector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl index d86e77e5a5d..4f88ee53bb2 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl @@ -15,10 +15,10 @@ module SharedDP { component SharedDPComponent { - port CCM_DDS::SharedDPTest::DDS_Write write1; - port CCM_DDS::SharedDPTest::DDS_Write write2; - port CCM_DDS::SharedDPTest::DDS_Write write3; - port CCM_DDS::SharedDPTest::DDS_Write write4; + port SharedDPTestConnector::DDS_Write write1; + port SharedDPTestConnector::DDS_Write write2; + port SharedDPTestConnector::DDS_Write write3; + port SharedDPTestConnector::DDS_Write write4; attribute boolean perform_test; }; diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl index 11d4d0cc409..f16a853aa20 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl @@ -14,16 +14,9 @@ #pragma ciao lem "Connector/ConnectorE.idl" -module CCM_DDS +module SharedDP { - module ::CCM_DDS::Typed < ::SharedDPTest, ::SharedDPTestSeq> SharedDPTest; -}; - -module SharedDP_Connector -{ - connector SDP_Connector : ::CCM_DDS::SharedDPTest::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::SharedDPTest, ::SharedDPTestSeq> SharedDPTestConnector; }; #endif /* SHARED_DP_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/DefaultQoS.cdp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/DefaultQoS.cdp index 7c10cb028b9..2608b00fc61 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/DefaultQoS.cdp +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/DefaultQoS.cdp @@ -18,7 +18,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SharedDP_Connector_SDP_Connector_Impl</string> + <string>create_SharedDP_SharedDPTestConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -29,7 +29,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SharedDP_Connector_SDP_Connector_Servant</string> + <string>create_SharedDP_SharedDPTestConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp index 56628402110..1087e6683d2 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp @@ -18,7 +18,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SharedDP_Connector_SDP_Connector_Impl</string> + <string>create_SharedDP_SharedDPTestConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -29,7 +29,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_SharedDP_Connector_SDP_Connector_Servant</string> + <string>create_SharedDP_SharedDPTestConnector_DDS_Event_Servant</string> </value> </value> </execParameter> |