Tue Aug 31 12:57:15 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/impl/DataReaderListener_T.cpp:
        * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp:
        * connectors/dds4ccm/impl/DomainParticipant_T.cpp:
        * connectors/dds4ccm/impl/PortStatusListener_T.cpp:
        * connectors/dds4ccm/impl/PublisherListener_T.cpp:
        * connectors/dds4ccm/impl/Publisher_T.cpp:
        * connectors/dds4ccm/impl/Reader_T.cpp:
        * connectors/dds4ccm/impl/SubscriberListener_T.cpp:
        * connectors/dds4ccm/impl/Subscriber_T.cpp:
        * connectors/dds4ccm/impl/TopicListener_T.cpp:
          Improved logging.

        * connectors/dds4ccm/impl/LocalObject_T.cpp:
        * connectors/dds4ccm/impl/LocalObject_T.h:
          Added copy constructor in which one can pass the object.

13 files changed, 96 insertions, 70 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 0f7423b26eb..036b6e25b55 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,21 @@
+Tue Aug 31 12:57:15 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/impl/DataReaderListener_T.cpp:
+        * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp:
+        * connectors/dds4ccm/impl/DomainParticipant_T.cpp:
+        * connectors/dds4ccm/impl/PortStatusListener_T.cpp:
+        * connectors/dds4ccm/impl/PublisherListener_T.cpp:
+        * connectors/dds4ccm/impl/Publisher_T.cpp:
+        * connectors/dds4ccm/impl/Reader_T.cpp:
+        * connectors/dds4ccm/impl/SubscriberListener_T.cpp:
+        * connectors/dds4ccm/impl/Subscriber_T.cpp:
+        * connectors/dds4ccm/impl/TopicListener_T.cpp:
+          Improved logging.
+
+        * connectors/dds4ccm/impl/LocalObject_T.cpp:
+        * connectors/dds4ccm/impl/LocalObject_T.h:
+          Added copy constructor in which one can pass the object.
+
 Mon Aug 30 22:26:16 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.cpp:
diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp
index a64ca2ec163..f7b405f9fa8 100644
--- a/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp
@@ -44,7 +44,8 @@ CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_data_av
           if (this->reactor_->notify (rh) != 0)
             {
               DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
-                            ACE_TEXT ("DataReaderListener_T::failed to use reactor.\n")));
+                            ACE_TEXT ("DataReaderListener_T::on_data_available - ")
+                            ACE_TEXT ("failed to use reactor.\n")));
             }
         }
       else
@@ -94,6 +95,7 @@ CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_data_av
   else if (result != ::DDS::RETCODE_OK)
     {
       DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
+                          ACE_TEXT ("DataReaderListener_T::on_data_available_i - ")
                           ACE_TEXT ("Unable to take data from data reader, ")
                           ACE_TEXT ("error %C.\n"),
                           translate_retcode (result)));
@@ -151,9 +153,9 @@ CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_data_av
   if (retval != ::DDS::RETCODE_OK)
     {
       DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
-        "DataReaderListener_T::on_data_available_i - "
-        "Error returning loan to DDS - <%C>\n",
-        translate_retcode (retval)));
+                    ACE_TEXT ("DataReaderListener_T::on_data_available_i - ")
+                    ACE_TEXT ("Error returning loan to DDS - <%C>\n"),
+                    translate_retcode (retval)));
     }
 }
 
@@ -171,11 +173,9 @@ CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::get_mask (
     {
       mask |= PortStatusListener_type::get_mask (listener);
     }
-    
   DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, CLINFO
                  "DataReaderListener_T::get_mask - "
                  "Mask becomes %x\n",
                  mask));
-                 
   return mask;
 }
diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp
index ddf34007d08..b70ea95cd97 100644
--- a/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp
@@ -46,7 +46,7 @@ CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_da
           if (this->reactor_->notify (rh) != 0)
             {
               DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
-                            ACE_TEXT ("DataReaderStateListener_T::")
+                            ACE_TEXT ("DataReaderStateListener_T::on_data_available")
                             ACE_TEXT ("failed to use reactor.\n")));
             }
         }
@@ -220,9 +220,9 @@ CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_da
       if (retval != DDS_RETCODE_OK)
         {
           DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
-            "DataReaderStateListener_T::on_data_available_i - "
-            "Error returning loan to DDS - <%C>\n",
-            translate_retcode (retval)));
+                        ACE_TEXT ("DataReaderStateListener_T::on_data_available_i - ")
+                        ACE_TEXT ("Error returning loan to DDS - <%C>\n"),
+                        translate_retcode (retval)));
         }
     }
   catch (const ::CORBA::Exception& ex)
