Mon May 23 15:07:33 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/impl/PublisherListener.cpp:
        * connectors/dds4ccm/impl/dds4ccm_conf.h:
        * connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl:
        * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp:
        * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp:
        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl:
        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp:
        * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp:
        * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl:
        * connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl:
        * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl:
        * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl:
        * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl:
        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl:
        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl:
        * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp:
        * connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp:
          Increased portability

27 files changed, 72 insertions, 46 deletions

diff --git a/CIAO/connectors/dds4ccm/impl/PublisherListener.cpp b/CIAO/connectors/dds4ccm/impl/PublisherListener.cpp
index 785d5d4f039..695b97b7b5d 100644
--- a/CIAO/connectors/dds4ccm/impl/PublisherListener.cpp
+++ b/CIAO/connectors/dds4ccm/impl/PublisherListener.cpp
@@ -287,11 +287,11 @@ namespace CIAO
                     ACE_TEXT ("PublisherListener::on_reliable_reader_activity_changed: ")
                     ACE_TEXT ("active count <%d> - active change <%d> - ")
                     ACE_TEXT ("not active count <%d> - inactive count change <%d>")
-                    ACE_TEXT ("last instance handle length <%d> - isValid <%d>\n"),
+                    ACE_TEXT ("last instance handle ")
+                    DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT("\n"),
                     status.active_count, status.active_count_change,
                     status.inactive_count, status.inactive_count_change,
-                    status.last_instance_handle.length,
-                    status.last_instance_handle.isValid));
+                    DDS_INSTANCE_HANDLE_LOG(status.last_instance_handle)));
 
       this->on_unexpected_status (the_Writer, ::DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS);
     }
diff --git a/CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h b/CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h
index 5b4bb5cb891..45ed6dea38d 100644
--- a/CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h
+++ b/CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h
@@ -33,11 +33,12 @@
 #define DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("length <%d> - isValid <%d>")
 #define DDS_INSTANCE_HANDLE_LOG(X) X.length, X.isValid
 #define DDS_INSTANCE_HANDLE_VALID(X) X.isValid
+#define DDS_INSTANCE_HANDLE_INVALID(X) !X.isValid
 #elif (CIAO_DDS4CCM_OPENDDS==1)
 #define DDS_INSTANCE_HANDLE_T_IN ::DDS::InstanceHandle_t
 #define DDS_INSTANCE_HANDLE_T_RETN ::DDS::InstanceHandle_t
 #define DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("<%d>")
 #define DDS_INSTANCE_HANDLE_LOG(X) X
-#define DDS_INSTANCE_HANDLE_VALID(X) true
+#define DDS_INSTANCE_HANDLE_VALID(X) false
 #endif
 #endif /* DDS4CCM_CONF_H_ */
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl
index a7644d56ffb..62acf782e59 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl
@@ -32,6 +32,8 @@ struct ThroughputTest {
 
 typedef sequence<ThroughputTest> ThroughputTestSeq;
 
+#pragma DCPS_DATA_TYPE "ThroughputCommand"
+
 struct ThroughputCommand
 {
     CommandKind  command;
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp
index a5af72d2747..3be425dc0cc 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp
@@ -54,7 +54,7 @@ namespace CIAO_CSL_DeadlineTest_Sender_Impl
     ACE_Thread_ID t_id;
     this->thread_id_ = t_id;
 
-    if(status.last_instance_handle.isValid && ! ::CORBA::is_nil (the_writer))
+    if(DDS_INSTANCE_HANDLE_VALID(status.last_instance_handle) && ! ::CORBA::is_nil (the_writer))
       {
         this->deadline_missed_ = true;
       }
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp
index 0ccd96c213b..f738064f0ac 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp
@@ -69,7 +69,7 @@ namespace CIAO_CFTLE_Test_Receiver_Impl
                           "key <%C> - iteration <%d>\n",
                           datum.key.in (),
                           datum.iteration));
