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

        * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc:
        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc:
          Removed some unnecessary defines.

        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h:
          Removed unused class variable.

        * connectors/dds4ccm/tests/Listener/*:
          Empty test framework for the listener test.

23 files changed, 2118 insertions, 5 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 9bd6ff0c63c..6b7a631598b 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,15 @@
+Thu Dec 10 09:41:12 UTC 2009  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc:
+        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc:
+          Removed some unnecessary defines.
+
+        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h:
+          Removed unused class variable.
+
+        * connectors/dds4ccm/tests/Listener/*:
+          Empty test framework for the listener test.
+
 Thu Dec 10 08:37:49 UTC 2009  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/tests/Getter/README:
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc
index 76f430d3177..d94b959fb3b 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc
@@ -56,7 +56,7 @@ project(DDS_Getter_Test_Base_stub) : ccm_stub {
   libout = ../lib
   libpaths += ../lib
   sharedname = DDS_Getter_Test_Base_stub
-  dynamicflags = GETTER_TEST_BASE_STUB_BUILD_DLL STARTER_STUB_BUILD_DLL
+  dynamicflags = GETTER_TEST_BASE_STUB_BUILD_DLL
 
   IDL_Files {
   }
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
index 597deb6413c..204d58414f6 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
@@ -99,7 +99,7 @@ project(DDS_Getter_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = RECEIVER_EXEC_BUILD_DLL GETTER_STARTER_STUB_BUILD_DLL
+  dynamicflags   = RECEIVER_EXEC_BUILD_DLL
 
   IDL_Files {
   }
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h
index 6ddd15fe288..80dfc9db596 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h
@@ -135,9 +135,6 @@ namespace CIAO_Getter_Test_Receiver_Impl
   private:
     ::Getter_Test::CCM_Receiver_Context_var context_;
     ::CCM_DDS::GetterTest::Getter_var       getter_;
-
-    typedef std::map<ACE_CString, DDS::InstanceHandle_t> Handle_Table;
-    Handle_Table handles_;
   };
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/Listener/Base/Listen_Invoker.idl b/CIAO/connectors/dds4ccm/tests/Listener/Base/Listen_Invoker.idl
new file mode 100644
index 00000000000..86b46d500b1
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/Listener/Base/Listen_Invoker.idl
@@ -0,0 +1,20 @@
+// $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
new file mode 100755
index 00000000000..4ea051ecd72
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/Listener/Base/Listen_Invoker.mpc
@@ -0,0 +1,115 @@
+// $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
new file mode 100644
index 00000000000..232c55fa864
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/Listener/Base/Listen_Test_Base.idl
@@ -0,0 +1,18 @@
+// $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
new file mode 100755
index 00000000000..9bcf6e7e80c
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/Listener/Base/Listen_Test_Base.mpc
@@ -0,0 +1,76 @@
+// $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
new file mode 100644
index 00000000000..8e9dc16580d
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/Listener/Connector/Listen_Test_Connector.idl
@@ -0,0 +1,26 @@
+// $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
new file mode 100755
index 00000000000..f124a5a868c
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/Listener/Connector/Listen_Test_Connector.mpc
@@ -0,0 +1,145 @@
+// $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
new file mode 100644
index 00000000000..d9c4cec1a42
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/Listener/Connector/Listen_Test_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- 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
new file mode 100644
index 00000000000..bb8c8eb1746
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/Listener/Connector/Listen_Test_Connector_exec.h
@@ -0,0 +1,61 @@
+// -*- 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/README b/CIAO/connectors/dds4ccm/tests/Listener/README
new file mode 100644
index 00000000000..f622af6a71d
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/Listener/README
@@ -0,0 +1,3 @@
+# $Id$
+
+This test tests the listener.
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/Listener/Receiver/Listen_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Listener/Receiver/Listen_Test_Receiver.idl
new file mode 100644
index 00000000000..992a916da1d
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/Listener/Receiver/Listen_Test_Receiver.idl
@@ -0,0 +1,27 @@
+// $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
new file mode 100755
index 00000000000..4944cedd399
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/Listener/Receiver/Listen_Test_Receiver.mpc
@@ -0,0 +1,157 @@
+// $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
new file mode 100644
index 00000000000..d087060d283
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/Listener/Receiver/Listen_Test_Receiver_exec.cpp
@@ -0,0 +1,146 @@
+// -*- 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
new file mode 100644
index 00000000000..b261bea81ec
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/Listener/Receiver/Listen_Test_Receiver_exec.h
@@ -0,0 +1,117 @@
+// -*- 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
new file mode 100644
index 00000000000..6b1919b304e
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/Listener/Sender/Listen_Test_Sender.idl
@@ -0,0 +1,33 @@
+// $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
new file mode 100755
index 00000000000..3e2b3c69e6f
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/Listener/Sender/Listen_Test_Sender.mpc
@@ -0,0 +1,152 @@
+// $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
new file mode 100644
index 00000000000..acd9eddc486
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/Listener/Sender/Listen_Test_Sender_exec.cpp
@@ -0,0 +1,278 @@
+// -*- 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
new file mode 100644
index 00000000000..c13d14d59e5
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/Listener/Sender/Listen_Test_Sender_exec.h
@@ -0,0 +1,118 @@
+// -*- 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 */
+
diff --git a/CIAO/connectors/dds4ccm/tests/Listener/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/Listener/descriptors/Plan.cdp
new file mode 100644
index 00000000000..4f1b8b363aa
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/Listener/descriptors/Plan.cdp
@@ -0,0 +1,354 @@
+<Deployment:DeploymentPlan
+   xmlns:Deployment="http://www.omg.org/Deployment"
+   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>
+
+  <implementation xmi:id="ReceiverComponentImplementation">
+    <name>ReceiverComponentImplementation</name>
+    <source/>
+    <artifact xmi:idref="Receiver_ExecArtifact" />
+    <artifact xmi:idref="Receiver_SvntArtifact" />
+    <execParameter>
+      <!-- entrypoint as exec parameter (see 10.6.1) -->
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Listen_Test_Receiver_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Listen_Test_Receiver_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Receiver_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Receiver_exec</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <implementation xmi:id="Listen_Test_ConnectorComponentImplementation">
+    <name>Listen_Test_ConnectorComponentImplementation</name>
+    <source/>
+    <artifact xmi:idref="Listen_Test_Connector_ExecArtifact" />
+    <artifact xmi:idref="Listen_Test_Connector_SvntArtifact" />
+    <execParameter>
+      <!-- entrypoint as exec parameter (see 10.6.1) -->
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Listen_Test_Listen_Test_Connector_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Listen_Test_Listen_Test_Connector_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Listen_Test_Connector_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Listen_Test_Connector_exec</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+  <implementation xmi:id="SenderComponentImplementation">
+    <name>SenderComponentImplementation</name>
+    <source/>
+    <artifact xmi:idref="Sender_ExecArtifact" />
+    <artifact xmi:idref="Sender_SvntArtifact" />
+    <execParameter>
+      <!-- entrypoint as exec parameter (see 10.6.1) -->
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Listen_Test_Sender_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Listen_Test_Sender_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Sender_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Sender_exec</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+  <instance xmi:id="ReceiverComponentInstance">
+    <name>ReceiverComponent</name>
+    <node>ReceiverNode</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="ReceiverComponentImplementation" />
+  </instance>
+  <instance xmi:id="Listen_Test_ConnectorComponentInstance">
+    <name>Listen_Test_ConnectorComponent</name>
+    <node>SenderNode</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="Listen_Test_ConnectorComponentImplementation" />
+    <configProperty>
+      <name>topic_name</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Listen_Test</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+  <instance xmi:id="Listen_Test_ConnectorComponentInstance2">
+    <name>Listen_Test_ConnectorComponent2</name>
+    <node>ReceiverNode</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="Listen_Test_ConnectorComponentImplementation" />
+    <configProperty>
+      <name>topic_name</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Listen_Test</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+  <instance xmi:id="SenderComponentInstance">
+    <name>SenderComponent</name>
+    <node>SenderNode</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="SenderComponentImplementation" />
+    <configProperty>
+      <name>keys</name>
+      <value>
+        <type>
+          <kind>tk_ulong</kind>
+        </type>
+        <value>
+          <ulong>5</ulong>
+        </value>
+      </value>
+    </configProperty>
+    <configProperty>
+      <name>iterations</name>
+      <value>
+        <type>
+          <kind>tk_ulong</kind>
+        </type>
+        <value>
+          <ulong>10</ulong>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <connection>
+    <name>info_listen_data</name>
+    <internalEndpoint>
+      <portName>info_listen_data_listener</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="ReceiverComponentInstance" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>push_consumer_data_listener</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="Listen_Test_ConnectorComponentInstance2" />
+    </internalEndpoint>
+  </connection>
+
+  <connection>
+    <name>info_listen_data_control</name>
+    <internalEndpoint>
+      <portName>info_listen_data_control</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="ReceiverComponentInstance" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>push_consumer_data_control</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="Listen_Test_ConnectorComponentInstance2" />
+    </internalEndpoint>
+  </connection>
+
+  <connection>
+    <name>writer_connection</name>
+    <internalEndpoint>
+      <portName>info_write_data</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="SenderComponentInstance" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <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" />
+    </internalEndpoint>
+  </connection>
+
+  <artifact xmi:id="Sender_ExecArtifact">
+    <name>Sender_exec</name>
+    <source/>
+    <node/>
+    <location>Sender_exec</location>
+  </artifact>
+  <artifact xmi:id="Sender_SvntArtifact">
+    <name>Sender_svnt</name>
+    <source/>
+    <node/>
+    <location>Sender_svnt</location>
+  </artifact>
+  <artifact xmi:id="Sender_StubArtifact">
+    <name>Sender_stub</name>
+    <source/>
+    <node/>
+    <location>Sender_stub</location>
+  </artifact>
+  <artifact xmi:id="Listen_Test_Connector_ExecArtifact">
+    <name>Listen_Test_Connector_exec</name>
+    <source/>
+    <node/>
+    <location>DDS_Listen_Test_Connector_exec</location>
+  </artifact>
+  <artifact xmi:id="Listen_Test_Connector_SvntArtifact">
+    <name>Listen_Test_Connector_svnt</name>
+    <source/>
+    <node/>
+    <location>DDS_Listen_Test_Connector_svnt</location>
+  </artifact>
+  <artifact xmi:id="Listen_Test_Connector_StubArtifact">
+    <name>Listen_Test_Connector_stub</name>
+    <source/>
+    <node/>
+    <location>DDS_Listen_Test_Connector_stub</location>
+  </artifact>
+  <artifact xmi:id="Receiver_ExecArtifact">
+    <name>Receiver_exec</name>
+    <source/>
+    <node/>
+    <location>Receiver_exec</location>
+  </artifact>
+  <artifact xmi:id="Receiver_SvntArtifact">
+    <name>Receiver_svnt</name>
+    <source/>
+    <node/>
+    <location>Receiver_svnt</location>
+  </artifact>
+  <artifact xmi:id="Receiver_StubArtifact">
+    <name>Receiver_stub</name>
+    <source/>
+    <node/>
+    <location>Receiver_stub</location>
+  </artifact>
+</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/Listener/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Listener/descriptors/run_test.pl
new file mode 100755
index 00000000000..e4878f89ea5
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/Listener/descriptors/run_test.pl
@@ -0,0 +1,228 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "$ENV{'ACE_ROOT'}/bin";
+use PerlACE::TestTarget;
+
+$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
+$TAO_ROOT = "$ENV{'TAO_ROOT'}";
+$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
+
+$daemons_running = 0;
+$em_running = 0;
+$ns_running = 0;
+
+$nr_daemon = 2;
+@ports = ( 60001, 60002 );
+@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
+@iorfiles = 0;
+@nodenames = ( "SenderNode", "ReceiverNode" );
+
+# ior files other than daemon
+# ior files other than daemon
+$ior_nsbase = "ns.ior";
+$ior_nsfile = 0;
+$ior_embase = "EM.ior";
+$ior_emfile = 0;
+
+#  Processes
+$E = 0;
+$EM = 0;
+$NS = 0;
+@DEAMONS = 0;
+
+# targets
+@tg_daemons = 0;
+$tg_naming = 0;
+$tg_exe_man = 0;
+$tg_executor = 0;
+
+$status = 0;
+$cdp_file = "Plan.cdp";
+
+PerlACE::add_lib_path ('../lib');
+$ENV{"DANCE_TRACE_ENABLE"} = 0;
+$ENV{"CIAO_TRACE_ENABLE"} = 0;
+$ENV{"CIAO_LOG_LEVEL"} = 5;
+$ENV{"DANCE_LOG_LEVEL"} = 5;
+# $ENV{"DDS4CCM_NDDS_LOG_VERBOSITY"} =  31;
+
+
+sub create_targets {
+    #   naming service
+    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
+
+    #   daemon
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for deamon $i failed\n";
+    }
+    #   execution manager
+    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
+    #   executor (plan_launcher)
+    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
+}
+
+sub init_ior_files {
+    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
+    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
+    }
+    delete_ior_files ();
+}
+
+# Delete if there are any .ior files.
+sub delete_ior_files {
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
+    }
+    $tg_naming->DeleteFile ($ior_nsbase);
+    $tg_exe_man->DeleteFile ($ior_embase);
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
+    }
+}
+
+sub kill_node_daemon {
+  for ($i = 0; $i < $nr_daemon; ++$i) {
+    $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
+  }
+}
+
+sub kill_open_processes {
+  if ($daemons_running == 1) {
+    kill_node_daemon ();
+  }
+
+  if ($em_running == 1) {
+    $EM->Kill (); $EM->TimedWait (1);
+  }
+
+  if ($ns_running == 1) {
+    $NS->Kill (); $NS->TimedWait (1);
+  }
+
+}
+
+sub run_node_daemons {
+  for ($i = 0; $i < $nr_daemon; ++$i) {
+      $iorbase = $iorbases[$i];
+      $iorfile = $iorfiles[$i];
+      $port = $ports[$i];
+      $nodename = $nodenames[$i];
+      $iiop = "iiop://localhost:$port";
+      $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+
+      $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
+      $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
+
+      print "Run dance_node_manager with $d_param\n";
+
+      $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
+      $result = $DEAMONS[$i]->Spawn ();
+      push(@processes, $DEAMONS[$i]);
+
+      if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
+                                      $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
+          print STDERR
+            "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
+          for (; $i >= 0; --$i) {
+              $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
+          }
+          return -1;
+      }
+  }
+  return 0;
+}
+
+create_targets ();
+init_ior_files ();
+
+# Invoke naming service
+
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 1 -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+
+$NS->Spawn ();
+
+print STDERR "Starting Naming Service with -m 1 -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
+
+if ($tg_naming->WaitForFileTimed ($ior_nsbase,
+                                  $tg_naming->ProcessStartWaitInterval ()) == -1)
+{
+    print STDERR "ERROR: cannot find naming service IOR file\n";
+    $NS->Kill (); $NS->TimedWait (1);
+    exit 1;
+}
+
+$ns_running = 1;
+# Set up NamingService environment
+$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
+
+# Invoke node daemon.
+print "Invoking node daemon\n";
+$status = run_node_daemons ();
+
+if ($status != 0) {
+    print STDERR "ERROR: Unable to execute the node daemon\n";
+    kill_open_processes ();
+    exit 1;
+}
+
+$daemons_running = 1;
+
+# Invoke execution manager.
+print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
+$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
+                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
+$EM->Spawn ();
+
+if ($tg_exe_man->WaitForFileTimed ($ior_embase,
+                                $tg_exe_man->ProcessStartWaitInterval ()) == -1) {
+    print STDERR
+      "ERROR: The ior file of execution manager could not be found\n";
+    kill_open_processes ();
+    exit 1;
+}
+
+$em_running = 1;
+
+# Invoke executor - start the application -.
+print "Invoking executor - launch the application -\n";
+
+print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
+$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
+                        "-x $cdp_file -k file://$ior_emfile");
+$E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ());
+
+for ($i = 0; $i < $nr_daemon; ++$i) {
+    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
+                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
+        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
+        kill_open_processes ();
+        exit 1;
+    }
+}
+
+print "Sleeping 30 seconds to allow task to complete\n";
+sleep (30);
+
+# Invoke executor - stop the application -.
+print "Invoking executor - stop the application -\n";
+print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n";
+
+$E =
+  new PerlACE::Process ("$DANCE_ROOT/bin/dance_plan_launcher",
+                        "-k file://$ior_emfile -x $cdp_file -q");
+$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ());
+
+print "Executor returned.\n";
+print "Shutting down rest of the processes.\n";
+
+delete_ior_files ();
+kill_open_processes ();
+
+exit $status;