@@ -235,8 +235,8 @@ CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_da
   catch (...)
     {
       DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
-        "DataReaderStateListener_T::on_data_available_i - "
-        "Unexpected exception caught\n"));
+                    ACE_TEXT ("DataReaderStateListener_T::on_data_available_i - ")
+                    ACE_TEXT ("Unexpected exception caught\n")));
     }
 }
 
@@ -259,7 +259,6 @@ CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::get_m
                  "DataReaderStateListener_T::get_mask - "
                  "Mask becomes %x\n",
                  mask));
-
   return mask;
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/DomainParticipant_T.cpp b/CIAO/connectors/dds4ccm/impl/DomainParticipant_T.cpp
index 2fc4b56f0a9..a34311605cc 100644
--- a/CIAO/connectors/dds4ccm/impl/DomainParticipant_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DomainParticipant_T.cpp
@@ -56,7 +56,7 @@ namespace CIAO
       ::DDS::PublisherListener_ptr a_listener,
       ::DDS::StatusMask mask)
     {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_publisher_with_profile");
+      DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_T::create_publisher_with_profile");
 
       DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, CLINFO
                     "CCM_DDS_DomainParticipant_T<DDS_TYPE, CCM_TYPE, "
@@ -108,7 +108,7 @@ namespace CIAO
       ::DDS::PublisherListener_ptr a_listener,
       ::DDS::StatusMask mask)
     {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_publisher");
+      DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_T::create_publisher");
       ACE_UNUSED_ARG (qos);
       DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, CLINFO
                     "CCM_DDS_DomainParticipant_T<DDS_TYPE, CCM_TYPE, "
@@ -206,7 +206,7 @@ namespace CIAO
       ::DDS::SubscriberListener_ptr a_listener,
       ::DDS::StatusMask mask)
     {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_subscriber_with_profile");
+      DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_T::create_subscriber_with_profile");
 
       DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, CLINFO
                    "CCM_DDS_DomainParticipant_T"
@@ -259,7 +259,7 @@ namespace CIAO
                                        ::DDS::SubscriberListener_ptr a_listener,
                                        ::DDS::StatusMask mask)
     {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_subscriber");
+      DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_T::create_subscriber");
 
       ACE_UNUSED_ARG (qos);
 
@@ -372,14 +372,14 @@ namespace CIAO
                                             ::DDS::TopicListener_ptr a_listener,
                                             ::DDS::StatusMask mask)
     {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_topic");
+      DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_T::create_topic");
 
       ACE_UNUSED_ARG (qos);
 
       if (impl_name == 0)
         {
           DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
-                        "DDS_DomainParticipant_i::create_topic - "
+                        "CCM_DDS_DomainParticipant_T::create_topic - "
                         "Error: provided nil topic name\n"));
           throw ::CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER,
                                         0);
@@ -388,14 +388,14 @@ namespace CIAO
       if (type_name == 0)
         {
           DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
-                        "DDS_DomainParticipant_i::create_topic - "
+                        "CCM_DDS_DomainParticipant_T::create_topic - "
                         "Error: provided nil type name\n"));
           throw ::CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER,
                                         0);
         }
 
       DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_DEBUG, CLINFO
-                    "DDS_DomainParticipant_i::create_topic - "
+                    "CCM_DDS_DomainParticipant_T::create_topic - "
                     "Attempting to create topic with name %C and type %C\n",
                     impl_name, type_name));
 
@@ -428,7 +428,7 @@ namespace CIAO
           if (!dds_tp)
             {
               DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, CLINFO
-                            "DDS_DomainParticipant_i::create_topic - "
+                            "CCM_DDS_DomainParticipant_T::create_topic - "
                             "Error: RTI DDS returned a nil topic\n"));
               delete ccm_dds_tl;
               throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
@@ -440,7 +440,7 @@ namespace CIAO
                             ::CORBA::NO_MEMORY ());
 
           DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, CLINFO
-                        "DDS_DomainParticipant_i::create_topic - "
+                        "CCM_DDS_DomainParticipant_T::create_topic - "
                         "Successfully created topic with name %C and type %C\n",
                         impl_name, type_name));
 