-    if (!info.instance_handle.isValid)
+    if (!DDS_INSTANCE_HANDLE_VALID(info.instance_handle))
       {
         ACE_ERROR ((LM_ERROR, "ERROR: ContentFilteredTopicListenEventTest_Listener::on_one_data: "
                               "instance handle seems to be invalid "
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp
index 4c46990a320..27034b9c969 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp
@@ -29,7 +29,6 @@
 #include "tao/ORB_Core.h"
 #include "ace/Reactor.h"
 
-
 #include "Base/Writer_BaseSupport.h"
 #include "Connector/Writer_Connector_conn.h"
 
@@ -107,7 +106,7 @@ namespace CIAO_Writer_Sender_Impl
             ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Unregistered <%C> - iteration <%d> - valid handle <%d>\n"),
                       i->first.c_str (),
                       i->second->iteration,
-                      hnd.isValid));
+                      hnd));
           }
         catch (...)
           {
@@ -123,8 +122,8 @@ namespace CIAO_Writer_Sender_Impl
     Writer_Table::iterator i = this->ktests_.begin ();
     for (i = this->ktests_.begin(); i != this->ktests_.end(); ++i)
       {
-        DDS_InstanceHandle_t hnd = this->writer_->register_instance (i->second);
-        if (!hnd.isValid)
+        DDS_InstanceHandle_t const hnd = this->writer_->register_instance (i->second);
+        if (DDS_INSTANCE_HANDLE_INVALID(hnd))
           {
             ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to register handle for <%C> - iteration <%d>\n"),
               i->first.c_str (), i->second->iteration));
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
index 7fcd9b047d3..a1429c1abb6 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
@@ -29,6 +29,7 @@
 #include "tao/ORB_Core.h"
 #include "ace/Reactor.h"
 #include "ace/OS_NS_sys_time.h"
+#include "dds4ccm/impl/dds4ccm_conf.h"
 
 namespace CIAO_Getter_Test_Receiver_Impl
 {
@@ -467,7 +468,7 @@ namespace CIAO_Getter_Test_Receiver_Impl
                                   gettertest_info.iteration));
           }
         // check readinfo struct.
-        if (readinfo.instance_handle.isValid)
+        if (DDS_INSTANCE_HANDLE_VALID(readinfo.instance_handle))
           {
             ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR FIXED: GET MANY: ")
                     ACE_TEXT ("received instance handle should be invalid ")
@@ -547,7 +548,7 @@ namespace CIAO_Getter_Test_Receiver_Impl
                                   gettertest_info->iteration));
           }
         // check readinfo struct.
