diff options
Diffstat (limited to 'CIAO/connectors/dds4ccm/tests')
269 files changed, 800 insertions, 331 deletions
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h index 33ea11ad617..a89d1ec1c52 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h @@ -60,7 +60,7 @@ namespace CIAO_CSL_DeadlineTest_Sender_Impl Sender_exec_i &callback_; }; -//============================================================ + //============================================================ // Sender_exec_i //============================================================ class Sender_exec_i @@ -76,9 +76,11 @@ namespace CIAO_CSL_DeadlineTest_Sender_Impl virtual void ccm_activate (void); virtual void ccm_passivate (void); virtual void ccm_remove (void); + // Port operations. virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr get_test_topic_connector_status(void); + void write (void); void add_instance_of_topic (const char *, int x ); diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/HelloTest_Library.xml b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/HelloTest_Library.xml index c452c475b49..08133d8de3a 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/HelloTest_Library.xml +++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/HelloTest_Library.xml @@ -2,7 +2,7 @@ <!-- $Id$ --> <dds xmlns="http://www.omg.org/dds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/dds ../../../docs/schema/dds_qos.xsd"> + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> <qos_profile name="HelloProfile"> <datawriter_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/QoSTest_Library.xml b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/QoSTest_Library.xml index 68d1c07a139..e287ee1c083 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/QoSTest_Library.xml +++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/QoSTest_Library.xml @@ -2,7 +2,7 @@ <!-- $Id$ --> <dds xmlns="http://www.omg.org/dds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/dds ../../../docs/schema/dds_qos.xsd"> + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> <qos_profile name="ReceiverProfile"> <datareader_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl index 2a445aeb903..448e1af0078 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file CoherentUpdate_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef COHERENT_UPDATE_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.idl index ed1e8a6ea10..ebb412e2d73 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.idl +++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.idl @@ -2,7 +2,7 @@ /** * @file Reader_Starter.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef COHERENT_WRITE_STARTER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl index b7c376debb9..b7a1e72117a 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file CoherentUpdate_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef COHERENT_UPDATE_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.idl index f0aeb97c1e9..675e5183b2f 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl index 5b889fd7bd1..7bd88c56805 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl index 4d162663d76..1b699873935 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file CoherentWrite_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef COHERENT_WRITE_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.idl index 46dd49922d6..7a50eed87f3 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.idl +++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.idl @@ -2,7 +2,7 @@ /** * @file Reader_Starter.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef COHERENT_WRITE_STARTER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl index d2085f40b6d..16496f23257 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file CoherentWrite_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef COHERENT_WRITE_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl index 52d4c12a8cb..e849e0fd8fd 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl index 5e33a1ef3b3..14bd7cc5ecf 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/CoherentWriter_Library.xml b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/CoherentWriter_Library.xml index db0355acda8..16887023c84 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/CoherentWriter_Library.xml +++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/CoherentWriter_Library.xml @@ -3,7 +3,7 @@ <!-- $Id$ --> <dds xmlns="http://www.omg.org/dds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/dds ../../../docs/schema/dds_qos.xsd"> + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> <qos_profile name="CoherentWriterProfile"> <!-- QoS used to configure the data writer created in the example code --> diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl index f670ee71f85..1d351a138f3 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file CFT_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef CONTENTFILTEREDTOPIC_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.idl index 587ba7d2b29..0d45e1732f5 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.idl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.idl @@ -1,7 +1,7 @@ // $Id$ /** - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef COMPONENT_IDL diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl index fbd82498cfc..af9957489c8 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file CFT_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef CONTENTFILTEREDTOPIC_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl index d10944664dd..480308dfe07 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file CFTLE_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl index f3803448708..87ccb73c2ec 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file CFTLE_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.idl index d391fd42242..fa883262ac3 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.idl index 72a132108ac..0f7d6b35e42 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl index 04acfd18444..2dbbee4ab90 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file Exception_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef CFT_EXCEPTION_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.idl index c0750298a31..2bb932550dc 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.idl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.idl @@ -1,7 +1,7 @@ // $Id$ /** - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef COMPONENT_IDL diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl index 19f8fa9dffa..1e7e2c601f8 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file Exception_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef CFT_EXCEPTION_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.idl index 84cc3548b04..96ffdf45aa3 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.idl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.idl @@ -2,7 +2,7 @@ /** * @file ReadGet_Starter.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef QUERYCONDITION_STARTER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl index 9205eafa3bc..28777250a83 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file ReadGet_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef QUERY_CONDITION_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl index 07fb630b014..236350ae43e 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file ReadGet_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef QUERY_CONDITION_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.idl index eab115ce81c..7b4650a6df9 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp index f0a40e6d494..63f34cdfa7e 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp @@ -326,7 +326,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl if (::CORBA::is_nil (read_reader)) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Receiver_exec_i::get_all - ") + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Receiver_exec_i::read_all_on_reader_port - ") ACE_TEXT ("ERROR: No Reader on Reader port\n"))); return; } @@ -335,7 +335,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl read_reader->read_all (queryfiltertest_info_seq, readinfo_seq); if (queryfiltertest_info_seq.length () == 0) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR : Receiver_exec_i::read_all : ") + ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR : Receiver_exec_i::read_all_on_reader_port : ") ACE_TEXT ("No samples available in Reader!\n"))); } for (CORBA::ULong it = 0; it < queryfiltertest_info_seq.length (); ++it) @@ -353,7 +353,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl if (::CORBA::is_nil (get_reader)) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::get_all - ") + ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::read_all_on_getter_port - ") ACE_TEXT ("No Reader on Getter port\n"))); return; } @@ -362,7 +362,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl get_reader->read_all (queryfiltertest_info_seq, readinfo_seq); if (queryfiltertest_info_seq.length () == 0) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR : Receiver_exec_i::read_all : ") + ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR : Receiver_exec_i::read_all_on_getter_port : ") ACE_TEXT ("No samples available in Reader!\n"))); } for (CORBA::ULong it = 0; it < queryfiltertest_info_seq.length (); ++it) @@ -380,7 +380,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl if (::CORBA::is_nil (get_getter)) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::get_all - ") + ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::get_all_on_getter_port - ") ACE_TEXT ("No Getter on Getter port\n"))); return; } @@ -395,7 +395,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl CORBA::Boolean result = get_getter->get_one (qf_info.out (), readinfo); if (ACE_OS::strlen (qf_info->symbol.in ()) == 0) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::get_all - ") + ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::get_all_on_getter_port - ") ACE_TEXT ("Name of key seems to be empty-> bailing out\n"))); return; } @@ -406,7 +406,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl } else { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::get_all - ") + ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::get_all_on_getter_port - ") ACE_TEXT ("time out when retrieving ") ACE_TEXT ("first sample.\n"))); } diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.idl index 3e1c34e19c6..05b0070531a 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ @@ -18,6 +18,7 @@ module ReadGet_Test component Sender { port ReadGet_Test::QueryConditionTestConnector::DDS_Write info_write; + provides CCM_DDS::ConnectorStatusListener sender_connector_status; uses ReadGetStarter start_reader; provides ReadGetRestarter restart_writer; diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp index c7d47f08f9e..6cf5b12dfa3 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp @@ -75,6 +75,60 @@ namespace CIAO_ReadGet_Test_Sender_Impl } /** + * Component Executor Implementation Class: ConnectorStatusListener_exec_i + */ + ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( + Sender_exec_i &callback) + : callback_ (callback) + { + } + + ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) + { + } + + // Operations from ::CCM_DDS::ConnectorStatusListener + void ConnectorStatusListener_exec_i::on_inconsistent_topic ( + ::DDS::Topic_ptr /*the_topic*/, + const DDS::InconsistentTopicStatus & /*status*/) + { + } + + void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( + ::DDS::DataReader_ptr /*the_reader*/, + const DDS::RequestedIncompatibleQosStatus & /*status*/) + { + } + + void ConnectorStatusListener_exec_i::on_sample_rejected ( + ::DDS::DataReader_ptr /*the_reader*/, + const DDS::SampleRejectedStatus & /*status*/) + { + } + + void ConnectorStatusListener_exec_i::on_offered_deadline_missed( + ::DDS::DataWriter_ptr /*the_writer*/, + const DDS::OfferedDeadlineMissedStatus & /*status*/) + { + } + + void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( + ::DDS::DataWriter_ptr /*the_writer*/, + const DDS::OfferedIncompatibleQosStatus & /*status*/) + { + } + + void ConnectorStatusListener_exec_i::on_unexpected_status( + ::DDS::Entity_ptr /*the_entity*/, + ::DDS::StatusKind status_kind) + { + if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) + { + this->callback_.get_started (); + } + } + + /** * Component Executor Implementation Class: Sender_exec_i */ @@ -133,6 +187,12 @@ namespace CIAO_ReadGet_Test_Sender_Impl this->ciao_restart_writer_.in ()); } + ::CCM_DDS::CCM_ConnectorStatusListener_ptr + Sender_exec_i::get_sender_connector_status (void) + { + return new ConnectorStatusListener_exec_i (*this); + } + void Sender_exec_i::restart (void) { @@ -188,6 +248,30 @@ namespace CIAO_ReadGet_Test_Sender_Impl starter->start_read (this->run_); } + void + Sender_exec_i::get_started (void) + { + try + { + ACE_NEW_THROW_EX (this->wh_, + WriteHandler (*this), + CORBA::INTERNAL ()); + this->reactor ()->notify (this->wh_); + } + catch (const ::CORBA::Exception& ex) + { + ex._tao_print_exception ("Exception caught:"); + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("ERROR: GET_CONNECTION_START_READER : Exception caught\n"))); + } + catch (...) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("ERROR: GET_CONNECTION_START_READER : Unknown exception caught\n"))); + } + } + + ::CORBA::UShort Sender_exec_i::keys (void) { @@ -225,24 +309,6 @@ namespace CIAO_ReadGet_Test_Sender_Impl void Sender_exec_i::ccm_activate (void) { - try - { - ACE_NEW_THROW_EX (this->wh_, - WriteHandler (*this), - CORBA::INTERNAL ()); - this->reactor ()->notify (this->wh_); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("Exception caught:"); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: GET_CONNECTION_START_READER : Exception caught\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: GET_CONNECTION_START_READER : Unknown exception caught\n"))); - } } void diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h index 7514ef2a334..c317e119c0f 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h @@ -82,6 +82,39 @@ namespace CIAO_ReadGet_Test_Sender_Impl }; /** + * Component Executor Implementation Class: ConnectorStatusListener_exec_i + */ + class SENDER_EXEC_Export ConnectorStatusListener_exec_i + : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, + public virtual ::CORBA::LocalObject + { + public: + ConnectorStatusListener_exec_i (Sender_exec_i &callback); + virtual ~ConnectorStatusListener_exec_i (void); + + virtual + void on_inconsistent_topic (::DDS::Topic_ptr the_topic, + const DDS::InconsistentTopicStatus & status); + virtual + void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader, + const DDS::RequestedIncompatibleQosStatus & status); + virtual + void on_sample_rejected (::DDS::DataReader_ptr the_reader, + const DDS::SampleRejectedStatus & status); + virtual + void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, + const DDS::OfferedDeadlineMissedStatus & status); + virtual + void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer, + const DDS::OfferedIncompatibleQosStatus & status); + virtual + void on_unexpected_status (::DDS::Entity_ptr the_entity, + ::DDS::StatusKind status_kind); + private: + Sender_exec_i &callback_; + }; + + /** * Component Executor Implementation Class: Sender_exec_i */ @@ -104,6 +137,9 @@ namespace CIAO_ReadGet_Test_Sender_Impl virtual ::CCM_ReadGetRestarter_ptr get_restart_writer (void); + virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr + get_sender_connector_status (void); + virtual ::CORBA::UShort keys (void); virtual void keys (::CORBA::UShort keys); @@ -120,6 +156,7 @@ namespace CIAO_ReadGet_Test_Sender_Impl //@{ /** User defined public operations. */ + void get_started (void); void start (void); void restart (void); //@} diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/Plan.cdp index 15e3998f405..153c6f2e78b 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/Plan.cdp +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/Plan.cdp @@ -545,6 +545,26 @@ </internalEndpoint> </connection> + <connection> + <name>sender_connector_status_sender</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>sender_connector_status</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="SenderComponentInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>error_listener</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="ReadGet_Test_SenderConnectorInstance" /> + </internalEndpoint> + </connection> + <artifact xmi:id="Sender_ExecArtifact"> <name>Sender_exec</name> <source/> diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/QueryCondition_Library.xml b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/QueryCondition_Library.xml index 41025e9fc32..34dad903f89 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/QueryCondition_Library.xml +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/QueryCondition_Library.xml @@ -3,7 +3,7 @@ <!-- $Id$ --> <dds xmlns="http://www.omg.org/dds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/dds ../../../../docs/schema/dds_qos.xsd"> + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> <qos_profile name="QueryConditionProfile"> <!-- QoS used to configure the data writer created in the example code --> diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl index 700810b49f6..5cf9b67f1f2 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file CFTLS_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl index fbb3b81c748..782543c9857 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file CFTLS_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.idl index 0238830efdc..ff8dc50f799 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.idl index b57f75d7142..abe69e84987 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl index 9c72ed80d07..9210139e755 100644 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl @@ -2,7 +2,7 @@ /** * @file Writer_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef WRITER_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.idl index 52da51a41e1..8edcd5d012e 100644 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.idl @@ -2,7 +2,7 @@ /** * @file Writer_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef WRITER_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.idl b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.idl index 829c4ebb60e..e23fae3ea28 100644 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.idl index 91871b19d95..eb120e6ab8b 100644 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl index 6bd1abc666c..1299b582b48 100644 --- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl @@ -2,7 +2,7 @@ /** * @file DNM_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef DOUBLE_NESTED_MODULE_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl index f7f11684c6a..0f0c3670c5d 100644 --- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl @@ -2,7 +2,7 @@ /** * @file DNM_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef DOUBLE_NESTED_MODULE_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl index 24d3079d59f..73cb62581b2 100644 --- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl @@ -2,7 +2,7 @@ /** * @file DNM_Sender.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl index e7bce731755..ba0b37c5577 100644 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file Event_Connection_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef EVENT_CONNECTION_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl index fbcfc782f50..e456dfd3710 100644 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file Event_Connection_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef KEYED_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl index 1d407755d68..af13df3b057 100644 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl index 9a44606a0f3..5d7eace4f59 100644 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl index 0d8ba6898eb..e94aa7d5c46 100644 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl @@ -2,7 +2,7 @@ /** * @file FSS_Event_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef FIXED_SIZE_STRUCT_EVENT_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl index 15df8d385de..d072bb7b54e 100644 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl @@ -2,7 +2,7 @@ /** * @file FSS_Event_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef FIXED_SIZE_STRUCT_EVENT_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl index 6acc2d0312a..12151014fa4 100644 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl @@ -2,7 +2,7 @@ /** * @file FSS_State_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef FIXED_SIZE_STRUCT_STATE_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl index 22c6bca8e5c..d502cffe810 100644 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl @@ -2,7 +2,7 @@ /** * @file FSS_State_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef FIXED_SIZE_STRUCT_STATE_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl index 8f4eae12a0f..c41a28d7066 100644 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file GCE_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef GET_COMPONENT_EVENT_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.idl index 101e1027684..a0daa8b28f6 100644 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.idl +++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.idl @@ -1,7 +1,7 @@ // $Id$ /** - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef COMPONENT_IDL diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl index ef2af9c5f98..a6062326d04 100644 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file GCE_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef GET_COMPONENT_EVENT_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl index 329b96ab7bd..cc2ee49d8c0 100644 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file GCS_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef GET_COMPONENT_STATE_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.idl index 22b9d1cc333..daa66fb4439 100644 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.idl +++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.idl @@ -1,7 +1,7 @@ // $Id$ /** - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef COMPONENT_IDL diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl index c69d12fecbe..31c514609ed 100644 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file GCS_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef GET_COMPONENT_STATE_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl index 5709fe39c20..243bd7fe124 100644 --- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl +++ b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl @@ -2,7 +2,7 @@ /** * @file Get_Invoker.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef GETTER_INVOKER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl index 152f122c5d6..6980c9e4bb5 100644 --- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file Getter_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef GETTER_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl index f5b31e30270..a3770782934 100644 --- a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file Getter_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef GETTER_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl index 34189e35a24..20ee77c4264 100644 --- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl index 39605844455..af681e2db02 100644 --- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Getter_Library.xml b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Getter_Library.xml index dfe24d9289c..42aa30cf032 100644 --- a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Getter_Library.xml +++ b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Getter_Library.xml @@ -4,9 +4,9 @@ <dds xmlns="http://www.omg.org/dds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/dds ../../../docs/schema/dds_qos.xsd"> + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> <qos_profile name="GetterProfile"> - <datawriter_qos> + <datawriter_qos> <durability> <kind>TRANSIENT_DURABILITY_QOS</kind> </durability> @@ -21,7 +21,7 @@ <kind>KEEP_ALL_HISTORY_QOS</kind> <depth>1</depth> </history> - </datawriter_qos> + </datawriter_qos> <datareader_qos> <durability> <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind> diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl index a9ea3f1686d..103ac1984c1 100644 --- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file IDL_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef IDL_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.idl index 07cab5ba2e7..f1273c133d0 100644 --- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.idl +++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef BASE_COMPONENT_IDL diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.idl index 24b6101f7f1..963115fb83f 100644 --- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.idl +++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef DERIVED_COMPONENT_IDL diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl index c9e20eaefd4..7cf81919025 100644 --- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file IDL_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef IDL_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl index 6ff0bd86e90..7f28e3c41ca 100644 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl @@ -2,7 +2,7 @@ /** * @file Writer_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef WRITER_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl index 52da51a41e1..8edcd5d012e 100644 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl @@ -2,7 +2,7 @@ /** * @file Writer_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef WRITER_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl index 07f0d8eda00..dc5393f24d7 100644 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl index 9eb427dbd61..13f88672182 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file Keyed_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef KEYED_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl index 1924f1ee4f9..7f44c70b2d6 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file Keyed_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef KEYED_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl index 28616f66c48..48ff7e26a5f 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl index 6863258f984..3ba040ce4cc 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl index 9c72ed80d07..9210139e755 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl @@ -2,7 +2,7 @@ /** * @file Writer_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef WRITER_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl index 52da51a41e1..8edcd5d012e 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl @@ -2,7 +2,7 @@ /** * @file Writer_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef WRITER_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl index 89ecf0a6a86..2ee3fd7ed1c 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl index e34fa5d405c..d6bad0833e5 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/KeyedWriter_Library.xml b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/KeyedWriter_Library.xml index bb92a97ff0f..9f6144b72a2 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/KeyedWriter_Library.xml +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/KeyedWriter_Library.xml @@ -4,7 +4,7 @@ <dds xmlns="http://www.omg.org/dds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/dds ../../../docs/schema/dds_qos.xsd"> + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> <qos_profile name="KeyedWriterProfile"> <!-- QoS used to configure the data writer created in the example code --> diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl index 199ee6c0a86..8ec6d4473d7 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl @@ -2,7 +2,7 @@ /** * @file RG_LateBinding_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RG_LATEBINDING_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.idl index 2574120a961..4465847487b 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.idl +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.idl @@ -2,7 +2,7 @@ /** * @file Reader_Starter.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef READER_STARTER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl index f6e1080005b..bea6d8be306 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl @@ -2,7 +2,7 @@ /** * @file RG_LateBinding_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RG_LATEBINDING_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.idl index 2bc1cfea791..fdebbda9a79 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.idl index 8ccf43d8c12..6020f215e82 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/LateBinding_Library.xml b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/LateBinding_Library.xml index 42192885a1a..fcb9a022f96 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/LateBinding_Library.xml +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/LateBinding_Library.xml @@ -3,7 +3,7 @@ <!-- $Id$ --> <dds xmlns="http://www.omg.org/dds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/dds ../../../../docs/schema/dds_qos.xsd"> + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> <qos_profile name="LateBindingProfile"> <datawriter_qos> diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl index 9e07835428f..8d0a8feae98 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl @@ -2,7 +2,7 @@ /** * @file WU_LateBinding_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef WU_LATEBINDING_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl index 152751ba587..a63c80f3df6 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl @@ -2,7 +2,7 @@ /** * @file WU_LateBinding_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef WU_LATEBINDING_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.idl index 647bc74654d..500123efb96 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.idl index 1b254bcd0a4..2b4cd723086 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl index 050aee731a1..1df8fc2e4cb 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file LMBM_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef LISTEN_MANY_BY_MANY_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl index 04d5e934a48..74f8b3c5675 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file LMBM_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef LISTEN_MANY_BY_MANY_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl index e63c4a7f967..3123710ceea 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl index d0fceb242ec..330cb2628af 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ @@ -17,6 +17,7 @@ module LMBM_Test component Sender { port ListenManyByManyTestConnector::DDS_Write info_write; + provides CCM_DDS::ConnectorStatusListener info_write_connector_status; attribute unsigned short keys; attribute unsigned short iterations; diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp index 39df73bdf0e..2ab21ddaaec 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp @@ -42,11 +42,66 @@ namespace CIAO_LMBM_Test_Sender_Impl } //============================================================ + // ConnectorStatusListener_exec_i + //============================================================ + ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( + Sender_exec_i &callback) + : callback_ (callback) + { + } + + ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) + { + } + + // Operations from ::CCM_DDS::ConnectorStatusListener + void ConnectorStatusListener_exec_i::on_inconsistent_topic ( + ::DDS::Topic_ptr /*the_topic*/, + const DDS::InconsistentTopicStatus & /*status*/) + { + } + + void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( + ::DDS::DataReader_ptr /*the_reader*/, + const DDS::RequestedIncompatibleQosStatus & /*status*/) + { + } + + void ConnectorStatusListener_exec_i::on_sample_rejected ( + ::DDS::DataReader_ptr /*the_reader*/, + const DDS::SampleRejectedStatus & /*status*/) + { + } + + void ConnectorStatusListener_exec_i::on_offered_deadline_missed( + ::DDS::DataWriter_ptr /*the_writer*/, + const DDS::OfferedDeadlineMissedStatus & /*status*/) + { + } + + void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( + ::DDS::DataWriter_ptr /*the_writer*/, + const DDS::OfferedIncompatibleQosStatus & /*status*/) + { + } + + void ConnectorStatusListener_exec_i::on_unexpected_status( + ::DDS::Entity_ptr /*the_entity*/, + ::DDS::StatusKind status_kind) + { + if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) + { + this->callback_.get_started (); + } + } + + //============================================================ // Component Executor Implementation Class: Sender_exec_i //============================================================ Sender_exec_i::Sender_exec_i (void) : keys_ (5) - , iterations_ (10) + , iterations_ (10) + , started_ (false) { this->ticker_ = new WriteTicker (*this); } @@ -102,6 +157,26 @@ namespace CIAO_LMBM_Test_Sender_Impl } } + void + Sender_exec_i::get_started (void) + { + this->started_ = true; + try + { + this->start (); + } + catch (const ::CORBA::Exception& ex) + { + ex._tao_print_exception ("Exception caught:"); + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("ERROR: Sender_exec_i::get_started: Exception caught\n"))); + } + catch (...) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("ERROR: Sender_exec_i::get_started: Unknown exception caught\n"))); + } + } void Sender_exec_i::start (void) @@ -154,6 +229,12 @@ namespace CIAO_LMBM_Test_Sender_Impl } // Component attributes and port operations. + ::CCM_DDS::CCM_ConnectorStatusListener_ptr + Sender_exec_i::get_info_write_connector_status (void) + { + return new ConnectorStatusListener_exec_i (*this); + } + ::CORBA::UShort Sender_exec_i::keys (void) @@ -204,26 +285,18 @@ namespace CIAO_LMBM_Test_Sender_Impl void Sender_exec_i::ccm_activate (void) { - try - { - start (); - } - catch (const ::CORBA::Exception& ex) - { - ex._tao_print_exception ("Exception caught:"); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Exception caught\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Unknown exception caught\n"))); - } } void Sender_exec_i::ccm_passivate (void) { + if (!this->started_) + { + ACE_ERROR ((LM_ERROR, + "Sender_exec_i::ccm_passivate - " + "ERROR: No publication matched received. " + "Test didn't run\n")); + } } void diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h index 30a6c0bcfff..fb32ab4de44 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h @@ -48,6 +48,39 @@ namespace CIAO_LMBM_Test_Sender_Impl }; //============================================================ + // ConnectorStatusListener_exec_i + //============================================================ + class SENDER_EXEC_Export ConnectorStatusListener_exec_i + : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, + public virtual ::CORBA::LocalObject + { + public: + ConnectorStatusListener_exec_i (Sender_exec_i &callback); + virtual ~ConnectorStatusListener_exec_i (void); + + virtual + void on_inconsistent_topic (::DDS::Topic_ptr the_topic, + const DDS::InconsistentTopicStatus & status); + virtual + void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader, + const DDS::RequestedIncompatibleQosStatus & status); + virtual + void on_sample_rejected (::DDS::DataReader_ptr the_reader, + const DDS::SampleRejectedStatus & status); + virtual + void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, + const DDS::OfferedDeadlineMissedStatus & status); + virtual + void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer, + const DDS::OfferedIncompatibleQosStatus & status); + virtual + void on_unexpected_status (::DDS::Entity_ptr the_entity, + ::DDS::StatusKind status_kind); + private: + Sender_exec_i &callback_; + }; + + //============================================================ // Component Executor Implementation Class: Sender_exec_i //============================================================ @@ -66,6 +99,8 @@ namespace CIAO_LMBM_Test_Sender_Impl //@{ /** Component attributes and port operations. */ + virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr + get_info_write_connector_status(void); virtual ::CORBA::UShort keys (void); @@ -87,7 +122,7 @@ namespace CIAO_LMBM_Test_Sender_Impl //@{ /** User defined public operations. */ - void start (void); + void get_started (void); void write_one (void); //@} @@ -100,6 +135,8 @@ namespace CIAO_LMBM_Test_Sender_Impl ::CORBA::UShort keys_; ::CORBA::UShort iterations_; + + bool started_; //@} //@{ @@ -113,7 +150,7 @@ namespace CIAO_LMBM_Test_Sender_Impl //@{ /** User defined private operations. */ - + void start (void); //@} /// Get the ACE_Reactor diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/ListenManyByMany_Library.xml b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/ListenManyByMany_Library.xml index 3674c57f811..949e4287e9a 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/ListenManyByMany_Library.xml +++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/ListenManyByMany_Library.xml @@ -3,7 +3,7 @@ <!-- $Id$ --> <dds xmlns="http://www.omg.org/dds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/dds ../../../docs/schema/dds_qos.xsd"> + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> <qos_profile name="ListenManyByManyProfile"> <!-- QoS used to configure the data writer created in the example code --> diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp index 6901c937d33..3113997f546 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp +++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp @@ -337,6 +337,25 @@ <instance xmi:idref="LMBM_Test_ConnectorComponentInstance" /> </internalEndpoint> </connection> + <connection> + <name>info_write_connector_status_sender</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>info_write_connector_status</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="SenderComponentInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>error_listener</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="LMBM_Test_ConnectorComponentInstance" /> + </internalEndpoint> + </connection> <artifact xmi:id="Sender_ExecArtifact"> <name>Sender_exec</name> diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl index fa50e162f10..b0f38be7792 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file LNE_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef LISTEN_NOT_ENABLED_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl index fdf631ade12..7a4637ce7c8 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file LNE_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef LISTEN_NOT_ENABLED_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl index d66ea66bb36..69ffd780bdb 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl index ef25e616cd2..8c3a3f67fbb 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl index cead5e3c051..b572cc36f9e 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file LOBO_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef LISTEN_ONE_BY_ONE_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl index 09a6f1b1440..0d5d250aaf0 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file LOBO_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef LISTEN_ONE_BY_ONE_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl index e0e66570e78..b39d90467e2 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl index 5bfb0e62118..e5a0c0a731b 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl index 45e8928d9b7..41f0ee3b10b 100644 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file Event_MemLeakDetection_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef EVENT_MEMLEAKDETECTION_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.idl index 7be512e3f05..2dd437f02a5 100644 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file Event_MemLeakDetection_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef KEYED_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.idl index 38d66d8efab..287ee549e01 100644 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.idl index dd3e3c9733f..20303192591 100644 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl index 55d39800fe5..5d9883bbbe5 100644 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file State_MemLeakDetection_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef STATE_MEMLEAKDETECTION_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.idl index e1e48db1c7b..a9f21327d3b 100644 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file State_MemLeakDetection_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef KEYED_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.idl index 808810effb8..36340ec5cb5 100644 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.idl index 30e3676a04d..87700e72984 100644 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl index 743842d32f5..889a935aab1 100644 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file TypeRegistration_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef MLD_TYPE_REGISTRATION_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.idl index be1174f1de3..7faac7b92bb 100644 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.idl +++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.idl @@ -1,7 +1,7 @@ // $Id$ /** - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef COMPONENT_IDL diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl index dd55fb31477..ca5c106e1d8 100644 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file TypeRegistration_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef MLD_TYPE_REGISTRATION_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/run_test.pl index 7bae1fb4f2e..1898597875f 100755 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/run_test.pl @@ -218,8 +218,8 @@ for ($i = 0; $i < $nr_daemon; ++$i) { } } -print "Sleeping 2 seconds to allow task to complete\n"; -sleep (2); +print "Sleeping 20 seconds to allow task to complete\n"; +sleep (20); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl index 27e33eddbd7..a921b0808a0 100644 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl @@ -2,7 +2,7 @@ /** * @file NonChangeable_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef NONCHANGEABLE_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.idl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.idl index 725e850b336..9c2bd803cd8 100644 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.idl +++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.idl @@ -2,7 +2,7 @@ /** * @file NonChangeable_Component.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef COMPONENT_IDL diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl index d553eaafb88..ccabdf61b23 100644 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl @@ -2,7 +2,7 @@ /** * @file NonChangeable_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef NONCHANGABLE_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl index 0d6cc5b1673..ca489d916f9 100644 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file OIT_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef ON_INCONSISTENT_TOPIC_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.idl index 4f150572c72..5e4726d1069 100644 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl index 83ea6163774..fcc6a005731 100644 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl @@ -2,7 +2,7 @@ /** * @file OIT_Receiver_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef ON_INCONSISTENT_TOPIC_TEST_RECEIVER_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl index b9108eee085..a31c329c85f 100644 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl index 70098b3c538..3f14182fc85 100644 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl @@ -3,7 +3,7 @@ /** * @file OIT_Sender_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef ON_INCONSISTENT_TOPIC_TEST_SENDER_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl index 94ab95016e5..f51728042e6 100644 --- a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl @@ -2,7 +2,7 @@ /** * @file OneFile_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef ONEFILE_BASE_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl index 8a08e82bad4..8a33aa146d4 100644 --- a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl @@ -2,7 +2,7 @@ /** * @file OneFile_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef ONEFILE_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Deadline_Library.xml b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Deadline_Library.xml index 89ccafec72d..6a929d9a879 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Deadline_Library.xml +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Deadline_Library.xml @@ -2,7 +2,7 @@ <!-- $Id$ --> <dds xmlns="http://www.omg.org/dds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/dds ../../../docs/schema/dds_qos.xsd"> + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> <qos_profile name="DeadlineProfile"> <datawriter_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/HelloTest_Library.xml b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/HelloTest_Library.xml index 2ea09d1e512..07016e141c0 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/HelloTest_Library.xml +++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/HelloTest_Library.xml @@ -2,8 +2,8 @@ <!-- $Id$ --> <dds xmlns="http://www.omg.org/dds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/dds ../../../docs/schema/dds_qos.xsd"> - <qos_profile name="DeadlineProfile"> + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> + <qos_profile name="HelloProfile"> <datawriter_qos> <reliability> <kind>RELIABLE_RELIABILITY_QOS</kind> diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl index 79653c6fa20..25e947ad634 100644 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file PortUsage_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef PORTUSAGE_EVENT_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.idl index 4d4a6c10ca9..bf6c2263c2a 100644 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.idl +++ b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef EVENT_COMPONENT_IDL diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl index a07c8315e1b..6ff33d1b54a 100644 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl @@ -2,7 +2,7 @@ /** * @file PortUsageEvent_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef PORTUSAGE_EVENT_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.idl index 7d909dfa242..338fe53f175 100644 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.idl +++ b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef STATE_COMPONENT_IDL diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl index 524426a50c6..eae2ab24c5b 100644 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl @@ -2,7 +2,7 @@ /** * @file PortUsageState_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef PORTUSAGE_STATE_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl index 0a1a7baf41e..029997017f1 100755 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl @@ -198,8 +198,8 @@ foreach $file (@files) { "-x $file -k file://$ior_emfile"); $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ()); - print "Sleeping 5 seconds to allow task to complete\n"; - sleep (5); + print "Sleeping 30 seconds to allow task to complete\n"; + sleep (30); print "Teardown the application\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl index 9c07b650022..b08ac93a360 100644 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file Proxy_RW_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef PROXY_RW_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.idl index b33bd5a0848..3243595bb92 100644 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.idl +++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.idl @@ -2,7 +2,7 @@ /** * @file Reader_Starter.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef READER_STARTER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.idl index a8361298e44..11c86757389 100644 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file Proxy_RW_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef PROXY_RW_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.idl index 694c4bb855a..b3e6d52c49a 100644 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.idl @@ -2,7 +2,7 @@ /** * @file Proxy_RW_Test_Receiver.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.idl index 6b89a5605bd..32bf08e1783 100644 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Plan.cdp index c619a73fc10..4f1be9998f6 100644 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Plan.cdp +++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Plan.cdp @@ -181,7 +181,7 @@ <kind>tk_string</kind> </type> <value> - <string>Proxy_RW_Library#Proxy_RWProfile</string> + <string>Proxy_RW_Library#ProxyRWProfile</string> </value> </value> </configProperty> @@ -210,7 +210,7 @@ <kind>tk_string</kind> </type> <value> - <string>Proxy_RW_Library#Proxy_RWProfile</string> + <string>Proxy_RW_Library#ProxyRWProfile</string> </value> </value> </configProperty> diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Proxy_RW_Library.xml b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Proxy_RW_Library.xml index a4400b11dda..415f498da8e 100644 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Proxy_RW_Library.xml +++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Proxy_RW_Library.xml @@ -3,7 +3,7 @@ <!-- $Id$ --> <dds xmlns="http://www.omg.org/dds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/dds ../../../../docs/schema/dds_qos.xsd"> + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> <qos_profile name="ProxyRWProfile"> <!-- QoS used to configure the data writer created in the example code --> diff --git a/CIAO/connectors/dds4ccm/tests/QoS/dump/qos.xml b/CIAO/connectors/dds4ccm/tests/QoS/dump/qos.xml index 5196e09f815..cf0cc502200 100644 --- a/CIAO/connectors/dds4ccm/tests/QoS/dump/qos.xml +++ b/CIAO/connectors/dds4ccm/tests/QoS/dump/qos.xml @@ -2,7 +2,7 @@ <!-- $Id$ --> <dds xmlns="http://www.omg.org/dds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/dds ../../../docs/schema/dds_qos.xsd"> + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> <qos_profile name="TestProfile"> <datareader_qos> <durability> diff --git a/CIAO/connectors/dds4ccm/tests/QoS/dump/qos_dump.cpp b/CIAO/connectors/dds4ccm/tests/QoS/dump/qos_dump.cpp index 6516faa5fb6..1f66730a955 100644 --- a/CIAO/connectors/dds4ccm/tests/QoS/dump/qos_dump.cpp +++ b/CIAO/connectors/dds4ccm/tests/QoS/dump/qos_dump.cpp @@ -19,41 +19,82 @@ int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) } DDS4CCM::QOS_XML_Loader xml_loader; - if (xml_loader.init (argv[1])) + DDS::ReturnCode_t const retcode = xml_loader.init (argv[1]); + if (retcode == DDS::RETCODE_OK) { + DDS::ReturnCode_t retcode_qos; ::DDS::DataWriterQos dw_qos; - xml_loader.get_datawriter_qos (dw_qos, - ACE_TEXT ("TestProfile"), - "TopicName"); - //dump + retcode_qos = xml_loader.get_datawriter_qos ( + dw_qos, + ACE_TEXT ("TestProfile"), + "TopicName"); + if (retcode_qos != DDS::RETCODE_OK) + { + ACE_ERROR ((LM_ERROR, "MAIN - " + "get_datawriter_qos return an error. Retcode <%d>", + retcode_qos)); + } ::DDS::DataReaderQos dr_qos; - xml_loader.get_datareader_qos (dr_qos, - ACE_TEXT ("TestProfile"), - "TopicName"); - //dump + retcode_qos = xml_loader.get_datareader_qos ( + dr_qos, + ACE_TEXT ("TestProfile"), + "TopicName"); + if (retcode_qos != DDS::RETCODE_OK) + { + ACE_ERROR ((LM_ERROR, "MAIN - " + "get_datareader_qos return an error. Retcode <%d>", + retcode_qos)); + } ::DDS::TopicQos tp_qos; - xml_loader.get_topic_qos (tp_qos, - ACE_TEXT ("TestProfile"), - "TopicName"); - //dump + retcode_qos = xml_loader.get_topic_qos ( + tp_qos, + ACE_TEXT ("TestProfile"), + "TopicName"); + if (retcode_qos != DDS::RETCODE_OK) + { + ACE_ERROR ((LM_ERROR, "MAIN - " + "get_topic_qos return an error. Retcode <%d>", + retcode_qos)); + } ::DDS::PublisherQos pub_qos; - xml_loader.get_publisher_qos (pub_qos, - ACE_TEXT ("TestProfile")); - //dump + retcode_qos = xml_loader.get_publisher_qos ( + pub_qos, + ACE_TEXT ("TestProfile")); + if (retcode_qos != DDS::RETCODE_OK) + { + ACE_ERROR ((LM_ERROR, "MAIN - " + "get_publisher_qos return an error. Retcode <%d>", + retcode_qos)); + } ::DDS::SubscriberQos sub_qos; - xml_loader.get_subscriber_qos (sub_qos, - ACE_TEXT ("TestProfile")); - //dump + retcode_qos = xml_loader.get_subscriber_qos ( + sub_qos, + ACE_TEXT ("TestProfile")); + if (retcode_qos != DDS::RETCODE_OK) + { + ACE_ERROR ((LM_ERROR, "MAIN - " + "get_subscriber_qos return an error. Retcode <%d>", + retcode_qos)); + } ::DDS::DomainParticipantQos dp_qos; - xml_loader.get_participant_qos (dp_qos, - ACE_TEXT ("TestProfile")); - //dump + retcode_qos = xml_loader.get_participant_qos ( + dp_qos, + ACE_TEXT ("TestProfile")); + if (retcode_qos != DDS::RETCODE_OK) + { + ACE_ERROR ((LM_ERROR, "MAIN - " + "get_participant_qos return an error. Retcode <%d>", + retcode_qos)); + } } + else + ACE_ERROR ((LM_ERROR, "MAIN - Init return an error. Retcode <%d>", + retcode)); } catch (const CORBA::Exception& ex) { diff --git a/CIAO/connectors/dds4ccm/tests/QoS/dump/run_test.pl b/CIAO/connectors/dds4ccm/tests/QoS/dump/run_test.pl index 759999e186c..8e017b17fbb 100755 --- a/CIAO/connectors/dds4ccm/tests/QoS/dump/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/QoS/dump/run_test.pl @@ -10,7 +10,7 @@ use PerlACE::TestTarget; my $program = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; -$PROG = $program->CreateProcess ("qos_dump", "qos.xml"); +$PROG = $program->CreateProcess ("qos_dump", "qos"); $program_status = $PROG->Spawn (); if ($program_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl index e25f8238242..f5161b853be 100644 --- a/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file QosProfile_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef QOSPROFILE_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl index 31f8b52df60..ee87e53284b 100644 --- a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl +++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl @@ -1,7 +1,7 @@ // $Id$ /** - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef COMPONENT_IDL diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl index 5d589595aac..746094c0d34 100644 --- a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file QosProfile_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef QOS_PROFILE_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/QosProfile_Library.xml b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/QosProfile_Library.xml index fb581d00420..db320502fc3 100644 --- a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/QosProfile_Library.xml +++ b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/QosProfile_Library.xml @@ -3,7 +3,7 @@ <!-- $Id$ --> <dds xmlns="http://www.omg.org/dds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/dds ../../../docs/schema/dds_qos.xsd"> + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> <qos_profile name="QosProfileProfile"> <datawriter_qos> diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl index a83e81f180b..edfe78462e6 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl @@ -2,7 +2,7 @@ /** * @file Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef BASE_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl index fc06d47642a..4d34a3a9642 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file Different_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef DIFFERENT_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.idl index 848f4815dd2..4ad15e84dc3 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file Different_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef QUERY_CONDITION_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.idl index cd585362d3a..b542838177a 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.idl index 7041ae87068..9426a8752fd 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/QueryCondition_Library.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/QueryCondition_Library.xml index 41025e9fc32..34dad903f89 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/QueryCondition_Library.xml +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/QueryCondition_Library.xml @@ -3,7 +3,7 @@ <!-- $Id$ --> <dds xmlns="http://www.omg.org/dds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/dds ../../../../docs/schema/dds_qos.xsd"> + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> <qos_profile name="QueryConditionProfile"> <!-- QoS used to configure the data writer created in the example code --> diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl index 0776e8afb26..4d913b84600 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file QCLE_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef QUERY_CONDITION_LISTEN_EVENT_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl index 0c3e4cf9168..2eb67f256b6 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file QCLE_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.idl index 6daaf013780..a1935dcb066 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.idl index 60854063611..5c7f33004ff 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.idl index 84cc3548b04..96ffdf45aa3 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.idl @@ -2,7 +2,7 @@ /** * @file ReadGet_Starter.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef QUERYCONDITION_STARTER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl index 9205eafa3bc..28777250a83 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file ReadGet_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef QUERY_CONDITION_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl index 07fb630b014..236350ae43e 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file ReadGet_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef QUERY_CONDITION_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.idl index fbbaff2309d..40e9de1358f 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.idl index 3e1c34e19c6..7bb38dd7551 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/QueryCondition_Library.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/QueryCondition_Library.xml index 41025e9fc32..34dad903f89 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/QueryCondition_Library.xml +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/QueryCondition_Library.xml @@ -3,7 +3,7 @@ <!-- $Id$ --> <dds xmlns="http://www.omg.org/dds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/dds ../../../../docs/schema/dds_qos.xsd"> + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> <qos_profile name="QueryConditionProfile"> <!-- QoS used to configure the data writer created in the example code --> diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl index a3806ce2419..c72cf2b58c8 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file QCLS_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef QUERY_CONDITION_LISTEN_STATE_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl index 8f57199a5ff..224095e188b 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file QCLS_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.idl index e7c9997406d..18d4713a28a 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.idl index 719b5510e60..6b6ac21c90d 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl index c89c994dafa..1187a550ff6 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file QCTL_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef QUERY_CONDITION_TWO_LISTENERS_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl index a8d36c76abf..7cc6e4531d5 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file QCTL_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.idl index 825e978df77..d168e0d1cfd 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.idl index 2b84508b50d..20b6ca74aa5 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.idl index 1cf95d56ee5..dba4e9029bb 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.idl @@ -2,7 +2,7 @@ /** * @file QCTQ_Starter.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef QUERYCONDITION_STARTER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl index dac9dda9bf4..9b5350a907d 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file QCTQ_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef QUERY_CONDITION_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.idl index d325d1b1e0e..9d508eb22d5 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file QCTQ_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef QUERY_CONDITION_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.idl index e2d9f872fe5..3380f64f114 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.idl index 59958a61055..a82f0c9c388 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/QueryCondition_Library.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/QueryCondition_Library.xml index 41025e9fc32..34dad903f89 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/QueryCondition_Library.xml +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/QueryCondition_Library.xml @@ -3,7 +3,7 @@ <!-- $Id$ --> <dds xmlns="http://www.omg.org/dds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/dds ../../../../docs/schema/dds_qos.xsd"> + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> <qos_profile name="QueryConditionProfile"> <!-- QoS used to configure the data writer created in the example code --> diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl index 1265ffa3cc9..4b954e793f2 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file QCTQM_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef QUERY_CONDITION_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl index 06e52858e9b..3bb9f1b35a2 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file QCTQM_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef QUERY_CONDITION_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.idl index 5a7c227c7e6..a3909c94041 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/QueryCondition_Library.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/QueryCondition_Library.xml new file mode 100644 index 00000000000..0a8b1beaf4e --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/QueryCondition_Library.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- $Id$ --> + +<dds xmlns="http://www.omg.org/dds" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> + <qos_profile name="QueryConditionProfile"> + <datawriter_qos> + <reliability> + <kind>RELIABLE_RELIABILITY_QOS</kind> + <max_blocking_time> + <sec>10</sec> + <nanosec>0</nanosec> + </max_blocking_time> + </reliability> + <durability> + <kind>TRANSIENT_DURABILITY_QOS</kind> + </durability> + <history> + <kind>KEEP_ALL_HISTORY_QOS</kind> + </history> + </datawriter_qos> + <!-- QoS used to configure the data reader created in the example code --> + <datareader_qos> + <reliability> + <kind>RELIABLE_RELIABILITY_QOS</kind> + </reliability> + <history> + <kind>KEEP_ALL_HISTORY_QOS</kind> + </history> + <durability> + <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind> + </durability> + </datareader_qos> + </qos_profile> +</dds> diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl index 29903ba6b30..752fb106ac9 100644 --- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl +++ b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl @@ -2,7 +2,7 @@ /** * @file Reader_Starter.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef READER_STARTER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl index c13b7c71f7d..f225ebebb6b 100644 --- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file Reader_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef READER_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl index 1fe1e59936d..ec7daf75faa 100644 --- a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file Reader_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef READER_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl index 275b850ea8f..0e9376a670e 100644 --- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl index 5e1c9f1b6c7..82505560e74 100644 --- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Reader_Library.xml b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Reader_Library.xml index 6dcda528579..3ad06703fa5 100644 --- a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Reader_Library.xml +++ b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Reader_Library.xml @@ -3,7 +3,7 @@ <!-- $Id$ --> <dds xmlns="http://www.omg.org/dds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/dds ../../../docs/schema/dds_qos.xsd"> + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> <qos_profile name="ReaderProfile"> <datawriter_qos> diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl index 105d0123e7e..d7a9faca25e 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl @@ -2,7 +2,7 @@ /** * @file RG_ResetTopic_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RG_RESETTOPIC_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl index bf198b37ea7..8c4bdd39a48 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl @@ -2,7 +2,7 @@ /** * @file Reader_Starter.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef READER_STARTER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl index c9f6ca1c2ea..7d5367135ff 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl @@ -2,7 +2,7 @@ /** * @file RG_ResetTopic_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RG_RESETTOPIC_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.idl index 1a3d83d66c6..c5cf963f652 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl index 218682613f5..c91adf4c4d6 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/ResetTopic_Library.xml b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/ResetTopic_Library.xml index 47f6d74b638..597d55886b6 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/ResetTopic_Library.xml +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/ResetTopic_Library.xml @@ -3,7 +3,7 @@ <!-- $Id$ --> <dds xmlns="http://www.omg.org/dds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/dds ../../../../docs/schema/dds_qos.xsd"> + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> <qos_profile name="ResetTopicProfile"> <datawriter_qos> diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl index 303f901ec7c..b0904f576e1 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl @@ -2,7 +2,7 @@ /** * @file TE_ResetTopic_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef TE_RESETTOPIC_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl index 22d04cff378..047be82e6c3 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl @@ -2,7 +2,7 @@ /** * @file TE_ResetTopic_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef TE_RESETTOPIC_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl index 9712f2257bc..879fe909d6e 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl index 6088cccbbda..8471c6690da 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl @@ -2,7 +2,7 @@ /** * @file TL_ResetTopic_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef TL_RESETTOPIC_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl index f3edfe458f6..325547f762d 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl @@ -2,7 +2,7 @@ /** * @file TL_ResetTopic_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef TL_RESETTOPIC_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl index c5e00ade823..7f4decd9c49 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl index 34d01d38303..e16d0e73281 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl @@ -2,7 +2,7 @@ /** * @file UL_ResetTopic_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef UL_RESETTOPIC_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl index 37f6f273c31..36e2e190042 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl @@ -2,7 +2,7 @@ /** * @file UL_ResetTopic_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef UL_RESETTOPIC_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.idl index 045716c67fa..9a14d38756b 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl index 2e17d246e34..ff318d44cf6 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl index 256c03da1af..bce4ce5fab0 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl @@ -2,7 +2,7 @@ /** * @file WL_ResetTopic_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef WL_RESETTOPIC_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl index 04e934b4a6a..16248af1752 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl @@ -2,7 +2,7 @@ /** * @file WL_ResetTopic_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef WL_RESETTOPIC_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.idl index 439c960b511..bd2c069035d 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl index a9f15fccaec..b74283b27ac 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl index b8bc773804c..64b8c6bd8bb 100644 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl @@ -17,6 +17,7 @@ module SL_ManyByMany component Sender { port ::SL_ManyByMany::SLManyByManyConnector::DDS_Update test_topic_update; + provides CCM_DDS::ConnectorStatusListener test_topic_connector_status; }; }; diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp index cf1cf289e56..0adf40904e7 100644 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp @@ -47,12 +47,69 @@ namespace CIAO_SL_ManyByMany_Sender_Impl } /** + * ConnectorStatusListener_exec_i + */ + + ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( + Sender_exec_i &callback) + : callback_ (callback) + { + } + + ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void) + { + } + + // Operations from ::CCM_DDS::ConnectorStatusListener + void ConnectorStatusListener_exec_i::on_inconsistent_topic ( + ::DDS::Topic_ptr /*the_topic*/, + const DDS::InconsistentTopicStatus & /*status*/) + { + } + + void ConnectorStatusListener_exec_i::on_requested_incompatible_qos ( + ::DDS::DataReader_ptr /*the_reader*/, + const DDS::RequestedIncompatibleQosStatus & /*status*/) + { + } + + void ConnectorStatusListener_exec_i::on_sample_rejected ( + ::DDS::DataReader_ptr /*the_reader*/, + const DDS::SampleRejectedStatus & /*status*/) + { + } + + void ConnectorStatusListener_exec_i::on_offered_deadline_missed( + ::DDS::DataWriter_ptr /*the_writer*/, + const DDS::OfferedDeadlineMissedStatus & /*status*/) + { + } + + void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( + ::DDS::DataWriter_ptr /*the_writer*/, + const DDS::OfferedIncompatibleQosStatus & /*status*/) + { + } + + void ConnectorStatusListener_exec_i::on_unexpected_status( + ::DDS::Entity_ptr /*the_entity*/, + ::DDS::StatusKind status_kind) + { + if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS) + { + this->callback_.get_started (); + } + } + + + /** * Component Executor Implementation Class: Sender_exec_i */ Sender_exec_i::Sender_exec_i (void) : test_nr_(UPDATE_CREATE) - , test_ok_(true) + , test_ok_(true) + , started_ (false) { ACE_NEW_THROW_EX (this->ticker_, pulse_Generator (*this), @@ -64,6 +121,12 @@ namespace CIAO_SL_ManyByMany_Sender_Impl delete this->ticker_; } + ::CCM_DDS::CCM_ConnectorStatusListener_ptr + Sender_exec_i::get_test_topic_connector_status (void) + { + return new ConnectorStatusListener_exec_i (*this); + } + // Supported operations and attributes. ACE_Reactor* Sender_exec_i::reactor (void) @@ -389,6 +452,14 @@ namespace CIAO_SL_ManyByMany_Sender_Impl } void + Sender_exec_i::get_started (void) + { + this->started_ = true; + this->add_instances_of_topic (); + this->start (); + } + + void Sender_exec_i::start (void) { long sec = 2L; @@ -437,14 +508,21 @@ namespace CIAO_SL_ManyByMany_Sender_Impl void Sender_exec_i::ccm_activate (void) { - this->add_instances_of_topic (); - this->start (); + /* Your code here. */ } void Sender_exec_i::ccm_passivate (void) { this->stop (); + + if (!this->started_) + { + ACE_ERROR ((LM_ERROR, + "Sender_exec_i::ccm_passivate - " + "ERROR: No publication matched received. " + "Test didn't run\n")); + } } void diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h index ede1b9120ce..cf784f81176 100644 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h @@ -70,6 +70,40 @@ namespace CIAO_SL_ManyByMany_Sender_Impl }; /** + * ConnectorStatusListener_exec_i + */ + + class SENDER_EXEC_Export ConnectorStatusListener_exec_i + : public virtual ::CCM_DDS::CCM_ConnectorStatusListener, + public virtual ::CORBA::LocalObject + { + public: + ConnectorStatusListener_exec_i (Sender_exec_i &callback); + virtual ~ConnectorStatusListener_exec_i (void); + + virtual + void on_inconsistent_topic (::DDS::Topic_ptr the_topic, + const DDS::InconsistentTopicStatus & status); + virtual + void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader, + const DDS::RequestedIncompatibleQosStatus & status); + virtual + void on_sample_rejected (::DDS::DataReader_ptr the_reader, + const DDS::SampleRejectedStatus & status); + virtual + void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer, + const DDS::OfferedDeadlineMissedStatus & status); + virtual + void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer, + const DDS::OfferedIncompatibleQosStatus & status); + virtual + void on_unexpected_status (::DDS::Entity_ptr the_entity, + ::DDS::StatusKind status_kind); + private: + Sender_exec_i &callback_; + }; + + /** * Component Executor Implementation Class: Sender_exec_i */ @@ -88,6 +122,8 @@ namespace CIAO_SL_ManyByMany_Sender_Impl //@{ /** Component attributes and port operations. */ + virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr + get_test_topic_connector_status (void); //@} //@{ @@ -101,8 +137,8 @@ namespace CIAO_SL_ManyByMany_Sender_Impl //@{ /** User defined public operations. */ + void get_started (void); void tick (void); - //@} private: @@ -122,6 +158,7 @@ namespace CIAO_SL_ManyByMany_Sender_Impl TestTopicSeq topic_seq_one_; TestTopicSeq topic_seq_many_; + bool started_; //@} //@{ diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/Plan.cdp index ea531f8f23b..0c925fc6a37 100644 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/Plan.cdp +++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/Plan.cdp @@ -330,6 +330,25 @@ <instance xmi:idref="SL_ManyByMany_ConnectorComponentInstance" /> </internalEndpoint> </connection> + <connection> + <name>test_topic_connector_status_sender</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>test_topic_connector_status</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="SenderComponentInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>error_listener</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="SL_ManyByMany_ConnectorComponentInstance" /> + </internalEndpoint> + </connection> <artifact xmi:id="Sender_ExecArtifact"> <name>Sender_exec</name> diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/SlMbM_Library.xml b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/SlMbM_Library.xml index e9f2e1796f6..f910971bb73 100644 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/SlMbM_Library.xml +++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/SlMbM_Library.xml @@ -4,7 +4,7 @@ <dds xmlns="http://www.omg.org/dds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/dds ../../../docs/schema/dds_qos.xsd"> + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> <qos_profile name="SlMbMProfile"> <!-- QoS used to configure the data writer created in the example code --> diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/SlObO_Library.xml b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/SlObO_Library.xml index f75fca69e2c..a08a18e854f 100644 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/SlObO_Library.xml +++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/SlObO_Library.xml @@ -4,7 +4,7 @@ <dds xmlns="http://www.omg.org/dds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/dds ../../../docs/schema/dds_qos.xsd"> + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> <qos_profile name="SlObOProfile"> <!-- QoS used to configure the data writer created in the example code --> diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl index 4ec2a99fd2e..0f4b73e1a60 100644 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl @@ -2,7 +2,7 @@ /** * @file SetConnectorAttribute_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef SETCONNECTORATTRIBUTE_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl index a74dfa79159..1ba837ec5eb 100644 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl +++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl @@ -2,7 +2,7 @@ /** * @file SetConnectorAttribute_Component.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef COMPONENT_IDL diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl index 30b992edce3..e9044e626ed 100644 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl @@ -2,7 +2,7 @@ /** * @file SetConnectorAttribute_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef SETCONNECTORATTRIBUTE_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl index 60696f3b55f..72b459830b9 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl @@ -2,7 +2,7 @@ /** * @file Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl index 719580a2827..41ece082be4 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * */ diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl index bbd5643d6ad..8636e66b274 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl @@ -2,7 +2,7 @@ /** * @file Connector1.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef SHARED_DP_CONNECTOR1_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl index c9a54be1cd2..5833439240b 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl @@ -2,7 +2,7 @@ /** * @file Connector2.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef 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 21196720078..8e41689081e 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl @@ -2,7 +2,7 @@ /** * @file Connector3.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef SHARED_DP_CONNECTOR3_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Shared_Library.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Shared_Library.xml index 33a5d272f7a..1ccbcff7e52 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Shared_Library.xml +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Shared_Library.xml @@ -3,7 +3,7 @@ <!-- $Id$ --> <dds xmlns="http://www.omg.org/dds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/dds ../../../../docs/schema/dds_qos.xsd"> + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> <qos_profile name="SharedProfile"> <datawriter_qos> diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Standalone_Library.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Standalone_Library.xml index 9bf9c03c57c..f459ed561cb 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Standalone_Library.xml +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Standalone_Library.xml @@ -3,7 +3,7 @@ <!-- $Id$ --> <dds xmlns="http://www.omg.org/dds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/dds ../../../../docs/schema/dds_qos.xsd"> + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> <qos_profile name="StandaloneProfile"> <datawriter_qos> diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl index fa546e7c9c7..930e5bb6ea6 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl @@ -2,7 +2,7 @@ /** * @file Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.idl index 719580a2827..41ece082be4 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.idl +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * */ diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl index bbd5643d6ad..8636e66b274 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl @@ -2,7 +2,7 @@ /** * @file Connector1.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef SHARED_DP_CONNECTOR1_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl index c9a54be1cd2..5833439240b 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl @@ -2,7 +2,7 @@ /** * @file Connector2.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef SHARED_DP_CONNECTOR2_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl index 21196720078..8e41689081e 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl @@ -2,7 +2,7 @@ /** * @file Connector3.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef SHARED_DP_CONNECTOR3_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Shared_Library.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Shared_Library.xml index 33a5d272f7a..1ccbcff7e52 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Shared_Library.xml +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Shared_Library.xml @@ -3,7 +3,7 @@ <!-- $Id$ --> <dds xmlns="http://www.omg.org/dds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/dds ../../../../docs/schema/dds_qos.xsd"> + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> <qos_profile name="SharedProfile"> <datawriter_qos> diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Standalone_Library.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Standalone_Library.xml index 9bf9c03c57c..f459ed561cb 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Standalone_Library.xml +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Standalone_Library.xml @@ -3,7 +3,7 @@ <!-- $Id$ --> <dds xmlns="http://www.omg.org/dds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/dds ../../../../docs/schema/dds_qos.xsd"> + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> <qos_profile name="StandaloneProfile"> <datawriter_qos> diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl index 37db69db053..5de21ae3b93 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl @@ -2,7 +2,7 @@ /** * @file Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl index 4f88ee53bb2..400496af4dc 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * */ diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl index 99513085a30..204667a7e99 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl @@ -2,7 +2,7 @@ /** * @file Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef SHARED_DP_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Shared_Library.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Shared_Library.xml index 33a5d272f7a..1ccbcff7e52 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Shared_Library.xml +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Shared_Library.xml @@ -3,7 +3,7 @@ <!-- $Id$ --> <dds xmlns="http://www.omg.org/dds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/dds ../../../../docs/schema/dds_qos.xsd"> + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> <qos_profile name="SharedProfile"> <datawriter_qos> diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Standalone_Library.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Standalone_Library.xml index 9bf9c03c57c..f459ed561cb 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Standalone_Library.xml +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Standalone_Library.xml @@ -3,7 +3,7 @@ <!-- $Id$ --> <dds xmlns="http://www.omg.org/dds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/dds ../../../../docs/schema/dds_qos.xsd"> + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> <qos_profile name="StandaloneProfile"> <datawriter_qos> diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl index 94d869e248b..6c1cc4a8ec7 100644 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file State_Connection_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef STATE_CONNECTION_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl index 35942d13319..3c2fd118974 100644 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file State_Connection_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef KEYED_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl index 937bb95b523..6aaf2e53248 100644 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl index 495b24cb54e..3e3ce3fb39c 100644 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl index 1d011fe0118..c2b2f9595af 100644 --- a/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file TopicName_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef TOPICNAME_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.idl index 11fe65a2bc1..f71ca26e99f 100644 --- a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.idl +++ b/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.idl @@ -1,7 +1,7 @@ // $Id$ /** - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef COMPONENT_IDL diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl index c6669638bfd..316fe04d8b8 100644 --- a/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file TopicName_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef TOPICNAME_EVENT_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl index cbca0f6dcc6..15543174780 100644 --- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl @@ -2,7 +2,7 @@ /** * @file TwoTopics_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef TWOTOPICS_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl index 7f9a1930369..a794387d9e3 100644 --- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl @@ -2,7 +2,7 @@ /** * @file TwoTopics_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef TWOTOPICS_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl index bf121f84075..a06e023caaf 100644 --- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl @@ -2,7 +2,7 @@ /** * @file Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl index 21d86bfabbc..84baa6a2223 100644 --- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl +++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl @@ -2,7 +2,7 @@ /** * @file HelloGoodbye.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef GOODBYE_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl index 5c56d1c76e7..9b1ef4ed916 100644 --- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl +++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl @@ -2,7 +2,7 @@ /** * @file HelloGoodbye.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef HELLO_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl index 491216ba0e2..ae581d312ac 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file Unkeyed_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef UNKEYED_TEST_BASE_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 97194267f11..085aca05d3c 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file Unkeyed_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef 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 56b7b3ef0cd..b3d0207cb4e 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL 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 12b010be1cb..676afa5661d 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl index d46c174faf9..a617b84778a 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl @@ -2,7 +2,7 @@ /** * @file Writer_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef WRITER_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl index 58890311082..2e6f6c8a3c2 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl @@ -2,7 +2,7 @@ /** * @file Writer_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef 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 89ecf0a6a86..2ee3fd7ed1c 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef RECEIVER_IDL diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl index e34fa5d405c..d6bad0833e5 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl @@ -2,7 +2,7 @@ /** * @file - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) * * by-hand idl3 translation of sender components. */ diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/UnkeyedWriter_Library.xml b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/UnkeyedWriter_Library.xml index a92b9129501..e2a454082cf 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/UnkeyedWriter_Library.xml +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/UnkeyedWriter_Library.xml @@ -4,7 +4,7 @@ <dds xmlns="http://www.omg.org/dds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/dds ../../../docs/schema/dds_qos.xsd"> + xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd"> <qos_profile name="UnkeyedWriterProfile"> <!-- QoS used to configure the data writer created in the example code --> diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl index 7eb1b3818e1..e2f354be167 100644 --- a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl @@ -2,7 +2,7 @@ /** * @file Updater_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef UPDATER_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl index d67fcf9a08b..48c739226c0 100644 --- a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl @@ -2,7 +2,7 @@ /** * @file Updater_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef UPDATER_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl index d4ecc310c28..013dcacef46 100644 --- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl @@ -2,7 +2,7 @@ /** * @file UCC_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef USERDATA_COPY_COUNT_TEST_BASE_IDL diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.idl index 57f998a3abc..4bebfac195b 100644 --- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.idl +++ b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.idl @@ -1,7 +1,7 @@ // $Id$ /** - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef COMPONENT_IDL diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl index 919a4a4aa05..b6dec72f248 100644 --- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl @@ -2,7 +2,7 @@ /** * @file UCC_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef USERDATA_COPY_COUNT_TEST_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl index 9f15496e66f..11cccee7e68 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl @@ -2,7 +2,7 @@ /** * @file VT_Union_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef VT_UNION_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl index 47e00931635..c79dc13a290 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl @@ -2,7 +2,7 @@ /** * @file VT_Valuetype_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef VT_VALUETYPE_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl index f56a7244386..b1452c3b7c3 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl @@ -2,7 +2,7 @@ /** * @file VTS_Union_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef VT_UNION_CONNECTOR_IDL_ diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl index 60c69886ba9..a37730c43bf 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl @@ -2,7 +2,7 @@ /** * @file VTS_Valuetype_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> + * @author Marcel Smit (msmit@remedy.nl) */ #ifndef VTS_VALUE_TYPE_CONNECTOR_IDL_ |