Tue Feb 2 09:49:43 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h
        * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.h
        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.h
        * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector_exec.h
        * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.h
        * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h
        * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h
        * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h
        * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector_exec.h
        * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector_exec.h
        * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector_exec.h
        * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector_exec.h
        * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.h
        * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector_exec.h
        * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector_exec.h
        * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.h
        * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector_exec.h
        * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.h
        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector_exec.h
        * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.h
        * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.h
        * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.h
        * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector_exec.h
        * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.h
        * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.h
        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector_exec.h
        * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.h
        * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.h
        * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector_exec.h
        * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector_exec.h
        * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector_exec.h
        * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.h
        * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.h
        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.h
        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.h
        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.h
        * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.h
        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.h
        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.h
        * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.h
        * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.h
          removed not needed include of LocalObject

        * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp
        * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h
        * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp
        * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h
          First rework to implement the required thread switch

46 files changed, 133 insertions, 120 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 4fcdacc6210..8c0522a3824 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,54 @@
+Tue Feb  2 09:49:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h
+        * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.h
+        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.h
+        * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector_exec.h
+        * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.h
+        * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h
+        * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h
+        * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h
+        * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector_exec.h
+        * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector_exec.h
+        * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector_exec.h
+        * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector_exec.h
+        * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.h
+        * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector_exec.h
+        * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector_exec.h
+        * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.h
+        * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector_exec.h
+        * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.h
+        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector_exec.h
+        * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.h
+        * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.h
+        * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.h
+        * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector_exec.h
+        * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.h
+        * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.h
+        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector_exec.h
+        * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.h
+        * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.h
+        * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector_exec.h
+        * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector_exec.h
+        * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector_exec.h
+        * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.h
+        * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.h
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.h
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.h
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.h
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.h
+        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.h
+        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.h
+        * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.h
+        * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.h
+          removed not needed include of LocalObject
+
+        * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp
+        * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h
+        * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp
+        * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h
+          First rework to implement the required thread switch
+
 Mon Feb  1 19:16:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl:
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h
index b5af71934ea..05488826bd4 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "Hello_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -22,8 +21,6 @@
 
 namespace CIAO_Hello_Hello_Connector_Impl
 {
-
-  // @from use of DDSHello as a parameter
   typedef CIAO::DDS4CCM::RTI::Type_Traits <
     DDSHello,
     DDSHelloSeq,
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.h b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.h
index b3085ea6033..79dea912e08 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "Quoter_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -24,7 +23,7 @@ namespace CIAO_Quoter_Quoter_Connector_Impl
 {
 
   // @from use of Stock_Info as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     ::Quoter::Stock_Info,
     ::Quoter::Stock_InfoSeq,
     ::Quoter::Stock_InfoTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.h b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.h
index 36a073c34ef..a5031fd3afc 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "Shapes_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -24,7 +23,7 @@ namespace CIAO_Shapes_Shapes_Connector_Impl
 {
 
   // @from use of ShapeType as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     ShapeType,
     ShapeTypeSeq,
     ShapeTypeTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp
index a068e675c94..20a20abc9e4 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp
@@ -8,10 +8,10 @@
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 CIAO::DDS4CCM::RTI::DataReaderHandler_T<DDS_TYPE, CCM_TYPE>::DataReaderHandler_T (
-            typename CCM_TYPE::listener_type::_ptr_type listener,
-            typename DDS_TYPE::data_reader * reader)
-      : reader_ (reader),
-        listener_ (CCM_TYPE::listener_type::_duplicate (listener))
+            typename CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>* drl,
+            ::DDS::DataReader_ptr dr)
+      : drl_ (drl),
+        dr_ (::DDS::DataReader::_duplicate (dr))
 {
 }
 
@@ -26,28 +26,7 @@ CIAO::DDS4CCM::RTI::DataReaderHandler_T<DDS_TYPE, CCM_TYPE>::handle_exception (A
 {
   try
     {
-      // Loop until there are messages available in the queue
-      for(;;)
-        {
-          typename DDS_TYPE::value_type instance;
-          ::DDS_SampleInfo sampleinfo;
-          ::DDS::ReturnCode_t const result = this->reader_->take_next_sample(instance,
-                                                                      sampleinfo);
-          if (result == DDS_RETCODE_NO_DATA)
-              break;
-          else if (result != DDS_RETCODE_OK)
-            {
-              CIAO_ERROR (1, (LM_ERROR, ACE_TEXT ("Unable to take data from data reader, error %d.\n"), result));
-              return 1;
-            }
-          if (sampleinfo.valid_data)
-            {
-              CIAO_DEBUG (6, (LM_DEBUG, ACE_TEXT ("DataReaderHandler_T : found valid data\n")));
-              ::CCM_DDS::ReadInfo readinfo;
-              readinfo <<= sampleinfo;
-              listener_->on_one_data (instance, readinfo);
-            }
-        }
+      drl_->on_data_available_i (dr_.in ());
     }
   catch (...)
     {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h
index d4cfb988e54..a5dd43363ed 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h
@@ -13,6 +13,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ace/Reactor.h"
+#include "dds4ccm/impl/ndds/DataReaderListener_T.h"
 
 namespace CIAO
 {
@@ -26,14 +27,14 @@ namespace CIAO
       {
         public:
           DataReaderHandler_T (
-              typename CCM_TYPE::listener_type::_ptr_type listener,
-              typename DDS_TYPE::data_reader * reader);
+              typename CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>* drl,
+              ::DDS::DataReader_ptr dr);
           virtual ~DataReaderHandler_T ();
 
           virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
         private:
-          typename DDS_TYPE::data_reader * reader_;
-          typename CCM_TYPE::listener_type::_var_type listener_;
+          typename CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>* drl_;
+          ::DDS::DataReader_var dr_;
       };
     }
   }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp
index 2d359126189..7b89376030a 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp
@@ -28,12 +28,35 @@ CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::~DataReaderListene
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_data_available(::DDS::DataReader *rdr)
+CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_data_available(::DDS::DataReader_ptr rdr)
 {
   CIAO_TRACE ("CIAO::DDS4CCM::RTI::DataReaderListener_T::on_data_available");
 
   if (CORBA::is_nil (this->control_.in ()) || this->control_->mode () == ::CCM_DDS::NOT_ENABLED)
-    return;
+    {
+      return;
+    }
+  else
+    {
+      this->on_data_available_i (rdr);
+      
+ //for now, don't use a DataReaderHandler. Just perform inline.
+//  ::CIAO::DDS4CCM::RTI::DataReaderHandler_T<DDS_TYPE, CCM_TYPE>* rh =
+ //     new  ::CIAO::DDS4CCM::RTI::DataReaderHandler_T<DDS_TYPE, CCM_TYPE>(this, rdr);
+  //this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->notify (rh);
+    }
+}
+
+template <typename DDS_TYPE, typename CCM_TYPE>
+void
+CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_data_available_i (::DDS::DataReader_ptr rdr)
+{
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::DataReaderListener_T::on_data_available_i");
+
+  if (CORBA::is_nil (this->control_.in ()) || this->control_->mode () == ::CCM_DDS::NOT_ENABLED)
+    {
+      return;
+    }
 
   ::CIAO::DDS4CCM::RTI::RTI_DataReader_i* rd =
       dynamic_cast < ::CIAO::DDS4CCM::RTI::RTI_DataReader_i*>(rdr);
@@ -53,10 +76,7 @@ CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_data_available(
       ACE_ERROR ((LM_ERROR, ACE_TEXT ("DataReaderListener_T::narrow failed.\n")));
       return;
     }
-// for now, don't use a DataReaderHandler. Just perform inline.
-//  ::CIAO::DDS4CCM::RTI::DataReaderHandler_T<DDS_TYPE, CCM_TYPE>* rh =
-//      new  ::CIAO::DDS4CCM::RTI::DataReaderHandler_T<DDS_TYPE, CCM_TYPE>(this->listener_.in (), reader);
-//  this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->notify (rh);
+    
   typename DDS_TYPE::dds_seq_type data;
   DDS_SampleInfoSeq sample_info;
   ::DDS::ReturnCode_t const result = reader->take (
@@ -67,10 +87,12 @@ CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_data_available(
               DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,
               DDS_ANY_INSTANCE_STATE);
   if (result == DDS_RETCODE_NO_DATA)
+    {
       return;
+    }
   else if (result != DDS_RETCODE_OK)
     {
-      CIAO_ERROR (1, (LM_ERROR, ACE_TEXT ("Unable to take data from data reader, error %d.\n"), result));
+      CIAO_ERROR (1, (LM_ERROR, ACE_TEXT ("Unable to take data from data reader, error %C.\n"), translate_retcode (result)));
       return;
     }
 
@@ -99,8 +121,8 @@ CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_data_available(
 
       if (nr_of_samples > 0)
         {
-          typename CCM_TYPE::seq_type::_var_type inst_seq = new typename CCM_TYPE::seq_type;
-          ::CCM_DDS::ReadInfoSeq_var infoseq = new ::CCM_DDS::ReadInfoSeq;
+          typename CCM_TYPE::seq_type::_var_type inst_seq = new typename CCM_TYPE::seq_type (nr_of_samples);
+          ::CCM_DDS::ReadInfoSeq_var infoseq = new ::CCM_DDS::ReadInfoSeq (nr_of_samples);
 
           infoseq->length (nr_of_samples);
           inst_seq->length (nr_of_samples);
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.h
index b6d650604c5..3070511b1c8 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.h
@@ -36,6 +36,9 @@ namespace CIAO
         virtual void on_data_available( ::DDS::DataReader *rdr);
 
         static ::DDS::StatusMask get_mask (void);
+
+        void on_data_available_i ( ::DDS::DataReader *rdr);
+
       private:
         typename CCM_TYPE::listener_type::_var_type listener_;
         ::CCM_DDS::DataListenerControl_var control_;
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector_exec.h
index b35301c7a08..82e130e23c7 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "Perf_Keyed_Test_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -24,7 +23,7 @@ namespace CIAO_Perf_Keyed_Test_Perf_Keyed_Test_Connector_Impl
 {
 
   // @from use of PerfKeyedTest as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     PerfKeyedTest,
     PerfKeyedTestSeq,
     PerfKeyedTestTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.h
index 9273a38827f..bb159300dcc 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "CSL_DeadlineTest_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -25,7 +24,7 @@ namespace CIAO_CSL_DeadlineTest_CSL_DeadlineTest_Connector_Impl
 {
 
   // @from use of CSL_DeadlineTest as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     TestTopic,
     TestTopicSeq,
     TestTopicTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h
index 695c9bdebc4..11b03904769 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "CSL_QoSTest_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -25,7 +24,7 @@ namespace CIAO_CSL_QoSTest_CSL_QoSTest_Connector_Impl
 {
 
   // @from use of CSL_QoSTest as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     TestTopic,
     TestTopicSeq,
     TestTopicTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h
index f3be2d1e32f..851190bd4ce 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "CSL_SRTest_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -25,7 +24,7 @@ namespace CIAO_CSL_SRTest_CSL_SRTest_Connector_Impl
 {
 
   // @from use of CSL_SRTest as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     TestTopic,
     TestTopicSeq,
     TestTopicTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h
index 81072dacadc..ca9c07f46d6 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "CSL_USTest_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -25,7 +24,7 @@ namespace CIAO_CSL_USTest_CSL_USTest_Connector_Impl
 {
 
   // @from use of CSL_USTest as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     TestTopic,
     TestTopicSeq,
     TestTopicTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector_exec.h
index 05f2d6bee47..d2e2e36818e 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "Writer_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -23,7 +22,7 @@
 namespace CIAO_Writer_Writer_Connector_Impl
 {
   // @from use of WriterTest as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     WriterTest,
     WriterTestSeq,
     WriterTestTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector_exec.h
index 8a5081c039a..cacd482854e 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "Event_Connection_Test_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -24,7 +23,7 @@ namespace CIAO_Event_Connection_Test_Event_Connection_Test_Connector_Impl
 {
 
   // @from use of Event_ConnectionTest as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     Event_ConnectionTest,
     Event_ConnectionTestSeq,
     Event_ConnectionTestTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector_exec.h
index 5cecdc7aa5a..f7976cfc659 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "Getter_Test_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -24,7 +23,7 @@ namespace CIAO_Getter_Test_Getter_Test_Connector_Impl
 {
 
   // @from use of GetterTest as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     GetterTest,
     GetterTestSeq,
     GetterTestTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector_exec.h
index 05f2d6bee47..d2e2e36818e 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "Writer_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -23,7 +22,7 @@
 namespace CIAO_Writer_Writer_Connector_Impl
 {
   // @from use of WriterTest as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     WriterTest,
     WriterTestSeq,
     WriterTestTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.h
index 0c9fcc66731..c9b40f57f77 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "Keyed_Test_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -24,7 +23,7 @@ namespace CIAO_Keyed_Test_Keyed_Test_Connector_Impl
 {
 
   // @from use of KeyedTest as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     KeyedTest,
     KeyedTestSeq,
     KeyedTestTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector_exec.h
index 05f2d6bee47..d2e2e36818e 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "Writer_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -23,7 +22,7 @@
 namespace CIAO_Writer_Writer_Connector_Impl
 {
   // @from use of WriterTest as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     WriterTest,
     WriterTestSeq,
     WriterTestTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector_exec.h
index 25e0b3e4351..c0ab7e2989e 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "LMBM_Test_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -24,7 +23,7 @@ namespace CIAO_LMBM_Test_LMBM_Test_Connector_Impl
 {
 
   // @from use of ListenManyByManyTest as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     ListenManyByManyTest,
     ListenManyByManyTestSeq,
     ListenManyByManyTestTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.h
index 8a9edb7b207..d556f57728c 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "LNE_Test_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -24,7 +23,7 @@ namespace CIAO_LNE_Test_LNE_Test_Connector_Impl
 {
 
   // @from use of ListenNotEnabledTest as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     ListenNotEnabledTest,
     ListenNotEnabledTestSeq,
     ListenNotEnabledTestTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector_exec.h
index 0400ea51e97..60851f07f79 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "LOBO_Test_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -24,7 +23,7 @@ namespace CIAO_LOBO_Test_LOBO_Test_Connector_Impl
 {
 
   // @from use of ListenOneByOneTest as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     ListenOneByOneTest,
     ListenOneByOneTestSeq,
     ListenOneByOneTestTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.h
index 436fb018deb..2af5152fe2a 100644
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "NonChangeable_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -23,7 +22,7 @@
 namespace CIAO_NonChangeable_NonChangeable_Connector_Impl
 {
   // @from use of NonChangeableTest as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     NonChangeableTest,
     NonChangeableTestSeq,
     NonChangeableTestTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector_exec.h
index 739257a7345..f37b9599c20 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "ConnectorStatusListener_Test_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -24,7 +23,7 @@ namespace CIAO_ConnectorStatusListener_Test_ConnectorStatusListener_Test_Connect
 {
 
   // @from use of ConnectorStatusListener_Test as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     TestTopic,
     TestTopicSeq,
     TestTopicTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.h
index f50cea99cfe..58eeee99025 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "ConnectorStatusListener_TestSec_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -24,7 +23,7 @@ namespace CIAO_ConnectorStatusListener_TestSec_ConnectorStatusListener_TestSec_C
 {
 
   // @from use of ConnectorStatusListener_Test as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     TestSecondTopic,
     TestSecondTopicSeq,
     TestSecondTopicTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.h
index e72f0e6ec48..1c4e6cd09a1 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "PSL_DeadlineTest_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -25,7 +24,7 @@ namespace CIAO_PSL_DeadlineTest_PSL_DeadlineTest_Connector_Impl
 {
 
   // @from use of PSL_DeadlineTest as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     TestTopic,
     TestTopicSeq,
     TestTopicTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.h
index c602bb4c0c5..c748b833336 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "PSL_SampleLost_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -25,7 +24,7 @@ namespace CIAO_PSL_SampleLost_PSL_SampleLost_Connector_Impl
 {
 
   // @from use of PSL_SampleLost as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     TestTopic,
     TestTopicSeq,
     TestTopicTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector_exec.h
index 5ea1ece500d..f7c0b5c3d25 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "QueryFilter_Test_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -24,7 +23,7 @@ namespace CIAO_QueryFilter_Test_QueryFilter_Test_Connector_Impl
 {
 
   // @from use of QueryFilterTest as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     QueryFilterTest,
     QueryFilterTestSeq,
     QueryFilterTestTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.h
index 082b47c5c01..d4b639a5fa8 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "Reader_Test_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -24,7 +23,7 @@ namespace CIAO_Reader_Test_Reader_Test_Connector_Impl
 {
 
   // @from use of ReaderTest as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     ReaderTest,
     ReaderTestSeq,
     ReaderTestTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.h
index 82af39b1bb6..5a9e51e8a6a 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "SL_Disabled_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_State_Connector_T.h"
@@ -25,7 +24,7 @@ namespace CIAO_SL_Disabled_SL_Disabled_Connector_Impl
 {
 
   // @from use of SL_Disabled as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     TestTopic,
     TestTopicSeq,
     TestTopicTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.h
index a1b6888f2eb..0b81ef419cd 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "SL_ManyByMany_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_State_Connector_T.h"
@@ -25,7 +24,7 @@ namespace CIAO_SL_ManyByMany_SL_ManyByMany_Connector_Impl
 {
 
   // @from use of SL_ManyByMany as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     TestTopic,
     TestTopicSeq,
     TestTopicTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector_exec.h
index dab43355cd4..eba432e321f 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "SL_OneByOne_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_State_Connector_T.h"
@@ -25,7 +24,7 @@ namespace CIAO_SL_OneByOne_SL_OneByOne_Connector_Impl
 {
 
   // @from use of SL_OneByOne as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     TestTopic,
     TestTopicSeq,
     TestTopicTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.h
index c7c4879f886..627645ede68 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "SetConnectorAttribute_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -23,7 +22,7 @@
 namespace CIAO_SetConnectorAttribute_SetConnectorAttribute_Connector_Impl
 {
   // @from use of SetConnectorAttributeTest as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     SetConnectorAttributeTest,
     SetConnectorAttributeTestSeq,
     SetConnectorAttributeTestTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector_exec.h b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector_exec.h
index d3eba02e8a2..8777e3ec498 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector_exec.h
index 3d95ba70bd3..dee83119ed6 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "State_Connection_Test_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_State_Connector_T.h"
@@ -24,7 +23,7 @@ namespace CIAO_State_Connection_Test_State_Connection_Test_Connector_Impl
 {
 
   // @from use of State_ConnectionTest as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     State_ConnectionTest,
     State_ConnectionTestSeq,
     State_ConnectionTestTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector_exec.h
index 5357bfb56cc..3a4e401edef 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "Unkeyed_Test_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -23,7 +22,7 @@
 namespace CIAO_Unkeyed_Test_Unkeyed_Test_Connector_Impl
 {
   // @from use of UnkeyedTest as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     UnkeyedTest,
     UnkeyedTestSeq,
     UnkeyedTestTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.h
index 05f2d6bee47..d2e2e36818e 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "Writer_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -23,7 +22,7 @@
 namespace CIAO_Writer_Writer_Connector_Impl
 {
   // @from use of WriterTest as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     WriterTest,
     WriterTestSeq,
     WriterTestTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.h
index 6f01473e5a6..ac896336e56 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "Updater_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_State_Connector_T.h"
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.h
index 16c6a193313..cf5edf1e4db 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "VT_Array_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -25,7 +24,7 @@ namespace CIAO_VT_Array_VT_Array_Connector_Impl
 {
 
   // @from use of VTopic as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     TopicArray,
     TopicArraySeq,
     TopicArrayTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.h
index 57537c89c53..1611b4b4c27 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "VT_Seq_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -25,7 +24,7 @@ namespace CIAO_VT_Seq_VT_Seq_Connector_Impl
 {
 
   // @from use of VTopic as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     TopicSeq,
     TopicSeqSeq,
     TopicSeqTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.h
index a234cce78d7..57ec06bfcb4 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "VT_String_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -25,7 +24,7 @@ namespace CIAO_VT_String_VT_String_Connector_Impl
 {
 
   // @from use of VTopic as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     TopicString,
     TopicStringSeq,
     TopicStringTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.h
index 74ab18badbe..6bd74e1c110 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "VTopic_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -25,7 +24,7 @@ namespace CIAO_VTopic_VTopic_Connector_Impl
 {
 
   // @from use of VTopic as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     TestTopic,
     TestTopicSeq,
     TestTopicTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.h
index 5d1491e235e..4da8d77ba02 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "VTS_Array_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -25,7 +24,7 @@ namespace CIAO_VTS_Array_VTS_Array_Connector_Impl
 {
 
   // @from use of VTopics as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     TopicArray,
     TopicArraySeq,
     TopicArrayTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.h
index d171220e360..0e1c65ffa16 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "VTS_Seq_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -25,7 +24,7 @@ namespace CIAO_VTS_Seq_VTS_Seq_Connector_Impl
 {
 
   // @from use of VTopics as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     TopicSeq,
     TopicSeqSeq,
     TopicSeqTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.h
index 0f1e7cdd1c8..0af4d418925 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "VTS_String_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -25,7 +24,7 @@ namespace CIAO_VTS_String_VTS_String_Connector_Impl
 {
 
   // @from use of VTopics as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     TopicString,
     TopicStringSeq,
     TopicStringTypeSupport,
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.h
index a4aeac8fb4f..170f9c80651 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "VTopics_Connector_exec_export.h"
-#include "tao/LocalObject.h"
 
 #include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
 #include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
@@ -25,7 +24,7 @@ namespace CIAO_VTopics_VTopics_Connector_Impl
 {
 
   // @from use of VTopics as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     TestTopic,
     TestTopicSeq,
     TestTopicTypeSupport,