-        if (readinfo.instance_handle.isValid)
+        if (DDS_INSTANCE_HANDLE_VALID(readinfo.instance_handle))
           {
             ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR VARIABLE: GET MANY: ")
                     ACE_TEXT ("received instance handle should be invalid ")
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl
index ce2bab8a20f..8761be1672c 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl
@@ -9,7 +9,7 @@
 #define WRITER_BASE_IDL
 
 #pragma ndds typesupport "Base/Writer_BaseSupport.h"
-#pragma opendds typesupport "Base/Writer_BaseTypeTypeSupportImpl.h"
+#pragma opendds typesupport "Base/Writer_BaseTypeSupportImpl.h"
 
 #pragma DCPS_DATA_TYPE "WriterTest"
 #pragma DCPS_DATA_KEY "WriterTest key"
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp
index f8eeb6a3845..a63bc83ad00 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp
@@ -108,9 +108,10 @@ namespace CIAO_Writer_Sender_Impl
             ::DDS::InstanceHandle_t const hnd = this->handles_[i->first.c_str ()];
             ccm_writer->unregister_instance (i->second, hnd);
             ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("Unregistered <%C> - valid handle <%d>\n"),
+                        ACE_TEXT ("Unregistered <%C> - valid ")
+                        DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("\n"),
                         i->first.c_str (),
-                        hnd.isValid));
+                        DDS_INSTANCE_HANDLE_LOG(hnd)));
           }
         catch (...)
           {
@@ -130,7 +131,7 @@ namespace CIAO_Writer_Sender_Impl
       {
         DDS::InstanceHandle_t const hnd =
           ccm_writer->register_instance (i->second);
-        if (!hnd.isValid)
+        if (DDS_INSTANCE_HANDLE_INVALID(hnd))
           {
             ACE_ERROR ((LM_ERROR,
                         ACE_TEXT ("ERROR: Unable to register handle for <%C>\n"),
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp
index ee48b3ae064..7d84ff9d6d6 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp
@@ -6,6 +6,7 @@
 #include "ace/Guard_T.h"
 #include "ace/Log_Msg.h"
 #include "ace/Reactor.h"
+#include "dds4ccm/impl/dds4ccm_conf.h"
 
 namespace CIAO_Writer_Sender_Impl
 {
@@ -190,10 +191,11 @@ namespace CIAO_Writer_Sender_Impl
             WriterTestConnector::Writer_var writer =
               this->ciao_context_->get_connection_info_write_data ();
             writer->unregister_instance (i->second, hnd);
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Unregistered <%C> - iteration <%d> - valid handle <%d>\n"),
+            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Unregistered <%C> - iteration <%d> - ")
+                      DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT("\n"),
                       i->first.c_str (),
                       i->second->iteration,
-                      hnd.isValid));
+                      DDS_INSTANCE_HANDLE_LOG(hnd)));
           }
         catch (...)
           {
@@ -211,21 +213,22 @@ namespace CIAO_Writer_Sender_Impl
 
     Writer_Table::iterator i = this->ktests_.begin ();
     ::DDS::InstanceHandle_t hnd = writer->register_instance (i->second);
-    if (!hnd.isValid)
+    if (DDS_INSTANCE_HANDLE_INVALID(hnd))
       {
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to register handle for <%C> - iteration <%d>\n"),
           i->first.c_str (), i->second->iteration));
       }
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Registering instance with <%C> - iteration <%d> - valid handle <%d>\n"),
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Registering instance with <%C> - iteration <%d> - ")
+                DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT("\n"),
                 i->second->key.in (),
                 i->second->iteration,
-                hnd.isValid));
+                DDS_INSTANCE_HANDLE_LOG(hnd)));
     this->handles_[i->first.c_str ()] = hnd;
     ++i;
     // Test exception. In Qos, max_instances is set to 1
     // so only one instance may be registered.
     hnd = writer->register_instance (i->second);
-    if (hnd.isValid)
+    if (DDS_INSTANCE_HANDLE_VALID(hnd))
       {
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Shouldn't be able to register instance for <%C> - iteration <%d>\n"),
           i->first.c_str (), i->second->iteration));
@@ -259,10 +262,11 @@ namespace CIAO_Writer_Sender_Impl
             ++this->last_key_->second->iteration;
             ::DDS::InstanceHandle_t hnd = this->handles_[this->last_key_->first.c_str ()];
             writer->write_one (this->last_key_->second, hnd);
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written keyed <%C> - iteration <%d> - valid handle <%d>\n"),
+            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written keyed <%C> - iteration <%d> - ")
+                    DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("\n"),
                     this->last_key_->first.c_str (),
                     this->last_key_->second->iteration,
-                    hnd.isValid));
+                    DDS_INSTANCE_HANDLE_LOG(hnd)));
           }
         catch (const CCM_DDS::InternalError& )
           {
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp
index d262efd9515..bcd9eb7745e 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp
@@ -3,6 +3,7 @@
 
 #include "LMBM_Test_Receiver_exec.h"
 #include "ace/Log_Msg.h"
+#include "dds4ccm/impl/dds4ccm_conf.h"
 
 namespace CIAO_LMBM_Test_Receiver_Impl
 {
@@ -47,7 +48,7 @@ namespace CIAO_LMBM_Test_Receiver_Impl
                                "key <%C> - iteration <%d>\n",
                                an_instance[i].key.in (),
                                an_instance[i].iteration));
