Mon Nov 9 19:32:42 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc
        * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
        * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h
        * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc
        * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp
        * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
        * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.h
        * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc
        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.h
        * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp
        * connectors/dds4ccm/impl/ndds/Connector_T.h
        * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp
        * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h
        * connectors/dds4ccm/impl/ndds/Getter_T.cpp
        * connectors/dds4ccm/impl/ndds/Getter_T.h
        * connectors/dds4ccm/impl/ndds/NDDS_Traits.h
        * connectors/dds4ccm/impl/ndds/SampleInfo.h
        * connectors/dds4ccm/impl/ndds/Writer_T.cpp
        * connectors/dds4ccm/impl/ndds/Writer_T.h
          Use the new RTI Corba kit feature to put the generated code in its
          own library. Moved CCM sequence to the connector traits.

        * connectors/dds4ccm/impl/ndds/Builtin_Writer_T.cpp
        * connectors/dds4ccm/impl/ndds/Builtin_Writer_T.h
          Deleted, not used anymore. No buildit types are supported

        * connectors/dds4ccm/impl/ndds/Reader.cpp
        * connectors/dds4ccm/impl/ndds/Reader.h
          Deleted, not used at all

        * connectors/dds4ccm/impl/ndds/Reader_T.cpp
        * connectors/dds4ccm/impl/ndds/Reader_T.h
          Small refactoring to prevent code duplication

