Thu Dec 10 12:42:08 UTC 2009 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h:
        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp:
          Renamed get_many into write_many.

        * connectors/dds4ccm/tests/ListenNotEnabled/*:
        * connectors/dds4ccm/tests/Listener/*:
          Split the listener into three separate tests. Added
          listener test where mode is NOT_ENABLED as starter.

36 files changed, 1345 insertions, 1574 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 71768f7fca7..96828f6ce5c 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,14 @@
+Thu Dec 10 12:42:08 UTC 2009  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h:
+        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp:
+          Renamed get_many into write_many.
+
+        * connectors/dds4ccm/tests/ListenNotEnabled/*:
+        * connectors/dds4ccm/tests/Listener/*:
+          Split the listener into three separate tests. Added
+          listener test where mode is NOT_ENABLED as starter.
+
 Thu Dec 10 11:01:16 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ciao/Containers/Servant_Activator.cpp:
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp
index 866eab6b46a..2c931c6464e 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp
@@ -102,7 +102,7 @@ namespace CIAO_Getter_Test_Sender_Impl
   }
 
   void
-  Sender_exec_i::get_many (void)
+  Sender_exec_i::write_many (void)
   {
     GetterTest_Seq write_many;
     write_many.length (this->keys_ * this->iterations_);
@@ -176,7 +176,7 @@ namespace CIAO_Getter_Test_Sender_Impl
      }
    else 
     {
-      get_many ();
+      write_many ();
       this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_);
     }
   }
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h
index 5ea2a95e2e5..6e82f638862 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h
@@ -105,7 +105,7 @@ namespace CIAO_Getter_Test_Sender_Impl
     CORBA::ULong last_iter_;
 
     void start_timeout_tests (void);
-    void get_many (void);
+    void write_many (void);
 
     pulse_Generator * ticker_;
   };
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl
new file mode 100644
index 00000000000..f524922f41d
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl
@@ -0,0 +1,18 @@
+// $Id$
+
+/**
+ * @file LNE_Test_Base.idl
+ * @author Marcel Smit <msmit@remedy.nl>
+ */
+
+#ifndef LISTEN_NOT_ENABLED_TEST_BASE_IDL
+#define LISTEN_NOT_ENABLED_TEST_BASE_IDL
+
+struct ListenNotEnabledTest {
+  string key;
+  long iteration;
+};
+
+typedef sequence<ListenNotEnabledTest> ListenNotEnabledTest_Seq;
+
+#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc
new file mode 100755
index 00000000000..043d8f8b8b3
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc
@@ -0,0 +1,76 @@
+// $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n LNE_Test_Base"
+
+project(DDS_LNE_Test_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
+              -Wb,stub_export_macro=LISTEN_NOT_ENABLED_TEST_BASE_STUB_Export \
+              -Wb,stub_export_include=LNE_Test_Base_stub_export.h
+
+  IDL_Files {
+    LNE_Test_Base.idl
+  }
+}
+
+project(DDS_LNE_Test_Base_ndds_ts_gen) : ndds_ts_defaults   {
+  custom_only = 1
+  after += DDS_LNE_Test_Base_idl_gen
+  ndds_ts_flags += -corba LNE_Test_BaseC.h -orb ACE_TAO1.7
+
+  NDDSTypeSupport_Files {
+    LNE_Test_Base.idl
+  }
+}
+
+project(DDS_LNE_Test_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_LNE_Test_Base_ndds_ts_gen DDS_LNE_Test_Base_stub
+  libs += DDS_LNE_Test_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_LNE_Test_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
+
+  Source_Files {
+    LNE_Test_Base.cxx
+    LNE_Test_BasePlugin.cxx
+    LNE_Test_BaseSupport.cxx
+  }
+
+  Header_Files {
+    LNE_Test_Base.h
+    LNE_Test_BasePlugin.h
+    LNE_Test_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_LNE_Test_Base_stub) : ccm_stub {
+  after += DDS_LNE_Test_Base_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_LNE_Test_Base_stub
+  dynamicflags = LISTEN_NOT_ENABLED_TEST_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    LNE_Test_BaseC.cpp
+  }
+
+  Header_Files {
+    LNE_Test_BaseC.h
+    LNE_Test_Base_stub_export.h
+  }
+
+  Inline_Files {
+    LNE_Test_BaseC.inl
+  }
+}
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl
new file mode 100644
index 00000000000..1eebd4fda3a
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl
@@ -0,0 +1,26 @@
+// $Id$
+
+/**
+ * @file LNE_Test_Connector.idl
+ * @author Marcel Smit <msmit@remedy.nl>
+ *
+ * by-hand translation of the idl3p.
+ */
+
+#ifndef LISTEN_NOT_ENABLED_TEST_CONNECTOR_IDL_
+#define LISTEN_NOT_ENABLED_TEST_CONNECTOR_IDL_
+
+#include  <Components.idl>
+#include "Base/LNE_Test_Base.idl"
+#include "connectors/dds4ccm/idl/ccm_dds.idl"
+
+TYPED_MODULE( ::ListenNotEnabledTest, ::ListenNotEnabledTest_Seq, ListenNotEnabledTest)
+
+module LNE_Test
+{
+  connector LNE_Test_Connector : ::CCM_DDS::ListenNotEnabledTest::DDS_Event
+  {
+  };
+};
+
+#endif /* LNE_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
new file mode 100755
index 00000000000..d1385ba1d45
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
@@ -0,0 +1,145 @@
+// $Id$
+// This file is generated with "generate_component_mpc.pl -p DDS_LNE_Test_Base -l .. -o ../lib -u DDS LNE_Test_Connector"
+
+project(DDS_LNE_Test_Connector_idl_gen) : connectoridldefaults {
+  after += DDS4CCM_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=LISTEN_NOT_ENABLED_TEST_CONNECTOR_STUB_Export \
+              -Wb,stub_export_include=LNE_Test_Connector_stub_export.h \
+              -Wb,skel_export_macro=LISTEN_NOT_ENABLED_TEST_CONNECTOR_SVNT_Export \
+              -Wb,skel_export_include=LNE_Test_Connector_svnt_export.h \
+              -Wb,svnt_export_macro=LISTEN_NOT_ENABLED_TEST_CONNECTOR_SVNT_Export \
+              -Wb,svnt_export_include=LNE_Test_Connector_svnt_export.h \
+              -Wb,exec_export_macro=LISTEN_NOT_ENABLED_TEST_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=LNE_Test_Connector_exec_export.h \
+              -I ..
+
+  IDL_Files {
+    LNE_Test_Connector.idl
+  }
+}
+
+project(DDS_LNE_Test_Connector_lem_gen) : ciaoidldefaults {
+  custom_only = 1
+  after += DDS_LNE_Test_Connector_idl_gen
+  idlflags += -Wb,stub_export_macro=LISTEN_NOT_ENABLED_TEST_CONNECTOR_LEM_STUB_Export \
+              -Wb,stub_export_include=LNE_Test_Connector_lem_stub_export.h \
+              -SS -Gxhst \
+              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+
+  IDL_Files {
+    LNE_Test_ConnectorE.idl
+  }
+}
+
+project(DDS_LNE_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base   {
+  after += DDS_LNE_Test_Connector_lem_gen DDS_LNE_Test_Connector_stub DDS_LNE_Test_Base_stub DDS4CCM_lem_stub
+  libs  += DDS_LNE_Test_Base_stub DDS_LNE_Test_Connector_stub DDS4CCM_lem_stub
+  libpaths += ../lib
+  libout = ../lib
+  includes += ..
+  sharedname = DDS_LNE_Test_Connector_lem_stub
+  dynamicflags   = LISTEN_NOT_ENABLED_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    LNE_Test_ConnectorEC.cpp
+  }
+
+  Header_Files {
+    LNE_Test_ConnectorEC.h
+    LNE_Test_Connector_lem_stub_export.h
+  }
+
+  Inline_Files {
+    LNE_Test_ConnectorEC.inl
+  }
+}
+
+project(DDS_LNE_Test_Connector_stub) : ccm_stub, dds4ccm_base   {
+  after += DDS_LNE_Test_Connector_idl_gen DDS_LNE_Test_Base_stub
+  libs  += DDS_LNE_Test_Base_stub
+  libpaths += ../lib
+  libout = ../lib
+  includes += ..
+  sharedname = DDS_LNE_Test_Connector_stub
+  dynamicflags   = LISTEN_NOT_ENABLED_TEST_CONNECTOR_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    LNE_Test_ConnectorC.cpp
+  }
+
+  Header_Files {
+    LNE_Test_ConnectorC.h
+    LNE_Test_Connector_stub_export.h
+  }
+
+  Inline_Files {
+    LNE_Test_ConnectorC.inl
+  }
+}
+
+project(DDS_LNE_Test_Connector_exec) : ciao_executor, dds4ccm_skel, nddslib {
+  after   += DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_stub DDS4CCM_lem_stub CIAO_DDS4CCM_NDDS_Impl DDS_LNE_Test_Base_NDDS_TS
+  sharedname = DDS_LNE_Test_Connector_exec
+  libs += DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Base_stub CIAO_DDS4CCM_NDDS_Impl DDS4CCM_lem_stub DDS_LNE_Test_Base_NDDS_TS
+  libpaths += ../lib
+  libout = ../lib
+  includes += ..
+  dynamicflags   = LISTEN_NOT_ENABLED_TEST_CONNECTOR_EXEC_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    LNE_Test_Connector_exec.cpp
+  }
+
+  Header_Files {
+    LNE_Test_Connector_exec.h
+    LNE_Test_Connector_exec_export.h
+  }
+
+  Inline_Files {
+  }
+}
+
+
+project(DDS_LNE_Test_Connector_svnt) : ciao_servant, dds4ccm_skel, nddslib {
+  after      += DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_exec DDS_LNE_Test_Connector_stub DDS4CCM_lem_stub
+  sharedname  = DDS_LNE_Test_Connector_svnt
+  libs       += DDS_LNE_Test_Connector_stub \
+                DDS_LNE_Test_Connector_lem_stub  \
+                DDS_LNE_Test_Base_stub \
+                DDS_LNE_Test_Connector_exec \
+                DDS4CCM_lem_stub
+  libpaths += ../lib
+  libout = ../lib
+  includes += ..
+  dynamicflags = LISTEN_NOT_ENABLED_TEST_CONNECTOR_SVNT_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    LNE_Test_ConnectorS.cpp
+    LNE_Test_Connector_svnt.cpp
+  }
+
+  Header_Files {
+    LNE_Test_ConnectorS.h
+    LNE_Test_Connector_svnt.h
+    LNE_Test_Connector_svnt_export.h
+  }
+
+  Inline_Files {
+    LNE_Test_ConnectorS.inl
+  }
+}
+
+
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.cpp
new file mode 100644
index 00000000000..49ca01d82a5
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "LNE_Test_Connector_exec.h"
+
+namespace CIAO_LNE_Test_LNE_Test_Connector_Impl
+{
+  LNE_Test_Connector_exec_i::LNE_Test_Connector_exec_i (void)
+    : DDS_Event_Connector_T<ListenNotEnabledTest_DDS_Traits, ListenNotEnabledTest_Connector_Traits> ()
+  {
+  }
+
+  LNE_Test_Connector_exec_i::~LNE_Test_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" LISTEN_NOT_ENABLED_TEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_LNE_Test_LNE_Test_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      LNE_Test_Connector_exec_i ());
+
+    return retval;
+  }
+}
+
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
new file mode 100644
index 00000000000..8a9edb7b207
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef LISTEN_NOT_ENABLED_TEST_CONNECTOR_EXEC_H_
+#define LISTEN_NOT_ENABLED_TEST_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "LNE_Test_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#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"
+
+#include "Base/LNE_Test_BaseSupport.h"
+
+namespace CIAO_LNE_Test_LNE_Test_Connector_Impl
+{
+
+  // @from use of ListenNotEnabledTest as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    ListenNotEnabledTest,
+    ListenNotEnabledTestSeq,
+    ListenNotEnabledTestTypeSupport,
+    ListenNotEnabledTestDataWriter,
+    ListenNotEnabledTestDataReader > ListenNotEnabledTest_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_LNE_Test_LNE_Test_Connector_Impl::LNE_Test_Connector_Exec,
+    ListenNotEnabledTest_Seq,
+    ::CCM_DDS::ListenNotEnabledTest::CCM_Writer,
+    ::CCM_DDS::ListenNotEnabledTest::CCM_Updater,
+    ::CCM_DDS::ListenNotEnabledTest::CCM_Getter,
+    ::CCM_DDS::ListenNotEnabledTest::CCM_Reader,
+    ::LNE_Test::CCM_LNE_Test_Connector_Context,
+    ::CCM_DDS::ListenNotEnabledTest::Listener,
+    ::CCM_DDS::ListenNotEnabledTest::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> ListenNotEnabledTest_Connector_Traits;
+
+  class LISTEN_NOT_ENABLED_TEST_CONNECTOR_EXEC_Export LNE_Test_Connector_exec_i :
+    public DDS_Event_Connector_T <ListenNotEnabledTest_DDS_Traits, ListenNotEnabledTest_Connector_Traits>
+  {
+  public:
+    LNE_Test_Connector_exec_i (void);
+    virtual ~LNE_Test_Connector_exec_i (void);
+  };
+
+  extern "C" LISTEN_NOT_ENABLED_TEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_LNE_Test_LNE_Test_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/Listener/README b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/README
index f622af6a71d..f622af6a71d 100644
--- a/CIAO/connectors/dds4ccm/tests/Listener/README
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/README
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl
new file mode 100644
index 00000000000..18fa2507c17
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl
@@ -0,0 +1,23 @@
+// $Id$
+
+/**
+ * @file
+ * @author Marcel Smit <msmit@remedy.nl>
+ */
+
+#ifndef RECEIVER_IDL
+#define RECEIVER_IDL
+
+#include "Connector/LNE_Test_Connector.idl"
+#include "Connector/LNE_Test_ConnectorE.idl"
+
+module LNE_Test
+{
+  component Receiver
+  {
+    port CCM_DDS::ListenNotEnabledTest::DDS_Listen info_listen;
+    provides CCM_DDS::ConnectorStatusListener info_listen_connector_status;
+  };
+};
+
+#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc
new file mode 100755
index 00000000000..cc0ad916dca
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc
@@ -0,0 +1,151 @@
+// $Id$
+
+project(DDS_LNE_Test_Receiver_idl_gen) : componentidldefaults {
+  custom_only = 1
+  after += DDS_LNE_Test_Connector_idl_gen
+  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
+              -Wb,stub_export_include=Receiver_stub_export.h \
+              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
+              -Wb,skel_export_include=Receiver_svnt_export.h \
+              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
+              -Wb,svnt_export_include=Receiver_svnt_export.h \
+              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
+              -Wb,exec_export_include=Receiver_exec_export.h -I..
+
+  IDL_Files {
+    LNE_Test_Receiver.idl
+  }
+}
+
+project(DDS_LNE_Test_Receiver_lem_gen) : ciaoidldefaults {
+  after += DDS_LNE_Test_Receiver_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
+              -Wb,stub_export_include=Receiver_lem_stub_export.h \
+              -SS -Gxhst -I..
+
+  IDL_Files {
+    LNE_Test_ReceiverE.idl
+  }
+}
+
+project(DDS_LNE_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+  after += DDS_LNE_Test_Receiver_lem_gen DDS_LNE_Test_Receiver_stub  \
+           DDS_LNE_Test_Connector_stub DDS_LNE_Test_Base_stub
+  libs  +=  Receiver_stub DDS_LNE_Test_Connector_stub \
+            DDS_LNE_Test_Base_stub
+  libpaths += ../lib
+  libout = ../lib
+  includes += ..
+  sharedname = Receiver_lem_stub
+  dynamicflags   = RECEIVER_LEM_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    LNE_Test_ReceiverEC.cpp
+  }
+
+  Header_Files {
+    LNE_Test_ReceiverEC.h
+    Receiver_lem_stub_export.h
+  }
+
+  Inline_Files {
+    LNE_Test_ReceiverEC.inl
+  }
+}
+
+project(DDS_LNE_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
+  after += DDS_LNE_Test_Receiver_idl_gen  DDS_LNE_Test_Connector_stub \
+           DDS_LNE_Test_Base_stub DDS_LNE_Test_Connector_lem_gen
+  libs  += DDS_LNE_Test_Connector_stub DDS_LNE_Test_Base_stub
+  libpaths += ../lib
+  libout = ../lib
+  includes += ..
+  sharedname = Receiver_stub
+  dynamicflags   = RECEIVER_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    LNE_Test_ReceiverC.cpp
+  }
+
+  Header_Files {
+    LNE_Test_ReceiverC.h
+    Receiver_stub_export.h
+  }
+
+  Inline_Files {
+    LNE_Test_ReceiverC.inl
+  }
+}
+
+project(DDS_LNE_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
+  after   += DDS_LNE_Test_Receiver_lem_stub DDS_LNE_Test_Receiver_stub \
+             DDS_LNE_Test_Base_stub DDS_LNE_Test_Connector_stub \
+             DDS_LNE_Test_Connector_lem_stub DDS4CCM_lem_stub
+  sharedname = Receiver_exec
+  libs += Receiver_stub Receiver_lem_stub DDS_LNE_Test_Base_stub \
+          DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_lem_stub \
+          DDS4CCM_lem_stub
+  libpaths += ../lib
+  libout = ../lib
+  includes += ..
+  dynamicflags   = RECEIVER_EXEC_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    LNE_Test_Receiver_exec.cpp
+  }
+
+  Header_Files {
+    LNE_Test_Receiver_exec.h
+    Receiver_exec_export.h
+  }
+
+  Inline_Files {
+  }
+}
+
+
+project(DDS_LNE_Test_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+  after      +=   DDS_LNE_Test_Receiver_lem_stub DDS_LNE_Test_Base_stub \
+                  DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_svnt \
+                  DDS_LNE_Test_Receiver_exec DDS_LNE_Test_Connector_lem_stub \
+                  DDS4CCM_lem_stub DDS4CCM_skel
+  sharedname  = Receiver_svnt
+  libs       += Receiver_stub Receiver_lem_stub DDS_LNE_Test_Base_stub \
+                DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_svnt \
+                Receiver_exec DDS_LNE_Test_Connector_lem_stub DDS4CCM_lem_stub \
+                DDS4CCM_skel
+  libpaths += ../lib
+  libout = ../lib
+  includes += ..
+  dynamicflags = RECEIVER_SVNT_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    LNE_Test_ReceiverS.cpp
+    LNE_Test_Receiver_svnt.cpp
+  }
+
+  Header_Files {
+    LNE_Test_ReceiverS.h
+    LNE_Test_Receiver_svnt.h
+    Receiver_svnt_export.h
+  }
+
+  Inline_Files {
+    LNE_Test_ReceiverS.inl
+  }
+}
+
+
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp
new file mode 100644
index 00000000000..9953f589a5b
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp
@@ -0,0 +1,211 @@
+// -*- C++ -*-
+//
+// $Id$
+
+#include "LNE_Test_Receiver_exec.h"
+#include "ciao/Logger/Log_Macros.h"
+#include "tao/ORB_Core.h"
+#include "ace/OS_NS_time.h"
+
+namespace CIAO_LNE_Test_Receiver_Impl
+{
+  //============================================================
+  // ListenNotEnabledTest_Listener_exec_i
+  //============================================================
+  ListenNotEnabledTest_Listener_exec_i::ListenNotEnabledTest_Listener_exec_i (
+                                              Atomic_ULong &received_one_by_one,
+                                              Atomic_ULong &received_many_by_many)
+    : received_one_by_one_ (received_one_by_one),
+      received_many_by_many_ (received_many_by_many)
+  {
+  }
+
+  ListenNotEnabledTest_Listener_exec_i::~ListenNotEnabledTest_Listener_exec_i (void)
+  {
+  }
+
+  void
+  ListenNotEnabledTest_Listener_exec_i::on_one_data (
+                                  const ListenNotEnabledTest & /*an_instance*/,
+                                  const ::CCM_DDS::ReadInfo & /*info*/)
+  {
+    ++this->received_one_by_one_;
+  }
+
+  void
+  ListenNotEnabledTest_Listener_exec_i::on_many_data (
+                                  const ListenNotEnabledTest_Seq & /*an_instance*/,
+                                  const ::CCM_DDS::ReadInfoSeq & /*info*/)
+  {
+    ++this->received_many_by_many_;
+  }
+
+  //============================================================
+  // ConnectorStatusListener_exec_i
+  //============================================================
+  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
+            Atomic_Bool &data_received)
+    : data_received_ (data_received)
+  {
+  }
+
+  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
+  {
+  }
+
+  // Operations from ::CCM_DDS::ConnectorStatusListener
+  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
+     ::DDS::Topic_ptr ,
+     const DDS::InconsistentTopicStatus & )
+  {
+  }
+
+  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
+    ::DDS::DataReader_ptr ,
+     const DDS::RequestedIncompatibleQosStatus & )
+  {
+  }
+
+  void ConnectorStatusListener_exec_i::on_sample_rejected(
+     ::DDS::DataReader_ptr ,
+     const DDS::SampleRejectedStatus & )
+  {
+  }
+
+  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
+     ::DDS::DataWriter_ptr ,
+     const DDS::OfferedDeadlineMissedStatus & )
+  {
+  }
+
+  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
+     ::DDS::DataWriter_ptr ,
+     const DDS::OfferedIncompatibleQosStatus & )
+  {
+  }
+
+  void ConnectorStatusListener_exec_i::on_unexpected_status(
+    ::DDS::Entity_ptr /*the_entity*/,
+    ::DDS::StatusKind  status_kind)
+  {
+    if (status_kind == ::DDS::DATA_ON_READERS_STATUS)
+      {
+        this->data_received_ = true;
+      }
+  }
+
+  //============================================================
+  // Receiver_exec_i
+  //============================================================
+  Receiver_exec_i::Receiver_exec_i (void)
+    : received_one_by_one_ (0),
+      received_many_by_many_ (0),
+      data_received_ (false)
+  {
+  }
+
+  Receiver_exec_i::~Receiver_exec_i (void)
+  {
+  }
+
+  // Port operations.
+  ::CCM_DDS::ListenNotEnabledTest::CCM_Listener_ptr
+  Receiver_exec_i::get_info_listen_data_listener (void)
+  {
+    return new ListenNotEnabledTest_Listener_exec_i (
+                this->received_one_by_one_,
+                this->received_many_by_many_);
+  }
+
+  ::CCM_DDS::CCM_PortStatusListener_ptr
+  Receiver_exec_i::get_info_listen_status (void)
+  {
+    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
+  }
+
+  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
+  Receiver_exec_i::get_info_listen_connector_status (void)
+  {
+    return new ConnectorStatusListener_exec_i (this->data_received_);
+  }
+
+  // Operations from Components::SessionComponent.
+  void
+  Receiver_exec_i::set_session_context (
+    ::Components::SessionContext_ptr ctx)
+  {
+    this->context_ =
+      ::LNE_Test::CCM_Receiver_Context::_narrow (ctx);
+    if ( ::CORBA::is_nil (this->context_.in ()))
+      {
+        throw ::CORBA::INTERNAL ();
+      }
+  }
+
+  void
+  Receiver_exec_i::configuration_complete (void)
+  {
+  }
+
+  void
+  Receiver_exec_i::ccm_activate (void)
+  {
+    ::CCM_DDS::DataListenerControl_var dlc =
+        this->context_->get_connection_info_listen_data_control ();
+    dlc->mode (::CCM_DDS::NOT_ENABLED);
+  }
+
+  void
+  Receiver_exec_i::ccm_passivate (void)
+  {
+  }
+
+  void
+  Receiver_exec_i::ccm_remove (void)
+  {
+    if (this->received_one_by_one_.value () > 0)
+      {
+        CIAO_ERROR ((LM_ERROR, "ERROR: NOT ENABLED: "
+                               "Received samples on one_by_one "
+                               "callback while mode is NOT_ENABLED "
+                               "expected <0> - received <%u>\n",
+                               this->received_one_by_one_.value ()));
+      }
+    if (this->received_many_by_many_.value () > 0)
+      {
+        CIAO_ERROR ((LM_ERROR, "ERROR: NOT ENABLED: "
+                               "Received samples on many_by_many "
+                               "callback while mode is NOT_ENABLED "
+                               "expected <0> - received <%u>\n",
+                               this->received_many_by_many_.value ()));
+      }
+    if (this->data_received_.value ())
+      {
+        CIAO_ERROR ((LM_ERROR, "ERROR: NOT ENABLED: "
+                               "Received DATA_ON_READERS_STATUS on "
+                               "ConnectorStatusListener\n"));
+      }
+    if (this->received_one_by_one_.value () == 0   &&
+        this->received_many_by_many_.value () == 0 &&
+        !this->data_received_.value ())
+      {
+        CIAO_DEBUG ((LM_DEBUG, "NOT ENABLED: "
+                               "Received no data at all."
+                               "Test passed!\n"));
+      }
+  }
+
+  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_LNE_Test_Receiver_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      Receiver_exec_i);
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h
new file mode 100644
index 00000000000..4083fcc0e95
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h
@@ -0,0 +1,135 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef CIAO_RECEIVER_EXEC_H_
+#define CIAO_RECEIVER_EXEC_H_
+
+#include "LNE_Test_ReceiverEC.h"
+
+#include /**/ "Receiver_exec_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/LocalObject.h"
+#include "ace/Reactor.h"
+#include "ace/Task.h"
+
+#include <map>
+
+namespace CIAO_LNE_Test_Receiver_Impl
+{
+  class Receiver_exec_i;
+
+  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong> Atomic_ULong;
+  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, bool> Atomic_Bool;
+
+  //============================================================
+  // ListenNotEnabledTest_Listener_exec_i
+  //============================================================
+  class RECEIVER_EXEC_Export ListenNotEnabledTest_Listener_exec_i
+    : public virtual ::CCM_DDS::ListenNotEnabledTest::CCM_Listener,
+      public virtual ::CORBA::LocalObject
+  {
+  public:
+    ListenNotEnabledTest_Listener_exec_i (
+                            Atomic_ULong &received_one_by_one,
+                            Atomic_ULong &received_many_by_many);
+    virtual ~ListenNotEnabledTest_Listener_exec_i (void);
+
+    virtual void
+    on_one_data (
+      const ListenNotEnabledTest & an_instance,
+      const ::CCM_DDS::ReadInfo & info);
+    virtual void
+    on_many_data (
+      const ListenNotEnabledTest_Seq & an_instance,
+      const ::CCM_DDS::ReadInfoSeq & info);
+  private:
+    Atomic_ULong &received_one_by_one_;
+    Atomic_ULong &received_many_by_many_;
+  };
+
+  //============================================================
+  // ConnectorStatusListener_exec_i
+  //============================================================
+  class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i
+    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
+      public virtual ::CORBA::LocalObject
+  {
+  public:
+    ConnectorStatusListener_exec_i (Atomic_Bool &data_received);
+    virtual ~ConnectorStatusListener_exec_i (void);
+
+    virtual
+    void on_inconsistent_topic( ::DDS::Topic_ptr ,
+                              const DDS::InconsistentTopicStatus & );
+    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_offered_deadline_missed( ::DDS::DataWriter_ptr ,
+                              const DDS::OfferedDeadlineMissedStatus & );
+    virtual
+    void on_offered_incompatible_qos( ::DDS::DataWriter_ptr ,
+                              const DDS::OfferedIncompatibleQosStatus & );
+    virtual
+    void on_unexpected_status( ::DDS::Entity_ptr ,
+                              ::DDS::StatusKind );
+  private:
+    Atomic_Bool &data_received_;
+  };
+
+  //============================================================
+  // Receiver_exec_i
+  //============================================================
+  class RECEIVER_EXEC_Export Receiver_exec_i
+    : public virtual Receiver_Exec,
+      public virtual ::CORBA::LocalObject
+  {
+  public:
+    Receiver_exec_i (void);
+    virtual ~Receiver_exec_i (void);
+
+    // Supported operations and attributes.
+    // Component attributes.
+
+    // Port operations.
+    virtual ::CCM_DDS::ListenNotEnabledTest::CCM_Listener_ptr
+    get_info_listen_data_listener (void);
+
+    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
+    get_info_listen_status (void);
+
+    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
+    get_info_listen_connector_status (void);
+
+    // Operations from Components::SessionComponent.
+    virtual void
+    set_session_context (
+      ::Components::SessionContext_ptr ctx);
+
+    virtual void configuration_complete (void);
+
+    virtual void ccm_activate (void);
+    virtual void ccm_passivate (void);
+    virtual void ccm_remove (void);
+
+  private:
+    ::LNE_Test::CCM_Receiver_Context_var context_;
+
+    Atomic_ULong received_one_by_one_;
+    Atomic_ULong received_many_by_many_;
+    Atomic_Bool  data_received_;
+  };
+
+  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_LNE_Test_Receiver_Impl (void);
+}
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl
new file mode 100644
index 00000000000..0dca89dbf81
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl
@@ -0,0 +1,27 @@
+// $Id$
+
+/**
+ * @file
+ * @author Marcel Smit <msmit@remedy.nl>
+ *
+ * by-hand idl3 translation of sender components.
+ */
+
+#ifndef DDS_LISTEN_NOT_ENABLED_TEST_SENDER_IDL
+#define DDS_LISTEN_NOT_ENABLED_TEST_SENDER_IDL
+
+#include "Connector/LNE_Test_Connector.idl"
+#include "Connector/LNE_Test_ConnectorE.idl"
+
+module LNE_Test
+{
+  component Sender
+  {
+    port CCM_DDS::ListenNotEnabledTest::DDS_Write info_write;
+
+    attribute unsigned short keys;
+    attribute unsigned short iterations;
+  };
+};
+
+#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc
new file mode 100755
index 00000000000..2902799aec7
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc
@@ -0,0 +1,149 @@
+// $Id$
+// This file is generated with "generate_component_mpc.pl -p DDS_LNE_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
+
+project(DDS_LNE_Test_Sender_idl_gen) : componentidldefaults   {
+  after += DDS_LNE_Test_Connector_idl_gen DDS_Starter_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
+              -Wb,stub_export_include=Sender_stub_export.h \
+              -Wb,skel_export_macro=SENDER_SVNT_Export \
+              -Wb,skel_export_include=Sender_svnt_export.h \
+              -Wb,svnt_export_macro=SENDER_SVNT_Export \
+              -Wb,svnt_export_include=Sender_svnt_export.h \
+              -Wb,exec_export_macro=SENDER_EXEC_Export \
+              -Wb,exec_export_include=Sender_exec_export.h \
+              -I ..
+
+  IDL_Files {
+    LNE_Test_Sender.idl
+  }
+}
+
+project(DDS_LNE_Test_Sender_lem_gen) : ciaoidldefaults {
+  after += DDS_LNE_Test_Sender_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
+              -Wb,stub_export_include=Sender_lem_stub_export.h \
+              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
+
+  IDL_Files {
+    LNE_Test_SenderE.idl
+  }
+}
+
+project(DDS_LNE_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base   {
+  after += DDS_LNE_Test_Sender_lem_gen DDS_LNE_Test_Sender_stub \
+           DDS_LNE_Test_Base_stub
+  libs  += DDS_LNE_Test_Base_stub Sender_stub
+  libpaths += ../lib
+  libout = ../lib
+  includes += ..
+  sharedname = Sender_lem_stub
+  dynamicflags   = SENDER_LEM_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    LNE_Test_SenderEC.cpp
+  }
+
+  Header_Files {
+    LNE_Test_SenderEC.h
+    Sender_lem_stub_export.h
+  }
+
+  Inline_Files {
+    LNE_Test_SenderEC.inl
+  }
+}
+
+project(DDS_LNE_Test_Sender_stub) : ccm_stub, dds4ccm_base   {
+  after += DDS_LNE_Test_Sender_idl_gen DDS_LNE_Test_Base_stub \
+           DDS_LNE_Test_Connector_stub
+  libs  += DDS_LNE_Test_Base_stub DDS_LNE_Test_Connector_stub
+  includes += ..
+  libpaths += ../lib
+  libout = ../lib
+  sharedname = Sender_stub
+  dynamicflags   = SENDER_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    LNE_Test_SenderC.cpp
+  }
+
+  Header_Files {
+    LNE_Test_SenderC.h
+    Sender_stub_export.h
+  }
+
+  Inline_Files {
+    LNE_Test_SenderC.inl
+  }
+}
+
+project(DDS_LNE_Test_Sender_exec) : ciao_executor, dds4ccm_base   {
+  after   += DDS_LNE_Test_Sender_lem_stub DDS_LNE_Test_Sender_stub \
+             DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_stub \
+             DDS4CCM_lem_stub
+  sharedname = Sender_exec
+  libs    += Sender_stub Sender_lem_stub DDS_LNE_Test_Base_stub \
+             DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_stub \
+             DDS4CCM_lem_stub
+  libpaths += ../lib
+  includes += ..
+  libout = ../lib
+  dynamicflags   = SENDER_EXEC_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    LNE_Test_Sender_exec.cpp
+  }
+
+  Header_Files {
+    LNE_Test_Sender_exec.h
+    Sender_exec_export.h
+  }
+
+  Inline_Files {
+  }
+}
+
+
+project(DDS_LNE_Test_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+  after      += DDS_LNE_Test_Base_stub  DDS_LNE_Test_Sender_lem_stub \
+                DDS4CCM_lem_stub DDS4CCM_skel DDS_LNE_Test_Connector_stub \
+                DDS_LNE_Test_Connector_svnt DDS_LNE_Test_Connector_lem_stub
+  sharedname  = Sender_svnt
+  libs       += Sender_stub Sender_lem_stub DDS_LNE_Test_Base_stub DDS4CCM_lem_stub \
+                DDS4CCM_skel DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_svnt \
+                DDS_LNE_Test_Connector_lem_stub
+  libpaths += ../lib
+  libout = ../lib
+  includes += ..
+  dynamicflags = SENDER_SVNT_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    LNE_Test_SenderS.cpp
+    LNE_Test_Sender_svnt.cpp
+  }
+
+  Header_Files {
+    LNE_Test_SenderS.h
+    LNE_Test_Sender_svnt.h
+    Sender_svnt_export.h
+  }
+
+  Inline_Files {
+    LNE_Test_SenderS.inl
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp
new file mode 100644
index 00000000000..816aa7d9ec4
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp
@@ -0,0 +1,167 @@
+// -*- C++ -*-
+// $Id$
+
+#include "LNE_Test_Sender_exec.h"
+#include "ace/Guard_T.h"
+#include "ciao/Logger/Log_Macros.h"
+#include "ace/Date_Time.h"
+#include "tao/ORB_Core.h"
+#include "ace/Reactor.h"
+
+namespace CIAO_LNE_Test_Sender_Impl
+{
+  //============================================================
+  // WriteManyHandler
+  //============================================================
+  WriteManyHandler::WriteManyHandler (Sender_exec_i &callback)
+    : callback_ (callback)
+  {
+  }
+
+  int
+  WriteManyHandler::handle_exception (ACE_HANDLE)
+  {
+    this->callback_.write_many ();
+    return 0;
+  }
+
+
+  //============================================================
+  // Component Executor Implementation Class: Sender_exec_i
+  //============================================================
+  Sender_exec_i::Sender_exec_i (void)
+    : iterations_ (10),
+      keys_ (5)
+  {
+  }
+
+  Sender_exec_i::~Sender_exec_i (void)
+  {
+  }
+
+  void
+  Sender_exec_i::write_many (void)
+  {
+    ListenNotEnabledTest_Seq write_many;
+    write_many.length (this->keys_ * this->iterations_);
+    for (CORBA::UShort key = 1; key < this->keys_ + 1; ++key)
+      {
+        ListenNotEnabledTest new_key;
+        char tmp[7];
+        ACE_OS::sprintf (tmp, "KEY_%d", key);
+        new_key.key = CORBA::string_dup(tmp);
+        for (CORBA::UShort iter = 1; iter < this->iterations_ + 1; ++iter)
+          {
+            new_key.iteration = iter;
+            write_many[key + iter - 2] = new_key;
+          }
+      }
+    try
+      {
+        ACE_Time_Value tv (1, 0);
+        ACE_OS::sleep (tv);
+        this->writer_->write_many (write_many);
+        CIAO_DEBUG ((LM_DEBUG, ACE_TEXT ("write_many : written <%u> samples\n"),
+              write_many.length ()));
+      }
+    catch (CCM_DDS::InternalError& ex)
+      {
+        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
+                    ACE_TEXT ("while write many writer info: index <%d> - retval <%d>\n"),
+                      ex.index, ex.error_code));
+      }
+  }
+
+
+  void
+  Sender_exec_i::start (void)
+  {
+    WriteManyHandler *rh = new WriteManyHandler (*this);
+    this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->notify (rh);
+  }
+
+  ::CORBA::UShort
+  Sender_exec_i::iterations (void)
+  {
+    return this->iterations_;
+  }
+
+  void
+  Sender_exec_i::iterations (::CORBA::UShort iterations)
+  {
+    this->iterations_ = iterations;
+  }
+
+  ::CORBA::UShort
+  Sender_exec_i::keys (void)
+  {
+    return this->keys_;
+  }
+
+  void
+  Sender_exec_i::keys (::CORBA::UShort keys)
+  {
+    this->keys_ = keys;
+  }
+
+  void
+  Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
+  {
+    this->context_ =
+      ::LNE_Test::CCM_Sender_Context::_narrow (ctx);
+
+    if ( ::CORBA::is_nil (this->context_.in ()))
+      {
+        throw ::CORBA::INTERNAL ();
+      }
+  }
+
+  void
+  Sender_exec_i::configuration_complete (void)
+  {
+  }
+
+  void
+  Sender_exec_i::ccm_activate (void)
+  {
+    try
+      {
+        this->writer_ = this->context_->get_connection_info_write_data ();
+        start ();
+      }
+    catch (const CORBA::Exception& ex)
+      {
+        ex._tao_print_exception ("Exception caught:");
+        CIAO_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Exception caught\n")));
+      }
+    catch (...)
+      {
+        CIAO_ERROR ((LM_ERROR, 
+          ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Unknown exception caught\n")));
+      }
+  }
+
+  void
+  Sender_exec_i::ccm_passivate (void)
+  {
+  }
+
+  void
+  Sender_exec_i::ccm_remove (void)
+  {
+  }
+
+  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_LNE_Test_Sender_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      Sender_exec_i);
+
+    return retval;
+  }
+}
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h
new file mode 100644
index 00000000000..b05f847aede
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h
@@ -0,0 +1,76 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef CIAO_SENDER_EXEC_H_
+#define CIAO_SENDER_EXEC_H_
+
+
+#include "LNE_Test_SenderEC.h"
+
+#include /**/ "Sender_exec_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/LocalObject.h"
+
+namespace CIAO_LNE_Test_Sender_Impl
+{
+  class Sender_exec_i;
+
+  //============================================================
+  // WriteManyHandler
+  //============================================================
+  class WriteManyHandler :
+    public ACE_Event_Handler
+  {
+  public:
+    WriteManyHandler (Sender_exec_i &callback);
+    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
+  private:
+    /// Maintains a handle that actually process the event
+    Sender_exec_i &callback_;
+  };
+
+  class Sender_exec_i
+    : public virtual Sender_Exec,
+      public virtual ::CORBA::LocalObject
+  {
+  public:
+    Sender_exec_i (void);
+    virtual ~Sender_exec_i (void);
+
+    virtual ::CORBA::UShort iterations (void);
+
+    virtual void iterations (::CORBA::UShort iterations);
+
+    virtual ::CORBA::UShort keys (void);
+
+    virtual void keys (::CORBA::UShort keys);
+
+    virtual void set_session_context (::Components::SessionContext_ptr ctx);
+
+    virtual void configuration_complete (void);
+
+    virtual void ccm_activate (void);
+    virtual void ccm_passivate (void);
+    virtual void ccm_remove (void);
+
+    void start (void);
+    void write_many (void);
+
+  private:
+    ::LNE_Test::CCM_Sender_Context_var context_;
+    CCM_DDS::ListenNotEnabledTest::Writer_var writer_;
+
+    CORBA::UShort iterations_;
+    CORBA::UShort keys_;
+ };
+
+  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_LNE_Test_Sender_Impl (void);
+}
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/Listener/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/Plan.cdp
index 4f1b8b363aa..e8e4300132b 100644
--- a/CIAO/connectors/dds4ccm/tests/Listener/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/Plan.cdp
@@ -3,8 +3,8 @@
    xmlns:xmi="http://www.omg.org/XMI"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>Listen_Test_Depl_1</label>
