Wed Jun 13 18:23:56 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h:
        * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp:
          With RTI DDS any unkeyed sample gets handle nil, but with
OpenDDS
          we get always the same handle for all samples of the same
type, but
          not nil. Extended this test to handle both vendors

        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl:
        * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl:
        * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl:
        * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl:
        * connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.idl:
        * connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.idl:
        * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl:
        * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl:
        * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl:
        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl:
        * connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl:
        * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl:
        * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.idl:
        * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.idl:
        * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.idl:
        * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.idl:
        * connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl:
        * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl:
        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl:
        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl:
        * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl:
        * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl:
        * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.idl:
        * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.idl:
        * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl:
        * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl:
        * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl:
        * connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.idl:
        * connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.idl:
        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl:
        * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl:
        * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl:
        * connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.idl:
        * connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.idl:
        * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.idl:
        * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.idl:
        * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.idl:
        * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.idl:
        * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.idl:
        * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.idl:
        * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl:
        * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl:
        * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl:
        * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl:
        * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl:
        * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl:
        * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl:
        * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl:
        * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl:
        * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl:
        * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl:
        * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl:
        * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl:
        * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl:
        * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl:
          Removed left over comments from the time that we manually had
to
          expend IDL3+ to IDL3

58 files changed, 86 insertions, 169 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 4b743dc7cd6..77d4b0166d4 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,69 @@
+Wed Jun 13 18:23:56 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h:
+        * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp:
+          With RTI DDS any unkeyed sample gets handle nil, but with OpenDDS
+          we get always the same handle for all samples of the same type, but
+          not nil. Extended this test to handle both vendors
+
+        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl:
+        * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl:
+        * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl:
+        * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl:
+        * connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.idl:
+        * connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.idl:
+        * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl:
+        * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl:
+        * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl:
+        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl:
+        * connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl:
+        * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl:
+        * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.idl:
+        * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.idl:
+        * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.idl:
+        * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.idl:
+        * connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl:
+        * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl:
+        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl:
+        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl:
+        * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl:
+        * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl:
+        * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.idl:
+        * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.idl:
+        * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl:
+        * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl:
+        * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl:
+        * connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.idl:
+        * connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.idl:
+        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl:
+        * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl:
+        * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl:
+        * connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.idl:
+        * connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.idl:
+        * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.idl:
+        * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.idl:
+        * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.idl:
+        * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.idl:
+        * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.idl:
+        * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.idl:
+        * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl:
+        * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl:
+        * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl:
+        * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl:
+        * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl:
+        * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl:
+        * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl:
+        * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl:
+        * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl:
+        * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl:
+        * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl:
+        * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl:
+        * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl:
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl:
+        * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl:
+          Removed left over comments from the time that we manually had to
+          expend IDL3+ to IDL3
+
 Wed Jun 13 17:42:32 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl
index e76b4d950c5..0b3dbb59efd 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_SENDER_IDL
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl
index 2744ca82141..4ee1618a181 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl
@@ -3,8 +3,6 @@
 /**
  * @file Distributor.idl
  * @author William R. Otte <wotte@dre.vanderbilt.edu>
- *
- * by-hand idl3 translation of distributor components.
  */
 
 #ifndef DDS_DISTRIBUTOR_IDL
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl
index 00ce03f97a5..1875605b465 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_SHAPES_SENDER_IDL
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl
index 784f43a3ff9..1786882d277 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_PERF_KEYED_TEST_SENDER_IDL
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.idl b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.idl
index 23d5baafec5..66e048bb9d3 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_LATENCYTT_TEST_SENDER_IDL
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.idl b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.idl
index 53e2a5f83fd..0d51ae7f8c8 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_THROUGHPUT_SENDER_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl
index 027d9397067..5b204fb8f1b 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_CSL_DEADLINETEST_SENDER_IDL
@@ -16,8 +13,8 @@ module CSL_DeadlineTest
 {
   component Sender
   {
-     port CSLDeadlineConnector::DDS_Write test_topic_write;
-     provides CCM_DDS::ConnectorStatusListener test_topic_connector_status;
+    port CSLDeadlineConnector::DDS_Write test_topic_write;
+    provides CCM_DDS::ConnectorStatusListener test_topic_connector_status;
   };
 };
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl
index bb8fe7aa035..78a296398b0 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_CSL_QOSTEST_SENDER_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl
index 037e612556e..b916f556c43 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_CSL_SRTEST_SENDER_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl
index b543cbdfbde..9ddd37fb34e 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_CSL_USTEST_SENDER_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 7bd88c56805..da87e5a68a3 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_COHERENT_UPDATE_TEST_SENDER_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 14bd7cc5ecf..66ed42c99bf 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_COHERENT_WRITE_TEST_SENDER_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 0f7d6b35e42..af49d887b84 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
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_SENDER_IDL
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 05b0070531a..59cc567618c 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
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_QUERY_CONDITION_TEST_SENDER_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 abe69e84987..5c797b81f8f 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
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_SENDER_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.idl
index eb120e6ab8b..4cdcbdd1824 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_WRITER_ENTITY_SENDER_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl
index 73cb62581b2..93175a1925b 100644
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl
@@ -3,8 +3,6 @@
 /**
  * @file DNM_Sender.idl
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DNM_SENDER_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 5d7eace4f59..1b25fe6a85a 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
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_EVENT_CONNECTION_TEST_SENDER_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 af681e2db02..95334347f9e 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_GETTER_TEST_SENDER_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl
index dc5393f24d7..61542295661 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_WRITER_ENTITY_SENDER_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 3ba040ce4cc..a8250ce26d0 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_KEYED_TEST_SENDER_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl
index d6bad0833e5..f56e30b82bf 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_KEYED_TEST_SENDER_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 6020f215e82..d05239bc5a2 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
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef RG_LATEBINDING_SENDER_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 2b4cd723086..2ae628babff 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
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef WU_LATEBINDING_SENDER_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 330cb2628af..a19c61273a4 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_LISTEN_MANY_BY_MANY_TEST_SENDER_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 8c3a3f67fbb..b3b7f8c1ff6 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_LISTEN_NOT_ENABLED_TEST_SENDER_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 e5a0c0a731b..77e3e6fd66e 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_LISTEN_ONE_BY_ONE_TEST_SENDER_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 20303192591..9d785b5a3de 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
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_EVENT_MEMLEAKDETECTION_TEST_SENDER_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 87700e72984..a0bfca28f9f 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
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_STATE_MEMLEAKDETECTION_TEST_SENDER_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 a31c329c85f..f4fd0bfb36f 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
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef ON_INCONSISTENT_TOPIC_TEST_SENDER_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl
index c380fccd101..f2b7d9c9345 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_PSL_DEADLINETEST_SENDER_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl
index c6342f09c1f..8ea0ba1277e 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_PSL_SAMPLELOST_SENDER_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 32bf08e1783..51dc43d4aa1 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
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef PROXY_RW_TEST_SENDER_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 9426a8752fd..2f25160a83b 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
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_QUERY_CONDITION_TEST_SENDER_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 5c7f33004ff..352d40b6042 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
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_QUERY_CONDITION_LISTEN_EVENT_TEST_SENDER_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 7bb38dd7551..8c5b7d5908f 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
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_QUERY_CONDITION_TEST_SENDER_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 6b6ac21c90d..61e4cf7bb4d 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
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_QUERY_CONDITION_LISTEN_STATE_TEST_SENDER_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 20b6ca74aa5..2cb13619125 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
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_QUERY_CONDITION_TWO_LISTENERS_TEST_SENDER_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 a82f0c9c388..6e41ffef2b4 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
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_QUERY_CONDITION_TEST_SENDER_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.idl
index 622f83e43fb..c6521c816a8 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_QUERY_CONDITION_TEST_SENDER_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 82505560e74..2721c0ffece 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_READER_TEST_SENDER_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 c91adf4c4d6..67766c8686c 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
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef RG_RESETTOPIC_SENDER_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 879fe909d6e..b67343ca5b5 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
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef TE_RESETTOPIC_SENDER_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 7f4decd9c49..4137b72b3e9 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
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef TL_RESETTOPIC_SENDER_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 ff318d44cf6..b95354bb93f 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
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef UL_RESETTOPIC_SENDER_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 b74283b27ac..437c3eb6c59 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
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef WL_RESETTOPIC_SENDER_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl
index 2316133c7ee..19be8fb27ea 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_SL_DISABLED_SENDER_IDL
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 64b8c6bd8bb..1259cbef5bd 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_SL_MANYBYMANY_SENDER_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl
index 05d63808e5a..d3d6c4c7cf2 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_SL_ONEBYONE_SENDER_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 3e3ce3fb39c..294731486ac 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
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_STATE_CONNECTION_TEST_SENDER_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp
index 9b48d935694..03750c144a4 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp
@@ -41,6 +41,7 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl
     : ciao_context_ (
         ::Unkeyed_Test::CCM_Receiver_Context::_duplicate (ctx))
       , received_ (received)
+      , handle_ (DDS::HANDLE_NIL)
   {
   }
 
@@ -54,18 +55,29 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl
   info_out_data_listener_exec_i::on_one_data (const ::UnkeyedTest & datum,
   const ::CCM_DDS::ReadInfo & info)
   {
+    // From the first sample store the instance handle, the handle should be
+    // nil (RTI DDS) or stay the same (OpenDDS)
+    if (this->received_ == 0)
+      {
+        this->handle_ = info.instance_handle;
+      }
     ++this->received_;
+
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("UnkeyedTest_Listener: ")
-            ACE_TEXT ("received keyed_test_info for <%C> at %u\n"),
+            ACE_TEXT ("received keyed_test_info for <%C> at iteration <%u> for handle ")
+            DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER
+            ACE_TEXT ("\n"),
             datum.key.in (),
-            datum.iteration));
-    if (info.instance_handle != ::DDS::HANDLE_NIL)
+            datum.iteration,
+            DDS_INSTANCE_HANDLE_LOG (info.instance_handle)));
+    if ((info.instance_handle != ::DDS::HANDLE_NIL) &&
+        (this->handle_ != info.instance_handle))
       {
         ACE_ERROR ((LM_ERROR,
                 ACE_TEXT ("ERROR: UnkeyedTest_Listener::on_one_data: ")
                 ACE_TEXT ("received instance handle ")
                 DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER
-                ACE_TEXT (" should be invalid ")
+                ACE_TEXT (" should be nil or stay the same ")
                 ACE_TEXT ("for unkeyed data ")
                 ACE_TEXT ("key <%C> - iteration <%u>\n"),
                 DDS_INSTANCE_HANDLE_LOG (info.instance_handle),
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h
index 611e730abea..0d49023a004 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h
@@ -41,6 +41,7 @@
 namespace CIAO_Unkeyed_Test_Receiver_Impl
 {
   typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong > Atomic_ULong;
+  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, DDS::InstanceHandle_t > Atomic_Handle;
 
   /**
    * Provider Executor Implementation Class: info_out_data_listener_exec_i
@@ -71,6 +72,7 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl
   private:
     ::Unkeyed_Test::CCM_Receiver_Context_var ciao_context_;
     Atomic_ULong &received_;
+    Atomic_Handle handle_;
   };
 
   /**
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 676afa5661d..76a81045f88 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_KEYED_TEST_SENDER_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl
index d6bad0833e5..f56e30b82bf 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marcel Smit (msmit@remedy.nl)
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_KEYED_TEST_SENDER_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl
index 183905fc832..32aaf1d0f39 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_UPDATER_SENDER_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl
index 9a58bfefead..5ced77ede85 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_VTOPIC_SENDER_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl
index b0ff9966665..7e076f1a791 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl
@@ -1,10 +1,7 @@
 // $Id$
 
 /**
- * @file
  * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
- *
- * by-hand idl3 translation of sender components.
  */
 
 #ifndef DDS_VTOPICS_SENDER_IDL