27 files changed, 177 insertions, 467 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index bd8e09feec2..a8d7b806340 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,40 @@
+Mon Nov  9 19:32:42 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc
+        * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
+        * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h
+        * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc
+        * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp
+        * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
+        * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.h
+        * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc
+        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
+        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.h
+        * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp
+        * connectors/dds4ccm/impl/ndds/Connector_T.h
+        * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp
+        * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h
+        * connectors/dds4ccm/impl/ndds/Getter_T.cpp
+        * connectors/dds4ccm/impl/ndds/Getter_T.h
+        * connectors/dds4ccm/impl/ndds/NDDS_Traits.h
+        * connectors/dds4ccm/impl/ndds/SampleInfo.h
+        * connectors/dds4ccm/impl/ndds/Writer_T.cpp
+        * connectors/dds4ccm/impl/ndds/Writer_T.h
+          Use the new RTI Corba kit feature to put the generated code in its
+          own library. Moved CCM sequence to the connector traits.
+
+        * connectors/dds4ccm/impl/ndds/Builtin_Writer_T.cpp
+        * connectors/dds4ccm/impl/ndds/Builtin_Writer_T.h
+          Deleted, not used anymore. No buildit types are supported
+
+        * connectors/dds4ccm/impl/ndds/Reader.cpp
+        * connectors/dds4ccm/impl/ndds/Reader.h
+          Deleted, not used at all
+
+        * connectors/dds4ccm/impl/ndds/Reader_T.cpp
+        * connectors/dds4ccm/impl/ndds/Reader_T.h
+          Small refactoring to prevent code duplication
+
 Mon Nov  9 19:11:42 UTC 2009  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl:
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc
index b6b50bb2a06..21cf204e93c 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc
@@ -5,7 +5,7 @@ project(DDS_Hello_Base_idl_gen) : taoidldefaults, anytypecode {
   idlflags -= -St -Sa
   idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=HELLO_BASE_STUB_Export \
-              -Wb,stub_export_include=Hello_Base_stub_export.h -GT
+              -Wb,stub_export_include=Hello_Base_stub_export.h
 
   IDL_Files {
     Hello_Base.idl
@@ -28,6 +28,7 @@ project(DDS_Hello_Base_NDDS_TS) : nddslib, taolib {
   libout = ../lib
   libpaths    += ../lib
   sharedname = DDS_Hello_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
 
   Source_Files {
     Hello_Base.cxx
@@ -40,7 +41,7 @@ project(DDS_Hello_Base_NDDS_TS) : nddslib, taolib {
     Hello_BasePlugin.h
     Hello_BaseSupport.h
   }
-  
+
   Inline_Files {
   }
 }
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
index 5989b2902df..da0cfe88ec2 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
@@ -82,9 +82,9 @@ project(DDS_Hello_Connector_stub) : ccm_stub, dds4ccm_base   {
 }
 
 project(DDS_Hello_Connector_exec) : ciao_executor, dds4ccm_skel, nddslib {
-  after   += DDS_Hello_Connector_lem_stub DDS_Hello_Connector_stub DDS4CCM_lem_stub CIAO_DDS4CCM_NDDS_Impl DDS_Hello_Base_ndds_ts_gen
+  after   += DDS_Hello_Connector_lem_stub DDS_Hello_Connector_stub DDS4CCM_lem_stub CIAO_DDS4CCM_NDDS_Impl DDS_Hello_Base_NDDS_TS
   sharedname = DDS_Hello_Connector_exec
-  libs += DDS_Hello_Connector_stub DDS_Hello_Connector_lem_stub DDS_Hello_Base_stub CIAO_DDS4CCM_NDDS_Impl DDS4CCM_lem_stub
+  libs += DDS_Hello_Connector_stub DDS_Hello_Connector_lem_stub DDS_Hello_Base_stub CIAO_DDS4CCM_NDDS_Impl DDS4CCM_lem_stub DDS_Hello_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
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 2556097e094..a50c75d6a64 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h
@@ -24,9 +24,8 @@ namespace CIAO_Hello_Hello_Connector_Impl
 {
 
   // @from use of DDSHello as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
     DDSHello,
-    DDSHello_Seq,
     DDSHelloSeq,
     DDSHelloTypeSupport,
     DDSHelloDataWriter,
@@ -34,6 +33,7 @@ namespace CIAO_Hello_Hello_Connector_Impl
 
   typedef Connector_Traits <
     ::CIAO_Hello_Hello_Connector_Impl::Hello_Connector_Exec,
+    DDSHello_Seq,
     ::CCM_DDS::CCM_DDSHello_Writer,
     ::CCM_DDS::CCM_DDSHello_Updater,
     ::CCM_DDS::CCM_DDSHello_Getter,
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc
index f7f6ad298ce..60af70abeb3 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc
@@ -6,7 +6,7 @@ project(DDS_Quoter_Base_idl_gen) : taoidldefaults, anytypecode {
   idlflags -= -St -Sa
   idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=QUOTER_BASE_STUB_Export \
-              -Wb,stub_export_include=Quoter_Base_stub_export.h -GT 
+              -Wb,stub_export_include=Quoter_Base_stub_export.h
 
   IDL_Files {
     Quoter_Base.idl
@@ -29,6 +29,7 @@ project(DDS_Quoter_Base_NDDS_TS) : nddslib, taolib {
   libout = ../lib
   libpaths    += ../lib
   sharedname = DDS_Quoter_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
 
   Source_Files {
     Quoter_Base.cxx
@@ -41,7 +42,7 @@ project(DDS_Quoter_Base_NDDS_TS) : nddslib, taolib {
     Quoter_BasePlugin.h
     Quoter_BaseSupport.h
   }
-  
+
   Inline_Files {
   }
 }
@@ -50,6 +51,7 @@ project(DDS_Quoter_Base_stub) : ccm_stub {
   after += DDS_Quoter_Base_idl_gen
   libs  +=
   libout = ../lib
+  libpaths    += ../lib
   sharedname = DDS_Quoter_Base_stub
   dynamicflags   = QUOTER_BASE_STUB_BUILD_DLL
 
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp
index 80afddef685..c307a971123 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp
@@ -89,7 +89,7 @@ namespace CIAO_Quoter_Broker_Impl
         ACE_ERROR_RETURN ((LM_ERROR,
                           "Unable to setup Timer\n"),
                             -1);
-  
+
       }
 
     this->active_ = 1;
@@ -151,7 +151,7 @@ namespace CIAO_Quoter_Broker_Impl
 
     return 0;
   }
-  
+
   void
   Broker_exec_i::read_one (void)
   {
@@ -196,8 +196,7 @@ namespace CIAO_Quoter_Broker_Impl
       }
     if(stock_infos->length()!= 0)
       {
-        int nr_of_stock_infos = stock_infos->length();
-        for(CORBA::ULong i = 0; i < (CORBA::ULong)nr_of_stock_infos; i ++)
+        for(CORBA::ULong i = 0; i < stock_infos->length(); i ++)
           {
             printf ("Stock_Info_Read_All: Number %d : received a stock_info for <%s> at %u:%u:%u\n",
                 i,
@@ -325,38 +324,38 @@ namespace CIAO_Quoter_Broker_Impl
   {
     printf("ConnectorStatusListener_exec_i::on_inconsistent_topic\n");
   }
-  
+
   void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
     ::DDS::DataReader_ptr /*the_reader*/,
-     const DDS::RequestedIncompatibleQosStatus & /*status*/)  
+     const DDS::RequestedIncompatibleQosStatus & /*status*/)
   {
     printf("ConnectorStatusListener_exec_i::on_requested_incompatible_qos\n");
   }
-  
+
   void ConnectorStatusListener_exec_i::on_sample_rejected(
      ::DDS::DataReader_ptr /*the_reader*/,
-     const DDS::SampleRejectedStatus & /*status*/)  
+     const DDS::SampleRejectedStatus & /*status*/)
   {
     printf("ConnectorStatusListener_exec_i::on_sample_rejected\n");
   }
 
   void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
      ::DDS::DataWriter_ptr /*the_writer*/,
-     const DDS::OfferedDeadlineMissedStatus & /*status*/)  
+     const DDS::OfferedDeadlineMissedStatus & /*status*/)
   {
     printf("ConnectorStatusListener_exec_i::on_offered_deadline_missed\n");
   }
-  
+
   void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
      ::DDS::DataWriter_ptr /*the_writer*/,
-     const DDS::OfferedIncompatibleQosStatus & /*status*/)  
+     const DDS::OfferedIncompatibleQosStatus & /*status*/)
   {
     printf("ConnectorStatusListener_exec_i::on_offered_incompatible_qos\n");
   }
-  
+
   void ConnectorStatusListener_exec_i::on_unexpected_status(
     ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind  /*status_kind*/)  
+    ::DDS::StatusKind  /*status_kind*/)
   {
     printf("ConnectorStatusListener_exec_i::on_unexpected_status\n");
   }
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
index 5b1e59e08b6..c9719b46c84 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
@@ -83,9 +83,9 @@ project(DDS_Quoter_Connector_stub) : ccm_stub, dds4ccm_base   {
 }
 
 project(DDS_Quoter_Connector_exec) : ciao_executor, dds4ccm_skel, nddslib {
-  after   += DDS_Quoter_Connector_lem_stub DDS_Quoter_Connector_stub DDS4CCM_lem_stub CIAO_DDS4CCM_NDDS_Impl DDS_Quoter_Base_ndds_ts_gen
+  after   += DDS_Quoter_Connector_lem_stub DDS_Quoter_Connector_stub DDS4CCM_lem_stub CIAO_DDS4CCM_NDDS_Impl DDS_Quoter_Base_NDDS_TS
   sharedname = DDS_Quoter_Connector_exec
-  libs += DDS_Quoter_Connector_stub DDS_Quoter_Connector_lem_stub DDS_Quoter_Base_stub CIAO_DDS4CCM_NDDS_Impl DDS4CCM_lem_stub
+  libs += DDS_Quoter_Connector_stub DDS_Quoter_Connector_lem_stub DDS_Quoter_Base_stub CIAO_DDS4CCM_NDDS_Impl DDS4CCM_lem_stub DDS_Quoter_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -96,10 +96,6 @@ project(DDS_Quoter_Connector_exec) : ciao_executor, dds4ccm_skel, nddslib {
 
   Source_Files {
     Quoter_Connector_exec.cpp
-    ../Base/Quoter_Base.cxx
-    ../Base/Quoter_BasePlugin.cxx
-    ../Base/Quoter_BaseSupport.cxx
-
   }
 
   Header_Files {
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 db88acc001d..4f2654f01d0 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.h
@@ -26,7 +26,6 @@ namespace CIAO_Quoter_Quoter_Connector_Impl
   // @from use of Stock_Info as a parameter
   typedef CIAO::DDS4CCM::RTI::Type_Traits < 
     ::Quoter::Stock_Info,
-    ::Quoter::Stock_Info_Seq,
     ::Quoter::Stock_InfoSeq,
     ::Quoter::Stock_InfoTypeSupport,
     ::Quoter::Stock_InfoDataWriter,
@@ -34,6 +33,7 @@ namespace CIAO_Quoter_Quoter_Connector_Impl
 
   typedef Connector_Traits <
     ::CIAO_Quoter_Quoter_Connector_Impl::Quoter_Connector_Exec,
+    ::Quoter::Stock_Info_Seq,
     ::CCM_DDS::CCM_Stock_Info_Writer,
     ::CCM_DDS::CCM_Stock_Info_Updater,
     ::CCM_DDS::CCM_Stock_Info_Getter,
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc
index 019aa2925e6..9751d9fa726 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc
@@ -6,7 +6,7 @@ project(DDS_Shapes_Base_idl_gen) : taoidldefaults, anytypecode {
   idlflags -= -St -Sa
   idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=SHAPES_BASE_STUB_Export \
-              -Wb,stub_export_include=Shapes_Base_stub_export.h -GT
+              -Wb,stub_export_include=Shapes_Base_stub_export.h
 
   IDL_Files {
     Shapes_Base.idl
@@ -29,6 +29,7 @@ project(DDS_Shapes_Base_NDDS_TS) : nddslib, taolib {
   libout = ../lib
   libpaths    += ../lib
   sharedname = DDS_Shapes_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
 
   Source_Files {
     Shapes_Base.cxx
@@ -41,17 +42,17 @@ project(DDS_Shapes_Base_NDDS_TS) : nddslib, taolib {
     Shapes_BasePlugin.h
     Shapes_BaseSupport.h
   }
-  
+
   Inline_Files {
   }
 }
 
 project(DDS_Shapes_Base_stub) : ccm_stub {
   after += DDS_Shapes_Base_idl_gen
-  libs  +=
   libout = ../lib
+  libpaths += ../lib
   sharedname = DDS_Shapes_Base_stub
-  dynamicflags   = SHAPES_BASE_STUB_BUILD_DLL
+  dynamicflags = SHAPES_BASE_STUB_BUILD_DLL
 
   IDL_Files {
   }
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
index 2fac3a28494..2ec80cdea02 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
@@ -83,9 +83,9 @@ project(DDS_Shapes_Connector_stub) : ccm_stub, dds4ccm_base   {
 }
 
 project(DDS_Shapes_Connector_exec) : ciao_executor, dds4ccm_skel, nddslib {
-  after   += DDS_Shapes_Connector_lem_stub DDS_Shapes_Connector_stub DDS4CCM_lem_stub CIAO_DDS4CCM_NDDS_Impl DDS_Shapes_Base_ndds_ts_gen
+  after   += DDS_Shapes_Connector_lem_stub DDS_Shapes_Connector_stub DDS4CCM_lem_stub CIAO_DDS4CCM_NDDS_Impl DDS_Shapes_Base_NDDS_TS
   sharedname = DDS_Shapes_Connector_exec
-  libs += DDS_Shapes_Connector_stub DDS_Shapes_Connector_lem_stub DDS_Shapes_Base_stub CIAO_DDS4CCM_NDDS_Impl DDS4CCM_lem_stub
+  libs += DDS_Shapes_Connector_stub DDS_Shapes_Connector_lem_stub DDS_Shapes_Base_stub CIAO_DDS4CCM_NDDS_Impl DDS4CCM_lem_stub DDS_Shapes_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -96,10 +96,6 @@ project(DDS_Shapes_Connector_exec) : ciao_executor, dds4ccm_skel, nddslib {
 
   Source_Files {
     Shapes_Connector_exec.cpp
-    ../Base/Shapes_Base.cxx
-    ../Base/Shapes_BasePlugin.cxx
-    ../Base/Shapes_BaseSupport.cxx
-
   }
 
   Header_Files {
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 9af586b71a2..01b7a7f5d0e 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.h
@@ -26,7 +26,6 @@ namespace CIAO_Shapes_Shapes_Connector_Impl
   // @from use of ShapeType as a parameter
   typedef CIAO::DDS4CCM::RTI::Type_Traits < 
     ShapeType,
-    ShapeType_Seq,
     ShapeTypeSeq,
     ShapeTypeTypeSupport,
     ShapeTypeDataWriter,
@@ -34,6 +33,7 @@ namespace CIAO_Shapes_Shapes_Connector_Impl
 
   typedef Connector_Traits <
     ::CIAO_Shapes_Shapes_Connector_Impl::Shapes_Connector_Exec,
+    ShapeType_Seq,
     ::CCM_DDS::CCM_ShapeType_Writer,
     ::CCM_DDS::CCM_ShapeType_Updater,
     ::CCM_DDS::CCM_ShapeType_Getter,
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp
index 73a43c00790..25367eb795b 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp
@@ -37,17 +37,17 @@ namespace CIAO_Shapes_Receiver_Impl
   //============================================================
   // Facet Executor Implementation Class: ShapeType_RawListener_exec_i
   //============================================================
-  
+
   ShapeType_RawListener_exec_i::ShapeType_RawListener_exec_i (void)
   {
   }
-  
+
   ShapeType_RawListener_exec_i::~ShapeType_RawListener_exec_i (void)
   {
   }
-  
+
   // Operations from ::CCM_DDS::ShapeType_RawListener
-  
+
   void
   ShapeType_RawListener_exec_i::on_data (
     const ShapeType & an_instance ,
@@ -63,17 +63,17 @@ namespace CIAO_Shapes_Receiver_Impl
   //============================================================
   // Facet Executor Implementation Class: PortStatusListener_exec_i
   //============================================================
-  
+
   PortStatusListener_exec_i::PortStatusListener_exec_i (void)
   {
   }
-  
+
   PortStatusListener_exec_i::~PortStatusListener_exec_i (void)
   {
   }
-  
+
   // Operations from ::CCM_DDS::PortStatusListener
-  
+
   void
   PortStatusListener_exec_i::on_requested_deadline_missed (
     ::DDS::DataReader_ptr /* the_reader */,
@@ -81,33 +81,33 @@ namespace CIAO_Shapes_Receiver_Impl
   {
     /* Your code here. */
   }
-  
+
   void
   PortStatusListener_exec_i::on_sample_lost (
     ::DDS::DataReader_ptr /* the_reader */,
     const ::DDS::SampleLostStatus & /* status */)
   {
-   
+
   }
-  
+
   //============================================================
   // Component Executor Implementation Class: Receiver_exec_iShapeType_RawListener_exec_i ();
   //============================================================
-  
+
   Receiver_exec_i::Receiver_exec_i (void)
     : rate_ (0),
       get_data_ (true),
       read_data_ (true),
       raw_listen_ (false)
-    
+
   {
     this->ticker_ = new read_action_Generator (*this);
   }
-  
+
   Receiver_exec_i::~Receiver_exec_i (void)
   {
   }
-  
+
   // Supported operations and attributes.
   void
   Receiver_exec_i::read_one (void)
@@ -140,7 +140,7 @@ namespace CIAO_Shapes_Receiver_Impl
                   ACE_TEXT ("no shape_info receieved\n")));
       }
   }
-   
+
   void
   Receiver_exec_i::read_all (void)
   {
@@ -158,7 +158,7 @@ namespace CIAO_Shapes_Receiver_Impl
                             time->tm_sec,
                             readinfoseq[i].timestamp.nanosec));
       }
-    for(CORBA::ULong i = 0; i < (CORBA::ULong)shape_infos->length(); ++i)
+    for(CORBA::ULong i = 0; i < shape_infos->length(); ++i)
       {
         CIAO_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL Shape Info : ")
               ACE_TEXT ("Number <%d> : received shape_info for <%s> at %u:%u:%u\n"),
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Builtin_Writer_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Builtin_Writer_T.cpp
deleted file mode 100644
index 831effde54a..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/Builtin_Writer_T.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-// $Id$
-#include "dds4ccm/impl/ndds/DataWriter.h"
-#include "dds4ccm/impl/ndds/Utils.h"
-
-#include "ciao/Logger/Log_Macros.h"
-
-// Implementation skeleton constructor
-template <typename DDS_TYPE, typename CCM_TYPE >
-CIAO::DDS4CCM::RTI::Builtin_Writer_T<DDS_TYPE, CCM_TYPE>::Builtin_Writer_T (::DDS::DataWriter_ptr writer)
-  : impl_ (0)
-{
-  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Builtin_Writer_T::Builtin_Writer_T");
-
-  RTI_DataWriter_i *rdw = dynamic_cast <RTI_DataWriter_i *> (writer);
-
-  if (rdw == 0)
-    {
-      CIAO_ERROR ((LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Builtin_Writer_T::Builtin_Writer_T - "
-                   "Unable to cast provided DataWriter to servant\n"));
-      throw CORBA::INTERNAL ();
-    }
-
-  impl_ =  DDS_TYPE::data_writer::narrow (rdw->get_datawriter ());
-
-  if (!impl_)
-    {
-      CIAO_ERROR ((LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Builtin_Writer_T::Builtin_Writer_T - "
-                   "Unable to narrow the provided writer entity to the specific "
-                   "type necessary to publish messages\n"));
-      throw CORBA::INTERNAL ();
-    }
-}
-
-// Implementation skeleton destructor
-template <typename DDS_TYPE, typename CCM_TYPE >
-CIAO::DDS4CCM::RTI::Builtin_Writer_T<DDS_TYPE, CCM_TYPE>::~Builtin_Writer_T (void)
-{
-  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Builtin_Writer_T::~Builtin_Writer_T");
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE >
-void
-CIAO::DDS4CCM::RTI::Builtin_Writer_T<DDS_TYPE, CCM_TYPE>::write (const typename DDS_TYPE::value_type & an_instance)
-{
-  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Builtin_Writer_T::write");
-
-  /*
-  if (CORBA::is_nil (an_instance))
-    {
-      CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO::DDS4CCM::RTI::Builtin_Writer_T::write - "
-                   "Write was provided a null instance to write\n"));
-      return;
-    }
-  */
-
-  CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO::DDS4CCM::RTI::Builtin_Writer_T::write - "
-               "Preparing to write to DDS\n"));
-  DDS_ReturnCode_t retval = this->impl_->write (an_instance,
-                                                DDS_HANDLE_NIL);
-
-  if (retval != DDS_RETCODE_OK)
-    {
-      CIAO_ERROR ((LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Builtin_Writer_T::write - "
-                   "Write unsuccessful, received error code %C\n",
-                   translate_retcode (retval)));
-      throw CCM_DDS::InternalError (retval, 0);
-    }
-
-  CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO::DDS4CCM::RTI::Builtin_Writer_T::write - "
-               "Write successful\n"));
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE >
-void
-CIAO::DDS4CCM::RTI::Builtin_Writer_T<DDS_TYPE, CCM_TYPE>::write (const typename DDS_TYPE::seq_type& instances, bool coherent_write)
-{
-  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Builtin_Writer_T::write");
-
-  if (coherent_write)
-    {
-      this->impl_->get_publisher()->begin_coherent_changes ();
-    }
-
-  CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO::DDS4CCM::RTI::Builtin_Writer_T::write - "
-               "Preparing to write to DDS\n"));
-  for (::DDS_Long index = 0; index < instances.length(); index++)
-    {
-      DDS_ReturnCode_t retval = this->impl_->write (instances[index],
-                                     DDS_HANDLE_NIL);
-
-      if (retval != DDS_RETCODE_OK)
-        {
-         CIAO_ERROR ((LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Builtin_Writer_T::write - "
-                       "Write unsuccessful, received error code %C\n",
-                       translate_retcode (retval)));
-          throw CCM_DDS::InternalError (retval, index);
-        }
-    }
-
-  if (coherent_write)
-    {
-      this->impl_->get_publisher()->end_coherent_changes ();
-    }
-
-  CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO::DDS4CCM::RTI::Builtin_Writer_T::write - "
-               "Write successful\n"));
-}
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Builtin_Writer_T.h b/CIAO/connectors/dds4ccm/impl/ndds/Builtin_Writer_T.h
deleted file mode 100644
index a8d05883a7e..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/Builtin_Writer_T.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * @author Johnny Willemsen <jwillemsen@remedy.nl>
- *
- * $Id$
- *
- * Wrapper facade for NDDS.
- */
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ace/Copy_Disabled.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    namespace RTI
-    {
-      template <typename DDS_TYPE, typename CCM_TYPE>
-      class Builtin_Writer_T : private ACE_Copy_Disabled
-      {
-      public:
-        /// Constructor
-        Builtin_Writer_T (::DDS::DataWriter_ptr dw);
-
-        /// Destructor
-        virtual ~Builtin_Writer_T (void);
-
-        virtual void write (const typename DDS_TYPE::value_type& an_instance);
-
-        virtual void write (const typename DDS_TYPE::seq_type& instances, bool coherent_write);
-      private:
-        typename DDS_TYPE::data_writer *impl_;
-      };
-    }
-  }
-}
-
-#include "dds4ccm/impl/ndds/Builtin_Writer_T.cpp"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Connector_T.h b/CIAO/connectors/dds4ccm/impl/ndds/Connector_T.h
index d3df3b0ce77..1a83d48cc7d 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Connector_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Connector_T.h
@@ -99,6 +99,7 @@ private:
 };
 
   template <typename BASE_TYPE,