-  <UUID>Listen_Test_Depl_1</UUID>
+  <label>LNE_Test_Depl_1</label>
+  <UUID>LNE_Test_Depl_1</UUID>
 
   <implementation xmi:id="ReceiverComponentImplementation">
     <name>ReceiverComponentImplementation</name>
@@ -19,7 +19,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Listen_Test_Receiver_Impl</string>
+          <string>create_LNE_Test_Receiver_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -30,7 +30,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Listen_Test_Receiver_Servant</string>
+          <string>create_LNE_Test_Receiver_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -58,11 +58,11 @@
     </execParameter>
   </implementation>
 
-  <implementation xmi:id="Listen_Test_ConnectorComponentImplementation">
-    <name>Listen_Test_ConnectorComponentImplementation</name>
+  <implementation xmi:id="LNE_Test_ConnectorComponentImplementation">
+    <name>LNE_Test_ConnectorComponentImplementation</name>
     <source/>
-    <artifact xmi:idref="Listen_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Listen_Test_Connector_SvntArtifact" />
+    <artifact xmi:idref="LNE_Test_Connector_ExecArtifact" />
+    <artifact xmi:idref="LNE_Test_Connector_SvntArtifact" />
     <execParameter>
       <!-- entrypoint as exec parameter (see 10.6.1) -->
       <name>component factory</name>
