4 files changed, 155 insertions, 66 deletions

diff --git a/CIAO/MPC/config/dds4ccm_impl.mpb b/CIAO/MPC/config/dds4ccm_impl.mpb
index 34b03336026..1cf83034121 100644
--- a/CIAO/MPC/config/dds4ccm_impl.mpb
+++ b/CIAO/MPC/config/dds4ccm_impl.mpb
@@ -1,17 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-feature(dds4ccm_opendds) : dds4ccm_skel, dds4ccm_logger, dcps {
+feature(dds4ccm_opendds) : dds4ccm_skel, ciao_logger, dcps {
   after += CIAO_DDS4CCM_NDDS_Impl
   libs += CIAO_DDS4CCM_NDDS_Impl
 }
 
-feature(dds4ccm_splice) : dds4ccm_skel {
+feature(dds4ccm_splice) : dds4ccm_skel, ciao_logger {
   after += CIAO_DDS4CCM_NDDS_Impl
   libs += CIAO_DDS4CCM_NDDS_Impl
 }
 
-feature(dds4ccm_ndds) : dds4ccm_skel, dds4ccm_logger, nddslib {
+feature(dds4ccm_ndds) : dds4ccm_skel, ciao_logger, nddslib {
   after += CIAO_DDS4CCM_NDDS_Impl
   libs += CIAO_DDS4CCM_NDDS_Impl
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp
index 78290ba82b1..e72fb21e497 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp
@@ -29,6 +29,95 @@ namespace CIAO
       {
       }
 
+      void
+      RTI_DomainParticipantListener_i::on_inconsistent_topic (
+          ::DDS::Topic_ptr,
+          const ::DDS::InconsistentTopicStatus & )
+      {
+      }
+
+      void
+      RTI_DomainParticipantListener_i::on_requested_deadline_missed (
+          ::DDS::DataReader_ptr ,
+          const ::DDS::RequestedDeadlineMissedStatus & )
+      {
+      }
+
+      void
+      RTI_DomainParticipantListener_i::on_requested_incompatible_qos (
+          ::DDS::DataReader_ptr ,
+          const ::DDS::RequestedIncompatibleQosStatus & )
+      {
+      }
+
+      void
+      RTI_DomainParticipantListener_i::on_sample_rejected (
+          ::DDS::DataReader_ptr ,
+          const ::DDS::SampleRejectedStatus & )
+      {
+      }
+
+      void
+      RTI_DomainParticipantListener_i::on_liveliness_changed (
+          ::DDS::DataReader_ptr ,
+          const ::DDS::LivelinessChangedStatus & )
+      {
+      }
+
+      void
+      RTI_DomainParticipantListener_i::on_data_available (
+          ::DDS::DataReader_ptr )
+      {
+      }
+
+      void
+      RTI_DomainParticipantListener_i::on_subscription_matched (
+          ::DDS::DataReader_ptr ,
+          const ::DDS::SubscriptionMatchedStatus & )
+      {
+      }
+
+      void
+      RTI_DomainParticipantListener_i::on_sample_lost (
+          ::DDS::DataReader_ptr ,
+          const ::DDS::SampleLostStatus & )
+      {
+      }
+
+      void
+      RTI_DomainParticipantListener_i::on_offered_deadline_missed (
+          ::DDS::DataWriter_ptr ,
+          const ::DDS::OfferedDeadlineMissedStatus & )
+      {
+      }
+
+      void
+      RTI_DomainParticipantListener_i::on_offered_incompatible_qos (
+          ::DDS::DataWriter_ptr ,
+          const ::DDS::OfferedIncompatibleQosStatus & )
+      {
+      }
+
+      void
+      RTI_DomainParticipantListener_i::on_liveliness_lost (
+          ::DDS::DataWriter_ptr ,
+          const ::DDS::LivelinessLostStatus & )
+      {
+      }
+
+      void
+      RTI_DomainParticipantListener_i::on_publication_matched (
+          ::DDS::DataWriter_ptr ,
+          const ::DDS::PublicationMatchedStatus & )
+      {
+      }
+
+      void
+      RTI_DomainParticipantListener_i::on_data_on_readers (
+          ::DDS::Subscriber_ptr )
+      {
+      }
+
       ::DDS::DomainParticipantListener_ptr
       RTI_DomainParticipantListener_i::get_domainparticipantlistener (void)
       {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h
index eec3498ff05..e1e4db63589 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h
@@ -41,68 +41,68 @@ namespace CIAO
 
         ::DDS::DomainParticipantListener_ptr get_domainparticipantlistener (void);
 
-      virtual void
-      on_inconsistent_topic (
-        ::DDS::Topic_ptr,
-        const ::DDS::InconsistentTopicStatus & );
-
-      virtual void
-      on_requested_deadline_missed (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::RequestedDeadlineMissedStatus & );
-
-      virtual void
-      on_requested_incompatible_qos (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::RequestedIncompatibleQosStatus & );
-
-      virtual void
-      on_sample_rejected (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::SampleRejectedStatus & );
-
-      virtual void
-      on_liveliness_changed (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::LivelinessChangedStatus & );
-
-      virtual void
-      on_data_available (
-        ::DDS::DataReader_ptr );
-
-      virtual void
-      on_subscription_matched (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::SubscriptionMatchedStatus & );
-
-      virtual void
-      on_sample_lost (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::SampleLostStatus & );
-
-      virtual void
-      on_offered_deadline_missed (
-        ::DDS::DataWriter_ptr ,
-        const ::DDS::OfferedDeadlineMissedStatus & );
-
-      virtual void
-      on_offered_incompatible_qos (
-        ::DDS::DataWriter_ptr ,
-        const ::DDS::OfferedIncompatibleQosStatus & );
-
-      virtual void
-      on_liveliness_lost (
-        ::DDS::DataWriter_ptr ,
-        const ::DDS::LivelinessLostStatus & );
-
-      virtual void
-      on_publication_matched (
-        ::DDS::DataWriter_ptr ,
-        const ::DDS::PublicationMatchedStatus & );
-
-      virtual void
-      on_data_on_readers (
-        ::DDS::Subscriber_ptr );
+        virtual void
+        on_inconsistent_topic (
+          ::DDS::Topic_ptr,
+          const ::DDS::InconsistentTopicStatus & );
+
+        virtual void
+        on_requested_deadline_missed (
+          ::DDS::DataReader_ptr ,
+          const ::DDS::RequestedDeadlineMissedStatus & );
+
+        virtual void
+        on_requested_incompatible_qos (
+          ::DDS::DataReader_ptr ,
+          const ::DDS::RequestedIncompatibleQosStatus & );
+
+        virtual void
+        on_sample_rejected (
+          ::DDS::DataReader_ptr ,
+          const ::DDS::SampleRejectedStatus & );
+
+        virtual void
+        on_liveliness_changed (
+          ::DDS::DataReader_ptr ,
+          const ::DDS::LivelinessChangedStatus & );
+
+        virtual void
+        on_data_available (
+          ::DDS::DataReader_ptr );
+
+        virtual void
+        on_subscription_matched (
+          ::DDS::DataReader_ptr ,
+          const ::DDS::SubscriptionMatchedStatus & );
+
+        virtual void
+        on_sample_lost (
+          ::DDS::DataReader_ptr ,
+          const ::DDS::SampleLostStatus & );
+
+        virtual void
+        on_offered_deadline_missed (
+          ::DDS::DataWriter_ptr ,
+          const ::DDS::OfferedDeadlineMissedStatus & );
+
+        virtual void
+        on_offered_incompatible_qos (
+          ::DDS::DataWriter_ptr ,
+          const ::DDS::OfferedIncompatibleQosStatus & );
+
+        virtual void
+        on_liveliness_lost (
+          ::DDS::DataWriter_ptr ,
+          const ::DDS::LivelinessLostStatus & );
+
+        virtual void
+        on_publication_matched (
+          ::DDS::DataWriter_ptr ,
+          const ::DDS::PublicationMatchedStatus & );
+
+        virtual void
+        on_data_on_readers (
+          ::DDS::Subscriber_ptr );
 
       private:
         ::DDS::DomainParticipantListener_var impl_;
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ndds_impl.mpc b/CIAO/connectors/dds4ccm/impl/ndds/ndds_impl.mpc
index 451c3e81d1e..1edb2b0195d 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/ndds_impl.mpc
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ndds_impl.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(CIAO_DDS4CCM_NDDS_Impl) : dds4ccm_skel, taolib, ciao_output, ccm_stub, dds4ccm_logger {
+project(CIAO_DDS4CCM_NDDS_Impl) : dds4ccm_skel, taolib, ciao_output, ccm_stub, ciao_logger {
 
   after += DDS4CCM_lem_stub
   libs += DDS4CCM_lem_stub