@@ -455,7 +455,7 @@ namespace CIAO
       else
         {
           DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, CLINFO
-                        "DDS_DomainParticipant_i::create_topic_with_profile - "
+                        "CCM_DDS_DomainParticipant_T::create_topic - "
                         "Re-using topic with name %C and type %C.\n",
                         impl_name, type_name));
 
@@ -481,12 +481,12 @@ namespace CIAO
         ::DDS::TopicListener_ptr a_listener,
         ::DDS::StatusMask mask)
     {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_topic_with_profile");
+      DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_T::create_topic_with_profile");
 
       if (impl_name == 0)
         {
           DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
-                        "DDS_DomainParticipant_i::create_topic_with_profile - "
+                        "CCM_DDS_DomainParticipant_T::create_topic_with_profile - "
                         "Error: provided nil topic name\n"));
           throw ::CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0);
         }
@@ -494,13 +494,13 @@ namespace CIAO
       if (type_name == 0)
         {
           DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
-                        "DDS_DomainParticipant_i::create_topic_with_profile - "
+                        "CCM_DDS_DomainParticipant_T::create_topic_with_profile - "
                         "Error: provided nil type name\n"));
           throw ::CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0);
         }
 
       DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_DEBUG, CLINFO
-                    "DDS_DomainParticipant_i::create_topic_with_profile - "
+                    "CCM_DDS_DomainParticipant_T::create_topic_with_profile - "
                     "Attempting to create topic with name %C and type %C\n",
                     impl_name, type_name));
 
@@ -533,7 +533,7 @@ namespace CIAO
           if (!dds_tp)
             {
               DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, CLINFO
-                            "DDS_DomainParticipant_i::create_topic_with_profile - "
+                            "CCM_DDS_DomainParticipant_T::create_topic_with_profile - "
                             "Error: RTI DDS returned a nil topic\n"));
               delete ccm_dds_tl;
               throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
@@ -545,7 +545,7 @@ namespace CIAO
                             ::CORBA::NO_MEMORY ());
 
           DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, CLINFO
-                        "DDS_DomainParticipant_i::create_topic_with_profile - "
+                        "CCM_DDS_DomainParticipant_T::create_topic_with_profile - "
                         "Successfully created topic with name %C and type %C\n",
                         impl_name, type_name));
 
@@ -560,7 +560,7 @@ namespace CIAO
       else
         {
           DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, CLINFO
-                        "DDS_DomainParticipant_i::create_topic_with_profile - "
+                        "CCM_DDS_DomainParticipant_T::create_topic_with_profile - "
                         "Re-using topic with name %C and type %C.\n",
                         impl_name, type_name));
           DPMANAGER->_inc_ref (this->impl (), dds_tp);
@@ -578,7 +578,7 @@ namespace CIAO
     ::DDS::ReturnCode_t
     CCM_DDS_DomainParticipant_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::delete_topic (::DDS::Topic_ptr a_topic)
     {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::delete_topic");
+      DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_T::delete_topic");
       CORBA::String_var topic_name = a_topic->get_name ();
       DDSTopicDescription * dds_td =
         this->impl ()->lookup_topicdescription (topic_name.in ());
@@ -655,6 +655,8 @@ namespace CIAO
       DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::lookup_topicdescription");
 
       DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_UNIMP_ACTION, (LM_DEBUG, CLINFO
+                    "CCM_DDS_DomainParticipant_T<DDS_TYPE, CCM_TYPE, "
+                    "VENDOR_TYPE>::lookup_topicdescription - "
                     "Looking up topic: name <%C>\n",
                     name));
 
@@ -692,7 +694,7 @@ namespace CIAO
                                                           const char * filter_expression,
                                                           const ::DDS::StringSeq & expression_parameters)
     {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_contentfilteredtopic");
+      DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_T::create_contentfilteredtopic");
 
 #if (CIAO_DDS4CCM_NDDS==1)
       Topic_type *top = dynamic_cast< Topic_type *> (related_topic);
@@ -740,7 +742,7 @@ namespace CIAO
                         ::CORBA::NO_MEMORY ());
 
       DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, CLINFO
-                    "DDS_DomainParticipant_i::create_contentfilteredtopic - "
+                    "CCM_DDS_DomainParticipant_T::create_contentfilteredtopic - "
                     "Successfully created contentfilteredtopic with name <%C> and "
                     "filter expression <%C>\n",
                     name, filter_expression));
