Mon Nov 1 11:15:34 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp:
        * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp:
        * connectors/dds4ccm/impl/Updater_T.cpp:
        * connectors/dds4ccm/impl/Writer_T.cpp:
        * connectors/dds4ccm/impl/dds4ccm_impl.mpc:
        * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h:
        * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.cpp:
        * connectors/dds4ccm/impl/ndds/DDSDataReaderListener_T.h:
        * connectors/dds4ccm/impl/ndds/DDSDomainParticipantListener.h:
        * connectors/dds4ccm/impl/ndds/DDSTopicListener_T.h:
        * connectors/dds4ccm/impl/ndds/DataReader.h:
        * connectors/dds4ccm/impl/ndds/DataWriter.h:
        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory_T.cpp:
        * connectors/dds4ccm/impl/ndds/DomainParticipantManager.h:
        * connectors/dds4ccm/impl/ndds/DomainParticipantManager.cpp:
        * connectors/dds4ccm/impl/ndds/DomainParticipant_T.cpp:
        * connectors/dds4ccm/impl/ndds/StatusCondition.h:
        * connectors/dds4ccm/impl/ndds/dds4ccm_ndds_export.h:
        * connectors/dds4ccm/impl/ndds/ndds.mpc:
        * connectors/dds4ccm/impl/Coherent_Changes_Guard.h:
        * connectors/dds4ccm/impl/Coherent_Changes_Guard.cpp:
        * connectors/dds4ccm/impl/DomainParticipantManager.h:
        * connectors/dds4ccm/impl/DomainParticipantManager.cpp:
        * connectors/dds4ccm/impl/ndds/dds4ccm_dds_ndds_export.h:
        * connectors/dds4ccm/impl/ndds/dds4ccm_ndds.mpc:
          Continued with the rename and move actions.

        * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h:
        * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp:
          Create two handlers in order to handle read and get separately.

22 files changed, 148 insertions, 133 deletions

diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp
index 4396c6635f5..f9f940469d3 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp
@@ -406,21 +406,24 @@ DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_passivate (vo
 
   try
     {
-      if (this->push_consumer_obtained_)
+      if (ACE_OS::strlen (this->topic_name_) != 0)
         {
-          this->push_consumer_.passivate ();
+          if (this->push_consumer_obtained_)
+            {
+              this->push_consumer_.passivate ();
+            }
+
+          if (this->supplier_obtained_)
+            {
+              this->supplier_.passivate ();
+            }
+
+          if (this->pull_consumer_obtained_)
+            {
+              this->pull_consumer_.passivate ();
+            }
+          TopicBaseConnector::ccm_passivate ();
         }
-
-      if (this->supplier_obtained_)
-        {
-          this->supplier_.passivate ();
-        }
-
-      if (this->pull_consumer_obtained_)
-        {
-          this->pull_consumer_.passivate ();
-        }
-      TopicBaseConnector::ccm_passivate ();
     }
   catch (const ::CCM_DDS::InternalError &ex)
     {
@@ -455,21 +458,24 @@ DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_remove (void)
 
   try
     {
-      if (this->push_consumer_obtained_)
-        {
-          this->push_consumer_.remove (this->subscriber_.in ());
-        }
-
-      if (this->supplier_obtained_)
-        {
-          this->supplier_.remove (this->publisher_.in ());
-        }
-
-      if (this->pull_consumer_obtained_)
+      if (ACE_OS::strlen (this->topic_name_) != 0)
         {
-          this->pull_consumer_.remove (this->subscriber_.in ());
+          if (this->push_consumer_obtained_)
+            {
+              this->push_consumer_.remove (this->subscriber_.in ());
+            }
+
+          if (this->supplier_obtained_)
+            {
+              this->supplier_.remove (this->publisher_.in ());
+            }
+
+          if (this->pull_consumer_obtained_)
+            {
+              this->pull_consumer_.remove (this->subscriber_.in ());
+            }
+          TopicBaseConnector::ccm_remove ();
         }
-      TopicBaseConnector::ccm_remove ();
     }
   catch (const ::CCM_DDS::InternalError &ex)
     {
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp
index 4bf2cb8068f..47aec096414 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp
@@ -542,32 +542,35 @@ DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_passivate (vo
 
   try
     {
-      if (this->observable_obtained_)
+      if (ACE_OS::strlen (this->topic_name_) != 0)
         {
-          this->observable_.passivate ();
+          if (this->observable_obtained_)
+            {
+              this->observable_.passivate ();
+            }
+
+          if (this->push_observer_obtained_)
+            {
+              this->push_observer_.passivate ();
+            }
+
+          if (this->push_state_observer_obtained_)
+            {
+              this->push_state_observer_.passivate ();
+            }
+
+          if (this->pull_observer_obtained_)
+            {
+              this->pull_observer_.passivate ();
+            }
+
+          if (this->passive_observer_obtained_)
+            {
+              this->passive_observer_.passivate ();
+            }
+
+          TopicBaseConnector::ccm_passivate ();
         }
-
-      if (this->push_observer_obtained_)
-        {
-          this->push_observer_.passivate ();
-        }
-
-      if (this->push_state_observer_obtained_)
-        {
-          this->push_state_observer_.passivate ();
-        }
-
-      if (this->pull_observer_obtained_)
-        {
-          this->pull_observer_.passivate ();
-        }
-
-      if (this->passive_observer_obtained_)
-        {
-          this->passive_observer_.passivate ();
-        }
-
-      TopicBaseConnector::ccm_passivate ();
     }
   catch (const ::CCM_DDS::InternalError &ex)
     {
@@ -602,31 +605,34 @@ DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_remove (void)
 
   try
     {
-      if (this->observable_obtained_)
-        {
-          this->observable_.remove (this->publisher_.in ());
-        }
-
-      if (this->push_observer_obtained_)
-        {
-          this->push_observer_.remove (this->subscriber_.in ());
-        }
-
-      if (this->push_state_observer_obtained_)
-        {
-          this->push_state_observer_.remove (this->subscriber_.in ());
-        }
-
-      if (this->pull_observer_obtained_)
-        {
-          this->pull_observer_.remove (this->subscriber_.in ());
-        }
-
-      if (this->passive_observer_obtained_)
+      if (ACE_OS::strlen (this->topic_name_) != 0)
         {
-          this->passive_observer_.remove (this->subscriber_.in ());
+          if (this->observable_obtained_)
+            {
+              this->observable_.remove (this->publisher_.in ());
+            }
+
+          if (this->push_observer_obtained_)
+            {
+              this->push_observer_.remove (this->subscriber_.in ());
+            }
+
+          if (this->push_state_observer_obtained_)
+            {
+              this->push_state_observer_.remove (this->subscriber_.in ());
+            }
+
+          if (this->pull_observer_obtained_)
+            {
+              this->pull_observer_.remove (this->subscriber_.in ());
+            }
+
+          if (this->passive_observer_obtained_)
+            {
+              this->passive_observer_.remove (this->subscriber_.in ());
+            }
+          TopicBaseConnector::ccm_remove ();
         }
-      TopicBaseConnector::ccm_remove ();
     }
   catch (const ::CCM_DDS::InternalError &ex)
     {
diff --git a/CIAO/connectors/dds4ccm/impl/Updater_T.cpp b/CIAO/connectors/dds4ccm/impl/Updater_T.cpp
index 812c6eed0bf..a25fd0f8e52 100644
--- a/CIAO/connectors/dds4ccm/impl/Updater_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/Updater_T.cpp
@@ -2,7 +2,7 @@
 
 #include "dds4ccm/impl/ndds/DataWriter_T.h"
 #include "dds4ccm/impl/Utils.h"
-#include "dds4ccm/impl/Coherent_Changes_Guard.h"
+#include "dds4ccm/impl/ndds/Coherent_Changes_Guard.h"
 #include "dds4ccm/impl/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE, DDS4CCM_Vendor VENDOR_TYPE>
diff --git a/CIAO/connectors/dds4ccm/impl/Writer_T.cpp b/CIAO/connectors/dds4ccm/impl/Writer_T.cpp
index cdce59f8a68..496325dcd17 100644
--- a/CIAO/connectors/dds4ccm/impl/Writer_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/Writer_T.cpp
@@ -2,7 +2,7 @@
 
 #include "dds4ccm/impl/ndds/DataWriter_T.h"
 #include "dds4ccm/impl/Utils.h"
-#include "dds4ccm/impl/Coherent_Changes_Guard.h"
+#include "dds4ccm/impl/ndds/Coherent_Changes_Guard.h"
 
 #include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h"
 
diff --git a/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc b/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc
index 55de1ee0e15..412a73a0f3c 100644
--- a/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc
+++ b/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc
@@ -14,11 +14,9 @@ project(CIAO_DDS4CCM_DDS_Impl) : install, dds4ccm_skel, dds4ccm_lem_stub, taolib
   }
 
   Source_Files {
-    Coherent_Changes_Guard.cpp
     ContentFilterSetting.cpp
     Utils.cpp
     DDSCallbackStatusHandler.cpp
-    DomainParticipantManager.cpp
     Log_Macros.cpp
   }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.cpp
index 8626e351417..f298eb8ba42 100644
--- a/CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.cpp
@@ -1,5 +1,5 @@
 // $Id$
-#include "dds4ccm/impl/Coherent_Changes_Guard.h"
+#include "dds4ccm/impl/ndds/Coherent_Changes_Guard.h"
 
 CIAO::DDS4CCM::Coherent_Changes_Guard::Coherent_Changes_Guard (
   DDSPublisher* p,
diff --git a/CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.h b/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h
index 4e1d3929dfd..19cf0f22347 100644
--- a/CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h
@@ -13,9 +13,7 @@
 #include "ace/Copy_Disabled.h"
 #include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
 
-#if (CIAO_DDS4CCM_NDDS==1)
-# include "ndds/ndds_cpp.h"
-#endif
+#include "ndds/ndds_cpp.h"
 
 namespace CIAO
 {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDSDataReaderListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDSDataReaderListener_T.h
index d513f28f68f..1e399ab1e05 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDSDataReaderListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDSDataReaderListener_T.h
@@ -13,7 +13,7 @@
 #include "dds4ccm/impl/dds4ccm_conf.h"
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
 
-#include "dds4ccm/impl/ndds/dds4ccm_dds_ndds_export.h"
+#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h"
 
 
 # include "ndds/ndds_cpp.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDSDomainParticipantListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DDSDomainParticipantListener.h
index 34a9aaaf656..12abb32500e 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDSDomainParticipantListener.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDSDomainParticipantListener.h
@@ -12,7 +12,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 
-#include "dds4ccm/impl/ndds/dds4ccm_dds_ndds_export.h"
+#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
 # include "ndds/ndds_cpp.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDSTopicListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDSTopicListener_T.h
index cbf9278192d..e688b40f475 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDSTopicListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDSTopicListener_T.h
@@ -12,7 +12,7 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
-#include "dds4ccm/impl/ndds/dds4ccm_dds_ndds_export.h"
+#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h"
 
 # include "ndds/ndds_cpp.h"
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h
index fd45d8db178..71f7472dd32 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h
@@ -12,7 +12,7 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
 
-#include "dds4ccm/impl/ndds/dds4ccm_dds_ndds_export.h"
+#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
 #include "tao/LocalObject.h"
@@ -23,7 +23,7 @@ namespace CIAO
 {
   namespace DDS4CCM
   {
-    class DDS4CCM_DDS_NDDS_Export DDS_DataReader_Base
+    class DDS4CCM_NDDS_Export DDS_DataReader_Base
       : public virtual ::DDS::DataReader,
         public virtual ::CORBA::LocalObject
     {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h
index addf9f79a43..2d69d30e3c3 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h
@@ -12,7 +12,7 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
 
-#include "dds4ccm/impl/ndds/dds4ccm_dds_ndds_export.h"
+#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
 #include "tao/LocalObject.h"
@@ -23,7 +23,7 @@ namespace CIAO
 {
   namespace DDS4CCM
   {
-    class DDS4CCM_DDS_NDDS_Export DDS_DataWriter_Base
+    class DDS4CCM_NDDS_Export DDS_DataWriter_Base
       : public virtual ::DDS::DataWriter,
         public virtual ::CORBA::LocalObject
     {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory_T.cpp
index 1259e541344..6bf55b872cc 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory_T.cpp
@@ -13,7 +13,7 @@
 #include "dds4ccm/idl/dds4ccm_BaseC.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
-#include "dds4ccm/impl/DomainParticipantManager.h"
+#include "dds4ccm/impl/ndds/DomainParticipantManager.h"
 
 
 namespace CIAO
diff --git a/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantManager.cpp
index 7bc3e2f5b25..7bc3e2f5b25 100644
--- a/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantManager.cpp
diff --git a/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantManager.h
index 297b74abac3..297b74abac3 100644
--- a/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantManager.h
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant_T.cpp
index fb4b8737b6e..61b6b4ece18 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant_T.cpp
@@ -12,7 +12,7 @@
 
 #include "dds4ccm/impl/Utils.h"
 #include "dds4ccm/impl/TopicListener_T.h"
-#include "dds4ccm/impl/DomainParticipantManager.h"
+#include "dds4ccm/impl/ndds/DomainParticipantManager.h"
 
 #include "dds4ccm/impl/ndds/convertors/PublisherQos.h"
 #include "dds4ccm/impl/ndds/convertors/SubscriberQos.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h
index c15e3a10168..8b2a43bc103 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h
@@ -13,7 +13,7 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 
-#include "dds4ccm/impl/ndds/dds4ccm_dds_ndds_export.h"
+#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
 #include "tao/LocalObject.h"
@@ -24,7 +24,7 @@ namespace CIAO
 {
   namespace DDS4CCM
   {
-    class DDS4CCM_DDS_NDDS_Export DDS_StatusCondition_i :
+    class DDS4CCM_NDDS_Export DDS_StatusCondition_i :
       public virtual ::DDS::StatusCondition,
       public virtual ::CORBA::LocalObject
     {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/dds4ccm_dds_ndds_export.h b/CIAO/connectors/dds4ccm/impl/ndds/dds4ccm_dds_ndds_export.h
deleted file mode 100644
index cce68d2f990..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/dds4ccm_dds_ndds_export.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// ------------------------------
-#ifndef DDS4CCM_DDS_NDDS_EXPORT_H
-#define DDS4CCM_DDS_NDDS_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (DDS4CCM_DDS_NDDS_HAS_DLL)
-#  define DDS4CCM_DDS_NDDS_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && DDS4CCM_DDS_NDDS_HAS_DLL */
-
-#if !defined (DDS4CCM_DDS_NDDS_HAS_DLL)
-#  define DDS4CCM_DDS_NDDS_HAS_DLL 1
-#endif /* ! DDS4CCM_DDS_NDDS_HAS_DLL */
-
-#if defined (DDS4CCM_DDS_NDDS_HAS_DLL) && (DDS4CCM_DDS_NDDS_HAS_DLL == 1)
-#  if defined (DDS4CCM_DDS_NDDS_BUILD_DLL)
-#    define DDS4CCM_DDS_NDDS_Export ACE_Proper_Export_Flag
-#    define DDS4CCM_DDS_NDDS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DDS4CCM_DDS_NDDS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* DDS4CCM_DDS_NDDS_BUILD_DLL */
-#    define DDS4CCM_DDS_NDDS_Export ACE_Proper_Import_Flag
-#    define DDS4CCM_DDS_NDDS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DDS4CCM_DDS_NDDS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* DDS4CCM_DDS_NDDS_BUILD_DLL */
-#else /* DDS4CCM_DDS_NDDS_HAS_DLL == 1 */
-#  define DDS4CCM_DDS_NDDS_Export
-#  define DDS4CCM_DDS_NDDS_SINGLETON_DECLARATION(T)
-#  define DDS4CCM_DDS_NDDS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* DDS4CCM_DDS_NDDS_HAS_DLL == 1 */
-
-#endif /* DDS4CCM_DDS_NDDS_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/dds4ccm_ndds_export.h b/CIAO/connectors/dds4ccm/impl/ndds/dds4ccm_ndds_export.h
new file mode 100644
index 00000000000..e8f95a00361
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/impl/ndds/dds4ccm_ndds_export.h
@@ -0,0 +1,36 @@
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// ------------------------------
+#ifndef DDS4CCM_DDS_NDDS_EXPORT_H
+#define DDS4CCM_DDS_NDDS_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (DDS4CCM_NDDS_HAS_DLL)
+#  define DDS4CCM_NDDS_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && DDS4CCM_NDDS_HAS_DLL */
+
+#if !defined (DDS4CCM_NDDS_HAS_DLL)
+#  define DDS4CCM_NDDS_HAS_DLL 1
+#endif /* ! DDS4CCM_NDDS_HAS_DLL */
+
+#if defined (DDS4CCM_NDDS_HAS_DLL) && (DDS4CCM_NDDS_HAS_DLL == 1)
+#  if defined (DDS4CCM_DDS_NDDS_BUILD_DLL)
+#    define DDS4CCM_NDDS_Export ACE_Proper_Export_Flag
+#    define DDS4CCM_NDDS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define DDS4CCM_DDS_NDDS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* DDS4CCM_DDS_NDDS_BUILD_DLL */
+#    define DDS4CCM_NDDS_Export ACE_Proper_Import_Flag
+#    define DDS4CCM_NDDS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define DDS4CCM_DDS_NDDS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* DDS4CCM_DDS_NDDS_BUILD_DLL */
+#else /* DDS4CCM_NDDS_HAS_DLL == 1 */
+#  define DDS4CCM_NDDS_Export
+#  define DDS4CCM_NDDS_SINGLETON_DECLARATION(T)
+#  define DDS4CCM_DDS_NDDS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* DDS4CCM_NDDS_HAS_DLL == 1 */
+
+#endif /* DDS4CCM_DDS_NDDS_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/dds4ccm_ndds.mpc b/CIAO/connectors/dds4ccm/impl/ndds/ndds.mpc
index 23e9497bf07..fc9aa026ce2 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/dds4ccm_ndds.mpc
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ndds.mpc
@@ -18,5 +18,7 @@ project(CIAO_DDS4CCM_DDS_NDDS) : install, dds4ccm_skel, dds4ccm_lem_stub, taolib
     DataWriter.cpp
     StatusCondition.cpp
     DDSDomainParticipantListener.cpp
+    DomainParticipantManager.cpp
+    Coherent_Changes_Guard.cpp
   }
 }
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp
index 502dac842eb..be0b60e3b75 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp
@@ -43,14 +43,18 @@ namespace CIAO_RG_LateBinding_Receiver_Impl
         ::RG_LateBinding::CCM_Receiver_Context::_duplicate (ctx))
     , expected_ (expected)
   {
-    ACE_NEW_THROW_EX (this->to_handler_,
+    ACE_NEW_THROW_EX (this->to_handler_read_,
+                      Timeout_Handler (*this),
+                      ::CORBA::INTERNAL ());
+    ACE_NEW_THROW_EX (this->to_handler_get_,
                       Timeout_Handler (*this),
                       ::CORBA::INTERNAL ());
   }
 
   RG_LateBinding_Receiver_impl::~RG_LateBinding_Receiver_impl ()
   {
-    delete this->to_handler_;
+    delete this->to_handler_read_;
+    delete this->to_handler_get_;
   }
 
   void
@@ -308,7 +312,7 @@ namespace CIAO_RG_LateBinding_Receiver_Impl
     ACE_Reactor *reactor)
   {
     if (reactor->schedule_timer (
-               this->to_handler_,
+               this->to_handler_read_,
                reinterpret_cast<const void *> (0),
                ACE_Time_Value (8, 0)) == -1)
       {
@@ -316,7 +320,7 @@ namespace CIAO_RG_LateBinding_Receiver_Impl
                               "Error scheduling timer"));
       }
     if (reactor->schedule_timer (
-               this->to_handler_,
+               this->to_handler_get_,
                reinterpret_cast<const void *> (1),
                ACE_Time_Value (10, 0)) == -1)
       {
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h
index 04eaa1084c6..9d2b50b49bb 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h
@@ -47,7 +47,8 @@ namespace CIAO_RG_LateBinding_Receiver_Impl
     ::RG_LateBinding::CCM_Receiver_Context_var ciao_context_;
     CORBA::UShort expected_;
 
-    Timeout_Handler *to_handler_;
+    Timeout_Handler *to_handler_read_;
+    Timeout_Handler *to_handler_get_;
 
     void check_samples (
       const char * test,