@@ -71,7 +71,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Listen_Test_Listen_Test_Connector_Impl</string>
+          <string>create_LNE_Test_LNE_Test_Connector_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -82,7 +82,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Listen_Test_Listen_Test_Connector_Servant</string>
+          <string>create_LNE_Test_LNE_Test_Connector_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -93,7 +93,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Listen_Test_Connector_svnt</string>
+          <string>LNE_Test_Connector_svnt</string>
         </value>
       </value>
     </execParameter>
@@ -104,7 +104,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Listen_Test_Connector_exec</string>
+          <string>LNE_Test_Connector_exec</string>
         </value>
       </value>
     </execParameter>
@@ -122,7 +122,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Listen_Test_Sender_Impl</string>
+          <string>create_LNE_Test_Sender_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -133,7 +133,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Listen_Test_Sender_Servant</string>
+          <string>create_LNE_Test_Sender_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -167,12 +167,12 @@
     <source/>
     <implementation xmi:idref="ReceiverComponentImplementation" />
   </instance>
-  <instance xmi:id="Listen_Test_ConnectorComponentInstance">
-    <name>Listen_Test_ConnectorComponent</name>
+  <instance xmi:id="LNE_Test_ConnectorComponentInstance">
+    <name>LNE_Test_ConnectorComponent</name>
     <node>SenderNode</node>
     <!-- hostname -->
     <source/>