@@ -759,7 +761,7 @@ namespace CIAO
     CCM_DDS_DomainParticipant_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::delete_contentfilteredtopic (
       ::DDS::ContentFilteredTopic_ptr a_contentfilteredtopic)
     {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::delete_contentfilteredtopic");
+      DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_T::delete_contentfilteredtopic");
       ContentFilteredTopic_type *ccm_dds_cft =
           dynamic_cast < ContentFilteredTopic_type *> (a_contentfilteredtopic);
       if (!ccm_dds_cft)
@@ -781,7 +783,7 @@ namespace CIAO
       const char * subscription_expression,
       const ::DDS::StringSeq & expression_parameters)
     {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_multitopic");
+      DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_T::create_multitopic");
 #if (CIAO_DDS4CCM_NDDS==1)
       ACE_UNUSED_ARG (name);
       ACE_UNUSED_ARG (type_name);
@@ -802,7 +804,7 @@ namespace CIAO
     CCM_DDS_DomainParticipant_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::delete_multitopic (
       ::DDS::MultiTopic_ptr a_multitopic)
     {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::delete_multitopic");
+      DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_T::delete_multitopic");
 #if (CIAO_DDS4CCM_NDDS==1)
       ACE_UNUSED_ARG (a_multitopic);
       //Not implemented in version ndds.4.5b.rev01 of RTI DDS.
@@ -825,7 +827,7 @@ namespace CIAO
     CCM_DDS_DomainParticipant_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::set_qos (
       const ::DDS::DomainParticipantQos & qos)
     {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_qos");
+      DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_T::set_qos");
 #if (CIAO_DDS4CCM_NDDS==1)
       ::DDS_DomainParticipantQos ccm_dds_qos;
       ccm_dds_qos <<= qos;
@@ -840,7 +842,7 @@ namespace CIAO
     CCM_DDS_DomainParticipant_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::get_qos (
       ::DDS::DomainParticipantQos & qos)
     {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_qos");
+      DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_T::get_qos");
       ::DDS_DomainParticipantQos ccm_dds_qos;
       ::DDS::ReturnCode_t retcode = this->impl()-> get_qos (ccm_dds_qos);
       qos <<= ccm_dds_qos;
@@ -871,7 +873,7 @@ namespace CIAO
     ::DDS::DomainParticipantListener_ptr
     CCM_DDS_DomainParticipant_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::get_listener (void)
     {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_listener");
+      DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_T::get_listener");
 
       DDSDomainParticipantListener *ccm_dds_dp_list = this->impl ()->get_listener ();
       CCM_DDS_DomainParticipantListener_i * list_proxy =
@@ -946,7 +948,7 @@ namespace CIAO
     CCM_DDS_DomainParticipant_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::set_default_publisher_qos (
       const ::DDS::PublisherQos & qos)
     {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_default_publisher_qos");
+      DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_T::set_default_publisher_qos");
       ::DDS_PublisherQos ccm_dds_qos;
       ccm_dds_qos <<= qos;
       return this->impl()->set_default_publisher_qos (ccm_dds_qos);
@@ -957,7 +959,7 @@ namespace CIAO
     CCM_DDS_DomainParticipant_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::get_default_publisher_qos (
       ::DDS::PublisherQos & qos)
     {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_publisher_qos");
+      DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_T::get_default_publisher_qos");
       ::DDS_PublisherQos ccm_dds_qos;
       ::DDS::ReturnCode_t retcode = this->impl()-> get_default_publisher_qos (ccm_dds_qos);
       qos <<= ccm_dds_qos;
@@ -969,7 +971,7 @@ namespace CIAO
     CCM_DDS_DomainParticipant_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::set_default_subscriber_qos (
       const ::DDS::SubscriberQos & qos)
     {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_default_subscriber_qos");
+      DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_T::set_default_subscriber_qos");
       ::DDS_SubscriberQos ccm_dds_qos;
       ccm_dds_qos <<= qos;
       return this->impl()->set_default_subscriber_qos (ccm_dds_qos);
@@ -980,7 +982,7 @@ namespace CIAO
     CCM_DDS_DomainParticipant_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::get_default_subscriber_qos (
       ::DDS::SubscriberQos & qos)
     {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_subscriber_qos");
+      DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_T::get_default_subscriber_qos");
       ::DDS_SubscriberQos ccm_dds_qos;
       ::DDS::ReturnCode_t retcode =
             this->impl()-> get_default_subscriber_qos (ccm_dds_qos);
@@ -993,7 +995,7 @@ namespace CIAO
     CCM_DDS_DomainParticipant_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::set_default_topic_qos (
       const ::DDS::TopicQos & qos)
     {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_default_topic_qos");
+      DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_T::set_default_topic_qos");
       ::DDS_TopicQos ccm_dds_qos;
       ccm_dds_qos <<= qos;
       return this->impl()->set_default_topic_qos (ccm_dds_qos);
@@ -1004,7 +1006,7 @@ namespace CIAO
     CCM_DDS_DomainParticipant_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::get_default_topic_qos (
       ::DDS::TopicQos & qos)
     {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_topic_qos");
+      DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_T::get_default_topic_qos");
       ::DDS_TopicQos ccm_dds_qos;
       ::DDS::ReturnCode_t retcode =
             this->impl()-> get_default_topic_qos (ccm_dds_qos);
@@ -1029,7 +1031,7 @@ namespace CIAO
       ::DDS::ParticipantBuiltinTopicData & impl_data,
       DDS_INSTANCE_HANDLE_T_IN impl_handle)
     {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_discovered_participant_data");
+      DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_T::get_discovered_participant_data");
       DDS_ParticipantBuiltinTopicData dds_part_data;
       dds_part_data <<= impl_data;
       ::DDS_InstanceHandle_t dds_hnd;
@@ -1062,7 +1064,7 @@ namespace CIAO
       ::DDS::TopicBuiltinTopicData & impl_data,
       DDS_INSTANCE_HANDLE_T_IN impl_handle)
     {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_discovered_topic_data");
+      DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_T::get_discovered_topic_data");
       DDS_TopicBuiltinTopicData dds_tp_data;
       dds_tp_data <<= impl_data;
       ::DDS_InstanceHandle_t dds_hnd;
diff --git a/CIAO/connectors/dds4ccm/impl/LocalObject_T.cpp b/CIAO/connectors/dds4ccm/impl/LocalObject_T.cpp
index f6d1133a536..a4b2fb81b6b 100644
--- a/CIAO/connectors/dds4ccm/impl/LocalObject_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/LocalObject_T.cpp
@@ -37,6 +37,12 @@ CIAO::DDS4CCM::LocalObject_Auto_Ptr_T<LOCAL_OBJECT>::~LocalObject_Auto_Ptr_T (vo
 }
 
 template <typename LOCAL_OBJECT>
+CIAO::DDS4CCM::LocalObject_Auto_Ptr_T<LOCAL_OBJECT>::LocalObject_Auto_Ptr_T (LOCAL_OBJECT* lobject)
+  : l (lobject)
+{
+}
+
+template <typename LOCAL_OBJECT>
 LOCAL_OBJECT*
 CIAO::DDS4CCM::LocalObject_Auto_Ptr_T<LOCAL_OBJECT>::operator-> (void) const
 {
diff --git a/CIAO/connectors/dds4ccm/impl/LocalObject_T.h b/CIAO/connectors/dds4ccm/impl/LocalObject_T.h
index 993b88af67a..13c5ecd0299 100644
--- a/CIAO/connectors/dds4ccm/impl/LocalObject_T.h
+++ b/CIAO/connectors/dds4ccm/impl/LocalObject_T.h
@@ -37,6 +37,8 @@ namespace CIAO
       
       ~LocalObject_Auto_Ptr_T (void);
 
+      explicit LocalObject_Auto_Ptr_T (LOCAL_OBJECT* lobject);
+
       LOCAL_OBJECT* operator-> (void) const;
 
       operator LOCAL_OBJECT *& (void);
diff --git a/CIAO/connectors/dds4ccm/impl/PortStatusListener_T.cpp b/CIAO/connectors/dds4ccm/impl/PortStatusListener_T.cpp
index 45f12f19fcf..5f2c9f8cdb2 100644
--- a/CIAO/connectors/dds4ccm/impl/PortStatusListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/PortStatusListener_T.cpp
@@ -191,14 +191,14 @@ CIAO::DDS4CCM::PortStatusListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::get_mask (
   if (! ::CORBA::is_nil (psl) ||
       CIAO_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS)
     {
-      mask = DDS_REQUESTED_DEADLINE_MISSED_STATUS |
-             DDS_SAMPLE_LOST_STATUS;
+      mask = ::DDS::REQUESTED_DEADLINE_MISSED_STATUS |
+             ::DDS::SAMPLE_LOST_STATUS;
     }
 
   DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, CLINFO
                  "PortStatusListener_T::get_mask - "
                  "Mask becomes %x\n",
-                 mask));
+                  mask));
 
-  return mask;                    
+  return mask;
 }
diff --git a/CIAO/connectors/dds4ccm/impl/PublisherListener_T.cpp b/CIAO/connectors/dds4ccm/impl/PublisherListener_T.cpp
index 20eeacd1493..c5a60853584 100644
--- a/CIAO/connectors/dds4ccm/impl/PublisherListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/PublisherListener_T.cpp
@@ -108,8 +108,8 @@ CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_offered_
               if (this->reactor_->notify (rh) != 0)
                 {
                   DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
-                                ACE_TEXT ("PublisherListener_T::failed to ")
-                                ACE_TEXT ("use reactor.\n")));
+                                ACE_TEXT ("PublisherListener_T::on_offered_deadline_missed - ")
+                                ACE_TEXT ("failed to use reactor.\n")));
                 }
             }
           else
@@ -175,8 +175,8 @@ CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_offered_
               if (this->reactor_->notify (rh) != 0)
                 {
                   DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
-                                ACE_TEXT ("PublisherListener_T::failed to ")
-                                ACE_TEXT ("use reactor.\n")));
+                                ACE_TEXT ("PublisherListener_T::on_offered_incompatible_qos - ")
+                                ACE_TEXT ("failed to use reactor.\n")));
                 }
             }
           else