+            typename SEQ_TYPE,
             typename WRITER_TYPE,
             typename UPDATER_TYPE,
             typename GETTER_TYPE,
@@ -111,6 +112,7 @@ private:
   struct Connector_Traits
   {
     typedef BASE_TYPE base_type;
+    typedef SEQ_TYPE seq_type;
     typedef WRITER_TYPE writer_type;
     typedef UPDATER_TYPE updater_type;
     typedef GETTER_TYPE getter_type;
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp
index 3080d92add9..42316df8d3f 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp
@@ -10,10 +10,10 @@ CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE>::DataWriterListener_T (
       typename CCM_TYPE::context_type::_ptr_type context,
       ACE_Atomic_Op <TAO_SYNCH_MUTEX, bool> &enabled)
       : context_ (CCM_TYPE::context_type::_duplicate (context)),
+        info_out_connector_status_ (CCM_DDS::ConnectorStatusListener::_duplicate (context->get_connection_error_listener ())),
         enable_ (enabled)
 {
   CIAO_TRACE ("CIAO::DDS4CCM::DataWriterListener_T::DataWriterListener_T");
-  this->info_out_connector_status_ = this->context_->get_connection_error_listener ();
 }
 
 // Implementation skeleton destructor
@@ -59,3 +59,17 @@ CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE>::on_publication_matched
   this->info_out_connector_status_->on_unexpected_status (the_Writer, ::DDS::PUBLICATION_MATCHED_STATUS);
 }
 