-    <implementation xmi:idref="Listen_Test_ConnectorComponentImplementation" />
+    <implementation xmi:idref="LNE_Test_ConnectorComponentImplementation" />
     <configProperty>
       <name>topic_name</name>
       <value>
@@ -180,17 +180,17 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Listen_Test</string>
+          <string>LNE_Test</string>
         </value>
       </value>
     </configProperty>
   </instance>
-  <instance xmi:id="Listen_Test_ConnectorComponentInstance2">
-    <name>Listen_Test_ConnectorComponent2</name>
+  <instance xmi:id="LNE_Test_ConnectorComponentInstance2">
+    <name>LNE_Test_ConnectorComponent2</name>
     <node>ReceiverNode</node>
     <!-- hostname -->
     <source/>
-    <implementation xmi:idref="Listen_Test_ConnectorComponentImplementation" />
+    <implementation xmi:idref="LNE_Test_ConnectorComponentImplementation" />
     <configProperty>
       <name>topic_name</name>
       <value>
@@ -198,7 +198,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Listen_Test</string>
+          <string>LNE_Test</string>
         </value>
       </value>
     </configProperty>
@@ -245,7 +245,7 @@
       <portName>push_consumer_data_listener</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Listen_Test_ConnectorComponentInstance2" />
+      <instance xmi:idref="LNE_Test_ConnectorComponentInstance2" />
     </internalEndpoint>
   </connection>
 