@@ -201,7 +201,7 @@ CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_offered_
   else
     {
       DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, CLINFO
-                    ACE_TEXT ("PublisherListener_T::on_offered_incompatible_qos: ")
+                    ACE_TEXT ("PublisherListener_T::on_offered_incompatible_qos - ")
                     ACE_TEXT ("No error listener connected\n")));
     }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/Publisher_T.cpp b/CIAO/connectors/dds4ccm/impl/Publisher_T.cpp
index 71e6749d0e0..340ac6c4c39 100644
--- a/CIAO/connectors/dds4ccm/impl/Publisher_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/Publisher_T.cpp
@@ -99,7 +99,7 @@ namespace CIAO
                                         ::DDS::DataWriterListener_ptr a_listener,
                                         ::DDS::StatusMask mask)
     {
-      DDS4CCM_TRACE ("CCM_DDS_Publisher_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::create_datawriter");
+      DDS4CCM_TRACE ("CCM_DDS_Publisher_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::create_datawriter_with_profile");
 
       Topic_type * topic = dynamic_cast < Topic_type * > (a_topic);
 
@@ -139,7 +139,7 @@ namespace CIAO
         {
           DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, CLINFO
                         "CCM_DDS_Publisher_T<DDS_TYPE, CCM_TYPE, "
-                        "VENDOR_TYPE>::create_datareader_with_profile - "
+                        "VENDOR_TYPE>::create_datawriter_with_profile - "
                         "Successfully created datawriter with profile <%C#%C>.\n",
                         library_name,
                         profile_name));