+template <typename DDS_TYPE, typename CCM_TYPE>
+bool
+CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE>::enabled (void) const
+{
+  return this->enabled_;
+}
+
+template <typename DDS_TYPE, typename CCM_TYPE>
+void
+CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE>::enabled (bool enabled)
+{
+  this->enabled_ = enabled;
+}
+
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.h
index 6c4321dd3f1..6e95062a8e9 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.h
@@ -49,7 +49,6 @@ namespace CIAO
 
     private:
       typename CCM_TYPE::context_type::_var_type context_;
-
       CCM_DDS::ConnectorStatusListener_var  info_out_connector_status_;
       ACE_Atomic_Op <TAO_SYNCH_MUTEX, bool> &enable_;
     };
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.cpp
index f93f81efc3e..ea5cd3e8132 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.cpp
@@ -79,7 +79,7 @@ CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE>::wait (
 template <typename DDS_TYPE, typename CCM_TYPE >
 bool
 CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE>::get_all (
-          typename DDS_TYPE::seq_type::_out_type instances,
+          typename CCM_TYPE::seq_type::_out_type instances,
           ::CCM_DDS::ReadInfoSeq_out infos)
 {
   ACE_UNUSED_ARG (instances);
@@ -90,7 +90,7 @@ CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE>::get_all (
 template <typename DDS_TYPE, typename CCM_TYPE >
 bool
 CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE>::get_all_history (
-          typename DDS_TYPE::seq_type::_out_type instances,
+          typename CCM_TYPE::seq_type::_out_type instances,
           ::CCM_DDS::ReadInfoSeq_out infos)
 {
   DDSConditionSeq active_conditions;
@@ -168,7 +168,7 @@ template <typename DDS_TYPE, typename CCM_TYPE >
 bool
 CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE>::get_one_history (
           const typename DDS_TYPE::value_type& an_instance,
-          typename DDS_TYPE::seq_type::_out_type instances,
+          typename CCM_TYPE::seq_type::_out_type instances,
           ::CCM_DDS::ReadInfoSeq_out infos)
 {
   ACE_UNUSED_ARG (an_instance);
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.h b/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.h
index a13a24bff0a..97aedb17bc9 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.h
@@ -29,11 +29,11 @@ namespace CIAO
         virtual ~Getter_T (void);
 
         virtual bool get_all (
-          typename DDS_TYPE::seq_type::_out_type instances,
+          typename CCM_TYPE::seq_type::_out_type instances,
           ::CCM_DDS::ReadInfoSeq_out infos);
 
         virtual bool get_all_history (
-          typename DDS_TYPE::seq_type::_out_type instances,
+          typename CCM_TYPE::seq_type::_out_type instances,
           ::CCM_DDS::ReadInfoSeq_out infos);
 
         virtual bool get_one (
@@ -42,7 +42,7 @@ namespace CIAO
 
         virtual bool get_one_history (
           const typename DDS_TYPE::value_type& an_instance,
-          typename DDS_TYPE::seq_type::_out_type instances,
+          typename CCM_TYPE::seq_type::_out_type instances,
           ::CCM_DDS::ReadInfoSeq_out infos);
 
         virtual bool get_next (
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/NDDS_Traits.h b/CIAO/connectors/dds4ccm/impl/ndds/NDDS_Traits.h
index fcaddb97709..d1b55e9e010 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/NDDS_Traits.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/NDDS_Traits.h
@@ -27,7 +27,6 @@ namespace CIAO
        * struct, so long as all of the needed fields are filled in.
        */
       template <typename VALUE_TYPE,
-                typename SEQ_TYPE,
                 typename DDS_SEQ_TYPE,
                 typename TYPE_SUPPORT,
                 typename DATA_WRITER,
@@ -35,7 +34,6 @@ namespace CIAO
       struct Type_Traits
       {
         typedef VALUE_TYPE value_type;
-        typedef SEQ_TYPE seq_type;
         typedef DDS_SEQ_TYPE dds_seq_type;
         typedef TYPE_SUPPORT type_support;
         typedef DATA_WRITER data_writer;
@@ -44,7 +42,6 @@ namespace CIAO
 
       typedef Type_Traits < const char *,
                             DDS_StringSeq,
-                            DDS_StringSeq,
                             DDSStringTypeSupport,
                             DDSStringDataWriter,
                             DDSStringDataReader > String_Traits;
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Reader.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Reader.cpp
deleted file mode 100644
index 1dc38146250..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/Reader.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-// $Id$
-
-#include "Reader.h"
-
-// Implementation skeleton constructor
-CCM_DDS_string_Reader_i::CCM_DDS_string_Reader_i (void)
-{
-}
-
-// Implementation skeleton destructor
-CCM_DDS_string_Reader_i::~CCM_DDS_string_Reader_i (void)
-{
-}
-
-void CCM_DDS_string_Reader_i::read_all (
-  ::CCM_DDS::string_Reader::stringSeq_out instances,
-  ::CCM_DDS::ReadInfoSeq_out infos)
-{
-  // Add your implementation here
-}
-
-void CCM_DDS_string_Reader_i::read_all_history (
-  ::CCM_DDS::string_Reader::stringSeq_out instances,
-  ::CCM_DDS::ReadInfoSeq_out infos)
-{
-  // Add your implementation here
-}
-
-void CCM_DDS_string_Reader_i::read_one (
-  char *& an_instance,
-  ::CCM_DDS::ReadInfo_out info)
-{
-  // Add your implementation here
-}
-
-void CCM_DDS_string_Reader_i::read_one_history (
-  const char * an_instance,
-  ::CCM_DDS::string_Reader::stringSeq_out instances,
-  ::CCM_DDS::ReadInfoSeq_out infos)
-{
-  // Add your implementation here
-}
-
-::CCM_DDS::QueryFilter * CCM_DDS_string_Reader_i::filter (void)
-{
-  // Add your implementation here
-}
-
-void CCM_DDS_string_Reader_i::filter (
-  const ::CCM_DDS::QueryFilter & filter)
-{
-  // Add your implementation here
-}
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Reader.h b/CIAO/connectors/dds4ccm/impl/ndds/Reader.h
deleted file mode 100644
index 15358976d0c..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/Reader.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// $Id$
-
-class  CCM_DDS_string_Reader_i
-  : public virtual POA_CCM_DDS::string_Reader
-{
-public:
-  // Constructor
-  CCM_DDS_string_Reader_i (void);
-
-  // Destructor
-  virtual ~CCM_DDS_string_Reader_i (void);
-
-  virtual
-  void read_all (
-    ::CCM_DDS::string_Reader::stringSeq_out instances,
-    ::CCM_DDS::ReadInfoSeq_out infos);
-
-  virtual
-  void read_all_history (
-    ::CCM_DDS::string_Reader::stringSeq_out instances,
-    ::CCM_DDS::ReadInfoSeq_out infos);
-
-  virtual
-  void read_one (
-    char *& an_instance,
-    ::CCM_DDS::ReadInfo_out info);
-
-  virtual
-  void read_one_history (
-    const char * an_instance,
-    ::CCM_DDS::string_Reader::stringSeq_out instances,
-    ::CCM_DDS::ReadInfoSeq_out infos);
-
-  virtual
-  ::CCM_DDS::QueryFilter * filter (void);
-
-  virtual
-  void filter (
-    const ::CCM_DDS::QueryFilter & filter);
-};
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.cpp
index 82babbb5354..29a2adf6f80 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.cpp
@@ -1,20 +1,36 @@
 // $Id$
+
 #include "dds4ccm/impl/ndds/DataReader.h"
 #include "dds4ccm/impl/ndds/Utils.h"
 #include "dds4ccm/impl/ndds/SampleInfo.h"
-
-
-
 #include "ciao/Logger/Log_Macros.h"
 
 // Implementation skeleton constructor
 template <typename DDS_TYPE, typename CCM_TYPE >
 CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::Reader_T (::DDS::DataReader_ptr reader)
-: reader_ (reader),
-  condition_(0)
+  : impl_ (0),
+    reader_ (reader)
 {
   CIAO_TRACE ("CIAO::DDS4CCM::RTI::Reader_T::Reader_T");
-  ACE_UNUSED_ARG (reader);
+
+  RTI_DataReader_i *rdr = dynamic_cast <RTI_DataReader_i *> (this->reader_);
+  if (!rdr)
+    {
+      CIAO_ERROR ((LM_ERROR, CLINFO ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::Reader_T - ")
+                   ACE_TEXT ("Unable to cast provided DataReader to servant\n")));
+      throw CORBA::INTERNAL ();
+    }
+
+  this->impl_ =  DDS_TYPE::data_reader::narrow (rdr->get_datareader ());
+
+  if (!this->impl_)
+    {
+      CIAO_ERROR ((LM_ERROR, CLINFO ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::Reader_T - ")
+                    ACE_TEXT ("Unable to narrow the provided reader entity to the specific ")
+                    ACE_TEXT ("type necessary to publish messages\n")));
+      throw CORBA::INTERNAL ();
+    }
+
 }
 
 // Implementation skeleton destructor
@@ -31,50 +47,23 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::~Reader_T (void)
 template <typename DDS_TYPE, typename CCM_TYPE >
 void
 CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_all (
-  typename DDS_TYPE::seq_type::_out_type instances,
+  typename CCM_TYPE::seq_type::_out_type instances,
   ::CCM_DDS::ReadInfoSeq_out infos)
 {
   //this function has to return the last sample of all instances
-  typename DDS_TYPE::seq_type::_var_type  inst_seq = new typename DDS_TYPE::seq_type;
+  typename CCM_TYPE::seq_type::_var_type  inst_seq = new typename CCM_TYPE::seq_type;
   ::CCM_DDS::ReadInfoSeq_var infoseq = new ::CCM_DDS::ReadInfoSeq;
 
-  RTI_DataReader_i *rdr = dynamic_cast <RTI_DataReader_i *> (this->reader_);
-  if (rdr == 0)
-    {
-      CIAO_ERROR ((LM_ERROR, CLINFO ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_all - ")
-                   ACE_TEXT ("Unable to cast provided DataReader to servant\n")));
-      throw CORBA::INTERNAL ();
-    }
-
-  typename DDS_TYPE::data_reader*
-      impl =  DDS_TYPE::data_reader::narrow (rdr->get_datareader ());
-
-  if (!impl)
-    {
-      CIAO_ERROR ((LM_ERROR, CLINFO ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_all - ")
-                    ACE_TEXT ("Unable to narrow the provided reader entity to the specific ")
-                    ACE_TEXT ("type necessary to publish messages\n")));
-      throw CORBA::INTERNAL ();
-    }
-
   DDS_SampleInfoSeq sample_info;
-  DDS_ReturnCode_t retval = DDS_RETCODE_NO_DATA;
   typename DDS_TYPE::dds_seq_type data;
   // DDS_TYPE::dds_seq_type = dds sequence
-  // DDS_TYPE::seq_type = ccm sequence
-  if (this->condition_)
-    {
-        // retval =  impl->read_w_condition (data, sample_info, 1, this->condition_);
-    }
-  else
-    {
-      retval = impl->read ( data,
+  // CCM_TYPE::seq_type = ccm sequence
+  DDS_ReturnCode_t retval = this->impl_->read ( data,
                             sample_info,
                             DDS_LENGTH_UNLIMITED,
                             DDS_READ_SAMPLE_STATE | DDS_NOT_READ_SAMPLE_STATE ,
                             DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,
                             DDS_ALIVE_INSTANCE_STATE);
-    }
 
   CORBA::ULong ix = 0;
   CORBA::ULong nr_of_last_samples = 0;
@@ -88,23 +77,23 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_all (
         //infoseq <<= sample_info; ??
 
         // count the last samples of all instances
-        for (CORBA::ULong i = 0 ; i < (CORBA::ULong)sample_info.length(); i++)
+        for (::DDS_Long i = 0 ; i < sample_info.length(); i++)
           {
             if((sample_info[i].sample_rank == 0) && (sample_info[i].valid_data))
               {
-                nr_of_last_samples++;
+                ++nr_of_last_samples;
               }
           }
         infoseq->length(nr_of_last_samples);
         inst_seq->length(nr_of_last_samples);
         // we need only the last sample of each instance
-        for (CORBA::ULong i = 0 ; i < (CORBA::ULong)sample_info.length(); i++)
+        for (::DDS_Long i = 0 ; i < sample_info.length(); i++)
           {
             if((sample_info[i].sample_rank == 0) && (sample_info[i].valid_data))
               {
                 sample_info[i].reception_timestamp >>= infoseq[ix].timestamp;
                 inst_seq[ix] = data[i];
-                ix++;
+                ++ix;
               }
           }
         break;
@@ -118,7 +107,7 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_all (
         break;
     }
   //return the loan
-  impl->return_loan(data,sample_info);
+  this->impl_->return_loan(data,sample_info);
   infos = infoseq._retn ();
   instances = inst_seq._retn();
 }
@@ -126,53 +115,25 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_all (
 template <typename DDS_TYPE, typename CCM_TYPE >
 void
 CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_all_history (
-          typename DDS_TYPE::seq_type::_out_type instances,
+          typename CCM_TYPE::seq_type::_out_type instances,
           ::CCM_DDS::ReadInfoSeq_out infos)
 {
   //this function has to return all samples of all instances
-  typename DDS_TYPE::seq_type::_var_type  inst_seq = new typename DDS_TYPE::seq_type;
+  typename CCM_TYPE::seq_type::_var_type  inst_seq = new typename CCM_TYPE::seq_type;
   ::CCM_DDS::ReadInfoSeq_var infoseq = new ::CCM_DDS::ReadInfoSeq;
 
-
-  RTI_DataReader_i *rdr = dynamic_cast <RTI_DataReader_i *> (this->reader_);
-  if (rdr == 0)
-    {
-      CIAO_ERROR ((LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::read_all_history - "
-                    "Unable to cast provided DataReader to servant\n"));
-      throw CORBA::INTERNAL ();
-    }
-
-  typename DDS_TYPE::data_reader*
-      impl =  DDS_TYPE::data_reader::narrow (rdr->get_datareader ());
-
-
-  if (!impl)
-    {
-      CIAO_ERROR ((LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::read_all_history - "
-                   "Unable to narrow the provided reader entity to the specific "
-                   "type necessary to publish messages\n"));
-      throw CORBA::INTERNAL ();
-    }
-
   DDS_SampleInfoSeq sample_info;
   DDS_ReturnCode_t retval = DDS_RETCODE_NO_DATA;
   typename DDS_TYPE::dds_seq_type data;
 
   // DDS_TYPE::dds_seq_type = dds sequence
-  // DDS_TYPE::seq_type = ccm sequence
-  if (this->condition_)
-    {
-      // retval =  impl->read_w_condition (data, sample_info, 1, this->condition_);
-    }
-  else
-    {
-      retval = impl->read ( data,
+  // CCM_TYPE::seq_type = ccm sequence
+      retval = this->impl_->read ( data,
                             sample_info,
                             DDS_LENGTH_UNLIMITED,
                             DDS_READ_SAMPLE_STATE | DDS_NOT_READ_SAMPLE_STATE ,
                             DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,
                             DDS_ALIVE_INSTANCE_STATE);
-     }
     CORBA::ULong nr_of_samples = 0;
     CORBA::ULong ix = 0;
     switch(retval)
@@ -181,9 +142,9 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_all_history (
           CIAO_DEBUG ((LM_DEBUG, ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_all_history - ")
                                  ACE_TEXT ("number_of_samples <%d>\n"), data.length ()));
           //count the number of valid data
-          for (CORBA::ULong i = 0 ; i < (CORBA::ULong)sample_info.length(); i++)
+          for (::DDS_Long i = 0 ; i < sample_info.length(); i++)
             {
-              if(sample_info[i].valid_data)\
+              if(sample_info[i].valid_data)
                 {
                   ++nr_of_samples;
                 }
@@ -191,13 +152,13 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_all_history (
           //infoseq->length(sample_info.length ());
           infoseq->length(nr_of_samples);
           inst_seq->length(nr_of_samples);
-          for (CORBA::ULong i = 0 ; i <(CORBA::ULong)sample_info.length(); i++)
+          for (::DDS_Long i = 0 ; i < sample_info.length(); i++)
             {
                 if(sample_info[i].valid_data)
                   {
                     sample_info[i].reception_timestamp >>= infoseq[ix].timestamp;
                     inst_seq[ix] = data[i];
-                    ix++;
+                    ++ix;
                   }
             }
           break;
@@ -211,7 +172,7 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_all_history (
           break;
       }
   //return the loan
-  impl->return_loan(data,sample_info);
+  this->impl_->return_loan(data,sample_info);
   infos = infoseq._retn ();
   instances = inst_seq._retn();
 }
@@ -222,45 +183,19 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_one (
           typename DDS_TYPE::value_type& an_instance,
           ::CCM_DDS::ReadInfo_out info)
 {
-  RTI_DataReader_i *rdr = dynamic_cast <RTI_DataReader_i *> (this->reader_);
-  if (rdr == 0)
-    {
-      CIAO_ERROR ((LM_ERROR, CLINFO ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_one - ")
-                    ACE_TEXT ("Unable to cast provided DataReader to servant\n")));
-      throw CORBA::INTERNAL ();
-    }
-
-  typename DDS_TYPE::data_reader*
-      impl = DDS_TYPE::data_reader::narrow (rdr->get_datareader ());
-
-
-  if (!impl)
-    {
-      CIAO_ERROR ((LM_ERROR, CLINFO ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_one - ")
-                    ACE_TEXT ("Unable to narrow the provided reader entity to the specific ")
-                    ACE_TEXT ("type necessary to publish messages\n")));
-      throw CORBA::INTERNAL ();
-    }
-
-  DDS_InstanceHandle_t hnd = impl->lookup_instance (an_instance);
+  DDS_InstanceHandle_t hnd = this->impl_->lookup_instance (an_instance);
   DDS_SampleInfoSeq sample_info;
   DDS_ReturnCode_t retval = DDS_RETCODE_NO_DATA;
 
   typename DDS_TYPE::dds_seq_type data;
 
   // DDS_TYPE::dds_seq_type = dds sequence
-  // DDS_TYPE::seq_type = ccm sequence
-  if (this->condition_)
-    {
-      // retval =  impl->read_w_condition (data, sample_info, 1, this->condition_);
-    }
-  else
-    {
+  // CCM_TYPE::seq_type = ccm sequence
       // if initial instance has a registered key, pass back instance with this key,
       // else return last instance regardless of key
       if (!DDS_InstanceHandle_equals (&hnd, & ::DDS_HANDLE_NIL))
         {
-          retval = impl->read_instance(data,
+          retval = this->impl_->read_instance(data,
                             sample_info,
                             DDS_LENGTH_UNLIMITED,
                             hnd,
@@ -272,7 +207,7 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_one (
         {
           CIAO_DEBUG ((LM_INFO, ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_one_history - ")
                                 ACE_TEXT ("No instance found.\n")));
-          retval = impl->read(data,
+          retval = this->impl_->read(data,
                             sample_info,
                             DDS_LENGTH_UNLIMITED,
                             DDS_READ_SAMPLE_STATE | DDS_NOT_READ_SAMPLE_STATE ,
@@ -280,7 +215,6 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_one (
                             DDS_ALIVE_INSTANCE_STATE);
 
         }
-    }
   int number_of_samples = 0;
   switch(retval)
     {
@@ -302,12 +236,12 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_one (
         //info.instance_status   DDS_InstanceStateKind instance_state;
         //info.instance_rank     DDS_Long sample_rank;   is always 0 with last sample
         //return the loan
-        impl->return_loan(data,sample_info);
+        this->impl_->return_loan(data,sample_info);
         break;
       case DDS_RETCODE_NO_DATA:
         CIAO_DEBUG ((LM_INFO, ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_one - ")
                               ACE_TEXT ("No data\n")));
-        impl->return_loan(data,sample_info);
+        this->impl_->return_loan(data,sample_info);
         //only if a key and no instance for that key throw NonExistent exception
         if (!DDS_InstanceHandle_equals (&hnd, & ::DDS_HANDLE_NIL))
           {
@@ -317,7 +251,7 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_one (
       default:
         CIAO_ERROR ((LM_ERROR, ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_one - ")
                                ACE_TEXT ("retval <%d>\n"), retval));
-        impl->return_loan(data,sample_info);
+        this->impl_->return_loan(data,sample_info);
         throw ::CCM_DDS::InternalError (retval, 0);
         break;
     }
@@ -327,49 +261,22 @@ template <typename DDS_TYPE, typename CCM_TYPE >
 void
 CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_one_history (
           const typename DDS_TYPE::value_type& an_instance,
-          typename DDS_TYPE::seq_type::_out_type instances,
+          typename CCM_TYPE::seq_type::_out_type instances,
           ::CCM_DDS::ReadInfoSeq_out infos)
 {
   //this function has to return all samples of all instances
-
-  typename DDS_TYPE::seq_type::_var_type  inst_seq = new typename DDS_TYPE::seq_type;
+  typename CCM_TYPE::seq_type::_var_type  inst_seq = new typename CCM_TYPE::seq_type;
   ::CCM_DDS::ReadInfoSeq_var infoseq = new ::CCM_DDS::ReadInfoSeq;
-
-
-  RTI_DataReader_i *rdr = dynamic_cast <RTI_DataReader_i *> (this->reader_);
-  if (rdr == 0)
-    {
-      CIAO_ERROR ((LM_ERROR, CLINFO ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_one_history - ")
-                                    ACE_TEXT ("Unable to cast provided DataReader to servant\n")));
-      throw CORBA::INTERNAL ();
-    }
-
-  typename DDS_TYPE::data_reader*
-      impl = DDS_TYPE::data_reader::narrow (rdr->get_datareader ());
-
-  if (!impl)
-    {
-      CIAO_ERROR ((LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::read_one_history - "
-                   "Unable to narrow the provided reader entity to the specific "
-                   "type necessary to publish messages\n"));
-      throw CORBA::INTERNAL ();
-    }
-  DDS_InstanceHandle_t hnd = impl->lookup_instance (an_instance);
+  DDS_InstanceHandle_t hnd = this->impl_->lookup_instance (an_instance);
   DDS_SampleInfoSeq sample_info;
   DDS_ReturnCode_t retval = DDS_RETCODE_NO_DATA;
   typename DDS_TYPE::dds_seq_type data;
 
   // DDS_TYPE::dds_seq_type = dds sequence
-  // DDS_TYPE::seq_type = ccm sequence
-  if (this->condition_)
-    {
-      // retval =  impl->read_w_condition (data, sample_info, 1, this->condition_);
-    }
-  else
-    {
+  // CCM_TYPE::seq_type = ccm sequence
       if (!DDS_InstanceHandle_equals (&hnd, & ::DDS_HANDLE_NIL))
         {
-          retval = impl->read_instance(data,
+          retval = this->impl_->read_instance(data,
                             sample_info,
                             DDS_LENGTH_UNLIMITED,
                             hnd,
@@ -381,7 +288,7 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_one_history (
         {
           CIAO_DEBUG ((LM_INFO, ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_one_history - ")
                                 ACE_TEXT ("No instance found.\n")));
-          retval = impl->read(data,
+          retval = this->impl_->read(data,
                             sample_info,
                             DDS_LENGTH_UNLIMITED,
                             DDS_READ_SAMPLE_STATE | DDS_NOT_READ_SAMPLE_STATE ,
@@ -389,14 +296,13 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_one_history (
                             DDS_ALIVE_INSTANCE_STATE);
 
         }
-    }
   CORBA::ULong ix = 0;
   CORBA::ULong nr_of_samples = 0;
   switch(retval)
     {
       case DDS_RETCODE_OK:
         //count the number of valid data
-        for (CORBA::ULong i = 0 ; i < (CORBA::ULong)sample_info.length(); i++)
+        for (::DDS_Long i = 0 ; i < sample_info.length(); i++)
           {
             if(sample_info[i].valid_data)
               {
@@ -406,29 +312,29 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_one_history (
         infoseq->length(nr_of_samples);
         inst_seq->length(nr_of_samples);
 
-        for (CORBA::ULong i = 0 ; i < (CORBA::ULong)sample_info.length(); i++)
+        for (::DDS_Long i = 0 ; i < sample_info.length(); i++)
           {
             sample_info[i].reception_timestamp >>= infoseq[ix].timestamp;
             inst_seq[ix] = data[i];
-            ix++;
+            ++ix;
           }
         break;
       case DDS_RETCODE_NO_DATA:
         CIAO_DEBUG ((LM_INFO, ACE_TEXT ("Reader_T: read_all_history No data : retval is %d ---\n"), retval));
         if (!DDS_InstanceHandle_equals (&hnd, & ::DDS_HANDLE_NIL))
           {
-            impl->return_loan(data,sample_info);
+            this->impl_->return_loan(data,sample_info);
             throw ::CCM_DDS::NonExistent(0);
           }
         break;
       default:
         CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Reader_T: read_all_history Failed retval is %d ---\n"), retval));
-        impl->return_loan(data,sample_info);
+        this->impl_->return_loan(data,sample_info);
         throw ::CCM_DDS::InternalError (retval, 0);
         break;
     }
   //return the loan
-  impl->return_loan(data,sample_info);
+  this->impl_->return_loan(data,sample_info);
   infos = infoseq._retn ();
   instances = inst_seq._retn();
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.h b/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.h
index 03d8b48b3ae..fe080dea000 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.h
@@ -30,11 +30,11 @@ namespace CIAO
         virtual ~Reader_T (void);
 
         virtual void read_all (
-          typename DDS_TYPE::seq_type::_out_type instances,
+          typename CCM_TYPE::seq_type::_out_type instances,
           ::CCM_DDS::ReadInfoSeq_out infos);
 
         virtual void read_all_history (
-          typename DDS_TYPE::seq_type::_out_type instances,
+          typename CCM_TYPE::seq_type::_out_type instances,
           ::CCM_DDS::ReadInfoSeq_out infos);
 
         virtual void read_one (
@@ -43,16 +43,15 @@ namespace CIAO
 
         virtual void read_one_history (
           const typename DDS_TYPE::value_type& an_instance,
-          typename DDS_TYPE::seq_type::_out_type instances,
+          typename CCM_TYPE::seq_type::_out_type instances,
           ::CCM_DDS::ReadInfoSeq_out infos);
 
         virtual ::CCM_DDS::QueryFilter *filter (void);
 
         virtual void filter (const ::CCM_DDS::QueryFilter & filter);
       private:
+        typename DDS_TYPE::data_reader *impl_;
         ::DDS::DataReader_ptr reader_;
-        DDSQueryCondition* condition_;
-
       };
     }
   }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h b/CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h
index eb39f7a35b4..b10e34755d3 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h
@@ -45,7 +45,7 @@ inline void
 operator<<= (::CCM_DDS::ReadInfoSeq & ccm_dds_readinfo_seq, const ::DDS_SampleInfoSeq & sample_info)
 {
   ccm_dds_readinfo_seq.length(sample_info.length ());
-  for (CORBA::ULong i = 0; i < (CORBA::ULong)sample_info.length(); i++)
+  for (::DDS_Long i = 0; i < sample_info.length(); i++)
     {
       if (sample_info[i].valid_data)
         {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.cpp
index 672e13b0969..a27946d44ce 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.cpp
@@ -65,7 +65,7 @@ CIAO::DDS4CCM::RTI::Writer_T<DDS_TYPE, CCM_TYPE>::write (const typename DDS_TYPE
 
 template <typename DDS_TYPE, typename CCM_TYPE >
 void
-CIAO::DDS4CCM::RTI::Writer_T<DDS_TYPE, CCM_TYPE>::write_many (const typename DDS_TYPE::seq_type& instances)
+CIAO::DDS4CCM::RTI::Writer_T<DDS_TYPE, CCM_TYPE>::write_many (const typename CCM_TYPE::seq_type& instances)
 {
   CIAO_TRACE ("CIAO::DDS4CCM::RTI::Writer_T::write");
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.h b/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.h
index 5c8c4d39dcc..28933e37208 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.h
@@ -31,7 +31,7 @@ namespace CIAO
 
         virtual void write (const typename DDS_TYPE::value_type& an_instance);
 
-        virtual void write_many (const typename DDS_TYPE::seq_type& instances);
+        virtual void write_many (const typename CCM_TYPE::seq_type& instances);
         
         virtual ::DDS::InstanceHandle_t register_instance (const typename DDS_TYPE::value_type & datum);