@@ -261,7 +261,7 @@
       <portName>push_consumer_data_control</portName>
       <provider>true</provider>
       <kind>Facet</kind>
-      <instance xmi:idref="Listen_Test_ConnectorComponentInstance2" />
+      <instance xmi:idref="LNE_Test_ConnectorComponentInstance2" />
     </internalEndpoint>
   </connection>
 
@@ -277,23 +277,7 @@
       <portName>supplier_data</portName>
       <provider>true</provider>
       <kind>Facet</kind>
-      <instance xmi:idref="Listen_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_invoker</name>
-    <internalEndpoint>
-      <portName>invoke_listen</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>listen_invoke</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
+      <instance xmi:idref="LNE_Test_ConnectorComponentInstance" />
     </internalEndpoint>
   </connection>
 
@@ -315,23 +299,23 @@
     <node/>
     <location>Sender_stub</location>
   </artifact>
-  <artifact xmi:id="Listen_Test_Connector_ExecArtifact">
-    <name>Listen_Test_Connector_exec</name>
+  <artifact xmi:id="LNE_Test_Connector_ExecArtifact">
+    <name>LNE_Test_Connector_exec</name>
     <source/>
     <node/>
-    <location>DDS_Listen_Test_Connector_exec</location>
+    <location>DDS_LNE_Test_Connector_exec</location>
   </artifact>
-  <artifact xmi:id="Listen_Test_Connector_SvntArtifact">
-    <name>Listen_Test_Connector_svnt</name>
+  <artifact xmi:id="LNE_Test_Connector_SvntArtifact">
+    <name>LNE_Test_Connector_svnt</name>
     <source/>
     <node/>
-    <location>DDS_Listen_Test_Connector_svnt</location>
+    <location>DDS_LNE_Test_Connector_svnt</location>
   </artifact>
-  <artifact xmi:id="Listen_Test_Connector_StubArtifact">
-    <name>Listen_Test_Connector_stub</name>
+  <artifact xmi:id="LNE_Test_Connector_StubArtifact">
+    <name>LNE_Test_Connector_stub</name>
     <source/>
     <node/>
-    <location>DDS_Listen_Test_Connector_stub</location>
+    <location>DDS_LNE_Test_Connector_stub</location>
   </artifact>
   <artifact xmi:id="Receiver_ExecArtifact">
     <name>Receiver_exec</name>
diff --git a/CIAO/connectors/dds4ccm/tests/Listener/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl
index e4878f89ea5..3aeb2a02770 100755
--- a/CIAO/connectors/dds4ccm/tests/Listener/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl
@@ -207,8 +207,8 @@ for ($i = 0; $i < $nr_daemon; ++$i) {
     }
 }
 
-print "Sleeping 30 seconds to allow task to complete\n";
-sleep (30);
+print "Sleeping 10 seconds to allow task to complete\n";
+sleep (10);
 
 # Invoke executor - stop the application -.
 print "Invoking executor - stop the application -\n";