diff --git a/CIAO/connectors/dds4ccm/impl/Reader_T.cpp b/CIAO/connectors/dds4ccm/impl/Reader_T.cpp
index f79234eee9b..74512e94e3b 100644
--- a/CIAO/connectors/dds4ccm/impl/Reader_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/Reader_T.cpp
@@ -233,7 +233,7 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::read_o
   CORBA::ULong const nr_of_valid_samples =
     this->get_nr_valid_samples (sample_info);
   DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, CLINFO
-                ACE_TEXT ("Reader_T::read_all - ")
+                ACE_TEXT ("Reader_T::read_one_all - ")
                 ACE_TEXT ("total number of samples <%u> - ")
                 ACE_TEXT ("valid number of samples <%u>\n"),
                 data.length (),
diff --git a/CIAO/connectors/dds4ccm/impl/SubscriberListener_T.cpp b/CIAO/connectors/dds4ccm/impl/SubscriberListener_T.cpp
index 6a50e46a563..d64722447a9 100644
--- a/CIAO/connectors/dds4ccm/impl/SubscriberListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/SubscriberListener_T.cpp
@@ -57,7 +57,7 @@ CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_request
                 {
                   DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
                                 ACE_TEXT ("SubscriberListener_T::")
-                                ACE_TEXT ("on_requested_incompatible_qos: ")
+                                ACE_TEXT ("on_requested_incompatible_qos - ")
                                 ACE_TEXT ("failed to use reactor.\n")));
                 }
             }