-        if (!info[i].instance_handle.isValid)
+        if (DDS_INSTANCE_HANDLE_INVALID(info[i].instance_handle))
           {
             ACE_ERROR ((LM_ERROR, "ERROR: ListenManyByManyTest_Listener_exec_i::on_many_data:"
                                 "instance handle %d seems to be invalid"
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp
index 8863aed1dfd..6aae52ac029 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp
@@ -38,7 +38,7 @@ namespace CIAO_LOBO_Test_Receiver_Impl
                             "key <%C> - iteration <%d>\n",
                             an_instance.key.in (),
                             an_instance.iteration));
-    if (!info.instance_handle.isValid)
+    if (DDS_INSTANCE_HANDLE_INVALID (info.instance_handle))
       {
         ACE_ERROR ((LM_ERROR, "ERROR: ListenOneByOneTest_Listener_exec_i::on_one_data: "
                             "instance handle seems to be invalid "
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp
index eef231a5f46..3d89802249b 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp
@@ -41,7 +41,7 @@ namespace CIAO_MultipleTemp_Receiver_Impl
                             "key <%C> - x <%d>\n",
                             an_instance.keyOne.in (),
                             an_instance.x));
-    if (!info.instance_handle.isValid)
+    if (DDS_INSTANCE_HANDLE_INVALID (info.instance_handle))
       {
         ACE_ERROR ((LM_ERROR, "ERROR: ListenOne_Listener_exec_i::on_one_data: "
                             "instance handle seems to be invalid "
@@ -90,7 +90,7 @@ namespace CIAO_MultipleTemp_Receiver_Impl
                               "key <%C> - y <%d>\n",
                               an_instance.keyTwo.in (),
                               an_instance.y));
-      if (!info.instance_handle.isValid)
+      if (DDS_INSTANCE_HANDLE_INVALID (info.instance_handle))
         {
           ACE_ERROR ((LM_ERROR, "ERROR: ListenTwo_Listener_exec_i::on_one_data: "
                               "instance handle seems to be invalid "
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 3b8854fa8f1..cc87b3d87dc 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
@@ -22,6 +22,9 @@ struct OIT_Receiver_Topic {
 
 typedef sequence<OIT_Receiver_Topic> OIT_Receiver_TopicSeq;
 
+#pragma DCPS_DATA_TYPE "OIT_Sender_Topic"
+#pragma DCPS_DATA_KEY "OIT_Sender_Topic symbol"
+
 struct OIT_Sender_Topic {
   string symbol; //@key
   long x;
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 749c213a314..e9f0b258f0d 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
@@ -11,6 +11,9 @@
 #pragma ndds typesupport "Base/QCLE_Test_BaseSupport.h"
 #pragma opendds typesupport "Base/QCLE_Test_BaseTypeSupportImpl.h"
 
+#pragma DCPS_DATA_TYPE "QueryConditionListenEventTest"
+#pragma DCPS_DATA_KEY "QueryConditionListenEventTest key"
+
 struct QueryConditionListenEventTest {
   string key; //@key
   long iteration;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp
index 6362aab400a..e89a04643c4 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp
@@ -72,7 +72,7 @@ namespace CIAO_QCLE_Test_Receiver_Impl
                             "key <%C> - iteration <%d>\n",
                             datum.key.in (),
                             datum.iteration));
-    if (!info.instance_handle.isValid)
+    if (DDS_INSTANCE_HANDLE_INVALID (info.instance_handle))
       {
         ACE_ERROR ((LM_ERROR, "ERROR: QueryConditionListenEventTest_Listener::on_one_data: "
                             "instance handle seems to be invalid "
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 3e244990713..9a267a45868 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
@@ -11,6 +11,9 @@
 #pragma ndds typesupport "Base/QCLS_Test_BaseSupport.h"
 #pragma opendds typesupport "Base/QCLS_Test_BaseTypeSupportImpl.h"
 
+#pragma DCPS_DATA_TYPE "QueryConditionListenStateTest"
+#pragma DCPS_DATA_KEY "QueryConditionListenStateTest key"
+
 struct QueryConditionListenStateTest {
   string key; //@key
   long iteration;
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 19dfc49c667..cf12fe03497 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
@@ -11,6 +11,9 @@
 #pragma ndds typesupport "Base/QCTL_Test_BaseSupport.h"
 #pragma opendds typesupport "Base/QCTL_Test_BaseTypeSupportImpl.h"
 
+#pragma DCPS_DATA_TYPE "QueryConditionTwoListenersTest"
+#pragma DCPS_DATA_KEY "QueryConditionTwoListenersTest key"
+
 struct QueryConditionTwoListenersTest {
   string key; //@key
   long iteration;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp
index a05e4292a90..92b61399a6d 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp
@@ -73,7 +73,7 @@ namespace CIAO_QCTL_Test_Receiver_Impl
                             "key <%C> - iteration <%d>\n",
                             datum.key.in (),
                             datum.iteration));
-    if (!info.instance_handle.isValid)
+    if (DDS_INSTANCE_HANDLE_INVALID(info.instance_handle))
       {
         ACE_ERROR ((LM_ERROR, "ERROR: QueryConditionTwoListenersTest_Listener_1::on_one_data: "
                             "instance handle seems to be invalid "
@@ -170,7 +170,7 @@ namespace CIAO_QCTL_Test_Receiver_Impl
                             "key <%C> - iteration <%d>\n",
                             datum.key.in (),
                             datum.iteration));
-    if (!info.instance_handle.isValid)
+    if (DDS_INSTANCE_HANDLE_INVALID(info.instance_handle))
       {
         ACE_ERROR ((LM_ERROR, "ERROR: QueryConditionTwoListenersTest_Listener_2::on_one_data: "
                             "instance handle seems to be invalid "
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp
index 527145fa594..6cf446c889f 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp
@@ -29,6 +29,7 @@
 #include "ace/OS_NS_unistd.h"
 #include "tao/ORB_Core.h"
 #include "ace/Reactor.h"
+#include "dds4ccm/impl/dds4ccm_conf.h"
 
 namespace CIAO_Reader_Test_Receiver_Impl
 {
@@ -335,10 +336,10 @@ namespace CIAO_Reader_Test_Receiver_Impl
                     key,
                     readertest_info_seq.length ()));
                 ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ONE ALL: ")
-                    ACE_TEXT ("Handle created for <%C>: length <%u> - isValid <%d>\n"),
+                    ACE_TEXT ("Handle created for <%C>: ")
+                    DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("\n"),
                     key,
-                    readinfo_seq[0].instance_handle.length,
-                    readinfo_seq[0].instance_handle.isValid));
+                    DDS_INSTANCE_HANDLE_LOG(readinfo_seq[0].instance_handle)));
               }
           }
       }
@@ -458,7 +459,7 @@ namespace CIAO_Reader_Test_Receiver_Impl
                     ++nr_keys_changed;
                   }
                 // check readinfo struct.
-                if (!readinfo_seq[it].instance_handle.isValid)
+                if (DDS_INSTANCE_HANDLE_INVALID(readinfo_seq[it].instance_handle))
                   {
                     ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ")
                             ACE_TEXT ("received instance handle should be valid ")
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl
index e1a7431c70d..f86a2d0ccbf 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl
@@ -11,6 +11,8 @@
 #pragma ndds typesupport "Base/SetConnectorAttribute_BaseSupport.h"
 #pragma opendds typesupport "Base/SetConnectorAttribute_BaseTypeSupportImpl.h"
 
+#pragma DCPS_DATA_TYPE "SetConnectorAttributeTest"
+
 struct SetConnectorAttributeTest {
   string key;
   long iteration;
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl
index ffd9252571c..b755cc4155e 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl
@@ -9,7 +9,7 @@
 #define BASE_IDL
 
 #pragma ndds typesupport "Base/BaseSupport.h"
-#pragma opendds typesupport "Base/BaseSupportTypeSupportImpl.h"
+#pragma opendds typesupport "Base/BaseTypeSupportImpl.h"
 
 #pragma DCPS_DATA_TYPE "SharedDPTest1"
 #pragma DCPS_DATA_KEY "SharedDPTest1 key1"
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl
index e020093acfa..c0a4b3e10b5 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl
@@ -9,7 +9,7 @@
 #define BASE_IDL
 
 #pragma ndds typesupport "Base/BaseSupport.h"
-#pragma opendds typesupport "Base/BaseSupportTypeSupportImpl.h"
+#pragma opendds typesupport "Base/BaseTypeSupportImpl.h"
 
 #pragma DCPS_DATA_TYPE "SharedDPTest"
 #pragma DCPS_DATA_KEY "SharedDPTest key"
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 12081d475d5..8cd1b668745 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
@@ -26,6 +26,7 @@
  **/
 
 #include "Unkeyed_Test_Receiver_exec.h"
+#include "dds4ccm/impl/dds4ccm_conf.h"
 
 namespace CIAO_Unkeyed_Test_Receiver_Impl
 {
@@ -58,7 +59,7 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl
             ACE_TEXT ("received keyed_test_info for <%C> at %u\n"),
             datum.key.in (),
             datum.iteration));
-    if (info.instance_handle.isValid)
+    if (DDS_INSTANCE_HANDLE_VALID (info.instance_handle))
       {
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: UnkeyedTest_Listener::on_one_data: ")
                 ACE_TEXT ("received instance handle should be invalid ")
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp
index acd0dacea8c..ee5c150dad3 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp
@@ -62,7 +62,7 @@ namespace CIAO_Updater_Receiver_Impl
                             "key <%C> - iteration <%d>\n",
                             datum.key.in (),
                             datum.x));
-    if (!info.instance_handle.isValid)
+    if (DDS_INSTANCE_HANDLE_INVALID (info.instance_handle))
       {
         ACE_ERROR ((LM_ERROR, "ERROR: ListenOneByOneTest_Listener_exec_i::on_one_data: "
                             "instance handle seems to be invalid "
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp
index c12e08ca161..28774196cf3 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp
@@ -28,6 +28,7 @@
 #include "Updater_Sender_exec.h"
 #include "tao/ORB_Core.h"
 #include "ace/Reactor.h"
+#include "dds4ccm/impl/dds4ccm_conf.h"
 
 namespace CIAO_Updater_Sender_Impl
 {
@@ -140,7 +141,7 @@ namespace CIAO_Updater_Sender_Impl
         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Expected : Exception AlreadyCreated test updater create_one.\n")));
         return true;
       }
-    catch (const CCM_DDS::InternalError& )
+    catch (const CCM_DDS::InternalError &)
       {
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while create_one for <%C>.\n"),
                         i.key.in ()));
@@ -166,7 +167,7 @@ namespace CIAO_Updater_Sender_Impl
                        i.key.in ()));
         return false;
       }
-    catch (const CCM_DDS::InternalError& )
+    catch (const CCM_DDS::InternalError &)
       {
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while update_one for <%C>.\n"),
                         i.key.in ()));
@@ -179,7 +180,7 @@ namespace CIAO_Updater_Sender_Impl
   Sender_exec_i::update_one_not_registered (
     ::Updater::UpdaterConnector::Updater_ptr updater)
   {
-    //update a not yet registered instance,expext a NonExistent exception
+    //update a not yet registered instance, expect a NonExistent exception
      //use second instance of table
     TestTopic i = this->topic_seq_one_[1];
     try
@@ -260,12 +261,12 @@ namespace CIAO_Updater_Sender_Impl
     //update an instance after registering first, using a handle
     TestTopic i = this->topic_seq_one_[2];
     //take third instance of table
-    DDS::InstanceHandle_t hnd = updater->register_instance(i);
+    DDS::InstanceHandle_t const hnd = updater->register_instance(i);
     try
       {
-        if (hnd.isValid)
+        if (DDS_INSTANCE_HANDLE_VALID(hnd))
           {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: update a new  instance after registrating instance, key <%C>\n"),
+            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: update a new  instance after registering instance, key <%C>\n"),
                         i.key.in ()));
             updater->update_one(i, hnd);
           }
diff --git a/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp b/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp
index b6aef4230f0..067e6c0efe3 100644
--- a/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp
+++ b/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp
@@ -52,7 +52,7 @@ namespace CIAO_AmiDds_Receiver_Impl
                           "key <%C> - iteration <%d>\n",
                           an_instance.key.in (),
                           an_instance.x));
-    if (!info.instance_handle.isValid)
+    if (DDS_INSTANCE_HANDLE_INVALID(info.instance_handle))
       {
         ACE_ERROR ((LM_ERROR, "ERROR: ListenOneByOneTest_Listener_exec_i::on_one_data: "
                             "instance handle seems to be invalid "