diff --git a/CIAO/connectors/dds4ccm/tests/Listener/Base/Listen_Invoker.idl b/CIAO/connectors/dds4ccm/tests/Listener/Base/Listen_Invoker.idl
deleted file mode 100644
index 86b46d500b1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Listener/Base/Listen_Invoker.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-// $Id$
-
-/**
- * @file Listen_Invoker.idl
- * @author Marcel Smit <msmit@remedy.nl>
- */
-
-#ifndef LISTEN_INVOKER_IDL
-#define LISTEN_INVOKER_IDL
-
-interface ListenInvoker
-{
-  void start_not_enabled ();
-  void start_listen_one_by_one (in unsigned short keys,
-                                in unsigned long iteration);
-  void start_listen_many_by_many (in unsigned short keys,
-                                  in unsigned long iteration);
-};
-
-#endif /* SAMPLE_INFO_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/Listener/Base/Listen_Invoker.mpc b/CIAO/connectors/dds4ccm/tests/Listener/Base/Listen_Invoker.mpc
deleted file mode 100755
index 4ea051ecd72..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Listener/Base/Listen_Invoker.mpc
+++ /dev/null
@@ -1,115 +0,0 @@
-// $Id$
-
-project(DDS_Listen_Invoker_idl_gen) : componentidldefaults {
-  custom_only = 1
-  after += 
-  idlflags += -Wb,stub_export_macro=GET_INVOKER_STUB_Export \
-              -Wb,stub_export_include=Listen_Invoker_stub_export.h \
-              -Wb,skel_export_macro=GET_INVOKER_SVNT_Export \
-              -Wb,skel_export_include=Listen_Invoker_svnt_export.h \
-              -Wb,svnt_export_macro=GET_INVOKER_SVNT_Export \
-              -Wb,svnt_export_include=Listen_Invoker_svnt_export.h \
-              -Wb,exec_export_macro=GET_INVOKER_EXEC_Export \
-              -Wb,exec_export_include=Listen_Invoker_exec_export.h -I..
-
-  IDL_Files {
-    Listen_Invoker.idl
-  }
-}
-
-project(DDS_Listen_Invoker_lem_gen) : ciaoidldefaults {
-  after += DDS_Listen_Invoker_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=GET_INVOKER_LEM_STUB_Export \
-              -Wb,stub_export_include=Listen_Invoker_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Listen_InvokerE.idl
-  }
-}
-
-project(DDS_Listen_Invoker_lem_stub) : ccm_svnt, dds4ccm_base  {
-  after += DDS_Listen_Invoker_lem_gen DDS_Listen_Invoker_stub
-  libs  += Listen_Invoker_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Listen_Invoker_lem_stub
-  dynamicflags   = GET_INVOKER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Listen_InvokerEC.cpp
-  }
-
-  Header_Files {
-    Listen_InvokerEC.h
-    Listen_Invoker_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Listen_InvokerEC.inl
-  }
-}
-
-project(DDS_Listen_Invoker_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Listen_Invoker_idl_gen
-  libs  += 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Listen_Invoker_stub
-  dynamicflags   = GET_INVOKER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Listen_InvokerC.cpp
-  }
-
-  Header_Files {
-    Listen_InvokerC.h
-    Listen_Invoker_stub_export.h
-  }
-
-  Inline_Files {
-    Listen_InvokerC.inl
-  }
-}
-
-
-project(DDS_Listen_Invoker_svnt) : ciao_servant, dds4ccm_base, nddslib {
-  after      +=   DDS_Listen_Invoker_lem_stub DDS_Listen_Invoker_stub\
-                  DDS4CCM_lem_stub DDS4CCM_skel
-  sharedname  = Listen_Invoker_svnt
-  libs       += Listen_Invoker_stub Listen_Invoker_lem_stub \
-                DDS4CCM_lem_stub DDS4CCM_skel
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags = GET_INVOKER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Listen_InvokerS.cpp
-    Listen_Invoker_svnt.cpp
-  }
-
-  Header_Files {
-    Listen_InvokerS.h
-    Listen_Invoker_svnt.h
-    Listen_Invoker_svnt_export.h
-  }
-
-  Inline_Files {
-    Listen_InvokerS.inl
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Listener/Base/Listen_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Listener/Base/Listen_Test_Base.idl
deleted file mode 100644
index 232c55fa864..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Listener/Base/Listen_Test_Base.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-// $Id$
-
-/**
- * @file Listen_Invoker_Base.idl
- * @author Marcel Smit <msmit@remedy.nl>
- */
-
-#ifndef LISTEN_TEST_BASE_IDL
-#define LISTEN_TEST_BASE_IDL
-
-struct ListenTest {
-  string key;
-  long iteration;
-};
-
-typedef sequence<ListenTest> ListenTest_Seq;
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Listener/Base/Listen_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Listener/Base/Listen_Test_Base.mpc
deleted file mode 100755
index 9bcf6e7e80c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Listener/Base/Listen_Test_Base.mpc
+++ /dev/null
@@ -1,76 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Listen_Test_Base"
-
-project(DDS_Listen_Test_Base_idl_gen) : taoidldefaults, anytypecode {
-  custom_only = 1
-  idlflags -= -St -Sa
-  idlflags += -SS -Gxhst \
-              -Wb,stub_export_macro=LISTEN_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=Listen_Test_Base_stub_export.h
-
-  IDL_Files {
-    Listen_Test_Base.idl
-  }
-}
-
-project(DDS_Listen_Test_Base_ndds_ts_gen) : ndds_ts_defaults   {
-  custom_only = 1
-  after += DDS_Listen_Test_Base_idl_gen
-  ndds_ts_flags += -corba Listen_Test_BaseC.h -orb ACE_TAO1.7
-
-  NDDSTypeSupport_Files {
-    Listen_Test_Base.idl
-  }
-}
-
-project(DDS_Listen_Test_Base_NDDS_TS) : nddslib, taolib {
-  after += DDS_Listen_Test_Base_ndds_ts_gen DDS_Listen_Test_Base_stub
-  libs += DDS_Listen_Test_Base_stub
-  libout = ../lib
-  libpaths    += ../lib
-  sharedname = DDS_Listen_Test_Base_NDDS_TS
-  dynamicflags = NDDS_USER_DLL_EXPORT
-
-  verbatim(gnuace, macros) {
-    override no_hidden_visibility = 1
-  }
-
-  Source_Files {
-    Listen_Test_Base.cxx
-    Listen_Test_BasePlugin.cxx
-    Listen_Test_BaseSupport.cxx
-  }
-
-  Header_Files {
-    Listen_Test_Base.h
-    Listen_Test_BasePlugin.h
-    Listen_Test_BaseSupport.h
-  }
-
-  Inline_Files {
-  }
-}
-
-project(DDS_Listen_Test_Base_stub) : ccm_stub {
-  after += DDS_Listen_Test_Base_idl_gen
-  libout = ../lib
-  libpaths += ../lib
-  sharedname = DDS_Listen_Test_Base_stub
-  dynamicflags = LISTEN_TEST_BASE_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Listen_Test_BaseC.cpp
-  }
-
-  Header_Files {
-    Listen_Test_BaseC.h
-    Listen_Test_Base_stub_export.h
-  }
-
-  Inline_Files {
-    Listen_Test_BaseC.inl
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Listener/Connector/Listen_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/Listener/Connector/Listen_Test_Connector.idl
deleted file mode 100644
index 8e9dc16580d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Listener/Connector/Listen_Test_Connector.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-
-/**
- * @file Listen_Test_Connector.idl
- * @author Marcel Smit <msmit@remedy.nl>
- *
- * by-hand translation of the idl3p.
- */
-
-#ifndef LISTEN_TEST_CONNECTOR_IDL_
-#define LISTEN_TEST_CONNECTOR_IDL_
-
-#include  <Components.idl>
-#include "Base/Listen_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
-
-TYPED_MODULE( ::ListenTest, ::ListenTest_Seq, ListenTest)
-
-module Listen_Test
-{
-  connector Listen_Test_Connector : ::CCM_DDS::ListenTest::DDS_Event
-  {
-  };
-};
-
-#endif /* Listen_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Listener/Connector/Listen_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Listener/Connector/Listen_Test_Connector.mpc
deleted file mode 100755
index f124a5a868c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Listener/Connector/Listen_Test_Connector.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -p DDS_Listen_Test_Base -l .. -o ../lib -u DDS Listen_Test_Connector"
-
-project(DDS_Listen_Test_Connector_idl_gen) : connectoridldefaults {
-  after += DDS4CCM_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=LISTEN_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Listen_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=LISTEN_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Listen_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=LISTEN_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Listen_Test_Connector_svnt_export.h \
-              -Wb,exec_export_macro=LISTEN_TEST_CONNECTOR_EXEC_Export \
-              -Wb,exec_export_include=Listen_Test_Connector_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    Listen_Test_Connector.idl
-  }
-}
-
-project(DDS_Listen_Test_Connector_lem_gen) : ciaoidldefaults {
-  custom_only = 1
-  after += DDS_Listen_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=LISTEN_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Listen_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
-
-  IDL_Files {
-    Listen_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_Listen_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base   {
-  after += DDS_Listen_Test_Connector_lem_gen DDS_Listen_Test_Connector_stub DDS_Listen_Test_Base_stub DDS4CCM_lem_stub
-  libs  += DDS_Listen_Test_Base_stub DDS_Listen_Test_Connector_stub DDS4CCM_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Listen_Test_Connector_lem_stub
-  dynamicflags   = LISTEN_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Listen_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Listen_Test_ConnectorEC.h
-    Listen_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Listen_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_Listen_Test_Connector_stub) : ccm_stub, dds4ccm_base   {
-  after += DDS_Listen_Test_Connector_idl_gen DDS_Listen_Test_Base_stub
-  libs  += DDS_Listen_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Listen_Test_Connector_stub
-  dynamicflags   = LISTEN_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Listen_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Listen_Test_ConnectorC.h
-    Listen_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Listen_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_Listen_Test_Connector_exec) : ciao_executor, dds4ccm_skel, nddslib {
-  after   += DDS_Listen_Test_Connector_lem_stub DDS_Listen_Test_Connector_stub DDS4CCM_lem_stub CIAO_DDS4CCM_NDDS_Impl DDS_Listen_Test_Base_NDDS_TS
-  sharedname = DDS_Listen_Test_Connector_exec
-  libs += DDS_Listen_Test_Connector_stub DDS_Listen_Test_Connector_lem_stub DDS_Listen_Test_Base_stub CIAO_DDS4CCM_NDDS_Impl DDS4CCM_lem_stub DDS_Listen_Test_Base_NDDS_TS
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags   = LISTEN_TEST_CONNECTOR_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Listen_Test_Connector_exec.cpp
-  }
-
-  Header_Files {
-    Listen_Test_Connector_exec.h
-    Listen_Test_Connector_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Listen_Test_Connector_svnt) : ciao_servant, dds4ccm_skel, nddslib {
-  after      += DDS_Listen_Test_Connector_lem_stub DDS_Listen_Test_Connector_exec DDS_Listen_Test_Connector_stub DDS4CCM_lem_stub
-  sharedname  = DDS_Listen_Test_Connector_svnt
-  libs       += DDS_Listen_Test_Connector_stub \
-                DDS_Listen_Test_Connector_lem_stub  \
-                DDS_Listen_Test_Base_stub \
-                DDS_Listen_Test_Connector_exec \
-                DDS4CCM_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags = LISTEN_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Listen_Test_ConnectorS.cpp
-    Listen_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Listen_Test_ConnectorS.h
-    Listen_Test_Connector_svnt.h
-    Listen_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-    Listen_Test_ConnectorS.inl
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Listener/Connector/Listen_Test_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/Listener/Connector/Listen_Test_Connector_exec.cpp
deleted file mode 100644
index d9c4cec1a42..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Listener/Connector/Listen_Test_Connector_exec.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "Listen_Test_Connector_exec.h"
-
-namespace CIAO_Listen_Test_Listen_Test_Connector_Impl
-{
-  Listen_Test_Connector_exec_i::Listen_Test_Connector_exec_i (void)
-    : DDS_Event_Connector_T<ListenTest_DDS_Traits, ListenTest_Connector_Traits> ()
-  {
-  }
-
-  Listen_Test_Connector_exec_i::~Listen_Test_Connector_exec_i (void)
-  {
-  }
-
-  extern "C" LISTEN_TEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Listen_Test_Listen_Test_Connector_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Listen_Test_Connector_exec_i ());
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/Listener/Connector/Listen_Test_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/Listener/Connector/Listen_Test_Connector_exec.h
deleted file mode 100644
index bb8c8eb1746..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Listener/Connector/Listen_Test_Connector_exec.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#ifndef LISTEN_TEST_CONNECTOR_EXEC_H_
-#define LISTEN_TEST_CONNECTOR_EXEC_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Listen_Test_ConnectorEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Listen_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"
-
-#include "Base/Listen_Test_BaseSupport.h"
-
-namespace CIAO_Listen_Test_Listen_Test_Connector_Impl
-{
-
-  // @from use of ListenTest as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
-    ListenTest,
-    ListenTestSeq,
-    ListenTestTypeSupport,
-    ListenTestDataWriter,
-    ListenTestDataReader > ListenTest_DDS_Traits;
-
-  typedef CIAO::DDS4CCM::Connector_Traits <
-    ::CIAO_Listen_Test_Listen_Test_Connector_Impl::Listen_Test_Connector_Exec,
-    ListenTest_Seq,
-    ::CCM_DDS::ListenTest::CCM_Writer,
-    ::CCM_DDS::ListenTest::CCM_Updater,
-    ::CCM_DDS::ListenTest::CCM_Getter,
-    ::CCM_DDS::ListenTest::CCM_Reader,
-    ::Listen_Test::CCM_Listen_Test_Connector_Context,
-    ::CCM_DDS::ListenTest::Listener,
-    ::CCM_DDS::ListenTest::StateListener,
-    ::CCM_DDS::ConnectorStatusListener> ListenTest_Connector_Traits;
-
-  class LISTEN_TEST_CONNECTOR_EXEC_Export Listen_Test_Connector_exec_i :
-    public DDS_Event_Connector_T <ListenTest_DDS_Traits, ListenTest_Connector_Traits>
-  {
-  public:
-    Listen_Test_Connector_exec_i (void);
-    virtual ~Listen_Test_Connector_exec_i (void);
-  };
-
-  extern "C" LISTEN_TEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Listen_Test_Listen_Test_Connector_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/Listener/Receiver/Listen_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Listener/Receiver/Listen_Test_Receiver.idl
deleted file mode 100644
index 992a916da1d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Listener/Receiver/Listen_Test_Receiver.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-// $Id$
-
-/**
- * @file
- * @author Marcel Smit <msmit@remedy.nl>
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Listen_Test_Connector.idl"
-#include "Connector/Listen_Test_ConnectorE.idl"
-
-#include "Base/Listen_Invoker.idl"
-#include "Base/Listen_InvokerE.idl"
-
-module Listen_Test
-{
-  component Receiver
-  {
-    port CCM_DDS::ListenTest::DDS_Listen info_listen;
-
-    provides ListenInvoker listen_invoke;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Listener/Receiver/Listen_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Listener/Receiver/Listen_Test_Receiver.mpc
deleted file mode 100755
index 4944cedd399..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Listener/Receiver/Listen_Test_Receiver.mpc
+++ /dev/null
@@ -1,157 +0,0 @@
-// $Id$
-
-project(DDS_Listen_Test_Receiver_idl_gen) : componentidldefaults {
-  custom_only = 1
-  after += DDS_Listen_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h -I..
-
-  IDL_Files {
-    Listen_Test_Receiver.idl
-  }
-}
-
-project(DDS_Listen_Test_Receiver_lem_gen) : ciaoidldefaults {
-  after += DDS_Listen_Test_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Listen_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_Listen_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
-  after += DDS_Listen_Test_Receiver_lem_gen DDS_Listen_Test_Receiver_stub  \
-           DDS_Listen_Test_Connector_stub DDS_Listen_Test_Base_stub \
-           DDS_Listen_Invoker_stub
-  libs  +=  Receiver_stub DDS_Listen_Test_Connector_stub \
-            DDS_Listen_Test_Base_stub Listen_Invoker_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags   = RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Listen_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Listen_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Listen_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_Listen_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Listen_Test_Receiver_idl_gen  DDS_Listen_Test_Connector_stub \
-           DDS_Listen_Test_Base_stub DDS_Listen_Test_Connector_lem_gen \
-           DDS_Listen_Invoker_stub DDS_Listen_Invoker_lem_stub
-  libs  += DDS_Listen_Test_Connector_stub DDS_Listen_Test_Base_stub \
-           Listen_Invoker_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags   = RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Listen_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Listen_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Listen_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_Listen_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
-  after   += DDS_Listen_Test_Receiver_lem_stub DDS_Listen_Test_Receiver_stub \
-             DDS_Listen_Test_Base_stub DDS_Listen_Test_Connector_stub \
-             DDS_Listen_Test_Connector_lem_stub DDS4CCM_lem_stub \
-             DDS_Listen_Invoker_lem_stub DDS_Listen_Invoker_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_Listen_Test_Base_stub \
-          DDS_Listen_Test_Connector_stub DDS_Listen_Test_Connector_lem_stub \
-          DDS4CCM_lem_stub Listen_Invoker_lem_stub Listen_Invoker_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags   = RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Listen_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Listen_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Listen_Test_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
-  after      +=   DDS_Listen_Test_Receiver_lem_stub DDS_Listen_Test_Base_stub \
-                  DDS_Listen_Test_Connector_stub DDS_Listen_Test_Connector_svnt \
-                  DDS_Listen_Test_Receiver_exec DDS_Listen_Test_Connector_lem_stub \
-                  DDS4CCM_lem_stub DDS4CCM_skel DDS_Listen_Invoker_stub \
-                  DDS_Listen_Invoker_svnt DDS_Listen_Invoker_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_Listen_Test_Base_stub \
-                DDS_Listen_Test_Connector_stub DDS_Listen_Test_Connector_svnt \
-                Receiver_exec DDS_Listen_Test_Connector_lem_stub DDS4CCM_lem_stub \
-                DDS4CCM_skel Listen_Invoker_stub Listen_Invoker_svnt \
-                Listen_Invoker_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags = RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Listen_Test_ReceiverS.cpp
-    Listen_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Listen_Test_ReceiverS.h
-    Listen_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-    Listen_Test_ReceiverS.inl
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Listener/Receiver/Listen_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Listener/Receiver/Listen_Test_Receiver_exec.cpp
deleted file mode 100644
index d087060d283..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Listener/Receiver/Listen_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "Listen_Test_Receiver_exec.h"
-#include "ciao/Logger/Log_Macros.h"
-#include "tao/ORB_Core.h"
-#include "ace/OS_NS_time.h"
-
-namespace CIAO_Listen_Test_Receiver_Impl
-{
-  //============================================================
-  // Invoker_exec_i
-  //============================================================
-  Invoker_exec_i::Invoker_exec_i (Receiver_exec_i & callback)
-    : callback_ (callback)
-  {
-  }
-
-  Invoker_exec_i::~Invoker_exec_i (void)
-  {
-  }
-
-  void
-  Invoker_exec_i::start_not_enabled ()
-  {
-  }
-
-  void
-  Invoker_exec_i::start_listen_one_by_one (::CORBA::UShort ,
-                                     CORBA::ULong )
-  {
-  }
-
-  void
-  Invoker_exec_i::start_listen_many_by_many (::CORBA::UShort ,
-                                    CORBA::ULong )
-  {
-  }
-
-  //============================================================
-  // ListenTest_Listener_exec_i
-  //============================================================
-  ListenTest_Listener_exec_i::ListenTest_Listener_exec_i (Atomic_ULong &received)
-    : received_ (received)
-  {
-  }
-
-  ListenTest_Listener_exec_i::~ListenTest_Listener_exec_i (void)
-  {
-  }
-
-  void
-  ListenTest_Listener_exec_i::on_one_data (
-                                  const ListenTest & /*an_instance*/,
-                                  const ::CCM_DDS::ReadInfo & /*info*/)
-  {
-  }
-
-  void
-  ListenTest_Listener_exec_i::on_many_data (
-                                  const ListenTest_Seq & /*an_instance*/,
-                                  const ::CCM_DDS::ReadInfoSeq & /*info*/)
-  {
-  }
-
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  Receiver_exec_i::Receiver_exec_i (void)
-    : received_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Port operations.
-  ::CCM_DDS::ListenTest::CCM_Listener_ptr
-  Receiver_exec_i::get_info_listen_data_listener (void)
-  {
-    return new ListenTest_Listener_exec_i (
-                this->received_);
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_listen_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_ListenInvoker_ptr
-  Receiver_exec_i::get_listen_invoke ()
-  {
-    return new Invoker_exec_i (*this);
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::Listen_Test::CCM_Receiver_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    //this->listen_ = this->context_->get_connection_info_get_fresh_data ();
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Listen_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/Listener/Receiver/Listen_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Listener/Receiver/Listen_Test_Receiver_exec.h
deleted file mode 100644
index b261bea81ec..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Listener/Receiver/Listen_Test_Receiver_exec.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#ifndef CIAO_RECEIVER_EXEC_H_
-#define CIAO_RECEIVER_EXEC_H_
-
-#include "Listen_Test_ReceiverEC.h"
-
-#include /**/ "Receiver_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-#include "ace/Reactor.h"
-#include "ace/Task.h"
-
-#include <map>
-
-namespace CIAO_Listen_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong > Atomic_ULong;
-
-  //============================================================
-  // ListenTest_Listener_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export ListenTest_Listener_exec_i
-    : public virtual ::CCM_DDS::ListenTest::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ListenTest_Listener_exec_i (Atomic_ULong &);
-    virtual ~ListenTest_Listener_exec_i (void);
-
-    virtual void
-    on_one_data (
-      const ListenTest & an_instance,
-      const ::CCM_DDS::ReadInfo & info);
-    virtual void
-    on_many_data (
-      const ListenTest_Seq & an_instance,
-      const ::CCM_DDS::ReadInfoSeq & info);
-  private:
-    Atomic_ULong &received_;
-  };
-
-  //============================================================
-  // Invoker_exec_i
-  //============================================================
-  class Invoker_exec_i
-    : public virtual ::CCM_ListenInvoker,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Invoker_exec_i (Receiver_exec_i & callback);
-    virtual ~Invoker_exec_i (void);
-
-    virtual void start_not_enabled ();
-    virtual void start_listen_one_by_one (::CORBA::UShort keys,
-                                      ::CORBA::ULong iteration);
-    virtual void start_listen_many_by_many (::CORBA::UShort keys, 
-                                      ::CORBA::ULong iterations);
-
-  private:
-    Receiver_exec_i &callback_;
-  };
-
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    // Supported operations and attributes.
-    // Component attributes.
-
-    // Port operations.
-    virtual ::CCM_DDS::ListenTest::CCM_Listener_ptr
-    get_info_listen_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_listen_status (void);
-
-    virtual ::CCM_ListenInvoker_ptr
-    get_listen_invoke ();
-
-    // Operations from Components::SessionComponent.
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::Listen_Test::CCM_Receiver_Context_var context_;
-    //::CCM_DDS::ListenTest::Listen_var       listen_;
-    Atomic_ULong received_;
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Listen_Test_Receiver_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/Listener/Sender/Listen_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/Listener/Sender/Listen_Test_Sender.idl
deleted file mode 100644
index 6b1919b304e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Listener/Sender/Listen_Test_Sender.idl
+++ /dev/null
@@ -1,33 +0,0 @@
-// $Id$
-
-/**
- * @file
- * @author Marcel Smit <msmit@remedy.nl>
- *
- * by-hand idl3 translation of sender components.
- */
-
-#ifndef DDS_LISTEN_TEST_SENDER_IDL
-#define DDS_LISTEN_TEST_SENDER_IDL
-
-#include "Connector/Listen_Test_Connector.idl"
-#include "Connector/Listen_Test_ConnectorE.idl"
-
-#include "Base/Listen_Invoker.idl"
-#include "Base/Listen_InvokerE.idl"
-
-module Listen_Test
-{
-  component Sender
-  {
-    port CCM_DDS::ListenTest::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
-
-    uses ListenInvoker invoke_listen;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Listener/Sender/Listen_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Listener/Sender/Listen_Test_Sender.mpc
deleted file mode 100755
index 3e2b3c69e6f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Listener/Sender/Listen_Test_Sender.mpc
+++ /dev/null
@@ -1,152 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -p DDS_Listen_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_Listen_Test_Sender_idl_gen) : componentidldefaults   {
-  after += DDS_Listen_Test_Connector_idl_gen DDS_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    Listen_Test_Sender.idl
-  }
-}
-
-project(DDS_Listen_Test_Sender_lem_gen) : ciaoidldefaults {
-  after += DDS_Listen_Test_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    Listen_Test_SenderE.idl
-  }
-}
-
-project(DDS_Listen_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base   {
-  after += DDS_Listen_Test_Sender_lem_gen DDS_Listen_Test_Sender_stub \
-           DDS_Listen_Test_Base_stub DDS_Listen_Invoker_stub
-  libs  += DDS_Listen_Test_Base_stub Sender_stub Listen_Invoker_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags   = SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Listen_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    Listen_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Listen_Test_SenderEC.inl
-  }
-}
-
-project(DDS_Listen_Test_Sender_stub) : ccm_stub, dds4ccm_base   {
-  after += DDS_Listen_Test_Sender_idl_gen DDS_Listen_Test_Base_stub \
-           DDS_Listen_Test_Connector_stub DDS_Listen_Invoker_stub \
-           DDS_Listen_Invoker_lem_stub
-  libs  += DDS_Listen_Test_Base_stub DDS_Listen_Test_Connector_stub \
-           Listen_Invoker_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags   = SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Listen_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    Listen_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Listen_Test_SenderC.inl
-  }
-}
-
-project(DDS_Listen_Test_Sender_exec) : ciao_executor, dds4ccm_base   {
-  after   += DDS_Listen_Test_Sender_lem_stub DDS_Listen_Test_Sender_stub \
-             DDS_Listen_Test_Connector_lem_stub DDS_Listen_Test_Connector_stub \
-             DDS4CCM_lem_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub DDS_Listen_Test_Base_stub \
-             DDS_Listen_Test_Connector_lem_stub DDS_Listen_Test_Connector_stub \
-             Listen_Invoker_stub DDS4CCM_lem_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags   = SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Listen_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Listen_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Listen_Test_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
-  after      += DDS_Listen_Test_Base_stub  DDS_Listen_Test_Sender_lem_stub \
-                DDS4CCM_lem_stub DDS4CCM_skel DDS_Listen_Test_Connector_stub \
-                DDS_Listen_Test_Connector_svnt DDS_Listen_Test_Connector_lem_stub \
-                DDS_Listen_Invoker_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub DDS_Listen_Test_Base_stub DDS4CCM_lem_stub \
-                DDS4CCM_skel DDS_Listen_Test_Connector_stub DDS_Listen_Test_Connector_svnt \
-                DDS_Listen_Test_Connector_lem_stub Listen_Invoker_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags = SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Listen_Test_SenderS.cpp
-    Listen_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Listen_Test_SenderS.h
-    Listen_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-    Listen_Test_SenderS.inl
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/Listener/Sender/Listen_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Listener/Sender/Listen_Test_Sender_exec.cpp
deleted file mode 100644
index acd9eddc486..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Listener/Sender/Listen_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,278 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "Listen_Test_Sender_exec.h"
-#include "ace/Guard_T.h"
-#include "ciao/Logger/Log_Macros.h"
-#include "ace/Date_Time.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_Listen_Test_Sender_Impl
-{
-  //============================================================
-  // Pulse generator
-  //============================================================
-
-  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
-     ::DDS::Topic_ptr ,
-     const DDS::InconsistentTopicStatus & )
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
-    ::DDS::DataReader_ptr ,
-     const DDS::RequestedIncompatibleQosStatus & )
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected(
-     ::DDS::DataReader_ptr ,
-     const DDS::SampleRejectedStatus & )
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-     ::DDS::DataWriter_ptr ,
-     const DDS::OfferedDeadlineMissedStatus & )
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-     ::DDS::DataWriter_ptr ,
-     const DDS::OfferedIncompatibleQosStatus & )
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind  status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      this->callback_.start ();
-  }
-
-
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-
-  Sender_exec_i::Sender_exec_i (void)
-    : iterations_ (10),
-      keys_ (5),
-      done_ (false),
-      ccm_activated_ (false),
-      last_iter_ (1)
-  {
-    this->ticker_ = new pulse_Generator (*this);
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  void
-  Sender_exec_i::start_timeout_tests (void)
-  {
-    //this->invoker_->start_timeout_get_one ();
-    //this->invoker_->start_timeout_get_many ();
-  }
-
-  void
-  Sender_exec_i::get_many (void)
-  {
-    ListenTest_Seq write_many;
-    write_many.length (this->keys_ * this->iterations_);
-    for (CORBA::UShort key = 1; key < this->keys_ + 1; ++key)
-      {
-        ListenTest new_key;
-        char tmp[7];
-        ACE_OS::sprintf (tmp, "KEY_%d", key);
-        new_key.key = CORBA::string_dup(tmp);
-        for (CORBA::UShort iter = 1; iter < this->iterations_ + 1; ++iter)
-          {
-            new_key.iteration = iter;
-            write_many[key + iter - 2] = new_key;
-          }
-      }
-    try
-      {
-        //this->invoker_->start_get_many (this->keys_, this->iterations_);
-        ACE_Time_Value tv (1, 0);
-        ACE_OS::sleep (tv);
-        this->writer_->write_many (write_many);
-        CIAO_DEBUG ((LM_DEBUG, ACE_TEXT ("write_many : written <%u> samples\n"),
-              write_many.length ()));
-      }
-    catch (CCM_DDS::InternalError& ex)
-      {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                    ACE_TEXT ("while write many writer info: index <%d> - retval <%d>\n"),
-                      ex.index, ex.error_code));
-      }
-  }
-
-
-  void
-  Sender_exec_i::start (void)
-  {
-    //start can be called more than once...
-    if (!this->done_ && this->ccm_activated_)
-      {
-        this->done_ = true;
-        start_timeout_tests ();
-        if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer (
-                    this->ticker_,
-                    0,
-                    ACE_Time_Value (0, 500000),
-                    ACE_Time_Value (0, 500000)) == -1)
-          {
-            CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                                  ACE_TEXT ("Error scheduling timer")));
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::tick (void)
-  {
-    if (this->last_iter_ <= this->iterations_)
-      {
-        ListenTest *new_key = new ListenTest;
-        new_key->key = CORBA::string_dup("KEY_1");
-//         this->invoker_->start_get_one (
-//                         CORBA::string_dup("KEY_1"),
-//                         last_iter_);
-        new_key->iteration = last_iter_;
-        ACE_Time_Value tv (0, 50000);
-        ACE_OS::sleep (tv);
-        this->writer_->write_one (*new_key, ::DDS::HANDLE_NIL);
-        CIAO_DEBUG ((LM_DEBUG, CLINFO "Written key <%C> with <%d>\n",
-                    new_key->key.in (), last_iter_));
-        ++last_iter_;
-     }
-   else 
-    {
-      get_many ();
-      this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_);
-    }
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_info_out_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (*this);
-  }
-
-  void
-  Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::Listen_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    try
-      {
-        this->writer_ = this->context_->get_connection_info_write_data ();
-        this->invoker_ = this->context_->get_connection_invoke_getter ();
-        this->ccm_activated_ = true;
-      }
-    catch (const CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        CIAO_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Exception caught\n")));
-      }
-    catch (...)
-      {
-        CIAO_ERROR ((LM_ERROR, 
-          ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Unknown exception caught\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_);
-    CIAO_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-    delete this->ticker_;
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Listen_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Listener/Sender/Listen_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Listener/Sender/Listen_Test_Sender_exec.h
deleted file mode 100644
index c13d14d59e5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Listener/Sender/Listen_Test_Sender_exec.h
+++ /dev/null
@@ -1,118 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#ifndef CIAO_SENDER_EXEC_H_
-#define CIAO_SENDER_EXEC_H_
-
-
-#include "Listen_Test_SenderEC.h"
-
-#include /**/ "Sender_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_Listen_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-    /// Handle the timeout.
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    /// Maintains a handle that actually process the event
-    Sender_exec_i &pulse_callback_;
-  };
-
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic( ::DDS::Topic_ptr ,
-                              const DDS::InconsistentTopicStatus & );
-    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_offered_deadline_missed( ::DDS::DataWriter_ptr ,
-                              const DDS::OfferedDeadlineMissedStatus & );
-    virtual
-    void on_offered_incompatible_qos( ::DDS::DataWriter_ptr ,
-                              const DDS::OfferedIncompatibleQosStatus & );
-    virtual
-    void on_unexpected_status( ::DDS::Entity_ptr ,
-                              ::DDS::StatusKind );
-  private:
-    /// Maintains a handle that actually process the event
-    Sender_exec_i &callback_;
-  };
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_info_out_connector_status (void);
-
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-    void start (void);
-    void tick (void);
-
-  private:
-    ::Listen_Test::CCM_Sender_Context_var context_;
-    CCM_DDS::ListenTest::Writer_var writer_;
-    ListenInvoker_var invoker_;
-
-    CORBA::UShort iterations_;
-    CORBA::UShort keys_;
-    bool          done_;
-    bool          ccm_activated_;
-    CORBA::ULong last_iter_;
-
-    void start_timeout_tests (void);
-    void get_many (void);
-
-    pulse_Generator * ticker_;
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Listen_Test_Sender_Impl (void);
-}
-
-#endif /* ifndef */
-