@@ -83,7 +83,7 @@ CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_request
   else
     {
       DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, CLINFO
-                  ACE_TEXT ("SubscriberListener_T::on_requested_incompatible_qos: ")
+                  ACE_TEXT ("SubscriberListener_T::on_requested_incompatible_qos - ")
                   ACE_TEXT ("No error listener connected\n")));
     }
 }
@@ -110,7 +110,7 @@ CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_unexpec
               if (this->reactor_->notify (rh) != 0)
                 {
                   DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
-                                ACE_TEXT ("SubscriberListener_T::on_unexpected_status: ")
+                                ACE_TEXT ("SubscriberListener_T::on_unexpected_status - ")
                                 ACE_TEXT ("failed to use reactor.\n")));
                 }
             }
@@ -137,7 +137,7 @@ CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_unexpec
   else
     {
       DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, CLINFO
-                  ACE_TEXT ("SubscriberListener_T::on_unexpected_status: ")
+                  ACE_TEXT ("SubscriberListener_T::on_unexpected_status - ")
                   ACE_TEXT ("No error listener connected for <%C>\n"),
                   translate_statuskind (status_kind)));
     }
@@ -196,7 +196,7 @@ CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_sample_
               if (this->reactor_->notify (rh) != 0)
                 {
                   DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
-                                ACE_TEXT ("SubscriberListener_T::on_sample_rejected: ")
+                                ACE_TEXT ("SubscriberListener_T::on_sample_rejected - ")
                                 ACE_TEXT ("failed to use reactor.\n")));
                 }
             }
@@ -222,7 +222,7 @@ CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_sample_
   else
     {
       DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, CLINFO
-                    ACE_TEXT ("SubscriberListener_T::on_sample_rejected: ")
+                    ACE_TEXT ("SubscriberListener_T::on_sample_rejected - ")
                     ACE_TEXT ("No error listener connected\n")));
     }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/Subscriber_T.cpp b/CIAO/connectors/dds4ccm/impl/Subscriber_T.cpp
index b9aa4421f7c..f98c754806f 100644
--- a/CIAO/connectors/dds4ccm/impl/Subscriber_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/Subscriber_T.cpp
@@ -171,7 +171,7 @@ namespace CIAO
             {
               DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, CLINFO
                           "CCM_DDS_Subscriber_T<DDS_TYPE, CCM_TYPE, "
-                          "VENDOR_TYPE>::create_datareader -Error: Unable to "
+                          "VENDOR_TYPE>::create_datareader - Error: Unable to "
                           "cast provided topic to one of its servant.\n"));
               delete ccm_dds_drl;
               throw ::CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0);
diff --git a/CIAO/connectors/dds4ccm/impl/TopicListener_T.cpp b/CIAO/connectors/dds4ccm/impl/TopicListener_T.cpp
index 0e41773a9e0..dea946f2894 100644
--- a/CIAO/connectors/dds4ccm/impl/TopicListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/TopicListener_T.cpp
@@ -50,7 +50,7 @@ CIAO::DDS4CCM::TopicListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_inconsistent
               if (this->reactor_->notify (rh) != 0)
                 {
                   DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
-                                ACE_TEXT ("TopicListener_T::on_inconsistent_topic: ")
+                                ACE_TEXT ("TopicListener_T::on_inconsistent_topic - ")
                                 ACE_TEXT ("failed to use reactor.\n")));
                 }
             }
@@ -76,7 +76,7 @@ CIAO::DDS4CCM::TopicListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_inconsistent
   else
     {
       DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, CLINFO
-                    ACE_TEXT ("TopicListener_T::on_inconsistent_topic: ")
+                    ACE_TEXT ("TopicListener_T::on_inconsistent_topic - ")
                     ACE_TEXT ("No error listener connected\n")));
     }
 }
@@ -95,7 +95,6 @@ CIAO::DDS4CCM::TopicListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::get_mask (
     {
       mask = ::DDS::INCONSISTENT_TOPIC_STATUS;
     }
-
   DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, CLINFO
                  "TopicListener_T::get_mask - "
                  "Mask becomes %x\n",