diff options
24 files changed, 67 insertions, 84 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 9ddd1b51877..63cca8b1322 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,32 @@ +Wed May 12 10:13:15 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl: + * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl: + * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl: + * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl: + * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl: + * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h: + * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl: + * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl: + * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h: + * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp: + * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl: + * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h: + * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl: + * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl: + * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h: + * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: + * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl: + * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h: + * connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp: + Instantiate the Typed CCM_DDS module inside the module of this test. This + way the IDL type and all CCM_DDS typed interfaces are all in the + module. + Wed May 12 09:50:06 UTC 2010 Marcel Smit <msmit@remedy.nl> * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl: diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl index 766783208bf..d382e20e91e 100644 --- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl @@ -17,15 +17,8 @@ module TT_Connector { - module ::CCM_DDS::Typed < HelloTopic, HelloTopicSeq> HelloConn; - connector TwoTopicsHello_Connector : HelloConn::DDS_Event - { - }; - - module ::CCM_DDS::Typed < GoodbyeTopic, GoodbyeTopicSeq> GoodbyeConn; - connector TwoTopicsGoodbye_Connector : GoodbyeConn::DDS_Event - { - }; + module ::CCM_DDS::Typed < HelloTopic, HelloTopicSeq> HelloConnector; + module ::CCM_DDS::Typed < GoodbyeTopic, GoodbyeTopicSeq> GoodbyeConnector; }; #endif /* TWOTOPICS_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl index e873178dd86..c18f3535053 100644 --- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl @@ -21,46 +21,28 @@ module Hello { // Hello connector - module ::CCM_DDS::Typed < HelloGoodbye, HelloGoodbyeSeq> HelloConn; - connector Hello_Connector : HelloConn::DDS_Event - { - }; + module ::CCM_DDS::Typed < HelloGoodbye, HelloGoodbyeSeq> HelloConnector; }; module Goodbye { // Goodbye connector - module ::CCM_DDS::Typed < HelloGoodbye, HelloGoodbyeSeq> GoodbyeConn; - connector Goodbye_Connector : GoodbyeConn::DDS_Event - { - }; + module ::CCM_DDS::Typed < HelloGoodbye, HelloGoodbyeSeq> GoodbyeConnector; }; module HelloGoodbye { // Hello connector - module ::CCM_DDS::Typed < ::Hello::HelloGoodbye, ::Hello::HelloGoodbyeSeq> HelloConn; - connector Hello_Connector : HelloConn::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::Hello::HelloGoodbye, ::Hello::HelloGoodbyeSeq> HelloConnector; // Goodbye connector - module ::CCM_DDS::Typed < ::Goodbye::HelloGoodbye, ::Goodbye::HelloGoodbyeSeq> GoodbyeConn; - connector Goodbye_Connector : GoodbyeConn::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::Goodbye::HelloGoodbye, ::Goodbye::HelloGoodbyeSeq> GoodbyeConnector; }; // Hello connector -module ::CCM_DDS::Typed < ::Hello::HelloGoodbye, ::Hello::HelloGoodbyeSeq> HelloConn; -connector Hello_Connector : HelloConn::DDS_Event -{ -}; +module ::CCM_DDS::Typed < ::Hello::HelloGoodbye, ::Hello::HelloGoodbyeSeq> HelloConnector; // Goodbye connector -module ::CCM_DDS::Typed < ::Goodbye::HelloGoodbye, ::Goodbye::HelloGoodbyeSeq> GoodbyeConn; -connector Goodbye_Connector : GoodbyeConn::DDS_Event -{ -}; +module ::CCM_DDS::Typed < ::Goodbye::HelloGoodbye, ::Goodbye::HelloGoodbyeSeq> GoodbyeConnector; #endif /* CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl index d59543e6501..411ee4f9976 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl @@ -14,16 +14,9 @@ #pragma ciao lem "Connector/Unkeyed_Test_ConnectorE.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::UnkeyedTest, ::UnkeyedTestSeq> UnkeyedTest; -}; - module Unkeyed_Test { - connector Unkeyed_Test_Connector : ::CCM_DDS::UnkeyedTest::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::UnkeyedTest, ::UnkeyedTestSeq> UnkeyedTestConnector; }; #endif /* Unkeyed_Test_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl index 1729bbe238f..151a1f5f012 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl @@ -14,7 +14,7 @@ module Unkeyed_Test { component Receiver { - port CCM_DDS::UnkeyedTest::DDS_Listen info_out; + port UnkeyedTestConnector::DDS_Listen info_out; provides CCM_DDS::ConnectorStatusListener info_out_connector_status; attribute unsigned short iterations; }; diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp index 6fc273d1eae..fdcf036dc63 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp @@ -144,7 +144,7 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl } // Port operations. - ::CCM_DDS::UnkeyedTest::CCM_Listener_ptr + ::Unkeyed_Test::UnkeyedTestConnector::CCM_Listener_ptr Receiver_exec_i::get_info_out_data_listener (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new UnkeyedTest RAW listener\n"))); diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h index 426ca0a9428..5966bd15742 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h @@ -48,7 +48,7 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl }; class RECEIVER_EXEC_Export UnkeyedTest_Listener_exec_i - : public virtual ::CCM_DDS::UnkeyedTest::CCM_Listener, + : public virtual ::Unkeyed_Test::UnkeyedTestConnector::CCM_Listener, public virtual ::CORBA::LocalObject { public: @@ -81,7 +81,7 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl virtual void iterations (::CORBA::UShort iterations); // Port operations. - virtual ::CCM_DDS::UnkeyedTest::CCM_Listener_ptr + virtual ::Unkeyed_Test::UnkeyedTestConnector::CCM_Listener_ptr get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr @@ -103,8 +103,8 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl private: ::Unkeyed_Test::CCM_Receiver_Context_var context_; - ::CCM_DDS::UnkeyedTest::Reader_var reader_; - ::CCM_DDS::UnkeyedTest::Getter_var getter_; + ::Unkeyed_Test::UnkeyedTestConnector::Reader_var reader_; + ::Unkeyed_Test::UnkeyedTestConnector::Getter_var getter_; CORBA::UShort iterations_; Atomic_ULong received_; diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl index a75a12c8e54..12b010be1cb 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl @@ -16,7 +16,7 @@ module Unkeyed_Test { component Sender { - port CCM_DDS::UnkeyedTest::DDS_Write info_write; + port UnkeyedTestConnector::DDS_Write info_write; attribute unsigned short rate; attribute unsigned short iterations; attribute unsigned short keys; diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h index fb9d5a9bab8..7c2e4ce06cf 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h @@ -68,7 +68,7 @@ namespace CIAO_Unkeyed_Test_Sender_Impl void start (void); void stop (void); - CCM_DDS::UnkeyedTest::Writer_var writer_; + ::Unkeyed_Test::UnkeyedTestConnector::Writer_var writer_; pulse_Generator * ticker_; ::Unkeyed_Test::CCM_Sender_Context_var context_; diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp index a8886179aec..0a8bffb617c 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Unkeyed_Test_Unkeyed_Test_Connector_Impl</string> + <string>create_Unkeyed_Test_UnkeyedTestConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Unkeyed_Test_Unkeyed_Test_Connector_Servant</string> + <string>create_Unkeyed_Test_UnkeyedTestConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl index a5894738606..19f4ef12391 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl @@ -14,16 +14,9 @@ #pragma ciao lem "Connector/Writer_ConnectorE.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTest; -}; - module Writer { - connector Writer_Connector : ::CCM_DDS::WriterTest::DDS_Event - { - }; + module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTestConnector; }; #endif /* Writer_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl index e42f3efc798..c0a984b68fd 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl @@ -14,7 +14,7 @@ module Writer { component Receiver { - port CCM_DDS::WriterTest::DDS_Listen info_out; + port WriterTestConnector::DDS_Listen info_out; attribute unsigned short iterations; }; }; diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp index fd1e853f12a..7d29f92716d 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp @@ -74,7 +74,7 @@ namespace CIAO_Writer_Receiver_Impl } // Port operations. - ::CCM_DDS::WriterTest::CCM_Listener_ptr + ::Writer::WriterTestConnector::CCM_Listener_ptr Receiver_exec_i::get_info_out_data_listener (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new WriterTest RAW listener\n"))); diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h index d1f941be18c..6df60e67c59 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h @@ -19,7 +19,7 @@ namespace CIAO_Writer_Receiver_Impl { class RECEIVER_EXEC_Export WriterTest_Listener_exec_i - : public virtual ::CCM_DDS::WriterTest::CCM_Listener, + : public virtual ::Writer::WriterTestConnector::CCM_Listener, public virtual ::CORBA::LocalObject { public: @@ -52,7 +52,7 @@ namespace CIAO_Writer_Receiver_Impl virtual void iterations (::CORBA::UShort iterations); // Port operations. - virtual ::CCM_DDS::WriterTest::CCM_Listener_ptr + virtual ::Writer::WriterTestConnector::CCM_Listener_ptr get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl index eebc31419e2..e34fa5d405c 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl @@ -16,7 +16,7 @@ module Writer { component Sender { - port CCM_DDS::WriterTest::DDS_Write info_write; + port WriterTestConnector::DDS_Write info_write; attribute unsigned short rate; attribute unsigned short iterations; attribute unsigned short keys; diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h index ead020fedfe..bf11d1c138b 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h @@ -75,7 +75,7 @@ namespace CIAO_Writer_Sender_Impl void start (void); void stop (void); - CCM_DDS::WriterTest::Writer_var writer_; + ::Writer::WriterTestConnector::Writer_var writer_; pulse_Generator * ticker_; ::Writer::CCM_Sender_Context_var context_; diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp index 88c24d90338..a44fb1f0683 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Writer_Writer_Connector_Impl</string> + <string>create_Writer_WriterTestConnector_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Writer_Writer_Connector_Servant</string> + <string>create_Writer_WriterTestConnector_DDS_Event_Servant</string> </value> </value> </execParameter> diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl index 1e93838fe70..25e73c0d784 100644 --- a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl @@ -14,16 +14,9 @@ #pragma ciao lem "Connector/Updater_ConnectorE.idl" -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> TestTopic; -}; - module Updater { - connector Updater_Connector : ::CCM_DDS::TestTopic::DDS_State - { - }; + module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> UpdaterConnector; }; #endif /* UPDATER_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl index 1a819121236..3cc8ff84e8e 100644 --- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl @@ -14,7 +14,7 @@ module Updater { component Receiver { - port CCM_DDS::TestTopic::DDS_Listen info_out; + port UpdaterConnector::DDS_Listen info_out; }; }; diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp index 5402c553baf..ffeaad6efb3 100644 --- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp @@ -82,8 +82,8 @@ namespace CIAO_Updater_Receiver_Impl return ::CCM_DDS::CCM_PortStatusListener::_nil (); } - ::CCM_DDS::TestTopic::CCM_Listener_ptr - Receiver_exec_i::get_info_out_data_listener (void) + ::Updater::UpdaterConnector::CCM_Listener_ptr + Receiver_exec_i::get_info_out_data_listener (void) { return new ListenOneByOneTest_Listener_exec_i ( this->thread_id_listener_); diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h index 3d7dfb09a7d..e86084c4eff 100644 --- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h @@ -28,7 +28,7 @@ namespace CIAO_Updater_Receiver_Impl // ListenOneByOneTest_Listener_exec_i //============================================================ class RECEIVER_EXEC_Export ListenOneByOneTest_Listener_exec_i - : public virtual ::CCM_DDS::TestTopic::CCM_Listener, + : public virtual ::Updater::UpdaterConnector::CCM_Listener, public virtual ::CORBA::LocalObject { public: @@ -59,7 +59,7 @@ namespace CIAO_Updater_Receiver_Impl virtual ~Receiver_exec_i (void); // Port operations. - virtual ::CCM_DDS::TestTopic::CCM_Listener_ptr + virtual ::Updater::UpdaterConnector::CCM_Listener_ptr get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl index 8ca5811a426..183905fc832 100644 --- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl @@ -16,7 +16,7 @@ module Updater { component Sender { - port CCM_DDS::TestTopic::DDS_Update test_topic_update; + port UpdaterConnector::DDS_Update test_topic_update; }; }; diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h index 3a900367ac4..a07d1874404 100644 --- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h @@ -80,7 +80,7 @@ namespace CIAO_Updater_Sender_Impl pulse_Generator * ticker_; ::Updater::CCM_Sender_Context_var context_; - CCM_DDS::TestTopic::Updater_var updater_; + ::Updater::UpdaterConnector::Updater_var updater_; UPDATER_TEST test_nr_; Atomic_Boolean test_ok_; TestTopicSeq topic_seq_one_; diff --git a/CIAO/connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp index 2cb74af488c..9135607f897 100644 --- a/CIAO/connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp +++ b/CIAO/connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp @@ -71,7 +71,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Updater_Updater_Connector_Impl</string> + <string>create_Updater_UpdaterConnector_DDS_State_Impl</string> </value> </value> </execParameter> @@ -82,7 +82,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Updater_Updater_Connector_Servant</string> + <string>create_Updater_UpdaterConnector_DDS_State_Servant</string> </value> </value> </execParameter> |