1323 files changed, 0 insertions, 162799 deletions

diff --git a/CIAO/connectors/dds4ccm/tests/.gitignore b/CIAO/connectors/dds4ccm/tests/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/.gitignore b/CIAO/connectors/dds4ccm/tests/CSLDeadline/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl
deleted file mode 100644
index 5bd3aa34352..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file   CSL_DeadlineTest_Base.idl
- * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
- */
-
-#ifndef CSL_DEADLINETEST_BASE_IDL
-#define CSL_DEADLINETEST_BASE_IDL
-
-#pragma ndds typesupport "Base/CSL_DeadlineTest_BaseSupport.h"
-#pragma opendds typesupport "Base/CSL_DeadlineTest_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TestTopic"
-#pragma DCPS_DATA_KEY "TestTopic key"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopic> TestTopicSeq;
-#endif
-
-#endif /* CSL_DEADLINETEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc
deleted file mode 100644
index c3219fd1a33..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_CSL_DeadlineTest_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_CSL_DeadlineTest_Base_stub
-  dynamicflags += CSL_DEADLINETEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=CSL_DEADLINETEST_BASE_STUB_Export \
-              -Wb,stub_export_include=CSL_DeadlineTest_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    CSL_DeadlineTest_Base.idl
-  }
-
-  opendds_ts_flags += --export=CSL_DEADLINETEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    CSL_DeadlineTest_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/.gitignore
deleted file mode 100644
index 079b83fa08f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/CSL_DeadlineTest_ConnectorE.idl
-/CSL_DeadlineTest_Connector_conn.cpp
-/CSL_DeadlineTest_Connector_conn.h
-/CSL_DeadlineTest_Connector_conn_export.h
-/CSL_DeadlineTest_Connector_lem_stub_export.h
-/CSL_DeadlineTest_Connector_stub_export.h
-/CSL_DeadlineTest_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl
deleted file mode 100644
index 72770442ace..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file CSL_DeadlineTest_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef CSL_DeadlineTest_CONNECTOR_IDL_
-#define CSL_DeadlineTest_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/CSL_DeadlineTest_Base.idl"
-
-#pragma ciao lem "Connector/CSL_DeadlineTest_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/CSL_DeadlineTest_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> CSLDeadlineConnector;
-
-#endif /* CSL_DeadlineTest_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
deleted file mode 100644
index 6b5cd55c228..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_CSL_DeadlineTest_Base -l .. -o ../lib -u DDS CSL_DeadlineTest_Connector"
-
-project(DDS_CSL_DT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_CSL_DeadlineTest_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=CSL_DEADLINETEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=CSL_DeadlineTest_Connector_stub_export.h \
-              -Wb,skel_export_macro=CSL_DEADLINETEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=CSL_DeadlineTest_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=CSL_DEADLINETEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=CSL_DeadlineTest_Connector_svnt_export.h \
-              -Wb,conn_export_macro=CSL_DEADLINETEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=CSL_DeadlineTest_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    CSL_DeadlineTest_Connector.idl
-  }
-}
-
-project(DDS_CSL_DT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_CSL_DT_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=CSL_DEADLINETEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=CSL_DeadlineTest_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    CSL_DeadlineTest_ConnectorE.idl
-  }
-}
-
-project(DDS_CSL_DT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_CSL_DT_Connector_lem_gen DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Base_stub
-  libs  += DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_CSL_DT_Connector_lem_stub
-  dynamicflags += CSL_DEADLINETEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_DeadlineTest_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    CSL_DeadlineTest_ConnectorEC.h
-    CSL_DeadlineTest_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_DeadlineTest_ConnectorEC.inl
-  }
-}
-
-project(DDS_CSL_DeadlineTest_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CSL_DT_Connector_idl_gen DDS_CSL_DeadlineTest_Base_stub
-  libs  += DDS_CSL_DeadlineTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_CSL_DeadlineTest_Connector_stub
-  dynamicflags += CSL_DEADLINETEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_DeadlineTest_ConnectorC.cpp
-  }
-
-  Header_Files {
-    CSL_DeadlineTest_ConnectorC.h
-    CSL_DeadlineTest_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_DeadlineTest_ConnectorC.inl
-  }
-}
-
-project(DDS_CSL_DeadlineTest_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_stub
-  sharedname = DDS_CSL_DeadlineTest_Connector_exec
-  libs += DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CSL_DEADLINETEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_DeadlineTest_Connector_conn.cpp
-  }
-
-  Header_Files {
-    CSL_DeadlineTest_Connector_conn.h
-    CSL_DeadlineTest_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CSL_DeadlineTest_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_exec DDS_CSL_DeadlineTest_Connector_stub
-  sharedname  = DDS_CSL_DeadlineTest_Connector_svnt
-  libs       += DDS_CSL_DeadlineTest_Connector_stub \
-                DDS_CSL_DT_Connector_lem_stub  \
-                DDS_CSL_DeadlineTest_Base_stub \
-                DDS_CSL_DeadlineTest_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CSL_DEADLINETEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_DeadlineTest_ConnectorS.cpp
-    CSL_DeadlineTest_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    CSL_DeadlineTest_ConnectorS.h
-    CSL_DeadlineTest_Connector_svnt.h
-    CSL_DeadlineTest_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl
deleted file mode 100644
index afff6a7ef12..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/CSL_DeadlineTest_Connector.idl"
-
-module CSL_DeadlineTest
-{
-  component Receiver
-  {
-    port CSLDeadlineConnector::DDS_Listen info_out;
-    provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
-   };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
deleted file mode 100644
index 96ca8bf00cc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
+++ /dev/null
@@ -1,135 +0,0 @@
-project(DDS_CSL_DeadlineTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_CSL_DT_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 {
-    CSL_DeadlineTest_Receiver.idl
-  }
-}
-
-project(DDS_CSL_DeadlineTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_CSL_DeadlineTest_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 {
-    CSL_DeadlineTest_ReceiverE.idl
-  }
-}
-
-project(DDS_CSL_DT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_CSL_DeadlineTest_Receiver_lem_gen DDS_CSL_DeadlineTest_Receiver_stub  DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Base_stub
-  libs  +=  Receiver_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_DeadlineTest_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    CSL_DeadlineTest_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_DeadlineTest_ReceiverEC.inl
-  }
-}
-
-project(DDS_CSL_DeadlineTest_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CSL_DeadlineTest_Receiver_idl_gen  DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DT_Connector_lem_gen
-  libs  += DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_DeadlineTest_ReceiverC.cpp
-  }
-
-  Header_Files {
-    CSL_DeadlineTest_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_DeadlineTest_ReceiverC.inl
-  }
-}
-
-project(DDS_CSL_DeadlineTest_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_CSL_DT_Receiver_lem_stub DDS_CSL_DeadlineTest_Receiver_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DT_Connector_lem_stub 
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DT_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_DeadlineTest_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    CSL_DeadlineTest_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CSL_DeadlineTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_CSL_DT_Receiver_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt DDS_CSL_DeadlineTest_Receiver_exec DDS_CSL_DT_Connector_lem_stub 
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt Receiver_exec DDS_CSL_DT_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_DeadlineTest_ReceiverS.cpp
-    CSL_DeadlineTest_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    CSL_DeadlineTest_ReceiverS.h
-    CSL_DeadlineTest_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp
deleted file mode 100644
index f8e2f553741..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-// -*- C++ -*-
-#include "CSL_DeadlineTest_Receiver_exec.h"
-#include "ace/Log_Msg.h"
-#include "tao/ORB_Core.h"
-
-namespace CIAO_CSL_DeadlineTest_Receiver_Impl
-{
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &deadline_missed)
-    : deadline_missed_ (deadline_missed)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-    this->deadline_missed_ = true;
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status (
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind /*status_kind*/)
-  {
-  }
-
-  //============================================================
-  // TestTopic_RawListener_exec_i
-  //============================================================
-  TestTopic_RawListener_exec_i::TestTopic_RawListener_exec_i (Atomic_ULong &received)
-      : received_ (received)
-  {
-  }
-
-  TestTopic_RawListener_exec_i::~TestTopic_RawListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::TestTopic_RawListener
-
-  void
-  TestTopic_RawListener_exec_i::on_one_data (
-    const TestTopic & an_instance ,
-    const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ++this->received_;
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TestTopic_RawListener: ")
-            ACE_TEXT ("received test_topic_info for <%C> at %u\n"),
-            an_instance.key.in (),
-            an_instance.x));
-  }
-
-  void
-  TestTopic_RawListener_exec_i::on_many_data (
-    const TestTopicSeq & /*an_instance */,
-    const ::CCM_DDS::ReadInfoSeq & /* info */)
-  {
-  }
-
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  Receiver_exec_i::Receiver_exec_i (void)
-    : deadline_missed_ (false)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  // Component attributes.
-  // Port operations.
-  ::CSLDeadlineConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new TestTopic RAW listener\n")));
-    return new TestTopic_RawListener_exec_i (this->received_);
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener\n")));
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Receiver_exec_i::get_info_out_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (this->deadline_missed_);
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::CSL_DeadlineTest::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 lc =
-    this->context_->get_connection_info_out_data_control ();
-
-    if (::CORBA::is_nil (lc.in ()))
-      {
-        ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-    lc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-     if (!this->deadline_missed_.value ())
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Didn't receive ")
-                              ACE_TEXT ("'on_offered_deadline_missed'\n")));
-      }
-    else
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: Received the unexpected ")
-                               ACE_TEXT ("'on_offered_deadline_missed'\n")));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_DeadlineTest_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/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h
deleted file mode 100644
index 09383f289ca..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h
+++ /dev/null
@@ -1,128 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_RECEIVER_EXEC_H_
-#define CIAO_RECEIVER_EXEC_H_
-
-#include "CSL_DeadlineTest_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/OS_NS_Thread.h"
-
-
-
-namespace CIAO_CSL_DeadlineTest_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong> Atomic_ULong;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean> Atomic_Boolean;
-
-  class Receiver_exec_i;
-
-  //============================================================
-  // TestTopic_RawListener_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export TestTopic_RawListener_exec_i
-    : public virtual ::CSLDeadlineConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    TestTopic_RawListener_exec_i (Atomic_ULong &);
-    virtual ~TestTopic_RawListener_exec_i (void);
-
-    virtual void
-    on_one_data (
-      const TestTopic & an_instance,
-      const ::CCM_DDS::ReadInfo & info);
-
-    virtual void
-    on_many_data (
-      const ::TestTopicSeq & data,
-      const ::CCM_DDS::ReadInfoSeq & info);
-
-  private:
-    Atomic_ULong &received_;
-  };
-
-
-  //============================================================
-  // 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_Boolean &);
-
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                ::DDS::StatusKind  status_kind);
-  private:
-    Atomic_Boolean &deadline_missed_;
-  };
-
-  //============================================================
-  // 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);
-
-    // Port operations.
-    virtual ::CSLDeadlineConnector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_info_out_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:
-    ::CSL_DeadlineTest::CCM_Receiver_Context_var context_;
-    Atomic_ULong received_;
-    Atomic_Boolean deadline_missed_;
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_DeadlineTest_Receiver_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/.gitignore
deleted file mode 100644
index 97f2c4f5077..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/CSL_DeadlineTest_SenderE.idl
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl
deleted file mode 100644
index 95ddfb14c9f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
- */
-
-#ifndef DDS_CSL_DEADLINETEST_SENDER_IDL
-#define DDS_CSL_DEADLINETEST_SENDER_IDL
-
-#include "Connector/CSL_DeadlineTest_Connector.idl"
-
-module CSL_DeadlineTest
-{
-  component Sender
-  {
-    port CSLDeadlineConnector::DDS_Write test_topic_write;
-    provides CCM_DDS::ConnectorStatusListener test_topic_connector_status;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc
deleted file mode 100644
index 45f26e72e69..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_CSL_DeadlineTest_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_CSL_DeadlineTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_CSL_DT_Connector_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 {
-    CSL_DeadlineTest_Sender.idl
-  }
-}
-
-project(DDS_CSL_DeadlineTest_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_CSL_DeadlineTest_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 {
-    CSL_DeadlineTest_SenderE.idl
-  }
-}
-
-project(DDS_CSL_DeadlineTest_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_CSL_DeadlineTest_Sender_lem_gen DDS_CSL_DeadlineTest_Sender_stub DDS_CSL_DeadlineTest_Base_stub
-  libs  += DDS_CSL_DeadlineTest_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_DeadlineTest_SenderEC.cpp
-  }
-
-  Header_Files {
-    CSL_DeadlineTest_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_DeadlineTest_SenderEC.inl
-  }
-}
-
-project(DDS_CSL_DeadlineTest_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CSL_DeadlineTest_Sender_idl_gen DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub
-  libs  += DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_DeadlineTest_SenderC.cpp
-  }
-
-  Header_Files {
-    CSL_DeadlineTest_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_DeadlineTest_SenderC.inl
-  }
-}
-
-project(DDS_CSL_DeadlineTest_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_CSL_DeadlineTest_Sender_lem_stub DDS_CSL_DeadlineTest_Sender_stub DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DT_Connector_lem_stub  DDS_CSL_DeadlineTest_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_DeadlineTest_Sender_exec.cpp
-  }
-
-  Header_Files {
-    CSL_DeadlineTest_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CSL_DeadlineTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_CSL_DeadlineTest_Base_stub  DDS_CSL_DeadlineTest_Sender_lem_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt DDS_CSL_DT_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub  DDS_CSL_DeadlineTest_Connector_svnt DDS_CSL_DT_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_DeadlineTest_SenderS.cpp
-    CSL_DeadlineTest_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    CSL_DeadlineTest_SenderS.h
-    CSL_DeadlineTest_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp
deleted file mode 100644
index a005474788c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp
+++ /dev/null
@@ -1,248 +0,0 @@
-// -*- C++ -*-
-// Test for OFFERED_DEADLINE_MISSED status : Writer failed to write data within
-// the deadline time period set in the profile.
-
-#include "CSL_DeadlineTest_Sender_exec.h"
-#include "ace/Guard_T.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_unistd.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_CSL_DeadlineTest_Sender_Impl
-{
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Atomic_Boolean &deadline_missed,
-    ACE_Thread_ID &thread_id,
-    Sender_exec_i &callback)
-    : deadline_missed_ (deadline_missed),
-      thread_id_ (thread_id),
-      callback_ (callback)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr the_writer,
-    const DDS::OfferedDeadlineMissedStatus & status)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_ = t_id;
-
-    if(status.last_instance_handle != ::DDS::HANDLE_NIL && ! ::CORBA::is_nil (the_writer))
-      {
-        this->deadline_missed_ = true;
-      }
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        // Add 2 different instances of topic
-        this->callback_.add_instance_of_topic ("ONE",1);
-        this->callback_.add_instance_of_topic ("TWO",2);
-
-        // When we have a publication matched start write the data once
-        this->callback_.write ();
-      }
-  }
-
-  //============================================================
-  // Sender_exec_i
-  //============================================================
-  Sender_exec_i::Sender_exec_i (void)
-    : deadline_missed_ (false),
-      thread_id_listener_ (0, 0)
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_test_topic_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (this->deadline_missed_,
-                                               this->thread_id_listener_,
-                                               *this);
-  }
-
-  // Supported operations and attributes.
-  void
-  Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ = ::CSL_DeadlineTest::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::write (void)
-  {
-    ::CSLDeadlineConnector::Writer_var writer =
-      this->context_->get_connection_test_topic_write_data ();
-
-    if (! ::CORBA::is_nil (writer.in ()) )
-      {
-        // to force an 'offered_deadline_missed'  write the topics with a pause
-        // of 2 sec in between and in the profile the deadline is set to 1 sec.
-        for (CSL_QoSTest_Table::iterator i = this->_ktests_.begin ();
-            i != this->_ktests_.end ();
-            ++i)
-          {
-            try
-              {
-                ACE_OS::sleep (2);
-                ::DDS::InstanceHandle_t const hnd =
-                  writer->register_instance (i->second);
-                writer->write_one(i->second,hnd);
-              }
-            catch (const CCM_DDS::InternalError& )
-              {
-                ACE_ERROR ((LM_ERROR,
-                            ACE_TEXT ("Internal Error while writing topic for <%C>.\n"),
-                            i->first.c_str ()));
-              }
-          }
-      }
-  }
-
- void
-  Sender_exec_i::add_instance_of_topic (const char * key, int x)
-  {
-    TestTopic *new_key = new TestTopic;
-    new_key->key = CORBA::string_dup(key);
-    new_key->x = x;
-    this->_ktests_[key] = new_key;
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    if (this->deadline_missed_.value ())
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ")
-                              ACE_TEXT ("'on_offered_deadline_missed'\n")));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: did not receive the expected ")
-                              ACE_TEXT ("error 'on_offered_deadline_missed'\n")));
-      }
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_.to_string(list_buf);
-
-    if (this->thread_id_listener_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread ID for ConnectorStatusListener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: "
-                              "Thread switch for ConnectorStatusListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                               "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread switch for ConnectorStatusListener "
-                              "doesn't seem to work! "
-                               "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    #else
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: ConnectorStatusListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: ConnectorStatusListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #endif
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_DeadlineTest_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/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h
deleted file mode 100644
index 678cc3c7e5e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h
+++ /dev/null
@@ -1,104 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_SENDER_EXEC_H_
-#define CIAO_SENDER_EXEC_H_
-
-
-#include "CSL_DeadlineTest_SenderEC.h"
-
-#include /**/ "Sender_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_CSL_DeadlineTest_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Sender_exec_i;
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean &deadline_missed,
-                                    ACE_Thread_ID &thread_id,
-                                    Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Atomic_Boolean &deadline_missed_;
-    ACE_Thread_ID &thread_id_;
-    Sender_exec_i &callback_;
-  };
-
-  //============================================================
-  // Sender_exec_i
-  //============================================================
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (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);
-
-    // Port operations.
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_test_topic_connector_status(void);
-
-    void write (void);
-    void add_instance_of_topic (const char *, int x );
-
-  private:
-    ::CSL_DeadlineTest::CCM_Sender_Context_var context_;
-
-    Atomic_Boolean deadline_missed_;
-    ACE_Thread_ID thread_id_listener_;
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, TestTopic_var> CSL_QoSTest_Table;
-    CSL_QoSTest_Table _ktests_;
- };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_DeadlineTest_Sender_Impl (void);
-
-
-
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/HelloTest_Library.xml b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/HelloTest_Library.xml
deleted file mode 100644
index a14318cb94c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/HelloTest_Library.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-  <qos_profile name="HelloProfile">
-     <datawriter_qos>
-          <reliability>
-               <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-               <max_blocking_time>
-                    <sec>2</sec>
-                    <nanosec>0</nanosec>
-               </max_blocking_time>
-         </reliability>
-          <durability>
-               <kind>TRANSIENT_DURABILITY_QOS</kind>
-          </durability>
-          <history>
-               <kind>KEEP_LAST_HISTORY_QOS</kind>
-               <depth>20</depth>
-          </history>
-          <deadline>
-               <period>
-                    <sec>1</sec>
-                    <nanosec>0</nanosec>
-               </period>
-          </deadline>
-     </datawriter_qos>
-    <datareader_qos>
-          <reliability>
-               <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-          </reliability>
-          <history>
-               <kind>KEEP_LAST_HISTORY_QOS</kind>
-               <depth>20</depth>
-          </history>
-          <durability>
-                 <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-          </durability>
-          <deadline>
-               <period>
-                    <sec>1</sec>
-                    <nanosec>0</nanosec>
-               </period>
-          </deadline>
-     </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/Plan.cdp
deleted file mode 100644
index 01c2adc328e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/Plan.cdp
+++ /dev/null
@@ -1,412 +0,0 @@
-<!--  -->
-<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>CSL_DeadlineTest_Depl_1</label>
-  <UUID>CSL_DeadlineTest_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_CSL_DeadlineTest_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_DeadlineTest_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="CSL_DeadlineTest_ConnectorComponentImplementation">
-    <name>CSL_DeadlineTest_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="CSL_DeadlineTest_Connector_ExecArtifact" />
-    <artifact xmi:idref="CSL_DeadlineTest_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_CSLDeadlineConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSLDeadlineConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CSL_DeadlineTest_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CSL_DeadlineTest_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_CSL_DeadlineTest_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_DeadlineTest_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="CSL_DeadlineTest_ConnectorComponentInstance">
-    <name>CSL_DeadlineTest_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CSL_DeadlineTest_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-    <name>qos_profile</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>HelloTest_Library#HelloProfile</string>
-      </value>
-    </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CSL_DeadlineTest_ConnectorComponentInstance2">
-    <name>CSL_DeadlineTest_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CSL_DeadlineTest_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_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="CSL_DeadlineTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CSL_DeadlineTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_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="CSL_DeadlineTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-    <connection>
-    <name>info_out_connector_status_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CSL_DeadlineTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>test_topic_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CSL_DeadlineTest_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_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="CSL_DeadlineTest_ConnectorComponentInstance" />
-    </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="CSL_DeadlineTest_Connector_ExecArtifact">
-    <name>CSL_DeadlineTest_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_CSL_DeadlineTest_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="CSL_DeadlineTest_Connector_SvntArtifact">
-    <name>CSL_DeadlineTest_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_CSL_DeadlineTest_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="CSL_DeadlineTest_Connector_StubArtifact">
-    <name>CSL_DeadlineTest_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_CSL_DeadlineTest_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/CSLDeadline/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 954241ce864..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="HelloTest_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="HelloProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>2</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-        <deadline>
-          <period>
-            <sec>1</sec>
-            <nanosec>0</nanosec>
-          </period>
-        </deadline>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-        <deadline>
-          <period>
-            <sec>1</sec>
-            <nanosec>0</nanosec>
-          </period>
-        </deadline>
-        </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl
deleted file mode 100755
index f41a32df43a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl
+++ /dev/null
@@ -1,242 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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_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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 10 seconds to allow task to complete\n";
-sleep (10);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/.gitignore b/CIAO/connectors/dds4ccm/tests/CSLQoS/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl
deleted file mode 100644
index d2b1a6260fd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file   CSL_QoSTest_Base.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef CSL_QOSTEST_BASE_IDL
-#define CSL_QOSTEST_BASE_IDL
-
-#pragma ndds typesupport "Base/CSL_QoSTest_BaseSupport.h"
-#pragma opendds typesupport "Base/CSL_QoSTest_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TestTopic"
-#pragma DCPS_DATA_KEY "TestTopic key"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopic> TestTopicSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc
deleted file mode 100644
index 3782d26a74d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_CSL_QoSTest_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_CSL_QoSTest_Base_stub
-  dynamicflags += CSL_QOSTEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=CSL_QOSTEST_BASE_STUB_Export \
-              -Wb,stub_export_include=CSL_QoSTest_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    CSL_QoSTest_Base.idl
-  }
-
-  opendds_ts_flags += --export=CSL_QOSTEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    CSL_QoSTest_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl
deleted file mode 100644
index 20c524cc3a3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file CSL_QoSTest_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef CSL_QOSTEST_CONNECTOR_IDL_
-#define CSL_QOSTEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/CSL_QoSTest_Base.idl"
-
-#pragma ciao lem "Connector/CSL_QoSTest_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/CSL_QoSTest_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> CSLQoSConnector;
-
-#endif /* CSL_QoSTest_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
deleted file mode 100644
index 06be4dfd932..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_CSL_QoSTest_Base -l .. -o ../lib -u DDS CSL_QoSTest_Connector"
-
-project(DDS_CSL_QoSTest_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_CSL_QoSTest_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=CSL_QOSTEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=CSL_QoSTest_Connector_stub_export.h \
-              -Wb,skel_export_macro=CSL_QOSTEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=CSL_QoSTest_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=CSL_QOSTEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=CSL_QoSTest_Connector_svnt_export.h \
-              -Wb,conn_export_macro=CSL_QOSTEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=CSL_QoSTest_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    CSL_QoSTest_Connector.idl
-  }
-}
-
-project(DDS_CSL_QoSTest_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_CSL_QoSTest_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=CSL_QOSTEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=CSL_QoSTest_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    CSL_QoSTest_ConnectorE.idl
-  }
-}
-
-project(DDS_CSL_QoSTest_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_CSL_QoSTest_Connector_lem_gen DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Base_stub
-  libs  += DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_CSL_QoSTest_Connector_lem_stub
-  dynamicflags += CSL_QOSTEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_QoSTest_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    CSL_QoSTest_ConnectorEC.h
-    CSL_QoSTest_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_QoSTest_ConnectorEC.inl
-  }
-}
-
-project(DDS_CSL_QoSTest_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CSL_QoSTest_Connector_idl_gen DDS_CSL_QoSTest_Base_stub
-  libs  += DDS_CSL_QoSTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_CSL_QoSTest_Connector_stub
-  dynamicflags += CSL_QOSTEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_QoSTest_ConnectorC.cpp
-  }
-
-  Header_Files {
-    CSL_QoSTest_ConnectorC.h
-    CSL_QoSTest_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_QoSTest_ConnectorC.inl
-  }
-}
-
-project(DDS_CSL_QoSTest_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Connector_stub
-  sharedname = DDS_CSL_QoSTest_Connector_exec
-  libs += DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CSL_QOSTEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_QoSTest_Connector_conn.cpp
-  }
-
-  Header_Files {
-    CSL_QoSTest_Connector_conn.h
-    CSL_QoSTest_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CSL_QoSTest_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Connector_exec DDS_CSL_QoSTest_Connector_stub
-  sharedname  = DDS_CSL_QoSTest_Connector_svnt
-  libs       += DDS_CSL_QoSTest_Connector_stub \
-                DDS_CSL_QoSTest_Connector_lem_stub  \
-                DDS_CSL_QoSTest_Base_stub \
-                DDS_CSL_QoSTest_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CSL_QOSTEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_QoSTest_ConnectorS.cpp
-    CSL_QoSTest_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    CSL_QoSTest_ConnectorS.h
-    CSL_QoSTest_Connector_svnt.h
-    CSL_QoSTest_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl
deleted file mode 100644
index 4a0d73b4e00..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/CSL_QoSTest_Connector.idl"
-
-module CSL_QoSTest
-{
-  component Receiver
-  {
-    port CSLQoSConnector::DDS_Listen info_out;
-    provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
-   };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc
deleted file mode 100644
index 1aa1e5f0e88..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc
+++ /dev/null
@@ -1,135 +0,0 @@
-project(DDS_CSL_QoSTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_CSL_QoSTest_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 {
-    CSL_QoSTest_Receiver.idl
-  }
-}
-
-project(DDS_CSL_QoSTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_CSL_QoSTest_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 {
-    CSL_QoSTest_ReceiverE.idl
-  }
-}
-
-project(DDS_CSL_QoSTest_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_CSL_QoSTest_Receiver_lem_gen DDS_CSL_QoSTest_Receiver_stub  DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Base_stub
-  libs  +=  Receiver_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_QoSTest_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    CSL_QoSTest_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_QoSTest_ReceiverEC.inl
-  }
-}
-
-project(DDS_CSL_QoSTest_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CSL_QoSTest_Receiver_idl_gen  DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_lem_gen
-  libs  += DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_QoSTest_ReceiverC.cpp
-  }
-
-  Header_Files {
-    CSL_QoSTest_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_QoSTest_ReceiverC.inl
-  }
-}
-
-project(DDS_CSL_QoSTest_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_CSL_QoSTest_Receiver_lem_stub DDS_CSL_QoSTest_Receiver_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_lem_stub 
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_QoSTest_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    CSL_QoSTest_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CSL_QoSTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_CSL_QoSTest_Receiver_lem_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_svnt DDS_CSL_QoSTest_Receiver_exec DDS_CSL_QoSTest_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_svnt Receiver_exec DDS_CSL_QoSTest_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_QoSTest_ReceiverS.cpp
-    CSL_QoSTest_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    CSL_QoSTest_ReceiverS.h
-    CSL_QoSTest_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp
deleted file mode 100644
index 64750dbb8d7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-// -*- C++ -*-
-//Test for ConnectorStatusListener: on_requested_incompatible_qos
-
-#include "CSL_QoSTest_Receiver_exec.h"
-#include "ace/Log_Msg.h"
-
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_CSL_QoSTest_Receiver_Impl
-{
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Atomic_Boolean &incompatible,
-    ACE_Thread_ID &thread_id)
-    : incompatible_ (incompatible),
-      thread_id_ (thread_id)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr the_reader,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_ = t_id;
-
-    if(! ::CORBA::is_nil(the_reader))
-      {
-        this->incompatible_ = true;
-      }
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status (
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind /*status_kind */)
-  {
-  }
-
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  Receiver_exec_i::Receiver_exec_i (void)
-    : incompatible_ (false),
-      thread_id_listener_ (0, 0)
-
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  ::CSLQoSConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new TestTopic RAW listener\n")));
-    return ::CSLQoSConnector::CCM_Listener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Receiver_exec_i::get_info_out_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (this->incompatible_,
-                                               this->thread_id_listener_);
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::CSL_QoSTest::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)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (!this->incompatible_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: did not receive the expected ")
-                               ACE_TEXT ("error 'on_requested_incompatible_qos' in Receiver\n")
-                    ));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Received the expected ")
-                               ACE_TEXT ("'on_requested_incompatible_qos' in Receiver\n")
-                    ));
-      }
-    //get current thread
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_.to_string (list_buf);
-    if (this->thread_id_listener_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread ID for ConnectorStatusListener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: "
-                              "Thread switch for ConnectorStatusListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                               "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread switch for ConnectorStatusListener "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: ConnectorStatusListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: ConnectorStatusListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #endif
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_QoSTest_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/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h
deleted file mode 100644
index 7f38ec76fb3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_RECEIVER_EXEC_H_
-#define CIAO_RECEIVER_EXEC_H_
-
-#include "CSL_QoSTest_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/OS_NS_Thread.h"
-
-
-
-namespace CIAO_CSL_QoSTest_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  //============================================================
-  // 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_Boolean &,
-                                    ACE_Thread_ID &);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                     const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                               ::DDS::StatusKind  status_kind);
-  private:
-    Atomic_Boolean &incompatible_;
-    ACE_Thread_ID &thread_id_;
-  };
-
-  //============================================================
-  // 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);
-
-    // Port operations.
-    virtual ::CSLQoSConnector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_info_out_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:
-    ::CSL_QoSTest::CCM_Receiver_Context_var context_;
-    Atomic_Boolean incompatible_;
-    ACE_Thread_ID thread_id_listener_;
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_QoSTest_Receiver_Impl (void);
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl
deleted file mode 100644
index 4e43a8ad491..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_CSL_QOSTEST_SENDER_IDL
-#define DDS_CSL_QOSTEST_SENDER_IDL
-
-#include "Connector/CSL_QoSTest_Connector.idl"
-
-module CSL_QoSTest
-{
-  component Sender
-  {
-     port CSLQoSConnector::DDS_Write info_write;
-     provides CCM_DDS::ConnectorStatusListener test_topic_connector_status;
-
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc
deleted file mode 100644
index 77b4674e421..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_CSL_QoSTest_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_CSL_QoSTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_CSL_QoSTest_Connector_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 {
-    CSL_QoSTest_Sender.idl
-  }
-}
-
-project(DDS_CSL_QoSTest_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_CSL_QoSTest_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 {
-    CSL_QoSTest_SenderE.idl
-  }
-}
-
-project(DDS_CSL_QoSTest_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_CSL_QoSTest_Sender_lem_gen DDS_CSL_QoSTest_Sender_stub DDS_CSL_QoSTest_Base_stub
-  libs  += DDS_CSL_QoSTest_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_QoSTest_SenderEC.cpp
-  }
-
-  Header_Files {
-    CSL_QoSTest_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_QoSTest_SenderEC.inl
-  }
-}
-
-project(DDS_CSL_QoSTest_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CSL_QoSTest_Sender_idl_gen DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub
-  libs  += DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_QoSTest_SenderC.cpp
-  }
-
-  Header_Files {
-    CSL_QoSTest_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_QoSTest_SenderC.inl
-  }
-}
-
-project(DDS_CSL_QoSTest_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_CSL_QoSTest_Sender_lem_stub DDS_CSL_QoSTest_Sender_stub DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Connector_stub  
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_lem_stub  DDS_CSL_QoSTest_Connector_stub  
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_QoSTest_Sender_exec.cpp
-  }
-
-  Header_Files {
-    CSL_QoSTest_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CSL_QoSTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_CSL_QoSTest_Base_stub  DDS_CSL_QoSTest_Sender_lem_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_svnt DDS_CSL_QoSTest_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub  DDS_CSL_QoSTest_Connector_svnt DDS_CSL_QoSTest_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_QoSTest_SenderS.cpp
-    CSL_QoSTest_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    CSL_QoSTest_SenderS.h
-    CSL_QoSTest_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp
deleted file mode 100644
index bf832d1bcdf..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-// -*- C++ -*-
-// Test for ConnectorStatusListener: on_offered_incompatible_qos
-
-#include "CSL_QoSTest_Sender_exec.h"
-#include "ace/Log_Msg.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_CSL_QoSTest_Sender_Impl
-{
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Atomic_Boolean &incompatible,
-    ACE_Thread_ID &thread_id)
-      : incompatible_ (incompatible),
-        thread_id_ (thread_id)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos (
-    ::DDS::DataWriter_ptr the_writer,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_ = t_id;
-
-    if(! ::CORBA::is_nil(the_writer))
-      {
-        this->incompatible_ = true;
-      }
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status (
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind  /*status_kind*/)
-  {
-  }
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-
-  Sender_exec_i::Sender_exec_i (void)
-    : incompatible_ (false),
-      thread_id_listener_ (0, 0)
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_test_topic_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (this->incompatible_,
-                                               this->thread_id_listener_);
-  }
-
-  // Supported operations and attributes.
-
-  void
-  Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::CSL_QoSTest::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)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    if (!this->incompatible_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: did not receive the expected ")
-                               ACE_TEXT ("error 'on_offered_incompatible_qos'\n")
-                    ));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ")
-                               ACE_TEXT ("'on_offered_incompatible_qos'\n")
-                    ));
-      }
-        //get current thread
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_.to_string (list_buf);
-    if (this->thread_id_listener_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread ID for ConnectorStatusListener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: "
-                              "Thread switch for ConnectorStatusListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                               "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread switch for ConnectorStatusListener "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: ConnectorStatusListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: ConnectorStatusListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #endif
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_QoSTest_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/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h
deleted file mode 100644
index 75c7bcfe932..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_SENDER_EXEC_H_
-#define CIAO_SENDER_EXEC_H_
-
-#include "CSL_QoSTest_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_CSL_QoSTest_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Sender_exec_i;
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean &,
-                                    ACE_Thread_ID &);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind  status_kind);
-  private:
-    Atomic_Boolean &incompatible_;
-    ACE_Thread_ID &thread_id_;
-  };
-
-  //============================================================
-  // Sender_exec_i
-  //============================================================
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (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);
-    // Port operations.
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-      get_test_topic_connector_status(void);
-
-  private:
-    ::CSL_QoSTest::CCM_Sender_Context_var context_;
-
-    Atomic_Boolean incompatible_;
-    ACE_Thread_ID thread_id_listener_;
- };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_QoSTest_Sender_Impl (void);
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/Plan.cdp
deleted file mode 100644
index f95cfc5d6bc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/Plan.cdp
+++ /dev/null
@@ -1,373 +0,0 @@
-<!--  -->
-<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>CSL_QoSTest_Depl_1</label>
-  <UUID>CSL_QoSTest_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_CSL_QoSTest_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_QoSTest_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="CSL_QoSTest_ConnectorComponentImplementation">
-    <name>CSL_QoSTest_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="CSL_QoSTest_Connector_ExecArtifact" />
-    <artifact xmi:idref="CSL_QoSTest_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_CSLQoSConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSLQoSConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CSL_QoSTest_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CSL_QoSTest_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_CSL_QoSTest_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_QoSTest_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="CSL_QoSTest_ConnectorComponentInstance">
-    <name>CSL_QoSTest_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CSL_QoSTest_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-    <name>qos_profile</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>QoSTest_Library#SenderProfile</string>
-      </value>
-    </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CSL_QoSTest_ConnectorComponentInstance2">
-    <name>CSL_QoSTest_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CSL_QoSTest_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QoSTest_Library#ReceiverProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CSL_QoSTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_out_connector_status_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CSL_QoSTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>test_topic_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CSL_QoSTest_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>test_topic_writer</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="CSL_QoSTest_ConnectorComponentInstance" />
-    </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="CSL_QoSTest_Connector_ExecArtifact">
-    <name>CSL_QoSTest_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_CSL_QoSTest_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="CSL_QoSTest_Connector_SvntArtifact">
-    <name>CSL_QoSTest_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_CSL_QoSTest_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="CSL_QoSTest_Connector_StubArtifact">
-    <name>CSL_QoSTest_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_CSL_QoSTest_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/CSLQoS/descriptors/QoSTest_Library.xml b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/QoSTest_Library.xml
deleted file mode 100644
index 9440aa13658..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/QoSTest_Library.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-  <qos_profile name="ReceiverProfile">
-    <datareader_qos>
-          <reliability>
-               <kind>RELIABLE_RELIABILITY_QOS</kind>
-          </reliability>
-          <liveliness>
-               <kind>MANUAL_BY_TOPIC_LIVELINESS_QOS</kind>
-          </liveliness>
-          <history>
-               <kind>KEEP_LAST_HISTORY_QOS</kind>
-               <depth>20</depth>
-          </history>
-          <durability>
-                 <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-          </durability>
-     </datareader_qos>
-  </qos_profile>
-  <qos_profile name="SenderProfile">
-     <datawriter_qos>
-          <reliability>
-               <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-               <max_blocking_time>
-                    <sec>2</sec>
-                    <nanosec>0</nanosec>
-               </max_blocking_time>
-         </reliability>
-          <durability>
-               <kind>TRANSIENT_DURABILITY_QOS</kind>
-          </durability>
-          <liveliness>
-               <kind>MANUAL_BY_TOPIC_LIVELINESS_QOS</kind>
-          </liveliness>
-          <history>
-               <kind>KEEP_LAST_HISTORY_QOS</kind>
-               <depth>20</depth>
-          </history>
-     </datawriter_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index c7b66a2685c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="QoSTest_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="SenderProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>2</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <liveliness>
-          <kind>DDS_MANUAL_BY_PARTICIPANT_LIVELINESS_QOS</kind>
-        </liveliness>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-    </qos_profile>
-
-    <qos_profile name="ReceiverProfile" is_default_qos="false">
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <liveliness>
-          <kind>DDS_MANUAL_BY_TOPIC_LIVELINESS_QOS</kind>
-        </liveliness>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl
deleted file mode 100755
index c6321471979..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 10 seconds to allow task to complete\n";
-sleep (10);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/.gitignore b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl
deleted file mode 100644
index 2435b1d1108..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file   CSL_SRTest_Base.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef CSL_SRTEST_BASE_IDL
-#define CSL_SRTEST_BASE_IDL
-
-#pragma ndds typesupport "Base/CSL_SRTest_BaseSupport.h"
-#pragma opendds typesupport "Base/CSL_SRTest_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TestTopic"
-#pragma DCPS_DATA_KEY "TestTopic key"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopic> TestTopicSeq;
-#endif
-
-#endif /* CSL_SRTEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc
deleted file mode 100644
index d1471149105..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_CSL_SRTest_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_CSL_SRTest_Base_stub
-  dynamicflags += CSL_SRTEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=CSL_SRTEST_BASE_STUB_Export \
-              -Wb,stub_export_include=CSL_SRTest_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    CSL_SRTest_Base.idl
-  }
-
-  opendds_ts_flags += --export=CSL_SRTEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    CSL_SRTest_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl
deleted file mode 100644
index 3e064833a91..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file CSL_SRTest_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef CSL_SRTEST_CONNECTOR_IDL_
-#define CSL_SRTEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/CSL_SRTest_Base.idl"
-
-#pragma ciao lem "Connector/CSL_SRTest_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/CSL_SRTest_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> CSL_SR_Connector;
-
-#endif /* CSL_SRTEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
deleted file mode 100644
index 2eaedc3edab..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_CSL_SRTest_Base -l .. -o ../lib -u DDS CSL_SRTest_Connector"
-
-project(DDS_CSL_SRTest_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_CSL_SRTest_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=CSL_SRTEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=CSL_SRTest_Connector_stub_export.h \
-              -Wb,skel_export_macro=CSL_SRTEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=CSL_SRTest_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=CSL_SRTEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=CSL_SRTest_Connector_svnt_export.h \
-              -Wb,conn_export_macro=CSL_SRTEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=CSL_SRTest_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    CSL_SRTest_Connector.idl
-  }
-}
-
-project(DDS_CSL_SRTest_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_CSL_SRTest_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=CSL_SRTEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=CSL_SRTest_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    CSL_SRTest_ConnectorE.idl
-  }
-}
-
-project(DDS_CSL_SRTest_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_CSL_SRTest_Connector_lem_gen DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Base_stub
-  libs  += DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_CSL_SRTest_Connector_lem_stub
-  dynamicflags += CSL_SRTEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_SRTest_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    CSL_SRTest_ConnectorEC.h
-    CSL_SRTest_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_SRTest_ConnectorEC.inl
-  }
-}
-
-project(DDS_CSL_SRTest_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CSL_SRTest_Connector_idl_gen DDS_CSL_SRTest_Base_stub
-  libs  += DDS_CSL_SRTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_CSL_SRTest_Connector_stub
-  dynamicflags += CSL_SRTEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_SRTest_ConnectorC.cpp
-  }
-
-  Header_Files {
-    CSL_SRTest_ConnectorC.h
-    CSL_SRTest_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_SRTest_ConnectorC.inl
-  }
-}
-
-project(DDS_CSL_SRTest_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Connector_stub
-  sharedname = DDS_CSL_SRTest_Connector_exec
-  libs += DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CSL_SRTEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_SRTest_Connector_conn.cpp
-  }
-
-  Header_Files {
-    CSL_SRTest_Connector_conn.h
-    CSL_SRTest_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CSL_SRTest_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Connector_exec DDS_CSL_SRTest_Connector_stub
-  sharedname  = DDS_CSL_SRTest_Connector_svnt
-  libs       += DDS_CSL_SRTest_Connector_stub \
-                DDS_CSL_SRTest_Connector_lem_stub  \
-                DDS_CSL_SRTest_Base_stub \
-                DDS_CSL_SRTest_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CSL_SRTEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_SRTest_ConnectorS.cpp
-    CSL_SRTest_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    CSL_SRTest_ConnectorS.h
-    CSL_SRTest_Connector_svnt.h
-    CSL_SRTest_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl
deleted file mode 100644
index 796d032255b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/CSL_SRTest_Connector.idl"
-
-module CSL_SRTest
-{
-  component Receiver
-  {
-    port CSL_SR_Connector::DDS_Listen info_out;
-    provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
-    attribute unsigned long rate;
-    attribute boolean read_data;//if true, read_all is invoked.
-    attribute boolean raw_listen; //if true, raw listen port is enabled.
-   };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc
deleted file mode 100644
index fbf27cbf327..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_CSL_SRTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_CSL_SRTest_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 {
-    CSL_SRTest_Receiver.idl
-  }
-}
-
-project(DDS_CSL_SRTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_CSL_SRTest_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 {
-    CSL_SRTest_ReceiverE.idl
-  }
-}
-
-project(DDS_CSL_SRTest_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_CSL_SRTest_Receiver_lem_gen DDS_CSL_SRTest_Receiver_stub  DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Base_stub
-  libs  +=  Receiver_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_SRTest_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    CSL_SRTest_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_SRTest_ReceiverEC.inl
-  }
-}
-
-project(DDS_CSL_SRTest_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CSL_SRTest_Receiver_idl_gen  DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_lem_gen
-  libs  += DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_SRTest_ReceiverC.cpp
-  }
-
-  Header_Files {
-    CSL_SRTest_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_SRTest_ReceiverC.inl
-  }
-}
-
-project(DDS_CSL_SRTest_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_CSL_SRTest_Receiver_lem_stub DDS_CSL_SRTest_Receiver_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_SRTest_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    CSL_SRTest_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CSL_SRTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_CSL_SRTest_Receiver_lem_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_svnt DDS_CSL_SRTest_Receiver_exec DDS_CSL_SRTest_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_svnt Receiver_exec DDS_CSL_SRTest_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_SRTest_ReceiverS.cpp
-    CSL_SRTest_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    CSL_SRTest_ReceiverS.h
-    CSL_SRTest_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp
deleted file mode 100644
index 95cf1a9f244..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp
+++ /dev/null
@@ -1,516 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-/**
-  * Test for ConnectorStatusListener:REJECTED_SAMPLE status through  too much instances
-  * in Sender <max_instances>2</max_instances>, in Receiver <max_instances>1</max_instances>
- **/
-
-#include "CSL_SRTest_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#include "dds4ccm/impl/TimeUtilities.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_CSL_SRTest_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::CSL_SRTest::CCM_Receiver_Context_ptr ctx,
-        Atomic_ULong &received)
-    : ciao_context_ (
-        ::CSL_SRTest::CCM_Receiver_Context::_duplicate (ctx))
-      , received_ (received)
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CSL_SR_Connector::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::TestTopic & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ++this->received_;
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TestTopic_Listener: ")
-            ACE_TEXT ("received testtopic_info for <%C> at %dl\n"),
-            datum.key.in (),
-            datum.x));
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::TestTopicSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::CSL_SRTest::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::CSL_SRTest::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_connector_status_exec_i
-   */
-
-  info_out_connector_status_exec_i::info_out_connector_status_exec_i (
-        ::CSL_SRTest::CCM_Receiver_Context_ptr ctx,
-        Atomic_Boolean &rejected,
-        ACE_Thread_ID &thread_id)
-    : ciao_context_ (
-        ::CSL_SRTest::CCM_Receiver_Context::_duplicate (ctx))
-      , rejected_ (rejected)
-      , thread_id_ (thread_id)
-  {
-  }
-
-  info_out_connector_status_exec_i::~info_out_connector_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-
-  void
-  info_out_connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */,
-  const ::DDS::InconsistentTopicStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr the_reader,
-  const ::DDS::SampleRejectedStatus & status)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_ = t_id;
-    if (status.last_reason == DDS::REJECTED_BY_INSTANCES_LIMIT &&
-        ! ::CORBA::is_nil(the_reader))
-      {
-        this->rejected_ = true;
-      }
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr /* the_entity */,
-  ::DDS::StatusKind /* status_kind */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * read_action_Generator
-   */
-
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &,
-                                         const void *)
-  {
-    try
-      {
-        if (pulse_callback_.read_data ())
-          {
-            this->pulse_callback_.read_all();
-          }
-       }
-    catch (...)
-      {
-      }
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : rate_ (0)
-      , read_data_ (false)
-      , raw_listen_ (false)
-      , received_ (0)
-      , rejected_(false)
-      , thread_id_listener_ (0, 0)
-  {
-    this->ticker_ = new read_action_Generator (*this);
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Receiver_exec_i::read_all (void)
-  {
-    ::CSL_SR_Connector::Reader_var reader;
-    if (this->read_data ())
-      {
-       reader = this->ciao_context_->get_connection_info_out_data();
-      }
-
-    if (::CORBA::is_nil (reader.in ()))
-      {
-        return;
-      }
-    TestTopicSeq TestTopic_infos;
-    ::CCM_DDS::ReadInfoSeq readinfoseq;
-    reader->read_all(TestTopic_infos, readinfoseq);
-    for(CORBA::ULong i = 0; i < readinfoseq.length(); ++i)
-      {
-        ACE_Time_Value tv;
-        tv <<= readinfoseq[i].source_timestamp;
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ")
-                              ACE_TEXT ("-> UTC date =%#T\n"),
-                              &tv));
-      }
-    for(CORBA::ULong i = 0; i < TestTopic_infos.length(); ++i)
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL keyed test info : ")
-              ACE_TEXT ("Number <%d> : received TestTopic_info for <%C> at %u\n"),
-            i,
-            TestTopic_infos[i].key.in (),
-            TestTopic_infos[i].x));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CSL_SR_Connector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->received_),
-            ::CSL_SR_Connector::CCM_Listener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::CSL_SR_Connector::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Receiver_exec_i::get_info_out_connector_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_connector_status_.in ()))
-      {
-        info_out_connector_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_connector_status_exec_i (
-            this->ciao_context_.in (),
-            this->rejected_,
-            this->thread_id_listener_),
-          ::CCM_DDS::CCM_ConnectorStatusListener::_nil ());
-
-          this->ciao_info_out_connector_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate (
-        this->ciao_info_out_connector_status_.in ());
-  }
-
-  ::CORBA::ULong
-  Receiver_exec_i::rate (void)
-  {
-    return this->rate_;
-  }
-
-  void
-  Receiver_exec_i::rate (
-    const ::CORBA::ULong rate)
-  {
-    this->rate_ = rate;
-  }
-
-  ::CORBA::Boolean
-  Receiver_exec_i::read_data (void)
-  {
-    return this->read_data_;
-  }
-
-  void
-  Receiver_exec_i::read_data (
-    const ::CORBA::Boolean read_data)
-  {
-    this->read_data_ = read_data;
-  }
-
-  ::CORBA::Boolean
-  Receiver_exec_i::raw_listen (void)
-  {
-    return this->raw_listen_;
-  }
-
-  void
-  Receiver_exec_i::raw_listen (
-    const ::CORBA::Boolean raw_listen)
-  {
-    this->raw_listen_ = raw_listen;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::CSL_SRTest::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::DataListenerControl_var lc =
-    this->ciao_context_->get_connection_info_out_data_control ();
-
-    if (::CORBA::is_nil (lc.in ()))
-      {
-        ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-    lc->mode (this->raw_listen_ ? ::CCM_DDS::ONE_BY_ONE : ::CCM_DDS::NOT_ENABLED);
-
-    // calculate the interval time
-    long const usec = 1000000 / this->rate_;
-    if (this->reactor ()->schedule_timer (this->ticker_,
-                                          0,
-                                          ACE_Time_Value(0, usec),
-                                          ACE_Time_Value(0, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->rejected_.value ())
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Have received the expected ")
-                              ACE_TEXT ("'on_sample_rejected'\n")
-                    ));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: did not receive the expected ")
-                              ACE_TEXT ("warning 'on_sample_rejected'\n")
-                    ));
-      }
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_.to_string (list_buf);
-
-    if (this->thread_id_listener_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread ID for ConnectorStatusListener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: "
-                              "Thread switch for ConnectorStatusListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                               "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread switch for ConnectorStatusListener "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: ConnectorStatusListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                               "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: ConnectorStatusListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #endif
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_SRTest_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/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h
deleted file mode 100644
index 6bec32bc73a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h
+++ /dev/null
@@ -1,269 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_CSL_SRTEST_RECEIVER_EXEC_CKJUTE_H_
-#define CIAO_CSL_SRTEST_RECEIVER_EXEC_CKJUTE_H_
-
-#include /**/ "ace/pre.h"
-
-#include "CSL_SRTest_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include "ace/OS_NS_Thread.h"
-
-namespace CIAO_CSL_SRTest_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong> Atomic_ULong;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean> Atomic_Boolean;
-
-  class Receiver_exec_i;
-  /**
-   * read_action_Generator
-   */
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-
-  private:
-    Receiver_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::CSL_SR_Connector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::CSL_SRTest::CCM_Receiver_Context_ptr ctx,
-      Atomic_ULong &);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CSL_SR_Connector::Listener. */
-
-    virtual
-    void on_one_data (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::TestTopicSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::CSL_SRTest::CCM_Receiver_Context_var ciao_context_;
-    Atomic_ULong &received_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::CSL_SRTest::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::CSL_SRTest::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_connector_status_exec_i
-   */
-
-  class info_out_connector_status_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_connector_status_exec_i (
-      ::CSL_SRTest::CCM_Receiver_Context_ptr ctx,
-      Atomic_Boolean  &,
-      ACE_Thread_ID &);
-    virtual ~info_out_connector_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-    const ::DDS::InconsistentTopicStatus & status);
-
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedIncompatibleQosStatus & status);
-
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleRejectedStatus & status);
-
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedDeadlineMissedStatus & status);
-
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedIncompatibleQosStatus & status);
-
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind status_kind);
-    //@}
-
-  private:
-    ::CSL_SRTest::CCM_Receiver_Context_var ciao_context_;
-    Atomic_Boolean &rejected_;
-    ACE_Thread_ID &thread_id_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::CSL_SR_Connector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_info_out_connector_status (void);
-
-    virtual ::CORBA::ULong rate (void);
-
-    virtual void rate (::CORBA::ULong rate);
-
-    virtual ::CORBA::Boolean read_data (void);
-
-    virtual void read_data (::CORBA::Boolean read_data);
-
-    virtual ::CORBA::Boolean raw_listen (void);
-
-    virtual void raw_listen (::CORBA::Boolean raw_listen);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void read_all (void);
-    //@}
-
-  private:
-    ::CSL_SRTest::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CSL_SR_Connector::CCM_Listener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_info_out_connector_status_;
-
-    ::CORBA::ULong rate_;
-
-    ::CORBA::Boolean read_data_;
-
-    ::CORBA::Boolean raw_listen_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    read_action_Generator * ticker_;
-    Atomic_ULong received_;
-    Atomic_Boolean rejected_;
-    ACE_Thread_ID thread_id_listener_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_SRTest_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl
deleted file mode 100644
index 7675b067f8e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_CSL_SRTEST_SENDER_IDL
-#define DDS_CSL_SRTEST_SENDER_IDL
-
-#include "Connector/CSL_SRTest_Connector.idl"
-
-module CSL_SRTest
-{
-  component Sender
-  {
-     port CSL_SR_Connector::DDS_Write test_topic_write;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc
deleted file mode 100644
index 5bef33fd457..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_CSL_SRTest_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_CSL_SRTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_CSL_SRTest_Connector_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 {
-    CSL_SRTest_Sender.idl
-  }
-}
-
-project(DDS_CSL_SRTest_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_CSL_SRTest_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 {
-    CSL_SRTest_SenderE.idl
-  }
-}
-
-project(DDS_CSL_SRTest_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_CSL_SRTest_Sender_lem_gen DDS_CSL_SRTest_Sender_stub DDS_CSL_SRTest_Base_stub
-  libs  += DDS_CSL_SRTest_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_SRTest_SenderEC.cpp
-  }
-
-  Header_Files {
-    CSL_SRTest_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_SRTest_SenderEC.inl
-  }
-}
-
-project(DDS_CSL_SRTest_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CSL_SRTest_Sender_idl_gen DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub
-  libs  += DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_SRTest_SenderC.cpp
-  }
-
-  Header_Files {
-    CSL_SRTest_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_SRTest_SenderC.inl
-  }
-}
-
-project(DDS_CSL_SRTest_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_CSL_SRTest_Sender_lem_stub DDS_CSL_SRTest_Sender_stub DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Connector_stub  
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_lem_stub  DDS_CSL_SRTest_Connector_stub  
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_SRTest_Sender_exec.cpp
-  }
-
-  Header_Files {
-    CSL_SRTest_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CSL_SRTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_CSL_SRTest_Base_stub  DDS_CSL_SRTest_Sender_lem_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_svnt DDS_CSL_SRTest_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub  DDS_CSL_SRTest_Connector_svnt DDS_CSL_SRTest_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_SRTest_SenderS.cpp
-    CSL_SRTest_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    CSL_SRTest_SenderS.h
-    CSL_SRTest_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp
deleted file mode 100644
index 4a3e7028231..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "CSL_SRTest_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_CSL_SRTest_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;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : rate_ (100)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::tick ()
-  {
-   ::CSL_SR_Connector::Writer_var writer =
-      this->ciao_context_->get_connection_test_topic_write_data ();
-
-    for (CSL_SRTest_Table::iterator i = this->_ktests_.begin ();
-         i != this->_ktests_.end ();
-         ++i)
-      {
-        try
-          {
-            if (! ::CORBA::is_nil (writer.in ()))
-              {
-                writer->write_one(i->second,::DDS::HANDLE_NIL);
-                i->second->x++;
-              }
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating topic for <%C>.\n"),
-                    i->first.c_str ()));
-          }
-       }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    // calculate the interval time
-    long const usec = 10000000 / this->rate_;
-
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (0, usec),
-                ACE_Time_Value (0, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-  }
-
-  void
-  Sender_exec_i::add_instance_of_topic (const char * key, int x)
-  {
-    TestTopic *new_key = new TestTopic;
-    new_key->key = CORBA::string_dup(key);
-    new_key->x = x;
-    this->_ktests_[key] = new_key;
-  }
-
-  // Component attributes and port operations.
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::CSL_SRTest::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    //add 2 different instances of topic
-    this->add_instance_of_topic ("ONE", 1);
-    this->add_instance_of_topic ("TWO", 2);
-    this->start ();
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_SRTest_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/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h
deleted file mode 100644
index a62c8408d18..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h
+++ /dev/null
@@ -1,129 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_CSL_SRTEST_SENDER_EXEC_EOLJBW_H_
-#define CIAO_CSL_SRTEST_SENDER_EXEC_EOLJBW_H_
-
-#include /**/ "ace/pre.h"
-
-#include "CSL_SRTest_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_CSL_SRTest_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * Pulse Generator
-   */
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void tick (void);
-    //@}
-
-  private:
-    ::CSL_SRTest::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    //@}
-
-    //@{
-    /** User defined members. */
-    pulse_Generator * ticker_;
-    CORBA::ULong rate_;
-
-    typedef std::map<ACE_CString, TestTopic_var> CSL_SRTest_Table;
-    CSL_SRTest_Table _ktests_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start (void);
-    void stop (void);
-
-    void add_instance_of_topic (const char *, int x);
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_SRTest_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/HelloTest_Library.xml b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/HelloTest_Library.xml
deleted file mode 100644
index f19727f38a0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/HelloTest_Library.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-  <qos_profile name="HelloProfile">
-     <datawriter_qos>
-          <reliability>
-               <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-               <max_blocking_time>
-                    <sec>0</sec>
-                    <nanosec>100000000</nanosec>
-               </max_blocking_time>
-         </reliability>
-          <durability>
-               <kind>TRANSIENT_DURABILITY_QOS</kind>
-          </durability>
-          <durability_service>
-               <history_kind>KEEP_LAST_HISTORY_QOS</history_kind>
-               <history_depth>10</history_depth>
-               <max_samples>10</max_samples>
-               <max_instances>2</max_instances>
-               <max_samples_per_instance>10</max_samples_per_instance>
-          </durability_service>
-    </datawriter_qos>
-    <datareader_qos>
-          <durability>
-                 <kind>VOLATILE_DURABILITY_QOS</kind>
-          </durability>
-          <deadline>
-               <period>
-                    <sec>DURATION_INFINITE_SEC</sec>
-                    <nanosec>DURATION_INFINITE_NSEC</nanosec>
-               </period>
-          </deadline>
-          <latency_budget>
-               <duration>
-                    <sec>0</sec>
-                    <nanosec>0</nanosec>
-               </duration>
-          </latency_budget>
-          <liveliness>
-               <kind>AUTOMATIC_LIVELINESS_QOS</kind>
-               <lease_duration>
-                    <sec>DURATION_INFINITE_SEC</sec>
-                    <nanosec>DURATION_INFINITE_NSEC</nanosec>
-               </lease_duration>
-          </liveliness>
-          <reliability>
-               <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-               <max_blocking_time>
-                    <sec>0</sec>
-                    <nanosec>100000000</nanosec>
-               </max_blocking_time>
-          </reliability>
-          <destination_order>
-                <kind>BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS</kind>
-          </destination_order>
-          <history>
-               <kind>KEEP_LAST_HISTORY_QOS</kind>
-               <depth>10</depth>
-          </history>
-          <resource_limits>
-               <initial_samples>1</initial_samples>
-               <initial_instances>1</initial_instances>
-               <max_samples>10</max_samples>
-               <max_instances>1</max_instances>
-               <max_samples_per_instance>10</max_samples_per_instance>
-          </resource_limits>
-          <ownership>
-               <kind>SHARED_OWNERSHIP_QOS</kind>
-          </ownership>
-          <time_based_filter>
-               <minimum_separation>
-                    <sec>0</sec>
-                    <nanosec>0</nanosec>
-               </minimum_separation>
-          </time_based_filter>
-          <reader_data_lifecycle>
-               <autopurge_nowriter_samples_delay>
-                    <sec>DURATION_INFINITE_SEC</sec>
-                    <nanosec>DURATION_INFINITE_NSEC</nanosec>
-               </autopurge_nowriter_samples_delay>
-               <autopurge_disposed_samples_delay>
-                    <sec>DURATION_INFINITE_SEC</sec>
-                    <nanosec>DURATION_INFINITE_NSEC</nanosec>
-               </autopurge_disposed_samples_delay>
-          </reader_data_lifecycle>
-     </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/Plan.cdp
deleted file mode 100644
index e2a0b7bef7d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/Plan.cdp
+++ /dev/null
@@ -1,458 +0,0 @@
-<!--  -->
-<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>CSL_SRTest_Depl_1</label>
-  <UUID>CSL_SRTest_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_CSL_SRTest_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_SRTest_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="CSL_SRTest_ConnectorComponentImplementation">
-    <name>CSL_SRTest_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="CSL_SRTest_Connector_ExecArtifact" />
-    <artifact xmi:idref="CSL_SRTest_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_CSL_SR_Connector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_SR_Connector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CSL_SRTest_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CSL_SRTest_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_CSL_SRTest_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_SRTest_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" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <!--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-->
-    <!--configProperty>
-      <name>get_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty-->
-    <configProperty>
-      <name>read_data</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>raw_listen</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="CSL_SRTest_ConnectorComponentInstance">
-    <name>CSL_SRTest_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CSL_SRTest_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-    <name>qos_profile</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>HelloTest_Library#HelloProfile</string>
-      </value>
-    </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CSL_SRTest_ConnectorComponentInstance2">
-    <name>CSL_SRTest_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CSL_SRTest_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_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="CSL_SRTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_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="CSL_SRTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_out_connector_status_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CSL_SRTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_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="CSL_SRTest_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CSL_SRTest_ConnectorComponentInstance2" />
-    </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="CSL_SRTest_Connector_ExecArtifact">
-    <name>CSL_SRTest_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_CSL_SRTest_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="CSL_SRTest_Connector_SvntArtifact">
-    <name>CSL_SRTest_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_CSL_SRTest_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="CSL_SRTest_Connector_StubArtifact">
-    <name>CSL_SRTest_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_CSL_SRTest_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/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 6af0ea977f5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-This file is used to create a situation which causes an on_rejected_sample event.
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="HelloTest_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="HelloProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>0</sec>
-            <nanosec>100000000</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <durability_service>
-          <history_kind>KEEP_LAST_HISTORY_QOS</history_kind>
-          <history_depth>10</history_depth>
-           <max_samples>10</max_samples>
-          <max_samples_per_instance>10</max_samples_per_instance>
-          <max_instances>2</max_instances>
-        </durability_service>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-       </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <durability>
-          <kind>VOLATILE_DURABILITY_QOS</kind>
-        </durability>
-        <deadline>
-          <period>
-            <sec>DURATION_INFINITE_SEC</sec>
-            <nanosec>DURATION_INFINITE_NSEC</nanosec>
-          </period>
-        </deadline>
-        <latency_budget>
-          <duration>
-            <sec>0</sec>
-            <nanosec>0</nanosec>
-          </duration>
-        </latency_budget>
-        <liveliness>
-          <kind>AUTOMATIC_LIVELINESS_QOS</kind>
-          <lease_duration>
-            <sec>DURATION_INFINITE_SEC</sec>
-            <nanosec>DURATION_INFINITE_NSEC</nanosec>
-          </lease_duration>
-        </liveliness>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>0</sec>
-            <nanosec>100000000</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <destination_order>
-          <kind>BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS</kind>
-        </destination_order>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>10</depth>
-        </history>
-        <resource_limits>
-          <initial_samples>1</initial_samples>
-          <initial_instances>1</initial_instances>
-          <max_samples>10</max_samples>
-          <max_instances>1</max_instances>
-          <max_samples_per_instance>10</max_samples_per_instance>
-        </resource_limits>
-        <user_data>
-          <value></value>
-        </user_data>
-        <ownership>
-          <kind>SHARED_OWNERSHIP_QOS</kind>
-        </ownership>
-        <time_based_filter>
-          <minimum_separation>
-            <sec>0</sec>
-            <nanosec>0</nanosec>
-          </minimum_separation>
-        </time_based_filter>
-        <reader_data_lifecycle>
-          <autopurge_nowriter_samples_delay>
-            <sec>DURATION_INFINITE_SEC</sec>
-            <nanosec>DURATION_INFINITE_NSEC</nanosec>
-          </autopurge_nowriter_samples_delay>
-          <autopurge_disposed_samples_delay>
-            <sec>DURATION_INFINITE_SEC</sec>
-            <nanosec>DURATION_INFINITE_NSEC</nanosec>
-          </autopurge_disposed_samples_delay>
-        </reader_data_lifecycle>
-        </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl
deleted file mode 100755
index 174721086cd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 10 seconds to allow task to complete\n";
-sleep (10);
-
-# 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 -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/.gitignore b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl
deleted file mode 100644
index 29c0dd70442..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file   CSL_USTest_Base.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef CSL_USTEST_BASE_IDL
-#define CSL_USTEST_BASE_IDL
-
-#pragma ndds typesupport "Base/CSL_USTest_BaseSupport.h"
-#pragma opendds typesupport "Base/CSL_USTest_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TestTopic"
-#pragma DCPS_DATA_KEY "TestTopic key"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopic> TestTopicSeq;
-#endif
-
-#endif /* CSL_USTEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc
deleted file mode 100644
index 9f5f5e9e8c5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_CSL_USTest_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_CSL_USTest_Base_stub
-  dynamicflags += CSL_USTEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=CSL_USTEST_BASE_STUB_Export \
-              -Wb,stub_export_include=CSL_USTest_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    CSL_USTest_Base.idl
-  }
-
-  opendds_ts_flags += --export=CSL_USTEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    CSL_USTest_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl
deleted file mode 100644
index 32ad7cf13ce..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file CSL_USTest_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef CSL_USTEST_CONNECTOR_IDL_
-#define CSL_USTEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/CSL_USTest_Base.idl"
-
-#pragma ciao lem "Connector/CSL_USTest_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/CSL_USTest_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> CSL_US_Connector;
-
-#endif /* CSL_USTest_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
deleted file mode 100644
index 2372945f778..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_CSL_USTest_Base -l .. -o ../lib -u DDS CSL_USTest_Connector"
-
-project(DDS_CSL_USTest_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_CSL_USTest_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=CSL_USTEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=CSL_USTest_Connector_stub_export.h \
-              -Wb,skel_export_macro=CSL_USTEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=CSL_USTest_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=CSL_USTEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=CSL_USTest_Connector_svnt_export.h \
-              -Wb,conn_export_macro=CSL_USTEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=CSL_USTest_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    CSL_USTest_Connector.idl
-  }
-}
-
-project(DDS_CSL_USTest_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_CSL_USTest_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=CSL_USTEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=CSL_USTest_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    CSL_USTest_ConnectorE.idl
-  }
-}
-
-project(DDS_CSL_USTest_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_CSL_USTest_Connector_lem_gen DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Base_stub
-  libs  += DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_CSL_USTest_Connector_lem_stub
-  dynamicflags += CSL_USTEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_USTest_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    CSL_USTest_ConnectorEC.h
-    CSL_USTest_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_USTest_ConnectorEC.inl
-  }
-}
-
-project(DDS_CSL_USTest_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CSL_USTest_Connector_idl_gen DDS_CSL_USTest_Base_stub
-  libs  += DDS_CSL_USTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_CSL_USTest_Connector_stub
-  dynamicflags += CSL_USTEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_USTest_ConnectorC.cpp
-  }
-
-  Header_Files {
-    CSL_USTest_ConnectorC.h
-    CSL_USTest_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_USTest_ConnectorC.inl
-  }
-}
-
-project(DDS_CSL_USTest_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_stub
-  sharedname = DDS_CSL_USTest_Connector_exec
-  libs += DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CSL_USTEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_USTest_Connector_conn.cpp
-  }
-
-  Header_Files {
-    CSL_USTest_Connector_conn.h
-    CSL_USTest_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CSL_USTest_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_exec DDS_CSL_USTest_Connector_stub
-  sharedname  = DDS_CSL_USTest_Connector_svnt
-  libs       += DDS_CSL_USTest_Connector_stub \
-                DDS_CSL_USTest_Connector_lem_stub  \
-                DDS_CSL_USTest_Base_stub \
-                DDS_CSL_USTest_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CSL_USTEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_USTest_ConnectorS.cpp
-    CSL_USTest_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    CSL_USTest_ConnectorS.h
-    CSL_USTest_Connector_svnt.h
-    CSL_USTest_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl
deleted file mode 100644
index aedb58ebd5f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/CSL_USTest_Connector.idl"
-
-module CSL_USTest
-{
-  component Receiver
-  {
-    port CSL_US_Connector::DDS_Listen info_out;
-    port CSL_US_Connector::DDS_Read info_read;
-    provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
-   };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc
deleted file mode 100644
index 79dda1f9d80..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_CSL_USTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_CSL_USTest_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 {
-    CSL_USTest_Receiver.idl
-  }
-}
-
-project(DDS_CSL_USTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_CSL_USTest_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 {
-    CSL_USTest_ReceiverE.idl
-  }
-}
-
-project(DDS_CSL_USTest_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_CSL_USTest_Receiver_lem_gen DDS_CSL_USTest_Receiver_stub  DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Base_stub
-  libs  +=  Receiver_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_USTest_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    CSL_USTest_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_USTest_ReceiverEC.inl
-  }
-}
-
-project(DDS_CSL_USTest_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CSL_USTest_Receiver_idl_gen  DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_lem_gen
-  libs  += DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_USTest_ReceiverC.cpp
-  }
-
-  Header_Files {
-    CSL_USTest_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_USTest_ReceiverC.inl
-  }
-}
-
-project(DDS_CSL_USTest_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_CSL_USTest_Receiver_lem_stub DDS_CSL_USTest_Receiver_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_USTest_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    CSL_USTest_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CSL_USTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_CSL_USTest_Receiver_lem_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_svnt DDS_CSL_USTest_Receiver_exec DDS_CSL_USTest_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_svnt Receiver_exec DDS_CSL_USTest_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_USTest_ReceiverS.cpp
-    CSL_USTest_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    CSL_USTest_ReceiverS.h
-    CSL_USTest_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp
deleted file mode 100644
index 5d0e0ba817e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp
+++ /dev/null
@@ -1,573 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "CSL_USTest_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "dds4ccm/impl/Utils.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_CSL_USTest_Receiver_Impl
-{
-  /**
-   * Pulser
-   */
-
-  Pulser::Pulser (Receiver_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  Pulser::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.read_all ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::CSL_USTest::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::CSL_USTest::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CSL_US_Connector::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::TestTopic & /* datum */,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::TestTopicSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::CSL_USTest::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::CSL_USTest::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_read_status_exec_i
-   */
-
-  info_read_status_exec_i::info_read_status_exec_i (
-        ::CSL_USTest::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::CSL_USTest::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_read_status_exec_i::~info_read_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_read_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_read_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_connector_status_exec_i
-   */
-
-  info_out_connector_status_exec_i::info_out_connector_status_exec_i (
-        ::CSL_USTest::CCM_Receiver_Context_ptr ctx,
-        Atomic_Boolean &subscription_matched_received,
-        Atomic_Boolean &liveliness_changed_received,
-        ACE_Thread_ID &thread_id_subcription_matched,
-        ACE_Thread_ID &thread_id_liveliness_changed)
-    : ciao_context_ (
-        ::CSL_USTest::CCM_Receiver_Context::_duplicate (ctx))
-      , subscription_matched_received_ (subscription_matched_received)
-      , liveliness_changed_received_ (liveliness_changed_received)
-      , thread_id_subcription_matched_ (thread_id_subcription_matched)
-      , thread_id_liveliness_changed_ (thread_id_liveliness_changed)
-  {
-  }
-
-  info_out_connector_status_exec_i::~info_out_connector_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-
-  void
-  info_out_connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */,
-  const ::DDS::InconsistentTopicStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleRejectedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr the_entity,
-  ::DDS::StatusKind status_kind)
-  {
-    ACE_DEBUG ((LM_DEBUG, "RECEIVER\tConnectorStatusListener_exec_i::on_unexpected_status: "
-                          "received <%C>\n",
-                          CIAO::DDS4CCM::translate_statuskind (status_kind)));
-    ACE_Thread_ID t_id;
-
-    if (! ::CORBA::is_nil (the_entity) && status_kind == DDS::SUBSCRIPTION_MATCHED_STATUS)
-      {
-        this->subscription_matched_received_ = true;
-        this->thread_id_subcription_matched_ = t_id;
-      }
-    else if (! ::CORBA::is_nil(the_entity) && status_kind == DDS::LIVELINESS_CHANGED_STATUS)
-      {
-        this->liveliness_changed_received_ = true;
-        this->thread_id_liveliness_changed_ = t_id;
-      }
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : subscription_matched_received_ (false)
-      , liveliness_changed_received_ (false)
-      , thread_id_listener_subscription_matched_ (0, 0)
-      , thread_id_listener_liveliness_changed_ (0, 0)
-      , received_(0)
-  {
-    ACE_NEW_THROW_EX (this->pulser_,
-                      Pulser (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-    delete this->pulser_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
- void
-  Receiver_exec_i::read_all ()
-  {
-    ::CSL_US_Connector::Reader_var reader =
-      this->ciao_context_->get_connection_info_read_data ();
-
-    try
-      {
-        TestTopicSeq readertest_info_seq;
-        ::CCM_DDS::ReadInfoSeq readinfo_seq;
-        if (this->received_ < 30)
-          {
-            reader->read_all (readertest_info_seq, readinfo_seq);
-            ACE_DEBUG ((LM_DEBUG, "Read %u samples\n",
-                                  readinfo_seq.length ()));
-            this->received_ += readinfo_seq.length ();
-          }
-        else
-          {
-            this->reactor ()->cancel_timer (this->pulser_);
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::read_all :Stop reading.\n")));
-          }
-      }
-    catch (const CCM_DDS::NonExistent& ex)
-      {
-        for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ALL: ")
-                  ACE_TEXT ("caught expected exception: index <%u>\n"),
-                  ex.indexes[i]));
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ")
-              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-              ex.error_code));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: READ ALL: ");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::read_all : Exception caught\n")));
-      }
-  }
-  // Component attributes and port operations.
-
-  ::CSL_US_Connector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in ()),
-            ::CSL_US_Connector::CCM_Listener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::CSL_US_Connector::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_read_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_read_status_.in ()))
-      {
-        info_read_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_read_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_read_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_read_status_.in ());
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Receiver_exec_i::get_info_out_connector_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_connector_status_.in ()))
-      {
-        info_out_connector_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_connector_status_exec_i (
-            this->ciao_context_.in (),
-            this->subscription_matched_received_,
-            this->liveliness_changed_received_,
-            this->thread_id_listener_subscription_matched_,
-            this->thread_id_listener_liveliness_changed_),
-            ::CCM_DDS::CCM_ConnectorStatusListener::_nil ());
-
-          this->ciao_info_out_connector_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate (
-        this->ciao_info_out_connector_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::CSL_USTest::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    if (this->reactor ()->schedule_timer (
-                this->pulser_,
-                0,
-                ACE_Time_Value (6, 0),
-                ACE_Time_Value (3, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (!this->subscription_matched_received_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: Didn't receive the expected ")
-                              ACE_TEXT ("'SUBSCRIPTION_MATCHED_STATUS'\n")));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Received the expected ")
-                               ACE_TEXT ("'SUBSCRIPTION_MATCHED_STATUS'\n")));
-      }
-    if (!this->liveliness_changed_received_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: Didn't receive the expected ")
-                              ACE_TEXT ("'LIVELINESS_CHANGED_STATUS'\n")));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Received the expected ")
-                               ACE_TEXT ("'LIVELINESS_CHANGED_STATUS' \n")));
-      }
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_subscription_matched_.to_string(list_buf);
-
-    //test thread switch for SUBSCRIPTION_MATCHED_STATUS
-    if (this->thread_id_listener_subscription_matched_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread ID for 'SUBSCRIPTION_MATCHED_STATUS' not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_subscription_matched_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: "
-                              "Thread switch for 'SUBSCRIPTION_MATCHED_STATUS' seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-    }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread switch for 'SUBSCRIPTION_MATCHED_STATUS' "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_subscription_matched_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: 'SUBSCRIPTION_MATCHED_STATUS': "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: 'SUBSCRIPTION_MATCHED_STATUS': "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    #endif
-
-    //test thread switch for LIVELINESS_CHANGED_STATUS
-    char list_buf_lc [65];
-    this->thread_id_listener_liveliness_changed_.to_string(list_buf_lc);
-
-    if (this->thread_id_listener_liveliness_changed_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread ID for 'LIVELINESS_CHANGED_STATUS' not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_liveliness_changed_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: "
-                              "Thread switch for 'LIVELINESS_CHANGED_STATUS' seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_lc,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread switch for 'LIVELINESS_CHANGED_STATUS' "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_lc,
-                              ccm_buf));
-     }
-    #else
-    else if (this->thread_id_listener_liveliness_changed_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: 'LIVELINESS_CHANGED_STATUS': "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_lc,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: 'LIVELINESS_CHANGED_STATUS': "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_lc,
-                              ccm_buf));
-      }
-    #endif
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_USTest_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/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h
deleted file mode 100644
index 88ebdc7a273..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h
+++ /dev/null
@@ -1,288 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_CSL_USTEST_RECEIVER_EXEC_GLRYKK_H_
-#define CIAO_CSL_USTEST_RECEIVER_EXEC_GLRYKK_H_
-
-#include /**/ "ace/pre.h"
-
-#include "CSL_USTest_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_CSL_USTest_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong > Atomic_ULong;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Receiver_exec_i;
-
-  /**
-   * Pulser
-   */
-
-  class Pulser :
-    public ACE_Event_Handler
-  {
-  public:
-    Pulser (Receiver_exec_i &callback);
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::CSL_US_Connector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::CSL_USTest::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CSL_US_Connector::Listener. */
-
-    virtual
-    void on_one_data (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::TestTopicSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::CSL_USTest::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::CSL_USTest::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::CSL_USTest::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_read_status_exec_i
-   */
-
-  class info_read_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_read_status_exec_i (
-      ::CSL_USTest::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_read_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::CSL_USTest::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_connector_status_exec_i
-   */
-
-  class info_out_connector_status_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_connector_status_exec_i (
-      ::CSL_USTest::CCM_Receiver_Context_ptr ctx,
-      Atomic_Boolean &subscription_matched_received,
-      Atomic_Boolean &liveliness_changed_received,
-      ACE_Thread_ID &thread_id_subcription_matched,
-      ACE_Thread_ID &thread_id_liveliness_changed);
-    virtual ~info_out_connector_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-    const ::DDS::InconsistentTopicStatus & status);
-
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedIncompatibleQosStatus & status);
-
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleRejectedStatus & status);
-
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedDeadlineMissedStatus & status);
-
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedIncompatibleQosStatus & status);
-
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind status_kind);
-    //@}
-
-  private:
-    ::CSL_USTest::CCM_Receiver_Context_var ciao_context_;
-    Atomic_Boolean &subscription_matched_received_;
-    Atomic_Boolean &liveliness_changed_received_;
-    ACE_Thread_ID &thread_id_subcription_matched_;
-    ACE_Thread_ID &thread_id_liveliness_changed_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::CSL_US_Connector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_read_status (void);
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_info_out_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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void read_all (void);
-
-    //@}
-
-  private:
-    ::CSL_USTest::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CSL_US_Connector::CCM_Listener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_read_status_;
-    ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_info_out_connector_status_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Pulser *pulser_;
-
-    Atomic_Boolean subscription_matched_received_;
-    Atomic_Boolean liveliness_changed_received_;
-    ACE_Thread_ID thread_id_listener_subscription_matched_;
-    ACE_Thread_ID thread_id_listener_liveliness_changed_;
-    Atomic_ULong received_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_USTest_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl
deleted file mode 100644
index 4cdc3107c58..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_CSL_USTEST_SENDER_IDL
-#define DDS_CSL_USTEST_SENDER_IDL
-
-#include "Connector/CSL_USTest_Connector.idl"
-
-module CSL_USTest
-{
-  component Sender
-  {
-    port CSL_US_Connector::DDS_Write test_topic_write;
-    provides CCM_DDS::ConnectorStatusListener test_topic_connector_status;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc
deleted file mode 100644
index ec9ebf7f815..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_CSL_USTest_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_CSL_USTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_CSL_USTest_Connector_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 {
-    CSL_USTest_Sender.idl
-  }
-}
-
-project(DDS_CSL_USTest_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_CSL_USTest_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 {
-    CSL_USTest_SenderE.idl
-  }
-}
-
-project(DDS_CSL_USTest_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_CSL_USTest_Sender_lem_gen DDS_CSL_USTest_Sender_stub DDS_CSL_USTest_Base_stub
-  libs  += DDS_CSL_USTest_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_USTest_SenderEC.cpp
-  }
-
-  Header_Files {
-    CSL_USTest_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_USTest_SenderEC.inl
-  }
-}
-
-project(DDS_CSL_USTest_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CSL_USTest_Sender_idl_gen DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub
-  libs  += DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_USTest_SenderC.cpp
-  }
-
-  Header_Files {
-    CSL_USTest_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    CSL_USTest_SenderC.inl
-  }
-}
-
-project(DDS_CSL_USTest_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_CSL_USTest_Sender_lem_stub DDS_CSL_USTest_Sender_stub DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_lem_stub  DDS_CSL_USTest_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_USTest_Sender_exec.cpp
-  }
-
-  Header_Files {
-    CSL_USTest_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CSL_USTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_CSL_USTest_Base_stub  DDS_CSL_USTest_Sender_lem_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_svnt DDS_CSL_USTest_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub  DDS_CSL_USTest_Connector_svnt DDS_CSL_USTest_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CSL_USTest_SenderS.cpp
-    CSL_USTest_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    CSL_USTest_SenderS.h
-    CSL_USTest_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp
deleted file mode 100644
index ba268353c2e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp
+++ /dev/null
@@ -1,580 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "CSL_USTest_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#include "dds4ccm/impl/Utils.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_CSL_USTest_Sender_Impl
-{
-  /**
-   * Write action 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;
-  }
-
-  /**
-   * Facet Executor Implementation Class: test_topic_connector_status_exec_i
-   */
-
-  test_topic_connector_status_exec_i::test_topic_connector_status_exec_i (
-        ::CSL_USTest::CCM_Sender_Context_ptr ctx,
-        Atomic_Boolean &publication_matched_received,
-        Atomic_Boolean &liveliness_lost_received,
-        Atomic_Boolean &reliable_dr_activity_changed_received,
-        Atomic_Boolean &reliable_writer_cache_changed_received,
-        ACE_Thread_ID &thread_id_publication_matched,
-        ACE_Thread_ID &thread_id_liveliness_lost,
-        ACE_Thread_ID &thread_id_reliable_dr_activity_changed,
-        ACE_Thread_ID &thread_id_reliable_writer_cache_changed)
-    : ciao_context_ (
-        ::CSL_USTest::CCM_Sender_Context::_duplicate (ctx))
-      , publication_matched_received_ (publication_matched_received)
-      , liveliness_lost_received_ (liveliness_lost_received)
-      , reliable_dr_activity_changed_received_ (reliable_dr_activity_changed_received)
-      , reliable_writer_cache_changed_received_ (reliable_writer_cache_changed_received)
-      , thread_id_publication_matched_ (thread_id_publication_matched)
-      , thread_id_liveliness_lost_ (thread_id_liveliness_lost)
-      , thread_id_reliable_dr_activity_changed_ (thread_id_reliable_dr_activity_changed)
-      , thread_id_reliable_writer_cache_changed_ (thread_id_reliable_writer_cache_changed)
-  {
-  }
-
-  test_topic_connector_status_exec_i::~test_topic_connector_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-
-  void
-  test_topic_connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */,
-  const ::DDS::InconsistentTopicStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  test_topic_connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  test_topic_connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleRejectedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  test_topic_connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  test_topic_connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  test_topic_connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr the_entity,
-  ::DDS::StatusKind status_kind)
-  {
-    ACE_Thread_ID t_id;
-    ACE_DEBUG ((LM_DEBUG, "SENDER\t\tConnectorStatusListener_exec_i::on_unexpected_status: "
-                          "received <%C>\n",
-                          CIAO::DDS4CCM::translate_statuskind (status_kind)));
-
-    if (! ::CORBA::is_nil(the_entity) && status_kind == DDS::LIVELINESS_LOST_STATUS)
-      {
-        this->liveliness_lost_received_ = true;
-        this->thread_id_liveliness_lost_ = t_id;
-    }
-    else if (! ::CORBA::is_nil(the_entity) && status_kind == DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        this->publication_matched_received_ = true;
-        this->thread_id_publication_matched_ = t_id;
-
-      }
-#if (CIAO_DDS4CCM_NDDS==1)
-    else if (! ::CORBA::is_nil(the_entity) && status_kind == DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS)
-      {
-        this->reliable_dr_activity_changed_received_ = true;
-        this->thread_id_reliable_dr_activity_changed_ = t_id;
-      }
-    else if (! ::CORBA::is_nil(the_entity) && status_kind == DDS::RELIABLE_WRITER_CACHE_CHANGED_STATUS)
-      {
-        this->reliable_writer_cache_changed_received_ = true;
-        this->thread_id_reliable_writer_cache_changed_ = t_id;
-      }
-#endif
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : publication_matched_received_ (false)
-      , liveliness_lost_received_ (false)
-      , reliable_dr_activity_changed_received_ (false)
-      , reliable_writer_cache_changed_received_ (false)
-      , thread_id_listener_publication_matched_ (0, 0)
-      , thread_id_listener_liveliness_lost_ (0, 0)
-      , thread_id_reliable_dr_activity_changed_ (0, 0)
-      , thread_id_reliable_writer_cache_changed_ (0, 0)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::tick ()
-  {
-    ::CSL_US_Connector::Writer_var writer =
-      this->ciao_context_->get_connection_test_topic_write_data ();
-
-    for (CSL_SRTest_Table::iterator i = this->_ktests_.begin ();
-         i != this->_ktests_.end ();
-         ++i)
-      {
-        try
-          {
-            if (! ::CORBA::is_nil (writer.in ()))
-              {
-                writer->write_one(i->second,::DDS::HANDLE_NIL);
-                ACE_DEBUG ((LM_DEBUG, "Written sample: <%C> - <%d>\n",
-                  i->first.c_str (),
-                  i->second->x));
-                i->second->x++;
-              }
-            else ACE_ERROR ((LM_ERROR, "Unable to write sample: <%C> - <%d>\n",
-                                        i->first.c_str (),
-                                        i->second->x));
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating topic for <%C>.\n"),
-                    i->first.c_str ()));
-          }
-     }
-  }
-
- void
-  Sender_exec_i::add_instance_of_topic (const char * key, int x)
-  {
-    TestTopic *new_key = new TestTopic;
-    new_key->key = CORBA::string_dup(key);
-    new_key->x = x;
-    this->_ktests_[key] = new_key;
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_test_topic_connector_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_test_topic_connector_status_.in ()))
-      {
-        test_topic_connector_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          test_topic_connector_status_exec_i (
-            this->ciao_context_.in (),
-            this->publication_matched_received_,
-            this->liveliness_lost_received_,
-            this->reliable_dr_activity_changed_received_,
-            this->reliable_writer_cache_changed_received_,
-            this->thread_id_listener_publication_matched_,
-            this->thread_id_listener_liveliness_lost_,
-            this->thread_id_reliable_dr_activity_changed_,
-            this->thread_id_reliable_writer_cache_changed_),
-            ::CCM_DDS::CCM_ConnectorStatusListener::_nil ());
-
-          this->ciao_test_topic_connector_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate (
-        this->ciao_test_topic_connector_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::CSL_USTest::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    // Add 2 different instances of topic
-    this->add_instance_of_topic ("ONE", 1);
-    this->add_instance_of_topic ("TWO", 2);
-    // calculate the interval time
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (3, 0),
-                ACE_Time_Value (1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    if (!this->publication_matched_received_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: Didn't receive the expected ")
-                              ACE_TEXT ("'PUBLICATION_MATCHED_STATUS'\n")
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ")
-                               ACE_TEXT ("'PUBLICATION_MATCHED_STATUS'\n")
-                    ));
-      }
-    if (!this->liveliness_lost_received_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: Didn't receive the expected ")
-                              ACE_TEXT ("'LIVELINESS_LOST_STATUS'\n")
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ")
-                               ACE_TEXT ("'LIVELINESS_LOST_STATUS'\n")
-                    ));
-      }
-#if (CIAO_DDS4CCM_NDDS==1)
-    if (!this->reliable_dr_activity_changed_received_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: Didn't receive the expected ")
-                              ACE_TEXT ("'RELIABLE_READER_ACTIVITY_CHANGED_STATUS'\n")
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ")
-                               ACE_TEXT ("'RELIABLE_READER_ACTIVITY_CHANGED_STATUS'\n")
-                    ));
-      }
-    if (!this->reliable_writer_cache_changed_received_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: Didn't receive the expected ")
-                              ACE_TEXT ("'RELIABLE_WRITER_CACHE_CHANGED_STATUS'\n")
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ")
-                               ACE_TEXT ("'RELIABLE_WRITER_CACHE_CHANGED_STATUS'\n")
-                    ));
-      }
-#endif
-
-    //get current thread
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    //test thread switch for PUBLICATION_MATCHED_STATUS
-
-    char list_buf_pm [65];
-    this->thread_id_listener_publication_matched_.to_string(list_buf_pm);
-    if (this->thread_id_listener_publication_matched_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread ID for 'PUBLICATION_MATCHED_STATUS' not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_publication_matched_== ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: "
-                              "Thread switch for 'PUBLICATION_MATCHED_STATUS' seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_pm,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread switch for 'PUBLICATION_MATCHED_STATUS' "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_pm,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_publication_matched_== ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: 'PUBLICATION_MATCHED_STATUS': "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_pm,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: 'PUBLICATION_MATCHED_STATUS': "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_pm,
-                              ccm_buf));
-      }
-    #endif
-
-    // Test thread switch for LIVELINESS_LOST_STATUS
-    char list_buf_ll [65];
-    this->thread_id_listener_liveliness_lost_.to_string(list_buf_ll);
-    if (this->thread_id_listener_liveliness_lost_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread ID for 'LIVELINESS_LOST_STATUS' not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_liveliness_lost_== ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: "
-                              "Thread switch for 'LIVELINESS_LOST_STATUS' seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                               "listener <%C> - component <%C>\n",
-                              list_buf_ll,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread switch for 'LIVELINESS_LOST_STATUS' "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_ll,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_liveliness_lost_== ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: 'LIVELINESS_LOST_STATUS': "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_ll,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: 'LIVELINESS_LOST_STATUS': "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_ll,
-                              ccm_buf));
-      }
-    #endif
-
-#if (CIAO_DDS4CCM_NDDS==1)
-    //test thread switch for RELIABLE_READER_ACTIVITY_CHANGED_STATUS
-    char list_buf_ra [65];
-    this->thread_id_reliable_dr_activity_changed_.to_string(list_buf_ra);
-
-    if (this->thread_id_reliable_dr_activity_changed_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread ID for 'RELIABLE_READER_ACTIVITY_CHANGED_STATUS' not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_reliable_dr_activity_changed_== ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: "
-                              "Thread switch for 'RELIABLE_READER_ACTIVITY_CHANGED_STATUS' seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_ra,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread switch for 'RELIABLE_READER_ACTIVITY_CHANGED_STATUS' "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_ra,
-                              ccm_buf));
-     }
-    #else
-    else if (this->thread_id_reliable_dr_activity_changed_== ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: 'RELIABLE_READER_ACTIVITY_CHANGED_STATUS': "
-                              "DDS seems to use a CCM thread for its callback: "
-                               "listener <%C> - component <%C>\n",
-                              list_buf_ra,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: 'RELIABLE_READER_ACTIVITY_CHANGED_STATUS': "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_ra,
-                              ccm_buf));
-      }
-    #endif
-#endif
-
-#if (CIAO_DDS4CCM_NDDS==1)
-    //test thread switch for RELIABLE_WRITER_CACHE_CHANGED_STATUS
-    char list_buf_rw [65];
-    this->thread_id_reliable_writer_cache_changed_.to_string (list_buf_rw);
-
-    if (this->thread_id_reliable_writer_cache_changed_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread ID for 'RELIABLE_WRITER_CACHE_CHANGED_STATUS' not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_reliable_writer_cache_changed_== ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: "
-                              "Thread switch for 'RELIABLE_WRITER_CACHE_CHANGED_STATUS' seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                               "listener <%C> - component <%C>\n",
-                              list_buf_rw,
-                              ccm_buf));
-    }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread switch for 'RELIABLE_WRITER_CACHE_CHANGED_STATUS' "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_rw,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_reliable_writer_cache_changed_== ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: 'RELIABLE_WRITER_CACHE_CHANGED_STATUS': "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_rw,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: 'RELIABLE_WRITER_CACHE_CHANGED_STATUS': "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_rw,
-                              ccm_buf));
-      }
-    #endif
-#endif
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_USTest_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/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h
deleted file mode 100644
index 74ae7db32ff..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h
+++ /dev/null
@@ -1,205 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_CSL_USTEST_SENDER_EXEC_R1USM7_H_
-#define CIAO_CSL_USTEST_SENDER_EXEC_R1USM7_H_
-
-#include /**/ "ace/pre.h"
-
-#include "CSL_USTest_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_CSL_USTest_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Sender_exec_i;
-
-  /**
-   * Write action generator
-   */
-
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: test_topic_connector_status_exec_i
-   */
-
-  class test_topic_connector_status_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    test_topic_connector_status_exec_i (
-      ::CSL_USTest::CCM_Sender_Context_ptr ctx,
-      Atomic_Boolean &publication_matched_received,
-      Atomic_Boolean &liveliness_lost_received,
-      Atomic_Boolean &reliable_dr_activity_changed_received,
-      Atomic_Boolean &reliable_writer_cache_changed_received,
-      ACE_Thread_ID &thread_id_publication_matched,
-      ACE_Thread_ID &thread_id_liveliness_lost,
-      ACE_Thread_ID &thread_id_reliable_dr_activity_changed,
-      ACE_Thread_ID &thread_id_reliable_writer_cache_changed);
-    virtual ~test_topic_connector_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-    const ::DDS::InconsistentTopicStatus & status);
-
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedIncompatibleQosStatus & status);
-
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleRejectedStatus & status);
-
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedDeadlineMissedStatus & status);
-
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedIncompatibleQosStatus & status);
-
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind status_kind);
-    //@}
-
-  private:
-    ::CSL_USTest::CCM_Sender_Context_var ciao_context_;
-    Atomic_Boolean &publication_matched_received_;
-    Atomic_Boolean &liveliness_lost_received_;
-    Atomic_Boolean &reliable_dr_activity_changed_received_;
-    Atomic_Boolean &reliable_writer_cache_changed_received_;
-    ACE_Thread_ID &thread_id_publication_matched_;
-    ACE_Thread_ID &thread_id_liveliness_lost_;
-    ACE_Thread_ID &thread_id_reliable_dr_activity_changed_;
-    ACE_Thread_ID &thread_id_reliable_writer_cache_changed_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_test_topic_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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void tick (void);
-
-    //@}
-
-  private:
-    ::CSL_USTest::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_test_topic_connector_status_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Atomic_Boolean publication_matched_received_;
-    Atomic_Boolean liveliness_lost_received_;
-    Atomic_Boolean reliable_dr_activity_changed_received_;
-    Atomic_Boolean reliable_writer_cache_changed_received_;
-    ACE_Thread_ID thread_id_listener_publication_matched_;
-    ACE_Thread_ID thread_id_listener_liveliness_lost_;
-    ACE_Thread_ID thread_id_reliable_dr_activity_changed_;
-    ACE_Thread_ID thread_id_reliable_writer_cache_changed_;
-    pulse_Generator * ticker_;
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, TestTopic_var> CSL_SRTest_Table;
-    CSL_SRTest_Table _ktests_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void add_instance_of_topic (const char *, int x);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CSL_USTest_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/CSL_Library.xml b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/CSL_Library.xml
deleted file mode 100644
index eac65f2581f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/CSL_Library.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-  <qos_profile name="CSLProfile">
-     <datawriter_qos>
-          <reliability>
-               <kind>RELIABLE_RELIABILITY_QOS</kind>
-         </reliability>
-          <durability>
-               <kind>TRANSIENT_DURABILITY_QOS</kind>
-          </durability>
-          <history>
-               <kind>KEEP_LAST_HISTORY_QOS</kind>
-               <depth>200</depth>
-          </history>
-        <liveliness>
-          <kind>MANUAL_BY_TOPIC_LIVELINESS_QOS</kind>
-          <lease_duration>
-            <sec>1</sec>
-            <nanosec>0</nanosec>
-          </lease_duration>
-        </liveliness>
-     </datawriter_qos>
-    <datareader_qos>
-          <reliability>
-               <kind>RELIABLE_RELIABILITY_QOS</kind>
-          </reliability>
-          <history>
-               <kind>KEEP_LAST_HISTORY_QOS</kind>
-               <depth>20</depth>
-          </history>
-          <durability>
-                 <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-          </durability>
-     </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp
deleted file mode 100644
index 0a4fd735998..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp
+++ /dev/null
@@ -1,432 +0,0 @@
-<!--  -->
-<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>CSL_USTest_Depl_1</label>
-  <UUID>CSL_USTest_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_CSL_USTest_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_USTest_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="CSL_USTest_ConnectorComponentImplementation">
-    <name>CSL_USTest_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="CSL_USTest_Connector_ExecArtifact" />
-    <artifact xmi:idref="CSL_USTest_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_CSL_US_Connector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_US_Connector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CSL_USTest_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CSL_USTest_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_CSL_USTest_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CSL_USTest_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="CSL_USTest_ConnectorComponentInstance">
-    <name>CSL_USTest_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CSL_USTest_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CSL_Library#CSLProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestUS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CSL_USTest_ConnectorComponentInstance2">
-    <name>CSL_USTest_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CSL_USTest_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CSL_Library#CSLProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestUS</string>
-        </value>
-      </value>
-    </configProperty>
-   </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CSL_USTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_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="CSL_USTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_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="CSL_USTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-    <connection>
-    <name>info_out_connector_status_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CSL_USTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>test_topic_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CSL_USTest_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_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="CSL_USTest_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_read_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_read_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CSL_USTest_ConnectorComponentInstance2" />
-    </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="CSL_USTest_Connector_ExecArtifact">
-    <name>CSL_USTest_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_CSL_USTest_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="CSL_USTest_Connector_SvntArtifact">
-    <name>CSL_USTest_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_CSL_USTest_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="CSL_USTest_Connector_StubArtifact">
-    <name>CSL_USTest_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_CSL_USTest_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/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 63f96806879..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="CSL_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="CSLProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>200</depth>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>1</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-        <liveliness>
-          <kind>DDS_MANUAL_BY_TOPIC_LIVELINESS_QOS</kind>
-          <lease_duration>
-            <sec>1</sec>
-            <nanosec>0</nanosec>
-          </lease_duration>
-        </liveliness>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl
deleted file mode 100755
index 2b535b3e697..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 20 seconds to allow task to complete\n";
-sleep (20);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/.gitignore b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl
deleted file mode 100644
index 8855d45864d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file CoherentUpdate_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COHERENT_UPDATE_TEST_BASE_IDL
-#define COHERENT_UPDATE_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/CoherentUpdate_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/CoherentUpdate_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "CoherentUpdateTest"
-#pragma DCPS_DATA_KEY "CoherentUpdateTest symbol"
-
-struct CoherentUpdateTest {
-  string symbol; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<CoherentUpdateTest> CoherentUpdateTestSeq;
-#endif
-
-#endif /* COHERENT_UPDATE_TEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.mpc
deleted file mode 100644
index 37658d27e27..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (CoherentUpdate_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = CoherentUpdate_Test_Base_stub
-  dynamicflags += COHERENT_UPDATE_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=COHERENT_UPDATE_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=CoherentUpdate_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    CoherentUpdate_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=COHERENT_UPDATE_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    CoherentUpdate_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.idl
deleted file mode 100644
index 7bd2be52b1b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file Reader_Starter.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COHERENT_WRITE_STARTER_IDL
-#define COHERENT_WRITE_STARTER_IDL
-
-#pragma ciao lem "Base/Reader_StarterE.idl"
-
-interface CoherentUpdateStarter
-{
-  void set_reader_properties (in unsigned short nr_iterations);
-  void start_read (in unsigned short run);
-};
-
-interface CoherentUpdateRestarter
-{
-  void restart_update ();
-};
-
-#endif /* COHERENT_WRITE_STARTER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc
deleted file mode 100644
index be474990c28..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc
+++ /dev/null
@@ -1,109 +0,0 @@
-project(DDS_Coh_Update_ReaderStarter_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
-              -Wb,stub_export_include=Reader_Starter_stub_export.h \
-              -Wb,skel_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,skel_export_include=Reader_Starter_svnt_export.h \
-              -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,svnt_export_include=Reader_Starter_svnt_export.h \
-              -Wb,exec_export_macro=READER_STARTER_EXEC_Export \
-              -Wb,exec_export_include=Reader_Starter_exec_export.h -I..
-
-  IDL_Files {
-    Reader_Starter.idl
-  }
-}
-
-project(DDS_Coh_Update_ReaderStarter_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Coh_Update_ReaderStarter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \
-              -Wb,stub_export_include=Reader_Starter_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Reader_StarterE.idl
-  }
-}
-
-project(DDS_Coh_Update_ReaderStarter_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Coh_Update_ReaderStarter_lem_gen DDS_Coh_Update_ReaderStarter_stub
-  libs  += Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Reader_Starter_lem_stub
-  dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterEC.cpp
-  }
-
-  Header_Files {
-    Reader_StarterEC.h
-    Reader_Starter_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_StarterEC.inl
-  }
-}
-
-project(DDS_Coh_Update_ReaderStarter_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Coh_Update_ReaderStarter_idl_gen
-  libs  +=
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Reader_Starter_stub
-  dynamicflags += READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterC.cpp
-  }
-
-  Header_Files {
-    Reader_StarterC.h
-    Reader_Starter_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_StarterC.inl
-  }
-}
-
-
-project(DDS_Coh_Update_ReaderStarter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_Coh_Update_ReaderStarter_lem_stub DDS_Coh_Update_ReaderStarter_stub
-  sharedname  = Reader_Starter_svnt
-  libs       += Reader_Starter_stub Reader_Starter_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += READER_STARTER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterS.cpp
-    Reader_Starter_svnt.cpp
-  }
-
-  Header_Files {
-    Reader_StarterS.h
-    Reader_Starter_svnt.h
-    Reader_Starter_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/.gitignore
deleted file mode 100644
index cd0af09aae3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/CoherentUpdate_Connector_conn_export.h
-/CoherentUpdate_Connector_lem_stub_export.h
-/CoherentUpdate_Connector_stub_export.h
-/CoherentUpdate_Connector_svnt_export.h
-/CoherentUpdate_Test_ConnectorE.idl
-/CoherentUpdate_Test_Connector_conn.cpp
-/CoherentUpdate_Test_Connector_conn.h
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl
deleted file mode 100644
index 22e01fc79fb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file CoherentUpdate_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COHERENT_UPDATE_TEST_CONNECTOR_IDL_
-#define COHERENT_UPDATE_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/CoherentUpdate_Test_Base.idl"
-
-#pragma ciao lem "Connector/CoherentUpdate_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/CoherentUpdate_Test_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::CoherentUpdateTest, ::CoherentUpdateTestSeq> CoherentUpdate_Test;
-
-#endif /* COHERENT_UPDATE_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc
deleted file mode 100644
index 3b33c29bfcc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p CoherentUpdate_TestBase -l .. -o ../lib -u DDS CoherentUpdate_Test_Connector"
-
-project(CoherentUpdate_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen CoherentUpdate_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COHERENT_UPDATE_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=CoherentUpdate_Connector_stub_export.h \
-              -Wb,skel_export_macro=COHERENT_UPDATE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=CoherentUpdate_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=COHERENT_UPDATE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=CoherentUpdate_Connector_svnt_export.h \
-              -Wb,conn_export_macro=COHERENT_UPDATE_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=CoherentUpdate_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    CoherentUpdate_Test_Connector.idl
-  }
-}
-
-project(CoherentUpdate_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += CoherentUpdate_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COHERENT_UPDATE_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=CoherentUpdate_Connector_lem_stub_export.h \
-              -SS -Gxhst -Sci \
-              -I ..
-
-  IDL_Files {
-    CoherentUpdate_Test_ConnectorE.idl
-  }
-}
-
-project(CoherentUpdate_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += CoherentUpdate_Connector_lem_gen CoherentUpdate_Connector_stub CoherentUpdate_Test_Base_stub
-  libs  += CoherentUpdate_Test_Base_stub CoherentUpdate_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = CoherentUpdate_Connector_lem_stub
-  dynamicflags += COHERENT_UPDATE_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentUpdate_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    CoherentUpdate_Test_ConnectorEC.h
-    CoherentUpdate_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CoherentUpdate_Test_ConnectorEC.inl
-  }
-}
-
-project(CoherentUpdate_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += CoherentUpdate_Connector_idl_gen CoherentUpdate_Test_Base_stub
-  libs  += CoherentUpdate_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = CoherentUpdate_Connector_stub
-  dynamicflags += COHERENT_UPDATE_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentUpdate_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    CoherentUpdate_Test_ConnectorC.h
-    CoherentUpdate_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    CoherentUpdate_Test_ConnectorC.inl
-  }
-}
-
-project(CoherentUpdate_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += CoherentUpdate_Connector_lem_stub CoherentUpdate_Connector_stub \
-             CoherentUpdate_Test_Base_stub
-  sharedname = CoherentUpdate_Connector_exec
-  libs += CoherentUpdate_Connector_stub CoherentUpdate_Connector_lem_stub \
-          CoherentUpdate_Test_Base_stub CoherentUpdate_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COHERENT_UPDATE_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentUpdate_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    CoherentUpdate_Test_Connector_conn.h
-    CoherentUpdate_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(CoherentUpdate_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += CoherentUpdate_Connector_lem_stub \
-                CoherentUpdate_Connector_exec \
-                CoherentUpdate_Connector_stub
-  sharedname  = CoherentUpdate_Connector_svnt
-  libs       += CoherentUpdate_Connector_stub \
-                CoherentUpdate_Connector_lem_stub  \
-                CoherentUpdate_Test_Base_stub \
-                CoherentUpdate_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COHERENT_UPDATE_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentUpdate_Test_ConnectorS.cpp
-    CoherentUpdate_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    CoherentUpdate_Test_ConnectorS.h
-    CoherentUpdate_Test_Connector_svnt.h
-    CoherentUpdate_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/.gitignore
deleted file mode 100644
index d07e6648dc0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/CoherentUpdate_Test_ReceiverE.idl
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.idl
deleted file mode 100644
index ab41ad8e412..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/CoherentUpdate_Test_Connector.idl"
-#include "Base/Reader_Starter.idl"
-
-module CoherentUpdate_Test
-{
-  component Receiver
-  {
-    port CoherentUpdate_Test::DDS_Read info_out;
-
-    provides CoherentUpdateStarter reader_start;
-    uses CoherentUpdateRestarter updater_restart;
-
-    attribute unsigned short nr_runs;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc
deleted file mode 100644
index 5c0974fb005..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc
+++ /dev/null
@@ -1,154 +0,0 @@
-project(CoherentUpdate_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += CoherentUpdate_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 {
-    CoherentUpdate_Test_Receiver.idl
-  }
-}
-
-project(CoherentUpdate_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += CoherentUpdate_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 {
-    CoherentUpdate_Test_ReceiverE.idl
-  }
-}
-
-project(CoherentUpdate_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += CoherentUpdate_Test_Receiver_lem_gen CoherentUpdate_Test_Receiver_stub  \
-           CoherentUpdate_Connector_stub CoherentUpdate_Test_Base_stub \
-           DDS_Coh_Update_ReaderStarter_stub
-  libs  +=  Receiver_stub CoherentUpdate_Connector_stub \
-            CoherentUpdate_Test_Base_stub Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentUpdate_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    CoherentUpdate_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CoherentUpdate_Test_ReceiverEC.inl
-  }
-}
-
-project(CoherentUpdate_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += CoherentUpdate_Test_Receiver_idl_gen  CoherentUpdate_Connector_stub \
-           CoherentUpdate_Test_Base_stub CoherentUpdate_Connector_lem_gen \
-           DDS_Coh_Update_ReaderStarter_stub DDS_Coh_Update_ReaderStarter_lem_stub
-  libs  += CoherentUpdate_Connector_stub CoherentUpdate_Test_Base_stub \
-           Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentUpdate_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    CoherentUpdate_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    CoherentUpdate_Test_ReceiverC.inl
-  }
-}
-
-project(CoherentUpdate_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += CoherentUpdate_Test_Receiver_lem_stub CoherentUpdate_Test_Receiver_stub \
-             CoherentUpdate_Test_Base_stub CoherentUpdate_Connector_stub \
-             CoherentUpdate_Connector_lem_stub \
-             DDS_Coh_Update_ReaderStarter_lem_stub DDS_Coh_Update_ReaderStarter_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub CoherentUpdate_Test_Base_stub \
-          CoherentUpdate_Connector_stub CoherentUpdate_Connector_lem_stub \
-          Reader_Starter_lem_stub Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentUpdate_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    CoherentUpdate_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(CoherentUpdate_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   CoherentUpdate_Test_Receiver_lem_stub CoherentUpdate_Test_Base_stub \
-                  CoherentUpdate_Connector_stub CoherentUpdate_Connector_svnt \
-                  CoherentUpdate_Test_Receiver_exec CoherentUpdate_Connector_lem_stub \
-                  DDS_Coh_Update_ReaderStarter_stub \
-                  DDS_Coh_Update_ReaderStarter_svnt DDS_Coh_Update_ReaderStarter_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub CoherentUpdate_Test_Base_stub \
-                CoherentUpdate_Connector_stub CoherentUpdate_Connector_svnt \
-                Receiver_exec CoherentUpdate_Connector_lem_stub \
-                Reader_Starter_stub Reader_Starter_svnt \
-                Reader_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentUpdate_Test_ReceiverS.cpp
-    CoherentUpdate_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    CoherentUpdate_Test_ReceiverS.h
-    CoherentUpdate_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp
deleted file mode 100644
index a6d4750a855..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,376 +0,0 @@
-// -*- C++ -*-
-#include "CoherentUpdate_Test_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/OS_NS_unistd.h"
-#include "ace/Reactor.h"
-#include "ace/Log_Msg.h"
-
-namespace CIAO_CoherentUpdate_Test_Receiver_Impl
-{
-  //============================================================
-  // read_action_Generator
-  //============================================================
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback,
-                                                int run)
-    : callback_ (callback),
-      run_ (run)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Checking if last sample "
-                          "is available in DDS...\n"));
-    if (this->callback_.check_last ())
-      this->callback_.run (this->run_);
-    return 0;
-  }
-
-  //============================================================
-  // Facet Executor Implementation Class: reader_start_exec_i
-  //============================================================
-
-  reader_start_exec_i::reader_start_exec_i (
-        ::CoherentUpdate_Test::CCM_Receiver_Context_ptr ctx,
-        Receiver_exec_i & callback)
-    : ciao_context_ (
-        ::CoherentUpdate_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  reader_start_exec_i::~reader_start_exec_i (void)
-  {
-  }
-
-  // Operations from ::CoherentUpdateStarter
-
-  void
-  reader_start_exec_i::set_reader_properties (
-    ::CORBA::UShort nr_iterations)
-  {
-    this->callback_.iterations (nr_iterations);
-  }
-
-  void
-  reader_start_exec_i::start_read (
-    ::CORBA::UShort run)
-  {
-    this->callback_.start_read (run);
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Receiver_exec_i
-  //============================================================
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : nr_runs_ (5),
-      iterations_ (10),
-      run_ (0),
-      last_iter_ (0),
-      ticker_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  bool
-  Receiver_exec_i::check_last ()
-  {
-    try
-      {
-        ::CoherentUpdate_Test::Reader_var reader =
-          this->ciao_context_->get_connection_info_out_data ();
-        if (::CORBA::is_nil (reader.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_last - "
-                                  "Unable to retrieve reader from context.\n"));
-            return false;
-          }
-        CoherentUpdateTest coherentwrite_info;
-        ::CCM_DDS::ReadInfo readinfo;
-        coherentwrite_info.symbol = CORBA::string_dup ("KEY_1");
-        reader->read_one_last (
-                coherentwrite_info,
-                readinfo,
-                ::DDS::HANDLE_NIL);
-                ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - "
-                              "last iteration <%d> - <%d>\n",
-                               coherentwrite_info.iteration,
-                               (this->run_ + 1) * this->iterations_ - 1));
-        return coherentwrite_info.iteration >= (this->run_ + 1) * this->iterations_ - 1;
-      }
-    catch (const ::CCM_DDS::InternalError &)
-      {
-      }
-    catch (const ::CCM_DDS::NonExistent &)
-      {
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: "
-                              "ERROR: Unexpected exception caught\n"));
-      }
-    return false;
-  }
-
-  // Supported operations and attributes.
-  void
-  Receiver_exec_i::read_all (::CoherentUpdate_Test::Reader_ptr reader)
-  {
-    try
-      {
-        CoherentUpdateTestSeq coherentwrite_info_seq;
-        ::CCM_DDS::ReadInfoSeq readinfo_seq;
-        reader->read_all (coherentwrite_info_seq, readinfo_seq);
-
-        for (CORBA::ULong it = 0; it < coherentwrite_info_seq.length (); ++it)
-          {
-            if (coherentwrite_info_seq[it].iteration > this->last_iter_)
-              {
-                if (coherentwrite_info_seq[it].iteration == ++this->last_iter_)
-                  {
-                    ACE_DEBUG ((LM_DEBUG, "OK: "));
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR: "));
-                  }
-                ACE_DEBUG ((LM_DEBUG, "expected: <%u> - "
-                                      "received <%d>\n",
-                                      this->last_iter_,
-                                      coherentwrite_info_seq[it].iteration));
-               }
-          }
-        if (this->run_ < this->nr_runs () + 1)
-          {
-             CoherentUpdateRestarter_var restarter =
-              this->ciao_context_->get_connection_updater_restart ();
-            if (! ::CORBA::is_nil (restarter))
-              {
-                restarter->restart_update ();
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_all -"
-                                      "Unable to restart.\n"));
-              }
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, "Finished: wait for shutdown\n"));
-          }
-      }
-    catch (const CCM_DDS::NonExistent& ex)
-      {
-        for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ALL: ")
-                  ACE_TEXT ("caught expected exception: index <%u>\n"),
-                  ex.indexes[i]));
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ")
-              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-              ex.error_code));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: READ ALL: ");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::read_all : Exception caught\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::start_read (CORBA::UShort run)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      read_action_Generator (*this, run),
-                      ::CORBA::INTERNAL ());
-    if (this->reactor ()->schedule_timer (
-                                          this->ticker_,
-                                          0,
-                                          ACE_Time_Value(1, 0),
-                                          ACE_Time_Value(1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::run (CORBA::UShort run)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::run - "
-                          "Starting run number <%d>\n",
-                          run));
-    this->run_ = run;
-    ::CoherentUpdate_Test::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data ();
-    if (! ::CORBA::is_nil (reader.in ()))
-      {
-        this->read_all (reader);
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::run - "
-                              "Unable to start: reader is nil.\n"));
-      }
-  }
-
-  // Supported operations and attributes.
-
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_CoherentUpdateStarter_ptr
-  Receiver_exec_i::get_reader_start (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_reader_start_.in ()))
-      {
-        reader_start_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          reader_start_exec_i (
-            this->ciao_context_.in (),
-            *this),
-          ::CCM_CoherentUpdateStarter::_nil ());
-
-        this->ciao_reader_start_ = tmp;
-      }
-
-    return
-      ::CCM_CoherentUpdateStarter::_duplicate (
-        this->ciao_reader_start_.in ());
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::nr_runs (void)
-  {
-    return
-      this->nr_runs_;
-  }
-
-  void
-  Receiver_exec_i::nr_runs (
-    const ::CORBA::UShort nr_runs)
-  {
-    this->nr_runs_ =
-      nr_runs;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::CoherentUpdate_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-    if (this->run_ == 1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: ")
-            ACE_TEXT ("Test did not run")
-            ACE_TEXT ("events.\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Finished coherent update test.\n")));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoherentUpdate_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/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h
deleted file mode 100644
index 92349ce6df1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h
+++ /dev/null
@@ -1,141 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COHERENTUPDATE_TEST_RECEIVER_EXEC_94WCEL_H_
-#define CIAO_COHERENTUPDATE_TEST_RECEIVER_EXEC_94WCEL_H_
-
-#include /**/ "ace/pre.h"
-
-#include "CoherentUpdate_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_CoherentUpdate_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  //============================================================
-  // read_action_Generator
-  //============================================================
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback,
-                           int run);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Receiver_exec_i &callback_;
-    int run_;
-  };
-
-  class RECEIVER_EXEC_Export reader_start_exec_i
-    : public virtual ::CCM_CoherentUpdateStarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    reader_start_exec_i (
-      ::CoherentUpdate_Test::CCM_Receiver_Context_ptr ctx,
-      Receiver_exec_i & callback);
-    virtual ~reader_start_exec_i (void);
-
-    // Operations and attributes from CoherentUpdateStarter
-
-    virtual
-    void set_reader_properties (
-      ::CORBA::UShort nr_iterations);
-
-    virtual
-    void start_read (
-      ::CORBA::UShort run);
-
-  private:
-    ::CoherentUpdate_Test::CCM_Receiver_Context_var ciao_context_;
-    Receiver_exec_i &callback_;
-  };
-
-
-  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 and port operations. */
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CCM_CoherentUpdateStarter_ptr
-    get_reader_start (void);
-
-    virtual ::CORBA::UShort
-    nr_runs (void);
-
-    virtual void
-    nr_runs (
-      ::CORBA::UShort nr_runs);
-
-    ::CORBA::UShort iterations (void);
-    void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    bool check_last ();
-
-    void start_read (CORBA::UShort run);
-    void run (CORBA::UShort run);
-
-  private:
-    ::CoherentUpdate_Test::CCM_Receiver_Context_var ciao_context_;
-    ::CCM_CoherentUpdateStarter_var ciao_reader_start_;
-
-    ::CORBA::UShort nr_runs_;
-
-    ::CORBA::UShort iterations_;
-    ::CORBA::UShort run_;
-    ::CORBA::Long last_iter_;
-
-    read_action_Generator *ticker_;
-
-    void read_all (
-      ::CoherentUpdate_Test::Reader_ptr reader);
-
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoherentUpdate_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/.gitignore
deleted file mode 100644
index 86849fed249..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/CoherentUpdate_Test_SenderE.idl
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl
deleted file mode 100644
index b9c3e548001..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_COHERENT_UPDATE_TEST_SENDER_IDL
-#define DDS_COHERENT_UPDATE_TEST_SENDER_IDL
-
-#include "Connector/CoherentUpdate_Test_Connector.idl"
-#include "Base/Reader_Starter.idl"
-
-module CoherentUpdate_Test
-{
-  component Sender
-  {
-    port CoherentUpdate_Test::DDS_Update info_update;
-
-    uses CoherentUpdateStarter start_reader;
-    provides CoherentUpdateRestarter restart_updater;
-
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc
deleted file mode 100644
index 56c819695ef..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc
+++ /dev/null
@@ -1,153 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p CoherentUpdate_TestBase -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(CoherentUpdate_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += CoherentUpdate_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 {
-    CoherentUpdate_Test_Sender.idl
-  }
-}
-
-project(CoherentUpdate_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += CoherentUpdate_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 {
-    CoherentUpdate_Test_SenderE.idl
-  }
-}
-
-project(CoherentUpdate_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += CoherentUpdate_Test_Sender_lem_gen CoherentUpdate_Test_Sender_stub \
-           CoherentUpdate_Test_Base_stub DDS_Coh_Update_ReaderStarter_stub
-  libs  += CoherentUpdate_Test_Base_stub Sender_stub Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentUpdate_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    CoherentUpdate_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CoherentUpdate_Test_SenderEC.inl
-  }
-}
-
-project(CoherentUpdate_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += CoherentUpdate_Test_Sender_idl_gen CoherentUpdate_Test_Base_stub \
-           CoherentUpdate_Connector_stub DDS_Coh_Update_ReaderStarter_stub \
-           DDS_Coh_Update_ReaderStarter_lem_stub
-  libs  += CoherentUpdate_Test_Base_stub CoherentUpdate_Connector_stub \
-           Reader_Starter_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentUpdate_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    CoherentUpdate_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    CoherentUpdate_Test_SenderC.inl
-  }
-}
-
-project(CoherentUpdate_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += CoherentUpdate_Test_Sender_lem_stub CoherentUpdate_Test_Sender_stub \
-             CoherentUpdate_Connector_lem_stub CoherentUpdate_Connector_stub \
-             DDS_Coh_Update_ReaderStarter_lem_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub CoherentUpdate_Test_Base_stub \
-             CoherentUpdate_Connector_lem_stub CoherentUpdate_Connector_stub \
-             Reader_Starter_stub Reader_Starter_lem_stub \
-             Reader_Starter_lem_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentUpdate_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    CoherentUpdate_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(CoherentUpdate_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += CoherentUpdate_Test_Base_stub  CoherentUpdate_Test_Sender_lem_stub \
-                CoherentUpdate_Connector_stub \
-                CoherentUpdate_Connector_svnt CoherentUpdate_Connector_lem_stub \
-                DDS_Coh_Update_ReaderStarter_stub DDS_Coh_Update_ReaderStarter_svnt \
-                DDS_Coh_Update_ReaderStarter_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub CoherentUpdate_Test_Base_stub \
-                CoherentUpdate_Connector_stub CoherentUpdate_Connector_svnt \
-                CoherentUpdate_Connector_lem_stub Reader_Starter_stub \
-                Reader_Starter_svnt Reader_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentUpdate_Test_SenderS.cpp
-    CoherentUpdate_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    CoherentUpdate_Test_SenderS.h
-    CoherentUpdate_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp
deleted file mode 100644
index b60ed95945a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,250 +0,0 @@
-// -*- C++ -*-
-#include "CoherentUpdate_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "ace/Log_Msg.h"
-
-#define SAMPLE_KEY_NAME "KEY_1"
-
-namespace CIAO_CoherentUpdate_Test_Sender_Impl
-{
-  //============================================================
-  // WriteHandler
-  //============================================================
-  WriteHandler::WriteHandler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteHandler::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.start ();
-    return 0;
-  }
-
-  //============================================================
-  // Facet Executor Implementation Class: restart_updater_exec_i
-  //============================================================
-
-  restart_updater_exec_i::restart_updater_exec_i (
-        ::CoherentUpdate_Test::CCM_Sender_Context_ptr ctx,
-        Sender_exec_i & callback)
-    : ciao_context_ (
-        ::CoherentUpdate_Test::CCM_Sender_Context::_duplicate (ctx)),
-      callback_ (callback)
-  {
-  }
-
-  restart_updater_exec_i::~restart_updater_exec_i (void)
-  {
-  }
-
-  // Operations from ::CoherentUpdateRestarter
-
-  void
-  restart_updater_exec_i::restart_update (void)
-  {
-    this->callback_.restart ();
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-
-  Sender_exec_i::Sender_exec_i (void)
-    : iterations_ (3),
-      run_ (1),
-      total_iter (0),
-      wh_ (0)
-  {
-    ACE_NEW_THROW_EX (this->wh_,
-                      WriteHandler (*this),
-                      CORBA::INTERNAL ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->wh_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_CoherentUpdateRestarter_ptr
-  Sender_exec_i::get_restart_updater (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_restart_updater_.in ()))
-      {
-        restart_updater_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          restart_updater_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_CoherentUpdateRestarter::_nil ());
-
-          this->ciao_restart_updater_ = tmp;
-      }
-
-    return
-      ::CCM_CoherentUpdateRestarter::_duplicate (
-        this->ciao_restart_updater_.in ());
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::CoherentUpdate_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    try
-      {
-        ::CoherentUpdate_Test::Updater_var updater =
-          this->ciao_context_->get_connection_info_update_data ();
-        updater->is_coherent_write (true);
-
-        // First create an instance for consecutive updating.
-        CoherentUpdateTest new_key;
-        new_key.symbol = CORBA::string_dup(SAMPLE_KEY_NAME);
-        new_key.iteration = 0;
-        updater->create_one (new_key);
-
-        this->reactor ()->notify (this->wh_);
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: GET_CONNECTION_START_READER : Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: GET_CONNECTION_START_READER : Unknown exception caught\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-  }
-
-  void
-  Sender_exec_i::restart (void)
-  {
-    ++this->run_;
-    delete this->wh_;
-    ACE_NEW_THROW_EX (this->wh_,
-                      WriteHandler (*this),
-                      CORBA::INTERNAL ());
-    this->reactor ()->notify (this->wh_);
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    ::CoherentUpdateStarter_var starter =
-        this->ciao_context_->get_connection_start_reader ();
-
-    if (! ::CORBA::is_nil (starter.in ()))
-      {
-        starter->set_reader_properties (this->iterations_);
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to start the reader\n")));
-      }
-
-    ACE_DEBUG ((LM_DEBUG, "Start run <%d> with <%u> iterations\n",
-                          this->run_,
-                          this->iterations ()));
-
-    CoherentUpdateTestSeq update_many_seq;
-    update_many_seq.length (this->iterations_);
-    for (int i = 1; i < this->iterations_ + 1; ++i)
-      {
-        CoherentUpdateTest new_key;
-        new_key.symbol = CORBA::string_dup(SAMPLE_KEY_NAME);
-        new_key.iteration = ++total_iter;
-        update_many_seq[i-1] = new_key;
-      }
-
-    ::CoherentUpdate_Test::Updater_var updater =
-        this->ciao_context_->get_connection_info_update_data ();
-    updater->update_many (update_many_seq);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written <%u> keys uptil now\n"),
-                total_iter));
-    ACE_OS::sleep (2);
-    starter->start_read (this->run_);
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoherentUpdate_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/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h
deleted file mode 100644
index bb6be68fcd7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h
+++ /dev/null
@@ -1,135 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COHERENTUPDATE_TEST_SENDER_EXEC_VI4L1L_H_
-#define CIAO_COHERENTUPDATE_TEST_SENDER_EXEC_VI4L1L_H_
-
-#include /**/ "ace/pre.h"
-
-#include "CoherentUpdate_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_CoherentUpdate_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  //============================================================
-  // WriteHandler
-  //============================================================
-  class WriteHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteHandler (Sender_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-
-  //============================================================
-  // Provider Executor Implementation Class: restart_updater_exec_i
-  //============================================================
-
-  class restart_updater_exec_i
-    : public virtual ::CCM_CoherentUpdateRestarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    restart_updater_exec_i (
-      ::CoherentUpdate_Test::CCM_Sender_Context_ptr ctx,
-      Sender_exec_i & callback);
-    virtual ~restart_updater_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CoherentUpdateRestarter. */
-
-    virtual
-    void restart_update (void);
-    //@}
-
-  private:
-    ::CoherentUpdate_Test::CCM_Sender_Context_var ciao_context_;
-    Sender_exec_i &callback_;
-  };
-
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_CoherentUpdateRestarter_ptr
-    get_restart_updater (void);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-    void restart (void);
-    //@}
-
-  private:
-    ::CoherentUpdate_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes and port operations. */
-    ::CCM_CoherentUpdateRestarter_var ciao_restart_updater_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    CORBA::UShort run_;
-    CORBA::ULong total_iter;
-    WriteHandler *wh_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoherentUpdate_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/Plan.cdp
deleted file mode 100644
index 8ac3c21fef5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/Plan.cdp
+++ /dev/null
@@ -1,385 +0,0 @@
-<!--  -->
-<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>CoherentUpdate_TestDepl_1</label>
-  <UUID>CoherentUpdate_TestDepl_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_CoherentUpdate_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_CoherentUpdate_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="CoherentUpdate_Test_ConnectorComponentImplementation">
-    <name>CoherentUpdate_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="CoherentUpdate_Connector_ExecArtifact" />
-    <artifact xmi:idref="CoherentUpdate_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_CoherentUpdate_Test_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoherentUpdate_Test_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentUpdate_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentUpdate_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_CoherentUpdate_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_CoherentUpdate_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" />
-    <configProperty>
-      <name>nr_runs</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CoherentUpdate_Test_ConnectorComponentInstance">
-    <name>CoherentUpdate_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CoherentUpdate_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentUpdater_Library#CoherentUpdaterProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentUpdate_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CoherentUpdate_Test_ConnectorComponentInstance2">
-    <name>CoherentUpdate_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CoherentUpdate_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentUpdater_Library#CoherentUpdaterProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentUpdate_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>4</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CoherentUpdate_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>updater_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CoherentUpdate_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>reader_starter</name>
-    <internalEndpoint>
-      <portName>start_reader</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>reader_start</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>restart_updater</name>
-    <internalEndpoint>
-      <portName>updater_restart</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>restart_updater</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </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="CoherentUpdate_Connector_ExecArtifact">
-    <name>CoherentUpdate_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>CoherentUpdate_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="CoherentUpdate_Connector_SvntArtifact">
-    <name>CoherentUpdate_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>CoherentUpdate_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="CoherentUpdate_Connector_StubArtifact">
-    <name>CoherentUpdate_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>CoherentUpdate_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/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index c9a46586ffb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="CoherentUpdater_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="CoherentUpdaterProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl
deleted file mode 100755
index c5b1964e047..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/.gitignore b/CIAO/connectors/dds4ccm/tests/CoherentWriter/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/.gitignore
deleted file mode 100644
index ffebb99f763..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-/CoherentWrite_Test_Base.cxx
-/CoherentWrite_Test_Base.h
-/CoherentWrite_Test_BasePlugin.cxx
-/CoherentWrite_Test_BasePlugin.h
-/CoherentWrite_Test_BaseSupport.cxx
-/CoherentWrite_Test_BaseSupport.h
-/CoherentWrite_Test_Base_stub_export.h
-/Reader_StarterE.idl
-/Reader_Starter_exec_export.h
-/Reader_Starter_lem_stub_export.h
-/Reader_Starter_stub_export.h
-/Reader_Starter_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl
deleted file mode 100644
index 58d4b9d347e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file CoherentWrite_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COHERENT_WRITE_TEST_BASE_IDL
-#define COHERENT_WRITE_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/CoherentWrite_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/CoherentWrite_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "CoherentWriteTest"
-#pragma DCPS_DATA_KEY "CoherentWriteTest symbol"
-
-struct CoherentWriteTest {
-  string symbol; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<CoherentWriteTest> CoherentWriteTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc
deleted file mode 100644
index 1fc2c2b7903..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (CoherentWrite_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = CoherentWrite_Test_Base_stub
-  dynamicflags += COHERENT_WRITE_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=COHERENT_WRITE_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=CoherentWrite_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    CoherentWrite_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=COHERENT_WRITE_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    CoherentWrite_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.idl
deleted file mode 100644
index fc0847932dc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file Reader_Starter.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COHERENT_WRITE_STARTER_IDL
-#define COHERENT_WRITE_STARTER_IDL
-
-#pragma ciao lem "Base/Reader_StarterE.idl"
-
-interface CoherentWriteStarter
-{
-  void set_reader_properties (in unsigned short nr_iterations);
-  void start_read (in unsigned short run);
-};
-
-interface CoherentWriteRestarter
-{
-  void restart_write ();
-};
-
-#endif /* COHERENT_WRITE_STARTER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc
deleted file mode 100644
index 2b15e9e7c45..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc
+++ /dev/null
@@ -1,109 +0,0 @@
-project(DDS_Coherent_Reader_Starter_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
-              -Wb,stub_export_include=Reader_Starter_stub_export.h \
-              -Wb,skel_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,skel_export_include=Reader_Starter_svnt_export.h \
-              -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,svnt_export_include=Reader_Starter_svnt_export.h \
-              -Wb,exec_export_macro=READER_STARTER_EXEC_Export \
-              -Wb,exec_export_include=Reader_Starter_exec_export.h -I..
-
-  IDL_Files {
-    Reader_Starter.idl
-  }
-}
-
-project(DDS_Coherent_Reader_Starter_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Coherent_Reader_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \
-              -Wb,stub_export_include=Reader_Starter_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Reader_StarterE.idl
-  }
-}
-
-project(DDS_Coherent_Reader_Starter_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Coherent_Reader_Starter_lem_gen DDS_Coherent_Reader_Starter_stub
-  libs  += Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Reader_Starter_lem_stub
-  dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterEC.cpp
-  }
-
-  Header_Files {
-    Reader_StarterEC.h
-    Reader_Starter_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_StarterEC.inl
-  }
-}
-
-project(DDS_Coherent_Reader_Starter_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Coherent_Reader_Starter_idl_gen
-  libs  +=
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Reader_Starter_stub
-  dynamicflags += READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterC.cpp
-  }
-
-  Header_Files {
-    Reader_StarterC.h
-    Reader_Starter_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_StarterC.inl
-  }
-}
-
-
-project(DDS_Coherent_Reader_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_Coherent_Reader_Starter_lem_stub DDS_Coherent_Reader_Starter_stub
-  sharedname  = Reader_Starter_svnt
-  libs       += Reader_Starter_stub Reader_Starter_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += READER_STARTER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterS.cpp
-    Reader_Starter_svnt.cpp
-  }
-
-  Header_Files {
-    Reader_StarterS.h
-    Reader_Starter_svnt.h
-    Reader_Starter_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/.gitignore
deleted file mode 100644
index 3f22aee3083..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/CoherentWrite_Test_ConnectorE.idl
-/CoherentWrite_Test_Connector_conn.cpp
-/CoherentWrite_Test_Connector_conn.h
-/CoherentWrite_Test_Connector_conn_export.h
-/CoherentWrite_Test_Connector_lem_stub_export.h
-/CoherentWrite_Test_Connector_stub_export.h
-/CoherentWrite_Test_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl
deleted file mode 100644
index 270b1189a74..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file CoherentWrite_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COHERENT_WRITE_TEST_CONNECTOR_IDL_
-#define COHERENT_WRITE_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/CoherentWrite_Test_Base.idl"
-
-#pragma ciao lem "Connector/CoherentWrite_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/CoherentWrite_Test_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::CoherentWriteTest, ::CoherentWriteTestSeq> CoherentWriteTestConnector;
-
-#endif /* CoherentWrite_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc
deleted file mode 100644
index cc2fac6fbf8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p CoherentWrite_Test_Base -l .. -o ../lib -u DDS CoherentWrite_Test_Connector"
-
-project(CoherentWrite_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen CoherentWrite_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COHERENT_WRITE_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=CoherentWrite_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=COHERENT_WRITE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=CoherentWrite_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=COHERENT_WRITE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=CoherentWrite_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=COHERENT_WRITE_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=CoherentWrite_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    CoherentWrite_Test_Connector.idl
-  }
-}
-
-project(CoherentWrite_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += CoherentWrite_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COHERENT_WRITE_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=CoherentWrite_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    CoherentWrite_Test_ConnectorE.idl
-  }
-}
-
-project(CoherentWrite_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += CoherentWrite_Test_Connector_lem_gen CoherentWrite_Test_Connector_stub CoherentWrite_Test_Base_stub
-  libs  += CoherentWrite_Test_Base_stub CoherentWrite_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = CoherentWrite_Test_Connector_lem_stub
-  dynamicflags += COHERENT_WRITE_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentWrite_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    CoherentWrite_Test_ConnectorEC.h
-    CoherentWrite_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CoherentWrite_Test_ConnectorEC.inl
-  }
-}
-
-project(CoherentWrite_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += CoherentWrite_Test_Connector_idl_gen CoherentWrite_Test_Base_stub
-  libs  += CoherentWrite_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = CoherentWrite_Test_Connector_stub
-  dynamicflags += COHERENT_WRITE_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentWrite_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    CoherentWrite_Test_ConnectorC.h
-    CoherentWrite_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    CoherentWrite_Test_ConnectorC.inl
-  }
-}
-
-project(CoherentWrite_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Connector_stub CoherentWrite_Test_Base_stub
-  sharedname = CoherentWrite_Test_Connector_exec
-  libs += CoherentWrite_Test_Connector_stub CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Base_stub CoherentWrite_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COHERENT_WRITE_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentWrite_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    CoherentWrite_Test_Connector_conn.h
-    CoherentWrite_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(CoherentWrite_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Connector_exec CoherentWrite_Test_Connector_stub
-  sharedname  = CoherentWrite_Test_Connector_svnt
-  libs       += CoherentWrite_Test_Connector_stub \
-                CoherentWrite_Test_Connector_lem_stub  \
-                CoherentWrite_Test_Base_stub \
-                CoherentWrite_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COHERENT_WRITE_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentWrite_Test_ConnectorS.cpp
-    CoherentWrite_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    CoherentWrite_Test_ConnectorS.h
-    CoherentWrite_Test_Connector_svnt.h
-    CoherentWrite_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/.gitignore
deleted file mode 100644
index 15ee47edcab..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/CoherentWrite_Test_ReceiverE.idl
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl
deleted file mode 100644
index 8591550a8ea..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/CoherentWrite_Test_Connector.idl"
-#include "Base/Reader_Starter.idl"
-
-module CoherentWrite_Test
-{
-  component Receiver
-  {
-    port CoherentWriteTestConnector::DDS_Get info_out;
-
-    provides CoherentWriteStarter reader_start;
-    uses CoherentWriteRestarter writer_restart;
-
-    attribute unsigned short nr_runs;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc
deleted file mode 100644
index e66cc09b7ae..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc
+++ /dev/null
@@ -1,155 +0,0 @@
-project(CoherentWrite_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += CoherentWrite_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 {
-    CoherentWrite_Test_Receiver.idl
-  }
-}
-
-project(CoherentWrite_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += CoherentWrite_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 {
-    CoherentWrite_Test_ReceiverE.idl
-  }
-}
-
-project(CoherentWrite_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += CoherentWrite_Test_Receiver_lem_gen CoherentWrite_Test_Receiver_stub  \
-           CoherentWrite_Test_Connector_stub CoherentWrite_Test_Base_stub \
-           DDS_Coherent_Reader_Starter_stub
-  libs  +=  Receiver_stub CoherentWrite_Test_Connector_stub \
-            CoherentWrite_Test_Base_stub Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentWrite_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    CoherentWrite_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CoherentWrite_Test_ReceiverEC.inl
-  }
-}
-
-project(CoherentWrite_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += CoherentWrite_Test_Receiver_idl_gen  CoherentWrite_Test_Connector_stub \
-           CoherentWrite_Test_Base_stub CoherentWrite_Test_Connector_lem_gen \
-           DDS_Coherent_Reader_Starter_stub DDS_Coherent_Reader_Starter_lem_stub
-  libs  += CoherentWrite_Test_Connector_stub CoherentWrite_Test_Base_stub \
-           Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentWrite_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    CoherentWrite_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    CoherentWrite_Test_ReceiverC.inl
-  }
-}
-
-project(CoherentWrite_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += CoherentWrite_Test_Receiver_lem_stub CoherentWrite_Test_Receiver_stub \
-             CoherentWrite_Test_Base_stub CoherentWrite_Test_Connector_stub \
-             CoherentWrite_Test_Connector_lem_stub \
-             DDS_Coherent_Reader_Starter_lem_stub DDS_Coherent_Reader_Starter_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub CoherentWrite_Test_Base_stub \
-          CoherentWrite_Test_Connector_stub CoherentWrite_Test_Connector_lem_stub \
-          Reader_Starter_lem_stub Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentWrite_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    CoherentWrite_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(CoherentWrite_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   CoherentWrite_Test_Receiver_lem_stub CoherentWrite_Test_Base_stub \
-                  CoherentWrite_Test_Connector_stub CoherentWrite_Test_Connector_svnt \
-                  CoherentWrite_Test_Receiver_exec CoherentWrite_Test_Connector_lem_stub \
-                  DDS_Coherent_Reader_Starter_stub \
-                  DDS_Coherent_Reader_Starter_svnt DDS_Coherent_Reader_Starter_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub CoherentWrite_Test_Base_stub \
-                CoherentWrite_Test_Connector_stub CoherentWrite_Test_Connector_svnt \
-                Receiver_exec CoherentWrite_Test_Connector_lem_stub \
-                Reader_Starter_stub Reader_Starter_svnt \
-                Reader_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentWrite_Test_ReceiverS.cpp
-    CoherentWrite_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    CoherentWrite_Test_ReceiverS.h
-    CoherentWrite_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp
deleted file mode 100644
index 061c5f5cd15..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,498 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "CoherentWrite_Test_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_CoherentWrite_Test_Receiver_Impl
-{
-  /**
-   * Read action Generator
-   */
-
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback,
-                                                int run)
-    : callback_ (callback),
-      run_ (run)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Checking if last sample "
-                          "is available in DDS...\n"));
-    // Use get_many for every even number. In that case, don't check whether
-    // the last sample has arrived since the samples are read by then (the
-    // getter only reads unread samples).
-    if (this->run_ % 2 == 1)
-      {
-        // Odd number so check if the last sample is available in DDS.
-        if (this->callback_.check_last ())
-          this->callback_.run (this->run_);
-      }
-    else
-      this->callback_.run (this->run_);
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::CoherentWrite_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::CoherentWrite_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: reader_start_exec_i
-   */
-
-  reader_start_exec_i::reader_start_exec_i (
-        ::CoherentWrite_Test::CCM_Receiver_Context_ptr ctx,
-        Receiver_exec_i &callback)
-    : ciao_context_ (
-        ::CoherentWrite_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  reader_start_exec_i::~reader_start_exec_i (void)
-  {
-  }
-
-  // Operations from ::CoherentWriteStarter
-
-  void
-  reader_start_exec_i::set_reader_properties (::CORBA::UShort nr_iterations)
-  {
-    this->callback_.iterations (nr_iterations);
-  }
-
-  void
-  reader_start_exec_i::start_read (::CORBA::UShort run)
-  {
-    this->callback_.start_read (run);
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : nr_runs_ (0)
-      , iterations_ (10)
-      , run_ (0)
-      , last_iter_ (0)
-      , ticker_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  bool
-  Receiver_exec_i::check_last (void)
-  {
-    try
-      {
-        ::CoherentWriteTestConnector::Reader_var reader =
-          this->ciao_context_->get_connection_info_out_data ();
-        CoherentWriteTest coherentwrite_info;
-        ::CCM_DDS::ReadInfo readinfo;
-        coherentwrite_info.symbol = CORBA::string_dup ("KEY_1");
-        reader->read_one_last (
-                coherentwrite_info,
-                readinfo,
-                ::DDS::HANDLE_NIL);
-                ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - "
-                              "last iteration <%d> - <%d>\n",
-                               coherentwrite_info.iteration,
-                               (this->run_ + 1) * this->iterations_ - 1));
-        return coherentwrite_info.iteration >= (this->run_ + 1) * this->iterations_ - 1;
-      }
-    catch (const ::CCM_DDS::InternalError &)
-      {
-      }
-    catch (const ::CCM_DDS::NonExistent &)
-      {
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: "
-                              "ERROR: Unexpected exception caught\n"));
-      }
-    return false;
-  }
-
-  void
-  Receiver_exec_i::check_iters (const char * test,
-                                const CoherentWriteTestSeq& coherentwrite_info_seq)
-  {
-    for (CORBA::ULong it = 0; it < coherentwrite_info_seq.length (); ++it)
-      {
-        if (coherentwrite_info_seq[it].iteration > this->last_iter_)
-          {
-            if (coherentwrite_info_seq[it].iteration == ++this->last_iter_)
-              {
-                ACE_DEBUG ((LM_DEBUG, "%C ALL OK: ", test));
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "%C ALL ERROR: ", test));
-              }
-            ACE_DEBUG ((LM_DEBUG, "expected: <%u> - "
-                                  "received <%d>\n",
-                                  this->last_iter_,
-                                  coherentwrite_info_seq[it].iteration));
-            }
-      }
-    if (this->run_ < this->nr_runs () + 1)
-      {
-        ::CoherentWriteRestarter_var restarter =
-          this->ciao_context_->get_connection_writer_restart ();
-        if (!::CORBA::is_nil (restarter.in ()))
-          restarter->restart_write ();
-        else
-          ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - "
-                                "Unable to restart the writer "
-                                "since the restarter is nil.\n"));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Finished: wait for shutdown\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::get_all (void)
-  {
-    try
-      {
-        ::CoherentWriteTestConnector::Getter_var getter =
-          this->ciao_context_->get_connection_info_out_fresh_data ();
-
-        if (::CORBA::is_nil (getter.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - "
-                                  "Unable to get samples since "
-                                  "getter is nil.\n"));
-            return;
-          }
-        DDS::Duration_t to;
-        to.sec = 5;
-        to.nanosec = 0;
-        getter->time_out (to);
-
-        CoherentWriteTestSeq coherentwrite_info_seq;
-        ::CCM_DDS::ReadInfoSeq readinfo_seq;
-        getter->get_many (coherentwrite_info_seq, readinfo_seq);
-
-        this->check_iters ("GET", coherentwrite_info_seq);
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: GET ALL: ")
-              ACE_TEXT ("caught NonExistent exception\n")));
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: GET ALL: ")
-              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-              ex.error_code));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: GET ALL: ");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::get_all : Exception caught\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::read_all (void)
-  {
-    try
-      {
-        ::CoherentWriteTestConnector::Reader_var reader =
-          this->ciao_context_->get_connection_info_out_data ();
-
-        if (::CORBA::is_nil (reader.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::read_all - "
-                                  "Unable to read since reader or "
-                                  "restarter is nil.\n"));
-            return;
-          }
-
-        CoherentWriteTestSeq coherentwrite_info_seq;
-        ::CCM_DDS::ReadInfoSeq readinfo_seq;
-        reader->read_all (coherentwrite_info_seq, readinfo_seq);
-
-        this->check_iters ("READ", coherentwrite_info_seq);
-      }
-    catch (const CCM_DDS::NonExistent& ex)
-      {
-        for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ALL: ")
-                  ACE_TEXT ("caught expected exception: index <%u>\n"),
-                  ex.indexes[i]));
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ")
-              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-              ex.error_code));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: READ ALL: ");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::read_all : Exception caught\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::start_read (CORBA::UShort run)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      read_action_Generator (*this, run),
-                      ::CORBA::INTERNAL ());
-    if (this->reactor ()->schedule_timer (
-                                          this->ticker_,
-                                          0,
-                                          ACE_Time_Value(1, 0),
-                                          ACE_Time_Value(1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::run (CORBA::UShort run)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::run - "
-                          "Starting run number <%d>\n",
-                          run));
-    this->run_ = run;
-    if (this->run_ % 2 == 1)
-      this->read_all ();
-    else
-      this->get_all ();
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  ::CCM_CoherentWriteStarter_ptr
-  Receiver_exec_i::get_reader_start (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_reader_start_.in ()))
-      {
-        reader_start_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          reader_start_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_CoherentWriteStarter::_nil ());
-
-          this->ciao_reader_start_ = tmp;
-      }
-
-    return
-      ::CCM_CoherentWriteStarter::_duplicate (
-        this->ciao_reader_start_.in ());
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::nr_runs (void)
-  {
-    return this->nr_runs_;
-  }
-
-  void
-  Receiver_exec_i::nr_runs (
-    const ::CORBA::UShort nr_runs)
-  {
-    this->nr_runs_ = nr_runs;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::CoherentWrite_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-    if (this->run_ == 1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: ")
-            ACE_TEXT ("Test did not run")
-            ACE_TEXT ("events.\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Finished coherent write test.\n")));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoherentWrite_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/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h
deleted file mode 100644
index ae74291ae77..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h
+++ /dev/null
@@ -1,214 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_COHERENTWRITE_TEST_RECEIVER_EXEC_Q0HRJG_H_
-#define CIAO_COHERENTWRITE_TEST_RECEIVER_EXEC_Q0HRJG_H_
-
-#include /**/ "ace/pre.h"
-
-#include "CoherentWrite_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_CoherentWrite_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  /**
-   * Read action Generator
-   */
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback,
-                           int run);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Receiver_exec_i &callback_;
-    int run_;
-  };
-
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::CoherentWrite_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::CoherentWrite_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: reader_start_exec_i
-   */
-
-  class reader_start_exec_i
-    : public virtual ::CCM_CoherentWriteStarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    reader_start_exec_i (
-      ::CoherentWrite_Test::CCM_Receiver_Context_ptr ctx,
-      Receiver_exec_i &callback);
-
-    virtual ~reader_start_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CoherentWriteStarter. */
-
-    virtual
-    void set_reader_properties (::CORBA::UShort nr_iterations);
-
-    virtual
-    void start_read (::CORBA::UShort run);
-    //@}
-
-  private:
-    ::CoherentWrite_Test::CCM_Receiver_Context_var ciao_context_;
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CCM_CoherentWriteStarter_ptr
-    get_reader_start (void);
-
-    virtual ::CORBA::UShort nr_runs (void);
-
-    virtual void nr_runs (::CORBA::UShort nr_runs);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    bool check_last (void);
-    void start_read (CORBA::UShort run);
-    void run (CORBA::UShort run);
-
-    ::CORBA::UShort iterations (void);
-    void iterations (::CORBA::UShort iterations);
-    //@}
-
-  private:
-    ::CoherentWrite_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    ::CCM_CoherentWriteStarter_var ciao_reader_start_;
-
-    ::CORBA::UShort nr_runs_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    CORBA::UShort   iterations_;
-    CORBA::UShort   run_;
-    CORBA::Long     last_iter_;
-
-    read_action_Generator *ticker_;
-
-    void check_iters (const char * test,
-                      const CoherentWriteTestSeq& coherentwrite_info_seq);
-
-    void get_all (void);
-    void read_all (void);
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoherentWrite_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/.gitignore
deleted file mode 100644
index ddc0ac818d7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/CoherentWrite_Test_SenderE.idl
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl
deleted file mode 100644
index 0e9cfb46df9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_COHERENT_WRITE_TEST_SENDER_IDL
-#define DDS_COHERENT_WRITE_TEST_SENDER_IDL
-
-#include "Connector/CoherentWrite_Test_Connector.idl"
-#include "Base/Reader_Starter.idl"
-
-module CoherentWrite_Test
-{
-  component Sender
-  {
-    port CoherentWriteTestConnector::DDS_Write info_write;
-
-    uses CoherentWriteStarter start_reader;
-    provides CoherentWriteRestarter restart_writer;
-
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc
deleted file mode 100644
index bc87dee5517..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc
+++ /dev/null
@@ -1,153 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p CoherentWrite_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(CoherentWrite_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += CoherentWrite_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 {
-    CoherentWrite_Test_Sender.idl
-  }
-}
-
-project(CoherentWrite_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += CoherentWrite_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 {
-    CoherentWrite_Test_SenderE.idl
-  }
-}
-
-project(CoherentWrite_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += CoherentWrite_Test_Sender_lem_gen CoherentWrite_Test_Sender_stub \
-           CoherentWrite_Test_Base_stub DDS_Coherent_Reader_Starter_stub
-  libs  += CoherentWrite_Test_Base_stub Sender_stub Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentWrite_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    CoherentWrite_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CoherentWrite_Test_SenderEC.inl
-  }
-}
-
-project(CoherentWrite_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += CoherentWrite_Test_Sender_idl_gen CoherentWrite_Test_Base_stub \
-           CoherentWrite_Test_Connector_stub DDS_Coherent_Reader_Starter_stub \
-           DDS_Coherent_Reader_Starter_lem_stub
-  libs  += CoherentWrite_Test_Base_stub CoherentWrite_Test_Connector_stub \
-           Reader_Starter_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentWrite_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    CoherentWrite_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    CoherentWrite_Test_SenderC.inl
-  }
-}
-
-project(CoherentWrite_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += CoherentWrite_Test_Sender_lem_stub CoherentWrite_Test_Sender_stub \
-             CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Connector_stub \
-             DDS_Coherent_Reader_Starter_lem_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub CoherentWrite_Test_Base_stub \
-             CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Connector_stub \
-             Reader_Starter_stub Reader_Starter_lem_stub \
-             Reader_Starter_lem_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentWrite_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    CoherentWrite_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(CoherentWrite_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += CoherentWrite_Test_Base_stub  CoherentWrite_Test_Sender_lem_stub \
-                CoherentWrite_Test_Connector_stub \
-                CoherentWrite_Test_Connector_svnt CoherentWrite_Test_Connector_lem_stub \
-                DDS_Coherent_Reader_Starter_stub DDS_Coherent_Reader_Starter_svnt \
-                DDS_Coherent_Reader_Starter_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub CoherentWrite_Test_Base_stub \
-                CoherentWrite_Test_Connector_stub CoherentWrite_Test_Connector_svnt \
-                CoherentWrite_Test_Connector_lem_stub Reader_Starter_stub \
-                Reader_Starter_svnt Reader_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CoherentWrite_Test_SenderS.cpp
-    CoherentWrite_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    CoherentWrite_Test_SenderS.h
-    CoherentWrite_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp
deleted file mode 100644
index 0c7f99cf703..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,265 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "CoherentWrite_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_CoherentWrite_Test_Sender_Impl
-{
-  /**
-   * WriteHandler
-   */
-
-  WriteHandler::WriteHandler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteHandler::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.start ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: restart_writer_exec_i
-   */
-
-  restart_writer_exec_i::restart_writer_exec_i (
-        ::CoherentWrite_Test::CCM_Sender_Context_ptr ctx,
-        Sender_exec_i &callback)
-    : ciao_context_ (
-        ::CoherentWrite_Test::CCM_Sender_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  restart_writer_exec_i::~restart_writer_exec_i (void)
-  {
-  }
-
-  // Operations from ::CoherentWriteRestarter
-
-  void
-  restart_writer_exec_i::restart_write (void)
-  {
-    this->callback_.restart ();
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : iterations_ (0)
-      , run_ (1)
-      , total_iter (0)
-      , wh_ (0)
-  {
-        ACE_NEW_THROW_EX (this->wh_,
-                          WriteHandler (*this),
-                          ::CORBA::INTERNAL ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->wh_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::restart (void)
-  {
-    ++this->run_;
-    delete this->wh_;
-    ACE_NEW_THROW_EX (this->wh_,
-                      WriteHandler (*this),
-                      ::CORBA::INTERNAL ());
-    this->reactor ()->notify (this->wh_);
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    ::CoherentWriteTestConnector::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-
-    CoherentWriteStarter_var starter =
-      this->ciao_context_->get_connection_start_reader ();
-    if (::CORBA::is_nil (starter.in ()) ||
-        ::CORBA::is_nil (writer.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to start the reader\n")));
-        return;
-      }
-
-    writer->is_coherent_write (true);
-    starter->set_reader_properties (this->iterations_);
-
-    ACE_DEBUG ((LM_DEBUG, "Start run <%d> with <%u> iterations\n",
-                          this->run_,
-                          this->iterations ()));
-
-    CoherentWriteTestSeq write_many_seq (this->iterations_);
-    write_many_seq.length (this->iterations_);
-    for (int i = 1; i < this->iterations_ + 1; ++i)
-      {
-        CoherentWriteTest new_key;
-        new_key.symbol = CORBA::string_dup("KEY_1");
-        new_key.iteration = ++total_iter;
-        write_many_seq[i-1] = new_key;
-      }
-    writer->write_many (write_many_seq);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written <%u> keys uptil now\n"),
-                total_iter));
-    ACE_OS::sleep (2);
-    starter->start_read (this->run_);
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_CoherentWriteRestarter_ptr
-  Sender_exec_i::get_restart_writer (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_restart_writer_.in ()))
-      {
-        restart_writer_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          restart_writer_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_CoherentWriteRestarter::_nil ());
-
-          this->ciao_restart_writer_ = tmp;
-      }
-
-    return
-      ::CCM_CoherentWriteRestarter::_duplicate (
-        this->ciao_restart_writer_.in ());
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::CoherentWrite_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    try
-      {
-        this->reactor ()->notify (this->wh_);
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: GET_CONNECTION_START_READER : Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: GET_CONNECTION_START_READER : Unknown exception caught\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoherentWrite_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/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h
deleted file mode 100644
index cca68b9c6f8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h
+++ /dev/null
@@ -1,162 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_COHERENTWRITE_TEST_SENDER_EXEC_MVBFHL_H_
-#define CIAO_COHERENTWRITE_TEST_SENDER_EXEC_MVBFHL_H_
-
-#include /**/ "ace/pre.h"
-
-#include "CoherentWrite_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_CoherentWrite_Test_Sender_Impl
-{
-
-  class Sender_exec_i;
-
-  /**
-   * WriteHandler
-   */
-
-  class WriteHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteHandler (Sender_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: restart_writer_exec_i
-   */
-
-  class restart_writer_exec_i
-    : public virtual ::CCM_CoherentWriteRestarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    restart_writer_exec_i (
-      ::CoherentWrite_Test::CCM_Sender_Context_ptr ctx,
-      Sender_exec_i &callback);
-    virtual ~restart_writer_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CoherentWriteRestarter. */
-
-    virtual
-    void restart_write (void);
-    //@}
-
-  private:
-    ::CoherentWrite_Test::CCM_Sender_Context_var ciao_context_;
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_CoherentWriteRestarter_ptr
-    get_restart_writer (void);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-    void restart (void);
-
-    //@}
-
-  private:
-    ::CoherentWrite_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_CoherentWriteRestarter_var ciao_restart_writer_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    CORBA::UShort run_;
-    CORBA::ULong total_iter;
-
-    WriteHandler *wh_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoherentWrite_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/CoherentWriter_Library.xml b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/CoherentWriter_Library.xml
deleted file mode 100644
index 20d72e051a0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/CoherentWriter_Library.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="CoherentWriterProfile">
-    <!-- QoS used to configure the data writer created in the example code -->
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-    <publisher_qos>
-      <presentation>
-        <access_scope>INSTANCE_PRESENTATION_QOS</access_scope>
-        <coherent_access>true</coherent_access>
-        <ordered_access>false</ordered_access>
-      </presentation>
-    </publisher_qos>
-  </qos_profile>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp
deleted file mode 100644
index f6e3a9e655d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp
+++ /dev/null
@@ -1,462 +0,0 @@
-<!--  -->
-<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>CoherentWrite_Test_Depl_1</label>
-  <UUID>CoherentWrite_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_CoherentWrite_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_CoherentWrite_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="CoherentWrite_Test_StateConnectorImplementation">
-    <name>CoherentWrite_Test_StateConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="CoherentWrite_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="CoherentWrite_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_CoherentWriteTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoherentWriteTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentWrite_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentWrite_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="CoherentWrite_Test_EventConnectorImplementation">
-    <name>CoherentWrite_Test_EventConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="CoherentWrite_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="CoherentWrite_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_CoherentWriteTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoherentWriteTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentWrite_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentWrite_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_CoherentWrite_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_CoherentWrite_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" />
-    <configProperty>
-      <name>nr_runs</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="CoherentWrite_Test_SenderConnectorInstance">
-    <name>CoherentWrite_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CoherentWrite_Test_EventConnectorImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentWriter_Library#CoherentWriterProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentWrite_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="CoherentWrite_Test_ReceiverConnectorInstance">
-    <name>CoherentWrite_Test_ReceiverConnector</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CoherentWrite_Test_StateConnectorImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentWriter_Library#CoherentWriterProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CoherentWrite_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>4</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CoherentWrite_Test_ReceiverConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_out_fresh_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CoherentWrite_Test_ReceiverConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="CoherentWrite_Test_SenderConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>reader_starter</name>
-    <internalEndpoint>
-      <portName>start_reader</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>reader_start</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>restart_writer</name>
-    <internalEndpoint>
-      <portName>writer_restart</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>restart_writer</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </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="CoherentWrite_Test_Connector_ExecArtifact">
-    <name>CoherentWrite_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>CoherentWrite_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="CoherentWrite_Test_Connector_SvntArtifact">
-    <name>CoherentWrite_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>CoherentWrite_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="CoherentWrite_Test_Connector_StubArtifact">
-    <name>CoherentWrite_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>CoherentWrite_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/CoherentWriter/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 7caa8986861..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="CoherentWriter_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="CoherentWriterProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl
deleted file mode 100755
index 638d55cd247..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl
deleted file mode 100644
index 9fe01e52f7f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef COLLACATED_BASE_
-#define COLLACATED_BASE_
-
-#pragma ndds typesupport "Base/Collocated_BaseSupport.h"
-#pragma opendds typesupport "Base/Collocated_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "CoPubSub::Test_msg"
-
-module CoPubSub {
-  struct Test_msg {
-    string hello;
-    long msgId;
-  };
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence <Test_msg> Test_msgSeq;
-#endif
-};
-
-
-#endif // COLLACATED_BASE_
-
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.mpc b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.mpc
deleted file mode 100644
index d939fdc6348..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (Collocated_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = Collocated_Base_stub
-  dynamicflags += COLLACATED_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=COLLACATED_BASE_STUB_Export \
-              -Wb,stub_export_include=Collocated_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Collocated_Base.idl
-  }
-
-  opendds_ts_flags += --export=COLLACATED_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Collocated_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl
deleted file mode 100644
index 28225040991..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef COLLACATED_CONNECTOR_
-#define COLLACATED_CONNECTOR_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Collocated_Base.idl"
-
-#pragma ciao lem "Connector/Collocated_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Collocated_BaseTypeSupport.idl"
-#endif
-
-module CoPubSub {
-  module CCM_DDS::Typed <Test_msg, Test_msgSeq> Test_conn;
-};
-
-#endif // COLLACATED_CONNECTOR_
-
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc
deleted file mode 100644
index 8555202b1e6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc
+++ /dev/null
@@ -1,144 +0,0 @@
-project(Collocated_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen Collocated_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COLLACATED_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Collocated_Connector_stub_export.h \
-              -Wb,skel_export_macro=COLLACATED_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Collocated_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=COLLACATED_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Collocated_Connector_svnt_export.h \
-              -Wb,conn_export_macro=COLLACATED_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Collocated_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Collocated_Connector.idl
-  }
-}
-
-project(Collocated_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += Collocated_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COLLACATED_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Collocated_Connector_lem_stub_export.h \
-              -SS -Gxhst -Sci \
-              -I ..
-
-  IDL_Files {
-    Collocated_ConnectorE.idl
-  }
-}
-
-project(Collocated_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += Collocated_Connector_lem_gen Collocated_Connector_stub Collocated_Base_stub
-  libs  += Collocated_Base_stub Collocated_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Collocated_Connector_lem_stub
-  dynamicflags += COLLACATED_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Collocated_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Collocated_ConnectorEC.h
-    Collocated_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Collocated_ConnectorEC.inl
-  }
-}
-
-project(Collocated_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += Collocated_Connector_idl_gen Collocated_Base_stub
-  libs  += Collocated_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Collocated_Connector_stub
-  dynamicflags += COLLACATED_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Collocated_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Collocated_ConnectorC.h
-    Collocated_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Collocated_ConnectorC.inl
-  }
-}
-
-project(Collocated_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += Collocated_Connector_lem_stub Collocated_Connector_stub \
-             Collocated_Base_stub
-  sharedname = Collocated_Connector_exec
-  libs += Collocated_Connector_stub Collocated_Connector_lem_stub \
-          Collocated_Base_stub Collocated_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COLLACATED_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Collocated_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Collocated_Connector_conn.h
-    Collocated_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(Collocated_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += Collocated_Connector_lem_stub \
-                Collocated_Connector_exec \
-                Collocated_Connector_stub
-  sharedname  = Collocated_Connector_svnt
-  libs       += Collocated_Connector_stub \
-                Collocated_Connector_lem_stub  \
-                Collocated_Base_stub \
-                Collocated_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COLLACATED_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Collocated_ConnectorS.cpp
-    Collocated_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Collocated_ConnectorS.h
-    Collocated_Connector_svnt.h
-    Collocated_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.idl b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.idl
deleted file mode 100644
index 4471ce44144..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.idl
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef PUBSUB_COMPONENT_
-#define PUBSUB_COMPONENT_
-
-#include <Components.idl>
-#include "Connector/Collocated_Connector.idl"
-
-module CoPubSub {
-  component PubSub_comp {
-    port Test_conn::DDS_Write TestPub;
-    port Test_conn::DDS_Listen TestSub;
-  };
-};
-
-#endif // PUBSUB_COMPONENT_
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc
deleted file mode 100644
index 1aa98495166..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc
+++ /dev/null
@@ -1,143 +0,0 @@
-project(PubSubComponent_idl_gen) : componentidldefaults, dds4ccm {
-  after += Collocated_Connector_idl_gen DDS_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=PUBSUB_COMPONENT_STUB_Export \
-              -Wb,stub_export_include=PubSub_Component_stub_export.h \
-              -Wb,skel_export_macro=PUBSUB_COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=PubSub_Component_svnt_export.h \
-              -Wb,svnt_export_macro=PUBSUB_COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=PubSub_Component_svnt_export.h \
-              -Wb,exec_export_macro=PUBSUB_COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=PubSub_Component_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    PubSub_Component.idl
-  }
-}
-
-project(PubSubComponent_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += PubSubComponent_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=PUBSUB_COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=PubSubComponent_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    PubSub_ComponentE.idl
-  }
-}
-
-project(PubSubComponent_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += PubSubComponent_lem_gen PubSubComponent_stub \
-           Collocated_Base_stub
-  libs  += Collocated_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = PubSub_Component_lem_stub
-  dynamicflags += PUBSUB_COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PubSub_ComponentEC.cpp
-  }
-
-  Header_Files {
-    PubSub_ComponentEC.h
-    PubSub_Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    PubSub_ComponentEC.inl
-  }
-}
-
-project(PubSubComponent_stub) : ccm_stub, dds4ccm_base {
-  after += PubSubComponent_idl_gen Collocated_Base_stub \
-           Collocated_Connector_stub
-  libs  += Collocated_Base_stub Collocated_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = PubSub_Component_stub
-  dynamicflags += PUBSUB_COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PubSub_ComponentC.cpp
-  }
-
-  Header_Files {
-    PubSub_ComponentC.h
-    PubSub_Component_stub_export.h
-  }
-
-  Inline_Files {
-    PubSub_ComponentC.inl
-  }
-}
-
-project(PubSubComponent_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += PubSubComponent_lem_stub PubSubComponent_stub \
-             Collocated_Connector_lem_stub Collocated_Connector_stub
-  sharedname = PubSub_Component_exec
-  libs    += PubSub_Component_stub PubSub_Component_lem_stub Collocated_Base_stub \
-             Collocated_Connector_lem_stub Collocated_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += PUBSUB_COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PubSub_Component_exec.cpp
-  }
-
-  Header_Files {
-    PubSub_Component_exec.h
-    PubSub_Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(PubSubComponent_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += Collocated_Base_stub  PubSubComponent_lem_stub \
-                Collocated_Connector_stub \
-                Collocated_Connector_svnt Collocated_Connector_lem_stub
-  sharedname  = PubSub_Component_svnt
-  libs       += PubSub_Component_stub PubSub_Component_lem_stub Collocated_Base_stub \
-                Collocated_Connector_stub Collocated_Connector_svnt \
-                Collocated_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += PUBSUB_COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PubSub_ComponentS.cpp
-    PubSub_Component_svnt.cpp
-  }
-
-  Header_Files {
-    PubSub_ComponentS.h
-    PubSub_Component_svnt.h
-    PubSub_Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp
deleted file mode 100644
index 462f0ebbdf4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp
+++ /dev/null
@@ -1,301 +0,0 @@
-// -*- C++ -*-
-#include "PubSub_Component_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_CoPubSub_PubSub_comp_Impl
-{
-
-
-  /**
-   * WriteHandler
-   */
-  WriteHandler::WriteHandler (PubSub_comp_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteHandler::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    return this->callback_.tick ();
-  }
-
-  /**
-   * Facet Executor Implementation Class: TestSub_data_listener_exec_i
-   */
-
-  TestSub_data_listener_exec_i::TestSub_data_listener_exec_i (
-        ::CoPubSub::CCM_PubSub_comp_Context_ptr ctx)
-    : ciao_context_ (
-        ::CoPubSub::CCM_PubSub_comp_Context::_duplicate (ctx))
-  {
-  }
-
-  TestSub_data_listener_exec_i::~TestSub_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CoPubSub::Test_conn::Listener
-
-  void
-  TestSub_data_listener_exec_i::on_one_data (
-    const ::CoPubSub::Test_msg & datum,
-    const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ACE_DEBUG ((LM_DEBUG, "TestSub_data_listener_exec_i::on_one_data - "
-              "New data received: <%C> - <%d>\n",
-              datum.hello.in (), datum.msgId));
-  }
-
-  void
-  TestSub_data_listener_exec_i::on_many_data (
-    const ::CoPubSub::Test_msgSeq & /* data */,
-    const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: TestSub_status_exec_i
-   */
-
-  TestSub_status_exec_i::TestSub_status_exec_i (
-        ::CoPubSub::CCM_PubSub_comp_Context_ptr ctx)
-    : ciao_context_ (
-        ::CoPubSub::CCM_PubSub_comp_Context::_duplicate (ctx))
-  {
-  }
-
-  TestSub_status_exec_i::~TestSub_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  TestSub_status_exec_i::on_requested_deadline_missed (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  TestSub_status_exec_i::on_sample_lost (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: PubSub_comp_exec_i
-   */
-
-  PubSub_comp_exec_i::PubSub_comp_exec_i (void)
-    : count_(-3)
-  {
-    ticker_ = new WriteHandler (*this);
-  }
-
-  PubSub_comp_exec_i::~PubSub_comp_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  PubSub_comp_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  int
-  PubSub_comp_exec_i::tick (void)
-  {
-    CoPubSub::Test_msg sample;
-    sample.hello = CORBA::string_dup("CoPubSub Test Message");
-    sample.msgId = ++this->count_;
-
-    // Reference to the writer interface for the DDS4CCM connector for msg type
-    ::CoPubSub::Test_conn::Writer_var writer;
-
-    writer = ciao_context_->get_connection_TestPub_data();
-
-    if (CORBA::is_nil(writer.in()))
-      {
-        ACE_ERROR ((LM_ERROR, "PubSub_comp_exec_i::tick - Writer seems nil.\n"));
-        return -1; // Don't reschedule timer
-      }
-
-    try
-      {
-          writer->write_one(sample, DDS::HANDLE_NIL);
-          ACE_DEBUG ((LM_DEBUG, "PubSub_comp_exec_i::tick - "
-                    "Sample has been written: <%C> - <%d>\n",
-                    sample.hello.in (), sample.msgId));
-      }
-    catch (const CCM_DDS::InternalError &) // catch "normal" exception
-      {
-        ACE_ERROR ((LM_ERROR, "PubSub_comp_exec_i::tick - "
-                  "ERROR: caught InternalError.\n"));
-
-        return -1; // Don't reschedule timer
-      }
-    catch (const CORBA::Exception & ex)
-      {
-        ex._tao_print_exception("PubSub_comp_exec_i::tick - ERROR: ");
-        return -1; // Don't reschedule timer
-      }
-    catch (...) // catch everything else. If this is called something is wrong
-      {
-        ACE_ERROR ((LM_ERROR, "PubSub_comp_exec_i::tick - "
-                  "ERROR: caught unknown exception.\n"));
-        return -1; // Don't reschedule timer
-      }
-    return 0;
-  }
-
-  // Component attributes and port operations.
-
-  ::CoPubSub::Test_conn::CCM_Listener_ptr
-  PubSub_comp_exec_i::get_TestSub_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_TestSub_data_listener_.in ()))
-      {
-        TestSub_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          TestSub_data_listener_exec_i (
-            this->ciao_context_.in ()),
-            ::CoPubSub::Test_conn::CCM_Listener::_nil ());
-
-          this->ciao_TestSub_data_listener_ = tmp;
-      }
-
-    return
-      ::CoPubSub::Test_conn::CCM_Listener::_duplicate (
-        this->ciao_TestSub_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  PubSub_comp_exec_i::get_TestSub_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_TestSub_status_.in ()))
-      {
-        TestSub_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          TestSub_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_TestSub_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_TestSub_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  PubSub_comp_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::CoPubSub::CCM_PubSub_comp_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  PubSub_comp_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  PubSub_comp_exec_i::ccm_activate (void)
-  {
-    CCM_DDS::DataListenerControl_var control =
-        ciao_context_->get_connection_TestSub_data_control();
-
-    if (! CORBA::is_nil(control.in()))
-      {
-          try
-            {
-              control->mode(CCM_DDS::ONE_BY_ONE);
-            }
-          catch (const CORBA::Exception & ex)
-            {
-              ex._tao_print_exception("PubSub_comp_exec_i::ccm_activate - ERROR: ");
-            }
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "PubSub_comp_exec_i::ccm_activate - "
-                  "ERROR: Data listener control seems nil.\n"));
-      }
-
-    ACE_Time_Value delay(3, 0);  // timer = 3 seconds + 0 usec = 3 sec
-    ACE_Time_Value repeat(3, 0); // timer = 3 seconds + 0 usec = 3 sec
-
-    if (this->reactor()->schedule_timer(this->ticker_,
-                                            0,
-                                            delay,
-                                            repeat) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "PubSub_comp_exec_i::ccm_activate - "
-                  "ERROR: Unable to schedule timer.\n"));
-      }
-    else
-      ACE_DEBUG ((LM_DEBUG, "PubSub_comp_exec_i::ccm_activate - "
-                "Timer is up and running.\n"));
-  }
-
-  void
-  PubSub_comp_exec_i::ccm_passivate (void)
-  {
-    this->reactor()->cancel_timer(this->ticker_);
-  }
-
-  void
-  PubSub_comp_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" PUBSUB_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoPubSub_PubSub_comp_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      PubSub_comp_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.h b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.h
deleted file mode 100644
index 7391ebf1357..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.h
+++ /dev/null
@@ -1,169 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_PUBSUB_COMPONENT_EXEC_VCU9KR_H_
-#define CIAO_PUBSUB_COMPONENT_EXEC_VCU9KR_H_
-
-#include /**/ "ace/pre.h"
-
-#include "PubSub_ComponentEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "PubSub_Component_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_CoPubSub_PubSub_comp_Impl
-{
-  class PubSub_comp_exec_i;
-
-  /**
-   * WriteHandler
-   */
-  class WriteHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteHandler (PubSub_comp_exec_i &callback);
-    virtual int handle_timeout (const ACE_Time_Value &, const void *);
-  private:
-    PubSub_comp_exec_i &callback_;
-  };
-
-
-  /**
-   * Provider Executor Implementation Class: TestSub_data_listener_exec_i
-   */
-
-  class TestSub_data_listener_exec_i
-    : public virtual ::CoPubSub::Test_conn::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    TestSub_data_listener_exec_i (
-      ::CoPubSub::CCM_PubSub_comp_Context_ptr ctx);
-    virtual ~TestSub_data_listener_exec_i (void);
-
-    /** @name Operations and attributes from CoPubSub::Test_conn::Listener */
-    //@{
-
-    virtual
-    void on_one_data (
-      const ::CoPubSub::Test_msg & datum,
-      const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (
-      const ::CoPubSub::Test_msgSeq & data,
-      const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::CoPubSub::CCM_PubSub_comp_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: TestSub_status_exec_i
-   */
-
-  class TestSub_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    TestSub_status_exec_i (
-      ::CoPubSub::CCM_PubSub_comp_Context_ptr ctx);
-    virtual ~TestSub_status_exec_i (void);
-
-    /** @name Operations and attributes from CCM_DDS::PortStatusListener */
-    //@{
-
-    virtual
-    void on_requested_deadline_missed (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::CoPubSub::CCM_PubSub_comp_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: PubSub_comp_exec_i
-   */
-
-  class PubSub_comp_exec_i
-    : public virtual PubSub_comp_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    PubSub_comp_exec_i (void);
-    virtual ~PubSub_comp_exec_i (void);
-
-    /** @name Supported operations and attributes. */
-    //@{
-
-    //@}
-
-    /** @name Component attributes and port operations. */
-    //@{
-
-    virtual ::CoPubSub::Test_conn::CCM_Listener_ptr
-    get_TestSub_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_TestSub_status (void);
-    //@}
-
-    /** @name 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);
-    //@}
-
-    /** @name User defined public operations. */
-    //@{
-    int tick (void);
-
-    //@}
-
-  private:
-    ::CoPubSub::CCM_PubSub_comp_Context_var ciao_context_;
-
-    /** @name Component attributes. */
-    //@{
-    ::CoPubSub::Test_conn::CCM_Listener_var ciao_TestSub_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_TestSub_status_;
-    //@}
-
-    /** @name User defined members. */
-    //@{
-    WriteHandler *ticker_;
-
-    ::CORBA::Long count_;
-    //@}
-
-    /** @name User defined private operations. */
-    //@{
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" PUBSUB_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoPubSub_PubSub_comp_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.idl b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.idl
deleted file mode 100644
index 791e62294f0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.idl
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef SUB_COMPONENT_
-#define SUB_COMPONENT_
-
-#include <Components.idl>
-#include "Connector/Collocated_Connector.idl"
-
-module CoPubSub {
-  component Sub_comp {
-    port Test_conn::DDS_Listen TestSub;
-  };
-};
-
-#endif // SUB_COMPONENT_
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc
deleted file mode 100644
index 371880ecee3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc
+++ /dev/null
@@ -1,143 +0,0 @@
-project(SubComponent_idl_gen) : componentidldefaults, dds4ccm {
-  after += Collocated_Connector_idl_gen DDS_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=PUBSUB_COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Sub_Component_stub_export.h \
-              -Wb,skel_export_macro=PUBSUB_COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Sub_Component_svnt_export.h \
-              -Wb,svnt_export_macro=PUBSUB_COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Sub_Component_svnt_export.h \
-              -Wb,exec_export_macro=PUBSUB_COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Sub_Component_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    Sub_Component.idl
-  }
-}
-
-project(SubComponent_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += SubComponent_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=PUBSUB_COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=SubComponent_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    Sub_ComponentE.idl
-  }
-}
-
-project(SubComponent_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += SubComponent_lem_gen SubComponent_stub \
-           Collocated_Base_stub
-  libs  += Collocated_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sub_Component_lem_stub
-  dynamicflags += PUBSUB_COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Sub_ComponentEC.cpp
-  }
-
-  Header_Files {
-    Sub_ComponentEC.h
-    Sub_Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Sub_ComponentEC.inl
-  }
-}
-
-project(SubComponent_stub) : ccm_stub, dds4ccm_base {
-  after += SubComponent_idl_gen Collocated_Base_stub \
-           Collocated_Connector_stub
-  libs  += Collocated_Base_stub Collocated_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sub_Component_stub
-  dynamicflags += PUBSUB_COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Sub_ComponentC.cpp
-  }
-
-  Header_Files {
-    Sub_ComponentC.h
-    Sub_Component_stub_export.h
-  }
-
-  Inline_Files {
-    Sub_ComponentC.inl
-  }
-}
-
-project(SubComponent_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += SubComponent_lem_stub SubComponent_stub \
-             Collocated_Connector_lem_stub Collocated_Connector_stub
-  sharedname = Sub_Component_exec
-  libs    += Sub_Component_stub Sub_Component_lem_stub Collocated_Base_stub \
-             Collocated_Connector_lem_stub Collocated_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += PUBSUB_COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Sub_Component_exec.cpp
-  }
-
-  Header_Files {
-    Sub_Component_exec.h
-    Sub_Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(SubComponent_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += Collocated_Base_stub  SubComponent_lem_stub \
-                Collocated_Connector_stub \
-                Collocated_Connector_svnt Collocated_Connector_lem_stub
-  sharedname  = Sub_Component_svnt
-  libs       += Sub_Component_stub Sub_Component_lem_stub Collocated_Base_stub \
-                Collocated_Connector_stub Collocated_Connector_svnt \
-                Collocated_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += PUBSUB_COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Sub_ComponentS.cpp
-    Sub_Component_svnt.cpp
-  }
-
-  Header_Files {
-    Sub_ComponentS.h
-    Sub_Component_svnt.h
-    Sub_Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.cpp
deleted file mode 100644
index a644b08d8cd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-// -*- C++ -*-
-#include "Sub_Component_exec.h"
-
-namespace CIAO_CoPubSub_Sub_comp_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: TestSub_data_listener_exec_i
-   */
-
-  TestSub_data_listener_exec_i::TestSub_data_listener_exec_i (
-        ::CoPubSub::CCM_Sub_comp_Context_ptr ctx)
-    : ciao_context_ (
-        ::CoPubSub::CCM_Sub_comp_Context::_duplicate (ctx))
-  {
-  }
-
-  TestSub_data_listener_exec_i::~TestSub_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CoPubSub::Test_conn::Listener
-
-  void
-  TestSub_data_listener_exec_i::on_one_data (
-    const ::CoPubSub::Test_msg & datum,
-    const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ACE_DEBUG ((LM_DEBUG, "TestSub_data_listener_exec_i::on_one_data - "
-              "New data received: <%C> - <%d>\n",
-              datum.hello.in (), datum.msgId));
-  }
-
-  void
-  TestSub_data_listener_exec_i::on_many_data (
-    const ::CoPubSub::Test_msgSeq & /* data */,
-    const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: TestSub_status_exec_i
-   */
-
-  TestSub_status_exec_i::TestSub_status_exec_i (
-        ::CoPubSub::CCM_Sub_comp_Context_ptr ctx)
-    : ciao_context_ (
-        ::CoPubSub::CCM_Sub_comp_Context::_duplicate (ctx))
-  {
-  }
-
-  TestSub_status_exec_i::~TestSub_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  TestSub_status_exec_i::on_requested_deadline_missed (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  TestSub_status_exec_i::on_sample_lost (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Sub_comp_exec_i
-   */
-
-  Sub_comp_exec_i::Sub_comp_exec_i (void){
-  }
-
-  Sub_comp_exec_i::~Sub_comp_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::CoPubSub::Test_conn::CCM_Listener_ptr
-  Sub_comp_exec_i::get_TestSub_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_TestSub_data_listener_.in ()))
-      {
-        TestSub_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          TestSub_data_listener_exec_i (
-            this->ciao_context_.in ()),
-            ::CoPubSub::Test_conn::CCM_Listener::_nil ());
-
-          this->ciao_TestSub_data_listener_ = tmp;
-      }
-
-    return
-      ::CoPubSub::Test_conn::CCM_Listener::_duplicate (
-        this->ciao_TestSub_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Sub_comp_exec_i::get_TestSub_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_TestSub_status_.in ()))
-      {
-        TestSub_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          TestSub_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_TestSub_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_TestSub_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sub_comp_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::CoPubSub::CCM_Sub_comp_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sub_comp_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sub_comp_exec_i::ccm_activate (void)
-  {
-    CCM_DDS::DataListenerControl_var control =
-      ciao_context_->get_connection_TestSub_data_control();
-
-    if (! CORBA::is_nil(control.in()))
-      {
-         try
-          {
-            control->mode(CCM_DDS::ONE_BY_ONE);
-          }
-         catch (const CORBA::Exception & ex)
-            {
-              ex._tao_print_exception("Sub_comp_exec_i::ccm_activate - ERROR: ");
-            }
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Sub_comp_exec_i::ccm_activate - "
-                  "ERROR: Listener control is nil.\n"));
-      }
-  }
-
-  void
-  Sub_comp_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sub_comp_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" PUBSUB_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoPubSub_Sub_comp_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sub_comp_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.h b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.h
deleted file mode 100644
index 4b6c45083f7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.h
+++ /dev/null
@@ -1,148 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_SUB_COMPONENT_EXEC_SXAYYT_H_
-#define CIAO_SUB_COMPONENT_EXEC_SXAYYT_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Sub_ComponentEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sub_Component_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_CoPubSub_Sub_comp_Impl
-{
-
-  /**
-   * Provider Executor Implementation Class: TestSub_data_listener_exec_i
-   */
-
-  class TestSub_data_listener_exec_i
-    : public virtual ::CoPubSub::Test_conn::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    TestSub_data_listener_exec_i (
-      ::CoPubSub::CCM_Sub_comp_Context_ptr ctx);
-    virtual ~TestSub_data_listener_exec_i (void);
-
-    /** @name Operations and attributes from CoPubSub::Test_conn::Listener */
-    //@{
-
-    virtual
-    void on_one_data (
-      const ::CoPubSub::Test_msg & datum,
-      const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (
-      const ::CoPubSub::Test_msgSeq & data,
-      const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::CoPubSub::CCM_Sub_comp_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: TestSub_status_exec_i
-   */
-
-  class TestSub_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    TestSub_status_exec_i (
-      ::CoPubSub::CCM_Sub_comp_Context_ptr ctx);
-    virtual ~TestSub_status_exec_i (void);
-
-    /** @name Operations and attributes from CCM_DDS::PortStatusListener */
-    //@{
-
-    virtual
-    void on_requested_deadline_missed (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::CoPubSub::CCM_Sub_comp_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sub_comp_exec_i
-   */
-
-  class Sub_comp_exec_i
-    : public virtual Sub_comp_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sub_comp_exec_i (void);
-    virtual ~Sub_comp_exec_i (void);
-
-    /** @name Supported operations and attributes. */
-    //@{
-
-    //@}
-
-    /** @name Component attributes and port operations. */
-    //@{
-
-    virtual ::CoPubSub::Test_conn::CCM_Listener_ptr
-    get_TestSub_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_TestSub_status (void);
-    //@}
-
-    /** @name 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);
-    //@}
-
-    /** @name User defined public operations. */
-    //@{
-
-    //@}
-
-  private:
-    ::CoPubSub::CCM_Sub_comp_Context_var ciao_context_;
-
-    /** @name Component attributes. */
-    //@{
-    ::CoPubSub::Test_conn::CCM_Listener_var ciao_TestSub_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_TestSub_status_;
-    //@}
-
-    /** @name User defined members. */
-    //@{
-
-    //@}
-
-    /** @name User defined private operations. */
-    //@{
-
-    //@}
-  };
-
-  extern "C" PUBSUB_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoPubSub_Sub_comp_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/Plan.cdp
deleted file mode 100644
index c8b624d3b41..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/Plan.cdp
+++ /dev/null
@@ -1,654 +0,0 @@
-<!--  -->
-<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>CollocatedDepl_1</label>
-  <UUID>CollocatedDepl_1</UUID>
-
-  <implementation xmi:id="SubComponentImplementation">
-    <name>SubComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sub_Component_ExecArtifact" />
-    <artifact xmi:idref="Sub_Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoPubSub_Sub_comp_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoPubSub_Sub_comp_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sub_Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sub_Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="PubSubComponentImplementation">
-    <name>PubSubComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="PubSub_Component_ExecArtifact" />
-    <artifact xmi:idref="PubSub_Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoPubSub_PubSub_comp_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoPubSub_PubSub_comp_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PubSub_Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PubSub_Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="CollocatedConnectorComponentImplementation">
-    <name>CollocatedConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Collocated_Connector_ExecArtifact" />
-    <artifact xmi:idref="Collocated_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_CoPubSub_Test_conn_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CoPubSub_Test_conn_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Collocated_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Collocated_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <!-- SubComponent1 and its connector -->
-  <instance xmi:id="SubComponentInstance1">
-    <name>SubComponent1</name>
-    <node>Node</node>
-    <source/>
-    <implementation xmi:idref="SubComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="SubComponent1Connector">
-    <name>SubComponent1Connector</name>
-    <node>Node</node>
-    <source/>
-    <implementation xmi:idref="CollocatedConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CollocatedTopic</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>push_consumer_filter</name>
-      <value>
-        <type>
-          <kind>tk_struct</kind>
-          <struct>
-            <name>QueryFilter</name>
-            <typeId>IDL:CCM_DDS/QueryFilter:1.0</typeId>
-            <member>
-              <name>expression</name>
-              <type>
-                <kind>tk_string</kind>
-              </type>
-            </member>
-            <member>
-              <name>parameters</name>
-              <type>
-                <kind>tk_sequence</kind>
-                <sequence>
-                  <elementType>
-                    <kind>tk_string</kind>
-                  </elementType>
-                </sequence>
-              </type>
-            </member>
-          </struct>
-        </type>
-        <value>
-          <member>
-            <name>expression</name>
-            <value>
-              <string>msgId &lt; %0</string>
-            </value>
-          </member>
-          <member>
-            <name>parameters</name>
-            <value>
-              <element>
-                <string>1</string>
-              </element>
-            </value>
-          </member>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- SubComponent2 and its connector -->
-  <instance xmi:id="SubComponentInstance2">
-    <name>SubComponent2</name>
-    <node>Node</node>
-    <source/>
-    <implementation xmi:idref="SubComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="SubComponent2Connector">
-    <name>SubComponent2Connector</name>
-    <node>Node</node>
-    <source/>
-    <implementation xmi:idref="CollocatedConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CollocatedTopic</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>push_consumer_filter</name>
-      <value>
-        <type>
-          <kind>tk_struct</kind>
-          <struct>
-            <name>QueryFilter</name>
-            <typeId>IDL:CCM_DDS/QueryFilter:1.0</typeId>
-            <member>
-              <name>expression</name>
-              <type>
-                <kind>tk_string</kind>
-              </type>
-            </member>
-            <member>
-              <name>parameters</name>
-              <type>
-                <kind>tk_sequence</kind>
-                <sequence>
-                  <elementType>
-                    <kind>tk_string</kind>
-                  </elementType>
-                </sequence>
-              </type>
-            </member>
-          </struct>
-        </type>
-        <value>
-          <member>
-            <name>expression</name>
-            <value>
-              <string>msgId &lt; %0</string>
-            </value>
-          </member>
-          <member>
-            <name>parameters</name>
-            <value>
-              <element>
-                <string>1</string>
-              </element>
-            </value>
-          </member>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- PubSubComponent and its connector -->
-  <instance xmi:id="PubSubComponentInstance">
-    <name>PubSubComponent</name>
-    <node>Node</node>
-    <source/>
-    <implementation xmi:idref="PubSubComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="PubSubComponentConnector">
-    <name>PubSubComponentConnector</name>
-    <node>Node</node>
-    <source/>
-    <implementation xmi:idref="CollocatedConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CollocatedTopic</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>push_consumer_filter</name>
-      <value>
-        <type>
-          <kind>tk_struct</kind>
-          <struct>
-            <name>QueryFilter</name>
-            <typeId>IDL:CCM_DDS/QueryFilter:1.0</typeId>
-            <member>
-              <name>expression</name>
-              <type>
-                <kind>tk_string</kind>
-              </type>
-            </member>
-            <member>
-              <name>parameters</name>
-              <type>
-                <kind>tk_sequence</kind>
-                <sequence>
-                  <elementType>
-                    <kind>tk_string</kind>
-                  </elementType>
-                </sequence>
-              </type>
-            </member>
-          </struct>
-        </type>
-        <value>
-          <member>
-            <name>expression</name>
-            <value>
-              <string>msgId &lt; %0</string>
-            </value>
-          </member>
-          <member>
-            <name>parameters</name>
-            <value>
-              <element>
-                <string>1</string>
-              </element>
-            </value>
-          </member>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- pubsub writer connection -->
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>TestPub_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="PubSubComponentInstance"/>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="PubSubComponentConnector"/>
-    </internalEndpoint>
-  </connection>
-
-  <!-- pub sub listener connections -->
-  <connection>
-    <name>pubsub_listener_filter</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>TestSub_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="PubSubComponentInstance"/>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="PubSubComponentConnector"/>
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>pubsub_data_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>TestSub_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="PubSubComponentInstance"/>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="PubSubComponentConnector"/>
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>pubsub_listener_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>TestSub_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="PubSubComponentInstance"/>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="PubSubComponentConnector"/>
-    </internalEndpoint>
-  </connection>
-
-  <!-- sub1 listener connections -->
-  <connection>
-    <name>sub1_listener_filter</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>TestSub_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SubComponentInstance1"/>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SubComponent1Connector"/>
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>sub1_data_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>TestSub_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SubComponentInstance1"/>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SubComponent1Connector"/>
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>sub1_listener_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>TestSub_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SubComponentInstance1"/>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SubComponent1Connector"/>
-    </internalEndpoint>
-  </connection>
-
-  <!-- sub2 listener connections -->
-  <connection>
-    <name>sub2_listener_filter</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>TestSub_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SubComponentInstance2"/>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SubComponent2Connector"/>
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>sub2_data_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>TestSub_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SubComponentInstance2"/>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SubComponent2Connector"/>
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>sub2_listener_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>TestSub_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SubComponentInstance2"/>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SubComponent2Connector"/>
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Collocated_Connector_ExecArtifact">
-    <name>Collocated_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>Collocated_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Collocated_Connector_SvntArtifact">
-    <name>Collocated_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>Collocated_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Collocated_Connector_StubArtifact">
-    <name>Collocated_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>Collocated_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Sub_Component_ExecArtifact">
-    <name>Sub_Component_exec</name>
-    <source/>
-    <node/>
-    <location>Sub_Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Sub_Component_SvntArtifact">
-    <name>Sub_Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Sub_Component_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sub_Component_StubArtifact">
-    <name>Sub_Component_stub</name>
-    <source/>
-    <node/>
-    <location>Sub_Component_stub</location>
-  </artifact>
-
-  <artifact xmi:id="PubSub_Component_ExecArtifact">
-    <name>PubSub_Component_exec</name>
-    <source/>
-    <node/>
-    <location>PubSub_Component_exec</location>
-  </artifact>
-  <artifact xmi:id="PubSub_Component_SvntArtifact">
-    <name>PubSub_Component_svnt</name>
-    <source/>
-    <node/>
-    <location>PubSub_Component_svnt</location>
-  </artifact>
-  <artifact xmi:id="PubSub_Component_StubArtifact">
-    <name>PubSub_Component_stub</name>
-    <source/>
-    <node/>
-    <location>PubSub_Component_stub</location>
-  </artifact>
-
-  <localityConstraint>
-    <constraint>SameProcess</constraint>
-    <constrainedInstance xmi:idref="PubSubComponentInstance"/>
-    <constrainedInstance xmi:idref="PubSubComponentConnector"/>
-  </localityConstraint>
-
-  <localityConstraint>
-    <constraint>SameProcess</constraint>
-    <constrainedInstance xmi:idref="SubComponentInstance1"/>
-    <constrainedInstance xmi:idref="SubComponent1Connector"/>
-    <constrainedInstance xmi:idref="SubComponentInstance2"/>
-    <constrainedInstance xmi:idref="SubComponent2Connector"/>
-  </localityConstraint>
-
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/run_test.pl
deleted file mode 100755
index 255dca278d1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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 = 1;
-@ports = ( 60001 );
-@iorbases = ( "NodeApp.ior" );
-@iorfiles = 0;
-@nodenames = ( "Node" );
-
-# 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/.gitignore b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/.gitignore
deleted file mode 100644
index e600c6c5059..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Connector
-/DiffDir.cxx
-/DiffDir.h
-/DiffDirPlugin.cxx
-/DiffDirPlugin.h
-/DiffDirSupport.cxx
-/DiffDirSupport.h
-/DiffDir_Common_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl
deleted file mode 100644
index c860f65027c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef DIFFDIR_IDL
-#define DIFFDIR_IDL
-
-#pragma ndds typesupport "DiffDirSupport.h"
-#pragma opendds typesupport "DiffDirTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "DiffDirType"
-#pragma DCPS_DATA_KEY "DiffDirType value"
-
-struct DiffDirType {
-  string value; //@key
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<DiffDirType> DiffDirTypeSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpb b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpb
deleted file mode 100644
index 0d50c8147b0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-feature (dds4ccm_ndds) {
-  dds_ts_flags += -d Connector
-}
-
-feature (dds4ccm_opendds) {
-  dds_ts_flags += -o Connector
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc
deleted file mode 100644
index 615ff24a7d2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc
+++ /dev/null
@@ -1,26 +0,0 @@
-project (DiffDir_stub) : taoidldefaults, \
-                         dds4ccm_ts_default, DiffDir {
-  sharedname = DiffDir_stub
-  dynamicflags += DIFFDIR_COMMON_STUB_BUILD_DLL
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=DIFFDIR_COMMON_STUB_Export \
-              -Wb,stub_export_include=DiffDir_Common_stub_export.h \
-              -o Connector
-
-  IDL_Files {
-    idlflags += -Gxhst
-    DiffDir.idl
-    gendir = Connector
-  }
-
-  opendds_ts_flags += --export=DIFFDIR_COMMON_STUB_Export
-
-  DDSGenerator_Files {
-    DiffDir.idl
-    gendir = Connector
-  }
-
-  Source_Files {
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl
deleted file mode 100644
index f4a400ab732..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef DIFFDIR_CONNECTOR_IDL
-#define DIFFDIR_CONNECTOR_IDL
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "DiffDir.idl"
-
-#pragma ciao lem "DiffDir_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Connector/DiffDirTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::DiffDirType, ::DiffDirTypeSeq> DiffDirConnector;
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc
deleted file mode 100644
index e3cefe05fad..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc
+++ /dev/null
@@ -1,135 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -b dds4ccm_base DiffDir_Connector"
-
-project(DiffDir_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DiffDir_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=DIFFDIR_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=DiffDir_Connector_stub_export.h \
-              -Wb,skel_export_macro=DIFFDIR_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=DiffDir_Connector_svnt_export.h \
-              -Wb,conn_export_macro=DIFFDIR_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=DiffDir_Connector_conn_export.h \
-              -Gxhex -Gxhsk -Gxhst \
-              -o Connector
-  IDL_Files {
-    DiffDir_Connector.idl
-    gendir = Connector
-  }
-}
-
-project(DiffDir_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  after    += DiffDir_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=DIFFDIR_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=DiffDir_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -o Connector
-
-  IDL_Files {
-    Connector/DiffDir_ConnectorE.idl
-    gendir = Connector
-  }
-}
-
-project(DiffDir_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub  {
-  after    += DiffDir_Connector_lem_gen DiffDir_Connector_stub
-  libs     += DiffDir_Connector_stub
-  includes += .
-
-  sharedname = DiffDir_Connector_lem_stub
-  dynamicflags += DIFFDIR_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector/DiffDir_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Connector/DiffDir_ConnectorEC.h
-    Connector/DiffDir_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Connector/DiffDir_ConnectorEC.inl
-  }
-}
-
-project(DiffDir_Connector_stub) : ccm_stub, dds4ccm_base {
-  after    += DiffDir_Connector_idl_gen DiffDir_stub
-  libs     += DiffDir_stub
-  includes += .
-
-  sharedname = DiffDir_Connector_stub
-  dynamicflags += DIFFDIR_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector/DiffDir_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Connector/DiffDir_ConnectorC.h
-    Connector/DiffDir_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Connector/DiffDir_ConnectorC.inl
-  }
-}
-
-project(DiffDir_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after    += DiffDir_Connector_lem_stub DiffDir_Connector_stub
-  sharedname = DiffDir_Connector_exec
-  libs     += DiffDir_Connector_stub DiffDir_Connector_lem_stub DiffDir_stub
-  includes += .
-
-  dynamicflags += DIFFDIR_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector/DiffDir_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Connector/DiffDir_Connector_conn.h
-    Connector/DiffDir_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DiffDir_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DiffDir_Connector_lem_stub
-  sharedname  = DiffDir_Connector_svnt
-  libs       += DiffDir_Connector_stub DiffDir_Connector_lem_stub DiffDir_stub
-  includes   += .
-
-  dynamicflags += DIFFDIR_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector/DiffDir_ConnectorS.cpp
-    Connector/DiffDir_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Connector/DiffDir_ConnectorS.h
-    Connector/DiffDir_Connector_svnt.h
-    Connector/DiffDir_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl
deleted file mode 100644
index db1caed274a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * @file CFT_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef CONTENTFILTEREDTOPIC_TEST_BASE_IDL
-#define CONTENTFILTEREDTOPIC_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/CFT_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/CFT_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "CFTTwoDimensionalTest"
-#pragma DCPS_DATA_KEY "CFTTwoDimensionalTest symbol"
-
-struct CFTTwoDimensionalTest {
-  string symbol; //@key
-  long x;
-  long y;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<CFTTwoDimensionalTest> CFTTwoDimensionalTestSeq;
-#endif
-
-#pragma DCPS_DATA_TYPE "CFTThreeDimensionalTest"
-#pragma DCPS_DATA_KEY "CFTThreeDimensionalTest symbol"
-
-struct CFTThreeDimensionalTest {
-  string symbol; //@key
-  long x;
-  long y;
-  long z;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<CFTThreeDimensionalTest> CFTThreeDimensionalTestSeq;
-#endif
-
-#endif /* CONTENTFILTEREDTOPIC_TEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.mpc
deleted file mode 100644
index 072bebbed80..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (CFT_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = CFT_Test_Base_stub
-  dynamicflags += CONTENTFILTEREDTOPIC_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=CFT_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    CFT_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=CONTENTFILTEREDTOPIC_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    CFT_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.idl
deleted file mode 100644
index 332b0c5eb7c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COMPONENT_IDL
-#define COMPONENT_IDL
-
-#include "Connector/CFT_Test_Connector.idl"
-
-module CFT_Test
-{
-  component CFTTestComponent
-  {
-    port CFTTwoDimensionalTestConn::DDS_Get two_dim_get;
-    port CFTThreeDimensionalTestConn::DDS_Get three_dim_get;
-    port CFTThreeDimensionalTestConn::DDS_Read three_dim_read;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc
deleted file mode 100644
index c932730b398..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(CFT_Test_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += CFT_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Component_stub_export.h \
-              -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Component_svnt_export.h \
-              -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Component_svnt_export.h \
-              -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Component_exec_export.h -I..
-
-  IDL_Files {
-    CFT_Test_Component.idl
-  }
-}
-
-project(CFT_Test_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += CFT_Test_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    CFT_Test_ComponentE.idl
-  }
-}
-
-project(CFT_Test_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += CFT_Test_Component_lem_gen CFT_Test_Component_stub  \
-           CFT_Test_Connector_stub CFT_Test_Base_stub
-  libs  +=  Component_stub CFT_Test_Connector_stub \
-            CFT_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_lem_stub
-  dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFT_Test_ComponentEC.cpp
-  }
-
-  Header_Files {
-    CFT_Test_ComponentEC.h
-    Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CFT_Test_ComponentEC.inl
-  }
-}
-
-project(CFT_Test_Component_stub) : ccm_stub, dds4ccm_base {
-  after += CFT_Test_Component_idl_gen  CFT_Test_Connector_stub \
-           CFT_Test_Base_stub CFT_Test_Connector_lem_gen
-  libs  += CFT_Test_Connector_stub CFT_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_stub
-  dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFT_Test_ComponentC.cpp
-  }
-
-  Header_Files {
-    CFT_Test_ComponentC.h
-    Component_stub_export.h
-  }
-
-  Inline_Files {
-    CFT_Test_ComponentC.inl
-  }
-}
-
-project(CFT_Test_Component_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += CFT_Test_Component_lem_stub CFT_Test_Component_stub \
-             CFT_Test_Base_stub CFT_Test_Connector_stub \
-             CFT_Test_Connector_lem_stub 
-  sharedname = Component_exec
-  libs += Component_stub Component_lem_stub CFT_Test_Base_stub \
-          CFT_Test_Connector_stub CFT_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFT_Test_Component_exec.cpp
-  }
-
-  Header_Files {
-    CFT_Test_Component_exec.h
-    Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(CFT_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   CFT_Test_Component_lem_stub CFT_Test_Base_stub \
-                  CFT_Test_Connector_stub CFT_Test_Connector_svnt \
-                  CFT_Test_Component_exec CFT_Test_Connector_lem_stub 
-  sharedname  = Component_svnt
-  libs       += Component_stub Component_lem_stub CFT_Test_Base_stub \
-                CFT_Test_Connector_stub CFT_Test_Connector_svnt \
-                Component_exec CFT_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFT_Test_ComponentS.cpp
-    CFT_Test_Component_svnt.cpp
-  }
-
-  Header_Files {
-    CFT_Test_ComponentS.h
-    CFT_Test_Component_svnt.h
-    Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.cpp
deleted file mode 100644
index 223ca8b96b3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// -*- C++ -*-
-#include "CFT_Test_Component_exec.h"
-
-namespace CIAO_CFT_Test_CFTTestComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  Component_exec_i::Component_exec_i (void)
-  {
-  }
-
-  Component_exec_i::~Component_exec_i (void)
-  {
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Component_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ = ::CFT_Test::CCM_CFTTestComponent_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_two_dim_get_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_three_dim_get_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_three_dim_read_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  void
-  Component_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_activate (void)
-  {
-    // if deployment succeeds, this test succeeds
-    ACE_DEBUG ((LM_DEBUG, "Component_exec_i::ccm_activate - "
-                          "OK : Test succeeded. Two "
-                          "ContentfilteredTopics can "
-                          "be created.\n"));
-  }
-
-  void
-  Component_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CFTTest_Component_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Component_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.h
deleted file mode 100644
index b6349f7f40a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component_exec.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COMPONENT_EXEC_H_
-#define CIAO_COMPONENT_EXEC_H_
-
-#include "CFT_Test_ComponentEC.h"
-
-#include /**/ "Component_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_CFT_Test_CFTTestComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  class COMPONENT_EXEC_Export Component_exec_i
-    : public virtual CFTTestComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Component_exec_i (void);
-    virtual ~Component_exec_i (void);
-
-    // Operations from Components::SessionComponent.
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_two_dim_get_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_three_dim_get_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_three_dim_read_status (void);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::CFT_Test::CCM_CFTTestComponent_Context_var context_;
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CFTTest_Component_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl
deleted file mode 100644
index df556d08cab..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file CFT_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef CONTENTFILTEREDTOPIC_TEST_CONNECTOR_IDL_
-#define CONTENTFILTEREDTOPIC_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/CFT_Test_Base.idl"
-
-#pragma ciao lem "Connector/CFT_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/CFT_Test_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::CFTTwoDimensionalTest, ::CFTTwoDimensionalTestSeq> CFTTwoDimensionalTestConn;
-module ::CCM_DDS::Typed < ::CFTThreeDimensionalTest, ::CFTThreeDimensionalTestSeq> CFTThreeDimensionalTestConn;
-#endif /* CONTENTFILTEREDTOPIC_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc
deleted file mode 100644
index 0d248c5b0be..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p CFT_Test_Base -l .. -o ../lib -u DDS CFT_Test_Connector"
-
-project(CFT_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen CFT_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=CFT_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=CONTENTFILTEREDTOPIC_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=CFT_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=CONTENTFILTEREDTOPIC_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=CFT_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=CONTENTFILTEREDTOPIC_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=CFT_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    CFT_Test_Connector.idl
-  }
-}
-
-project(CFT_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += CFT_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=CFT_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    CFT_Test_ConnectorE.idl
-  }
-}
-
-project(CFT_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += CFT_Test_Connector_lem_gen CFT_Test_Connector_stub CFT_Test_Base_stub
-  libs  += CFT_Test_Base_stub CFT_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = CFT_Test_Connector_lem_stub
-  dynamicflags += CONTENTFILTEREDTOPIC_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFT_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    CFT_Test_ConnectorEC.h
-    CFT_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CFT_Test_ConnectorEC.inl
-  }
-}
-
-project(CFT_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += CFT_Test_Connector_idl_gen CFT_Test_Base_stub
-  libs  += CFT_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = CFT_Test_Connector_stub
-  dynamicflags += CONTENTFILTEREDTOPIC_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFT_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    CFT_Test_ConnectorC.h
-    CFT_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    CFT_Test_ConnectorC.inl
-  }
-}
-
-project(CFT_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += CFT_Test_Connector_lem_stub CFT_Test_Connector_stub CFT_Test_Base_stub
-  sharedname = CFT_Test_Connector_exec
-  libs += CFT_Test_Connector_stub CFT_Test_Connector_lem_stub CFT_Test_Base_stub CFT_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CONTENTFILTEREDTOPIC_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFT_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    CFT_Test_Connector_conn.h
-    CFT_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(CFT_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += CFT_Test_Connector_lem_stub CFT_Test_Connector_exec CFT_Test_Connector_stub
-  sharedname  = CFT_Test_Connector_svnt
-  libs       += CFT_Test_Connector_stub \
-                CFT_Test_Connector_lem_stub  \
-                CFT_Test_Base_stub \
-                CFT_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CONTENTFILTEREDTOPIC_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFT_Test_ConnectorS.cpp
-    CFT_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    CFT_Test_ConnectorS.h
-    CFT_Test_Connector_svnt.h
-    CFT_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/Plan.cdp
deleted file mode 100644
index 74d797ad7dc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/Plan.cdp
+++ /dev/null
@@ -1,419 +0,0 @@
-<!--  -->
-<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>CFTTest_Depl</label>
-  <UUID>CFTTest_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFTTest_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFT_Test_CFTTestComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="TwoDim_CFT_Test_ConnectorImplementation">
-    <name>TwoDim_CFT_Test_ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="CFT_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="CFT_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_CFTTwoDimensionalTestConn_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFTTwoDimensionalTestConn_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFT_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFT_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ThreeDim_CFT_Test_ConnectorImplementation">
-    <name>ThreeDim_CFT_Test_ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="CFT_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="CFT_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_CFTThreeDimensionalTestConn_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFTThreeDimensionalTestConn_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFT_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFT_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ComponentInstance">
-    <name>Component</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="TwoDim_CFT_Test_ConnectorInstance">
-    <name>TwoDim_CFT_Test_Connector</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="TwoDim_CFT_Test_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TwoDimensionalTopic</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ThreeDim_CFT_Test_ConnectorInstance">
-    <name>ThreeDim_CFT_Test_Connector</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ThreeDim_CFT_Test_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ThreeDimensionalTopic</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>pull_observer_filter</name>
-      <value>
-        <type>
-          <kind>tk_struct</kind>
-          <struct>
-            <name>QueryFilter</name>
-            <typeId>IDL:CCM_DDS/QueryFilter:1.0</typeId>
-            <member>
-              <name>expression</name>
-              <type>
-                <kind>tk_string</kind>
-              </type>
-            </member>
-            <member>
-              <name>parameters</name>
-              <type>
-                <kind>tk_sequence</kind>
-                <sequence>
-                  <elementType>
-                    <kind>tk_string</kind>
-                  </elementType>
-                </sequence>
-              </type>
-            </member>
-          </struct>
-        </type>
-        <value>
-          <member>
-            <name>expression</name>
-            <value>
-              <string>( (x > %0) AND (x &lt; %1) )</string>
-            </value>
-          </member>
-          <member>
-            <name>parameters</name>
-            <value>
-              <element>
-                <string>2</string>
-              </element>
-              <element>
-                <string>5</string>
-              </element>
-            </value>
-          </member>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>passive_observer_filter</name>
-      <value>
-        <type>
-          <kind>tk_struct</kind>
-          <struct>
-            <name>QueryFilter</name>
-            <typeId>IDL:CCM_DDS/QueryFilter:1.0</typeId>
-            <member>
-              <name>expression</name>
-              <type>
-                <kind>tk_string</kind>
-              </type>
-            </member>
-            <member>
-              <name>parameters</name>
-              <type>
-                <kind>tk_sequence</kind>
-                <sequence>
-                  <elementType>
-                    <kind>tk_string</kind>
-                  </elementType>
-                </sequence>
-              </type>
-            </member>
-          </struct>
-        </type>
-        <value>
-          <member>
-            <name>expression</name>
-            <value>
-              <string>( (x &lt; %0) OR (x > %1) )</string>
-            </value>
-          </member>
-          <member>
-            <name>parameters</name>
-            <value>
-              <element>
-                <string>2</string>
-              </element>
-              <element>
-                <string>5</string>
-              </element>
-            </value>
-          </member>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>two_dim_get_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>two_dim_get_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TwoDim_CFT_Test_ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>three_dim_get_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>three_dim_get_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ThreeDim_CFT_Test_ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>three_dim_read_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>three_dim_read_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ThreeDim_CFT_Test_ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>three_dim_get_filter_confit</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>three_dim_get_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ThreeDim_CFT_Test_ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="CFT_Test_Connector_ExecArtifact">
-    <name>CFT_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>CFT_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="CFT_Test_Connector_SvntArtifact">
-    <name>CFT_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>CFT_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="CFT_Test_Connector_StubArtifact">
-    <name>CFT_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>CFT_Test_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/run_test.pl
deleted file mode 100755
index 415d3a8df9d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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 = 1;
-@ports = ( 60001 );
-@iorbases = ( "Component.ior" );
-@iorfiles = 0;
-@nodenames = ( "ComponentNode" );
-
-# 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 10 seconds to allow task to complete\n";
-sleep (10);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/WrongQuery.cdp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/WrongQuery.cdp
deleted file mode 100644
index bc767abfca1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/WrongQuery.cdp
+++ /dev/null
@@ -1,255 +0,0 @@
-<!--  -->
-<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>ReadGet_Test_Depl_1</label>
-  <UUID>ReadGet_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_ReadGet_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_ReadGet_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="ReadGet_Test_ReceiverConnectorImplementation">
-    <name>ReadGet_Test_ReceiverConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="ReadGet_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="ReadGet_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_ReadGet_Test_QueryConditionTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ReadGet_Test_QueryConditionTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFT_ReadGet_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFT_ReadGet_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>report_errors</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ReadGet_Test_ReceiverConnectorInstance">
-    <name>ReadGet_Test_ReceiverConnector</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReadGet_Test_ReceiverConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReadGet_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>passive_observer_filter</name>
-      <value>
-        <type>
-          <kind>tk_struct</kind>
-          <struct>
-            <name>QueryFilter</name>
-            <typeId>IDL:CCM_DDS/QueryFilter:1.0</typeId>
-            <member>
-              <name>expression</name>
-              <type>
-                <kind>tk_string</kind>
-              </type>
-            </member>
-            <member>
-              <name>parameters</name>
-              <type>
-                <kind>tk_sequence</kind>
-                <sequence>
-                  <elementType>
-                    <kind>tk_string</kind>
-                  </elementType>
-                </sequence>
-              </type>
-            </member>
-          </struct>
-        </type>
-        <value>
-          <member>
-            <name>expression</name>
-            <value>
-              <string>( (x > %0) AND (x &lt; %1) )</string>
-            </value>
-          </member>
-          <member>
-            <name>parameters</name>
-            <value>
-              <element>
-                <string>2</string>
-              </element>
-              <element>
-                <string>5</string>
-              </element>
-            </value>
-          </member>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>get_port_filter_config</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReadGet_Test_ReceiverConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="ReadGet_Test_Connector_ExecArtifact">
-    <name>CFT_ReadGet_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>CFT_ReadGet_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="ReadGet_Test_Connector_SvntArtifact">
-    <name>CFT_ReadGet_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>CFT_ReadGet_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="ReadGet_Test_Connector_StubArtifact">
-    <name>CFT_ReadGet_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>ReadGet_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/ContentFilteredTopic/Deployments/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/run_test.pl
deleted file mode 100755
index 8a4460518c9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/run_test.pl
+++ /dev/null
@@ -1,214 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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 = 1;
-@ports = ( 60001 );
-@iorbases = ( "NodeApp1.ior" );
-@iorfiles = 0;
-@nodenames = ( "ReceiverNode" );
-
-# 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;
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../ReadGet/lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../ReadGet/lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../ReadGet/lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../ReadGet/lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-
-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 = "$DANCE_ROOT/bin/dance_locality_manager";
-
-        $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 node daemon\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        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;
-}
-
-if ($#ARGV == -1) {
-    opendir(DIR, ".");
-    @files = grep(/\.cdp$/,readdir(DIR));
-    closedir(DIR);
-}
-else {
-    @files = @ARGV;
-}
-
-create_targets ();
-init_ior_files ();
-
-foreach $file (@files) {
-    print "*********** Starting test for deployment $file ***********\n";
-
-    print STDERR "Starting Naming Service\n";
-
-    $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-    $NS->Spawn ();
-
-    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 daemons\n";
-        kill_open_processes ();
-        exit 1;
-    }
-
-    $daemons_running = 1;
-
-    # Invoke execution manager.
-    print "Invoking execution manager\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";
-    $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                      "-x $file -k file://$ior_emfile -q");
-    $pl_status = $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ());
-    if ($pl_status != 0) {
-        print "OK: dance_plan_launcher reported a problem <$pl_status>\n";
-        kill_open_processes ();
-    }
-    else {
-        print STDERR "ERROR: dance_plan_launcher did not report an error\n";
-        kill_open_processes ();
-    }
-    delete_ior_files ();
-    kill_open_processes ();
-}
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl
deleted file mode 100644
index f7d819efe29..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file CFTLE_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_BASE_IDL
-#define CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/CFTLE_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/CFTLE_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "ContentFilteredTopicListenEventTest"
-#pragma DCPS_DATA_KEY "ContentFilteredTopicListenEventTest key"
-
-struct ContentFilteredTopicListenEventTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<ContentFilteredTopicListenEventTest> ContentFilteredTopicListenEventTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.mpc
deleted file mode 100644
index 59e839f1dc5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_CFTLE_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_CFTLE_Test_Base_stub
-  dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=CFTLE_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    CFTLE_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    CFTLE_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl
deleted file mode 100644
index 04395d584eb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file CFTLE_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_IDL_
-#define CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/CFTLE_Test_Base.idl"
-
-#pragma ciao lem "Connector/CFTLE_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/CFTLE_Test_BaseTypeSupport.idl"
-#endif
-
-module CFTLE_Test
-{
-  module ::CCM_DDS::Typed < ::ContentFilteredTopicListenEventTest, ::ContentFilteredTopicListenEventTestSeq> ContentFilteredTopicListenEventTestConnector;
-};
-
-#endif /* CFTLE_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc
deleted file mode 100644
index 3a5a0b192f7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_CFTLE_Test_Base -l .. -o ../lib -u DDS CFTLE_Test_Connector"
-
-project(DDS_CFTLE_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_CFTLE_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=CFTLE_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=CFTLE_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=CFTLE_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=CFTLE_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    CFTLE_Test_Connector.idl
-  }
-}
-
-project(DDS_CFTLE_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_CFTLE_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=CFTLE_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    CFTLE_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_CFTLE_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_CFTLE_Test_Connector_lem_gen DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Base_stub
-  libs  += DDS_CFTLE_Test_Base_stub DDS_CFTLE_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_CFTLE_Test_Connector_lem_stub
-  dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLE_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    CFTLE_Test_ConnectorEC.h
-    CFTLE_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CFTLE_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_CFTLE_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CFTLE_Test_Connector_idl_gen DDS_CFTLE_Test_Base_stub
-  libs  += DDS_CFTLE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_CFTLE_Test_Connector_stub
-  dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLE_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    CFTLE_Test_ConnectorC.h
-    CFTLE_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    CFTLE_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_CFTLE_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_CFTLE_Test_Connector_lem_stub DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Base_stub
-  sharedname = DDS_CFTLE_Test_Connector_exec
-  libs += DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Connector_lem_stub DDS_CFTLE_Test_Base_stub DDS_CFTLE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLE_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    CFTLE_Test_Connector_conn.h
-    CFTLE_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CFTLE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_CFTLE_Test_Connector_lem_stub DDS_CFTLE_Test_Connector_exec DDS_CFTLE_Test_Connector_stub
-  sharedname  = DDS_CFTLE_Test_Connector_svnt
-  libs       += DDS_CFTLE_Test_Connector_stub \
-                DDS_CFTLE_Test_Connector_lem_stub  \
-                DDS_CFTLE_Test_Base_stub \
-                DDS_CFTLE_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLE_Test_ConnectorS.cpp
-    CFTLE_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    CFTLE_Test_ConnectorS.h
-    CFTLE_Test_Connector_svnt.h
-    CFTLE_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.idl
deleted file mode 100644
index ef595aa217d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/CFTLE_Test_Connector.idl"
-
-module CFTLE_Test
-{
-  component Receiver
-  {
-    port ContentFilteredTopicListenEventTestConnector::DDS_Listen info_listen;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc
deleted file mode 100644
index 5c52a76f4f3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-project(DDS_CFTLE_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_CFTLE_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 {
-    CFTLE_Test_Receiver.idl
-  }
-}
-
-project(DDS_CFTLE_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_CFTLE_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 {
-    CFTLE_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_CFTLE_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_CFTLE_Test_Receiver_lem_gen DDS_CFTLE_Test_Receiver_stub  \
-           DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Base_stub
-  libs  +=  Receiver_stub DDS_CFTLE_Test_Connector_stub \
-            DDS_CFTLE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLE_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    CFTLE_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CFTLE_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_CFTLE_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CFTLE_Test_Receiver_idl_gen  DDS_CFTLE_Test_Connector_stub \
-           DDS_CFTLE_Test_Base_stub DDS_CFTLE_Test_Connector_lem_gen
-  libs  += DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLE_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    CFTLE_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    CFTLE_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_CFTLE_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_CFTLE_Test_Receiver_lem_stub DDS_CFTLE_Test_Receiver_stub \
-             DDS_CFTLE_Test_Base_stub DDS_CFTLE_Test_Connector_stub \
-             DDS_CFTLE_Test_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_CFTLE_Test_Base_stub \
-          DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLE_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    CFTLE_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CFTLE_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_CFTLE_Test_Receiver_lem_stub DDS_CFTLE_Test_Base_stub \
-                  DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Connector_svnt \
-                  DDS_CFTLE_Test_Receiver_exec DDS_CFTLE_Test_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_CFTLE_Test_Base_stub \
-                DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Connector_svnt \
-                Receiver_exec DDS_CFTLE_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLE_Test_ReceiverS.cpp
-    CFTLE_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    CFTLE_Test_ReceiverS.h
-    CFTLE_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp
deleted file mode 100644
index 44b10bf7e3d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,355 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "CFTLE_Test_Receiver_exec.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-#define MIN_ITERATION 2
-#define MAX_ITERATION 5
-
-#define SAMPLES_PER_KEY 2
-
-namespace CIAO_CFTLE_Test_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_listen_data_listener_exec_i
-   */
-
-  info_listen_data_listener_exec_i::info_listen_data_listener_exec_i (
-        ::CFTLE_Test::CCM_Receiver_Context_ptr ctx,
-        ACE_Thread_ID &thread_id,
-        Atomic_Long &samples_received)
-    : ciao_context_ (
-        ::CFTLE_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , thread_id_ (thread_id)
-      , samples_received_ (samples_received)
-  {
-  }
-
-  info_listen_data_listener_exec_i::~info_listen_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::Listener
-
-  void
-  info_listen_data_listener_exec_i::on_one_data (const ::ContentFilteredTopicListenEventTest & datum,
-  const ::CCM_DDS::ReadInfo & info)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_ = t_id;
-    ++this->samples_received_;
-    ACE_DEBUG ((LM_DEBUG, "ContentFilteredTopicListenEventTest_Listener::on_one_data: "
-                          "key <%C> - iteration <%d>\n",
-                          datum.key.in (),
-                          datum.iteration));
-    if (info.instance_handle == ::DDS::HANDLE_NIL)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ContentFilteredTopicListenEventTest_Listener::on_one_data: "
-                              "instance handle seems to be invalid "
-                              "key <%C> - iteration <%d>\n",
-                              datum.key.in (),
-                              datum.iteration));
-      }
-    if (info.source_timestamp.sec == 0 &&
-        info.source_timestamp.nanosec == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ContentFilteredTopicListenEventTest_Listener::on_one_data: "
-                              "source timestamp seems to be invalid (nil) "
-                              "key <%C> - iteration <%d>\n",
-                              datum.key.in (),
-                              datum.iteration));
-      }
-    if (datum.iteration <= MIN_ITERATION ||
-        datum.iteration  > MAX_ITERATION )
-      {
-        ACE_ERROR ((LM_ERROR, "ContentFilteredTopicListenEventTest_Listener::on_one_data: "
-                              "ERROR: Unexpected iteration received.\n"));
-      }
-  }
-
-  void
-  info_listen_data_listener_exec_i::on_many_data (const ::ContentFilteredTopicListenEventTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_listen_status_exec_i
-   */
-
-  info_listen_status_exec_i::info_listen_status_exec_i (
-        ::CFTLE_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::CFTLE_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_listen_status_exec_i::~info_listen_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_listen_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_listen_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : keys_ (5)
-      , iterations_ (10)
-      , thread_id_listener_ (0, 0)
-      , samples_expected_ (keys_ * SAMPLES_PER_KEY)
-      , samples_received_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  void
-  Receiver_exec_i::start (void)
-  {
-    ::CCM_DDS::DataListenerControl_var dlc =
-        this->ciao_context_->get_connection_info_listen_data_control ();
-    dlc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  // Component attributes and port operations.
-
-  ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_listen_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_listen_data_listener_.in ()))
-      {
-        info_listen_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_listen_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->thread_id_listener_,
-            this->samples_received_),
-            ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_listen_data_listener_ = tmp;
-      }
-
-    return
-      ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::CCM_Listener::_duplicate (
-        this->ciao_info_listen_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_listen_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_listen_status_.in ()))
-      {
-        info_listen_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_listen_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_listen_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_listen_status_.in ());
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Receiver_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-
-    this->samples_expected_ = SAMPLES_PER_KEY * this->keys_;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::CFTLE_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_listen_data ();
-    if (CORBA::is_nil (reader.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::configuration_complete - "
-                              "Error get reader connection.\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - "
-                          "Start listening.\n"));
-    start ();
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_.to_string (list_buf);
-
-
-    if (this->thread_id_listener_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for ReaderListener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "CFT_EVENT: "
-                              "Thread switch for ReaderListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: CFT_EVENT: "
-                              "Thread switch for ReaderListener "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: CFT_EVENT: ReaderListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "CFT_EVENT: ReaderListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #endif
-    if (this->samples_received_ != this->samples_expected_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: CFT_EVENT: ReaderListener: "
-                              "Unexpected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_,
-                              this->samples_received_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "CFT_EVENT: ReaderListener: "
-                              "Expected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_,
-                              this->samples_received_.value ()));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CFTLE_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/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h
deleted file mode 100644
index a5d193bd04e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h
+++ /dev/null
@@ -1,189 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_CFTLE_TEST_RECEIVER_EXEC_NV4QAC_H_
-#define CIAO_CFTLE_TEST_RECEIVER_EXEC_NV4QAC_H_
-
-#include /**/ "ace/pre.h"
-
-#include "CFTLE_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_CFTLE_Test_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Long> Atomic_Long;
-
-  /**
-   * Provider Executor Implementation Class: info_listen_data_listener_exec_i
-   */
-
-  class info_listen_data_listener_exec_i
-    : public virtual ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_listen_data_listener_exec_i (
-      ::CFTLE_Test::CCM_Receiver_Context_ptr ctx,
-      ACE_Thread_ID &thread_id,
-      Atomic_Long &samples_received);
-    virtual ~info_listen_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CFTLE_Test::ContentFilteredTopicListenEventTestConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::ContentFilteredTopicListenEventTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::ContentFilteredTopicListenEventTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::CFTLE_Test::CCM_Receiver_Context_var ciao_context_;
-    ACE_Thread_ID &thread_id_;
-    Atomic_Long &samples_received_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_listen_status_exec_i
-   */
-
-  class info_listen_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_listen_status_exec_i (
-      ::CFTLE_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_listen_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::CFTLE_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::CCM_Listener_ptr
-    get_info_listen_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_listen_status (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-
-    //@}
-
-  private:
-    ::CFTLE_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::CCM_Listener_var ciao_info_listen_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_listen_status_;
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    ACE_Thread_ID thread_id_listener_;
-
-    CORBA::Long samples_expected_;
-    Atomic_Long samples_received_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CFTLE_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.idl
deleted file mode 100644
index a7f807f0e64..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_SENDER_IDL
-#define DDS_CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_SENDER_IDL
-
-#include "Connector/CFTLE_Test_Connector.idl"
-
-module CFTLE_Test
-{
-  component Sender
-  {
-    port ContentFilteredTopicListenEventTestConnector::DDS_Write info_write;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc
deleted file mode 100644
index 6715e986b2d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_CFTLE_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_CFTLE_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_CFTLE_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 {
-    CFTLE_Test_Sender.idl
-  }
-}
-
-project(DDS_CFTLE_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_CFTLE_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 {
-    CFTLE_Test_SenderE.idl
-  }
-}
-
-project(DDS_CFTLE_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_CFTLE_Test_Sender_lem_gen DDS_CFTLE_Test_Sender_stub \
-           DDS_CFTLE_Test_Base_stub
-  libs  += DDS_CFTLE_Test_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLE_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    CFTLE_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CFTLE_Test_SenderEC.inl
-  }
-}
-
-project(DDS_CFTLE_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CFTLE_Test_Sender_idl_gen DDS_CFTLE_Test_Base_stub \
-           DDS_CFTLE_Test_Connector_stub
-  libs  += DDS_CFTLE_Test_Base_stub DDS_CFTLE_Test_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLE_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    CFTLE_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    CFTLE_Test_SenderC.inl
-  }
-}
-
-project(DDS_CFTLE_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_CFTLE_Test_Sender_lem_stub DDS_CFTLE_Test_Sender_stub \
-             DDS_CFTLE_Test_Connector_lem_stub DDS_CFTLE_Test_Connector_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub DDS_CFTLE_Test_Base_stub \
-             DDS_CFTLE_Test_Connector_lem_stub DDS_CFTLE_Test_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLE_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    CFTLE_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CFTLE_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_CFTLE_Test_Base_stub  DDS_CFTLE_Test_Sender_lem_stub \
-                DDS_CFTLE_Test_Connector_stub \
-                DDS_CFTLE_Test_Connector_svnt DDS_CFTLE_Test_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub DDS_CFTLE_Test_Base_stub \
-                DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Connector_svnt \
-                DDS_CFTLE_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLE_Test_SenderS.cpp
-    CFTLE_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    CFTLE_Test_SenderS.h
-    CFTLE_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.cpp
deleted file mode 100644
index 0352ef020de..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,257 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "CFTLE_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_CFTLE_Test_Sender_Impl
-{
-  /**
-   * WriteTicker
-   */
-
-  WriteTicker::WriteTicker (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteTicker::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.write_one ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (5)
-      , iterations_ (10)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      WriteTicker (*this),
-                      CORBA::INTERNAL ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::write_one (void)
-  {
-    if (this->last_key_ != this->samples_.end ())
-      {
-        try
-          {
-            ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::Writer_var writer =
-              this->ciao_context_->get_connection_info_write_data ();
-            ++this->last_key_->second->iteration;
-            writer->write_one (this->last_key_->second, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, "Written key <%C> - <%u>\n",
-                          this->last_key_->first.c_str (),
-                          this->last_key_->second->iteration));
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                        ACE_TEXT ("while updating writer info for <%C>.\n"),
-                          this->last_key_->first.c_str ()));
-          }
-        ++this->last_key_;
-      }
-    else
-      {
-        //onto the next iteration
-        this->last_key_ = this->samples_.begin ();
-        while (this->last_key_ != this->samples_.end ())
-          {
-            if (this->last_key_->second->iteration == this->iterations_)
-              {
-                //next key
-                ++this->last_key_;
-              }
-            else
-              {
-                break;
-              }
-          }
-        if (this->last_key_ == this->samples_.end ())
-          {
-            this->reactor ()->cancel_timer (this->ticker_);
-          }
-      }
-  }
-
-
-  void
-  Sender_exec_i::start (void)
-  {
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        ContentFilteredTopicListenEventTest *new_key = new ContentFilteredTopicListenEventTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->iteration = 0;
-
-        this->samples_[key] = new_key;
-      }
-   this->last_key_ = this->samples_.begin ();
-   if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (5, 50000),
-                ACE_Time_Value (0, 50000)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::CFTLE_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    try
-      {
-        start ();
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Unknown exception caught\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CFTLE_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/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.h
deleted file mode 100644
index 23ebae100fa..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.h
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_CFTLE_TEST_SENDER_EXEC_VCGUTW_H_
-#define CIAO_CFTLE_TEST_SENDER_EXEC_VCGUTW_H_
-
-#include /**/ "ace/pre.h"
-
-#include "CFTLE_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_CFTLE_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * WriteTicker
-   */
-
-  class WriteTicker :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteTicker (Sender_exec_i &callback);
-    int handle_timeout (const ACE_Time_Value &, const void *);
-  private:
-    /// Maintains a handle that actually process the event
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-    void write_one (void);
-
-    //@}
-
-  private:
-    ::CFTLE_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    WriteTicker *ticker_;
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, ContentFilteredTopicListenEventTest_var> Writer_Table;
-    Writer_Table samples_;
-
-    Writer_Table::iterator last_key_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CFTLE_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/Plan.cdp
deleted file mode 100644
index 521e7fb5cef..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/Plan.cdp
+++ /dev/null
@@ -1,441 +0,0 @@
-<!--  -->
-<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>CFTLE_Test_Depl_1</label>
-  <UUID>CFTLE_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_CFTLE_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_CFTLE_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="CFTLE_Test_ConnectorComponentImplementation">
-    <name>CFTLE_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="CFTLE_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="CFTLE_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_CFTLE_Test_ContentFilteredTopicListenEventTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFTLE_Test_ContentFilteredTopicListenEventTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFTLE_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFTLE_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_CFTLE_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_CFTLE_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" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CFTLE_Test_ConnectorComponentInstance">
-    <name>CFTLE_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CFTLE_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFTLE_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CFTLE_Test_ConnectorComponentInstance2">
-    <name>CFTLE_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CFTLE_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFTLE_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>push_consumer_filter</name>
-      <value>
-        <type>
-          <kind>tk_struct</kind>
-          <struct>
-            <name>QueryFilter</name>
-            <typeId>IDL:CCM_DDS/QueryFilter:1.0</typeId>
-            <member>
-              <name>expression</name>
-              <type>
-                <kind>tk_string</kind>
-              </type>
-            </member>
-            <member>
-              <name>parameters</name>
-              <type>
-                <kind>tk_sequence</kind>
-                <sequence>
-                  <elementType>
-                    <kind>tk_string</kind>
-                  </elementType>
-                </sequence>
-              </type>
-            </member>
-          </struct>
-        </type>
-        <value>
-          <member>
-            <name>expression</name>
-            <value>
-              <string>( (iteration > %0) AND (iteration &lt; %1) )</string>
-            </value>
-          </member>
-          <member>
-            <name>parameters</name>
-            <value>
-              <element>
-                <string>2</string>
-              </element>
-              <element>
-                <string>5</string>
-              </element>
-            </value>
-          </member>
-        </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_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_listen_reader_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CFTLE_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="CFTLE_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="CFTLE_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="CFTLE_Test_ConnectorComponentInstance" />
-    </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="CFTLE_Test_Connector_ExecArtifact">
-    <name>CFTLE_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_CFTLE_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="CFTLE_Test_Connector_SvntArtifact">
-    <name>CFTLE_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_CFTLE_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="CFTLE_Test_Connector_StubArtifact">
-    <name>CFTLE_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_CFTLE_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/ContentFilteredTopic/EventListener/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/run_test.pl
deleted file mode 100755
index d8b4eca445d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl
deleted file mode 100644
index 40911e517e4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file Exception_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef CFT_EXCEPTION_TEST_BASE_IDL
-#define CFT_EXCEPTION_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/Exception_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/Exception_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "CFTExceptionTest"
-#pragma DCPS_DATA_KEY "CFTExceptionTest symbol"
-
-struct CFTExceptionTest {
-  string symbol; //@key
-  long x;
-  long y;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<CFTExceptionTest> CFTExceptionTestSeq;
-#endif
-
-#endif /* CFT_EXCEPTION_TEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.mpc
deleted file mode 100644
index 11b3f8805fa..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (CFT_Exception_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = CFT_Exception_Test_Base_stub
-  dynamicflags += CFT_EXCEPTION_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=CFT_EXCEPTION_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=CFT_Exception_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Exception_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=CFT_EXCEPTION_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Exception_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/.gitignore b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/.gitignore
deleted file mode 100644
index 6dc72fd9a88..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Component_exec_export.h
-/Component_lem_stub_export.h
-/Component_stub_export.h
-/Component_svnt_export.h
-/Exception_Test_ComponentE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.idl
deleted file mode 100644
index 232907f01c6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COMPONENT_IDL
-#define COMPONENT_IDL
-
-#include "Connector/Exception_Test_Connector.idl"
-
-module CFT_Exception_Test
-{
-  component CFTTestComponent
-  {
-    port CFTExceptionTestConn::DDS_Get getter;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc
deleted file mode 100644
index 2abef71a064..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(CFT_Exception_Test_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += CFT_Exception_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Component_stub_export.h \
-              -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Component_svnt_export.h \
-              -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Component_svnt_export.h \
-              -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Component_exec_export.h -I..
-
-  IDL_Files {
-    Exception_Test_Component.idl
-  }
-}
-
-project(CFT_Exception_Test_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += CFT_Exception_Test_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Exception_Test_ComponentE.idl
-  }
-}
-
-project(CFT_Exception_Test_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += CFT_Exception_Test_Component_lem_gen CFT_Exception_Test_Component_stub  \
-           CFT_Exception_Test_Connector_stub CFT_Exception_Test_Base_stub
-  libs  +=  Component_stub CFT_Exception_Test_Connector_stub \
-            CFT_Exception_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_lem_stub
-  dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Exception_Test_ComponentEC.cpp
-  }
-
-  Header_Files {
-    Exception_Test_ComponentEC.h
-    Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Exception_Test_ComponentEC.inl
-  }
-}
-
-project(CFT_Exception_Test_Component_stub) : ccm_stub, dds4ccm_base {
-  after += CFT_Exception_Test_Component_idl_gen  CFT_Exception_Test_Connector_stub \
-           CFT_Exception_Test_Base_stub CFT_Exception_Test_Connector_lem_gen
-  libs  += CFT_Exception_Test_Connector_stub CFT_Exception_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_stub
-  dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Exception_Test_ComponentC.cpp
-  }
-
-  Header_Files {
-    Exception_Test_ComponentC.h
-    Component_stub_export.h
-  }
-
-  Inline_Files {
-    Exception_Test_ComponentC.inl
-  }
-}
-
-project(CFT_Exception_Test_Component_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += CFT_Exception_Test_Component_lem_stub CFT_Exception_Test_Component_stub \
-             CFT_Exception_Test_Base_stub CFT_Exception_Test_Connector_stub \
-             CFT_Exception_Test_Connector_lem_stub 
-  sharedname = Component_exec
-  libs += Component_stub Component_lem_stub CFT_Exception_Test_Base_stub \
-          CFT_Exception_Test_Connector_stub CFT_Exception_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Exception_Test_Component_exec.cpp
-  }
-
-  Header_Files {
-    Exception_Test_Component_exec.h
-    Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(CFT_Exception_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   CFT_Exception_Test_Component_lem_stub CFT_Exception_Test_Base_stub \
-                  CFT_Exception_Test_Connector_stub CFT_Exception_Test_Connector_svnt \
-                  CFT_Exception_Test_Component_exec CFT_Exception_Test_Connector_lem_stub 
-  sharedname  = Component_svnt
-  libs       += Component_stub Component_lem_stub CFT_Exception_Test_Base_stub \
-                CFT_Exception_Test_Connector_stub CFT_Exception_Test_Connector_svnt \
-                Component_exec CFT_Exception_Test_Connector_lem_stub  
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Exception_Test_ComponentS.cpp
-    Exception_Test_Component_svnt.cpp
-  }
-
-  Header_Files {
-    Exception_Test_ComponentS.h
-    Exception_Test_Component_svnt.h
-    Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.cpp
deleted file mode 100644
index beaf2f4956a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-// -*- C++ -*-
-#include "Exception_Test_Component_exec.h"
-
-namespace CIAO_CFT_Exception_Test_CFTTestComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  Component_exec_i::Component_exec_i (void)
-  {
-  }
-
-  Component_exec_i::~Component_exec_i (void)
-  {
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Component_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::CFT_Exception_Test::CCM_CFTTestComponent_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_getter_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  void
-  Component_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Component_exec_i::test_set_query_parameters ()
-  {
-    bool exception_caught = false;
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::test_set_query_parameters: Test exception\n"));
-        ::DDS::StringSeq parameters;
-        parameters.length (2);
-        parameters[0] = CORBA::string_dup ("2");
-        parameters[1] = CORBA::string_dup ("43");
-
-        this->filter_config_->set_filter_parameters (parameters);
-      }
-    catch (const ::CCM_DDS::InternalError&)
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::test_set_query_parameters - "
-                              "caught expected InternalErr exception.\n"));
-        exception_caught = true;
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Receiver_exec_i::test_set_query_parameters: ");
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::test_set_query_parameters - "
-                              "Exception caught\n"));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::test_set_query_parameters - "
-                              "caught unknown exception\n"));
-      }
-    if (!exception_caught)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::test_set_query_parameters - "
-                              "Didn't catch the exprected exception\n"));
-      }
-  }
-
-  void
-  Component_exec_i::ccm_activate (void)
-  {
-    this->filter_config_ =
-      this->context_->get_connection_getter_filter_config ();
-    this->test_set_query_parameters ();
-  }
-
-  void
-  Component_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CFTTest_Component_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Component_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.h
deleted file mode 100644
index f8367688ab0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COMPONENT_EXEC_H_
-#define CIAO_COMPONENT_EXEC_H_
-
-#include "Exception_Test_ComponentEC.h"
-
-#include /**/ "Component_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_CFT_Exception_Test_CFTTestComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  class COMPONENT_EXEC_Export Component_exec_i
-    : public virtual CFTTestComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Component_exec_i (void);
-    virtual ~Component_exec_i (void);
-
-    // Operations from Components::SessionComponent.
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_getter_status(void);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::CFT_Exception_Test::CCM_CFTTestComponent_Context_var context_;
-    ::CCM_DDS::ContentFilterSetting_var filter_config_;
-
-    void
-    test_set_query_parameters ();
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CFTTest_Component_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl
deleted file mode 100644
index dc039960236..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @file Exception_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef CFT_EXCEPTION_TEST_CONNECTOR_IDL_
-#define CFT_EXCEPTION_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Exception_Test_Base.idl"
-
-#pragma ciao lem "Connector/Exception_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Exception_Test_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::CFTExceptionTest, ::CFTExceptionTestSeq> CFTExceptionTestConn;
-#endif /* CFT_EXCEPTION_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc
deleted file mode 100644
index 3f1aa68a9dd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p CFT_Exception_Test_Base -l .. -o ../lib -u DDS CFT_Exception_Test_Connector"
-
-project(CFT_Exception_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen CFT_Exception_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=CFT_EXCEPTION_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=CFT_Exception_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=CFT_EXCEPTION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=CFT_Exception_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=CFT_EXCEPTION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=CFT_Exception_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=CFT_EXCEPTION_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=CFT_Exception_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Exception_Test_Connector.idl
-  }
-}
-
-project(CFT_Exception_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += CFT_Exception_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=CFT_EXCEPTION_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=CFT_Exception_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Exception_Test_ConnectorE.idl
-  }
-}
-
-project(CFT_Exception_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += CFT_Exception_Test_Connector_lem_gen CFT_Exception_Test_Connector_stub CFT_Exception_Test_Base_stub
-  libs  += CFT_Exception_Test_Base_stub CFT_Exception_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = CFT_Exception_Test_Connector_lem_stub
-  dynamicflags += CFT_EXCEPTION_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Exception_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Exception_Test_ConnectorEC.h
-    Exception_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Exception_Test_ConnectorEC.inl
-  }
-}
-
-project(CFT_Exception_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += CFT_Exception_Test_Connector_idl_gen CFT_Exception_Test_Base_stub
-  libs  += CFT_Exception_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = CFT_Exception_Test_Connector_stub
-  dynamicflags += CFT_EXCEPTION_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Exception_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Exception_Test_ConnectorC.h
-    Exception_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Exception_Test_ConnectorC.inl
-  }
-}
-
-project(CFT_Exception_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += CFT_Exception_Test_Connector_lem_stub CFT_Exception_Test_Connector_stub CFT_Exception_Test_Base_stub
-  sharedname = CFT_Exception_Test_Connector_exec
-  libs += CFT_Exception_Test_Connector_stub CFT_Exception_Test_Connector_lem_stub CFT_Exception_Test_Base_stub CFT_Exception_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CFT_EXCEPTION_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Exception_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Exception_Test_Connector_conn.h
-    Exception_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(CFT_Exception_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += CFT_Exception_Test_Connector_lem_stub CFT_Exception_Test_Connector_exec CFT_Exception_Test_Connector_stub
-  sharedname  = CFT_Exception_Test_Connector_svnt
-  libs       += CFT_Exception_Test_Connector_stub \
-                CFT_Exception_Test_Connector_lem_stub  \
-                CFT_Exception_Test_Base_stub \
-                CFT_Exception_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CFT_EXCEPTION_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Exception_Test_ConnectorS.cpp
-    Exception_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Exception_Test_ConnectorS.h
-    Exception_Test_Connector_svnt.h
-    Exception_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/Plan.cdp
deleted file mode 100644
index 66b371dbb3b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/Plan.cdp
+++ /dev/null
@@ -1,193 +0,0 @@
-<!--  -->
-<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>CFTTest_Depl</label>
-  <UUID>CFTTest_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFTTest_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFT_Exception_Test_CFTTestComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="CFT_Exception_Test_ConnectorImplementation">
-    <name>CFT_Exception_Test_ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="CFT_Exception_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="CFT_Exception_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_CFTExceptionTestConn_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFTExceptionTestConn_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFT_Exception_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFT_Exception_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-
-  <instance xmi:id="ComponentInstance">
-    <name>Component</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="CFT_Exception_Test_ConnectorInstance">
-    <name>CFT_Exception_Test_Connector</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CFT_Exception_Test_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ExceptionTopic</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>getter_filter_config</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>getter_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CFT_Exception_Test_ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="CFT_Exception_Test_Connector_ExecArtifact">
-    <name>CFT_Exception_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>CFT_Exception_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="CFT_Exception_Test_Connector_SvntArtifact">
-    <name>CFT_Exception_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>CFT_Exception_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="CFT_Exception_Test_Connector_StubArtifact">
-    <name>CFT_Exception_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>CFT_Exception_Test_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/run_test.pl
deleted file mode 100755
index 4b792aab84f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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 = ( "Component.ior", "Sender.ior" );
-@iorfiles = 0;
-@nodenames = ( "ComponentNode", "SenderNode" );
-
-# 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 10 seconds to allow task to complete\n";
-sleep (10);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/.gitignore b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/.gitignore
deleted file mode 100644
index ff64ba3a619..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-/ReadGet_StarterE.idl
-/ReadGet_Starter_exec_export.h
-/ReadGet_Starter_lem_stub_export.h
-/ReadGet_Starter_stub_export.h
-/ReadGet_Starter_svnt_export.h
-/ReadGet_Test_Base.cxx
-/ReadGet_Test_Base.h
-/ReadGet_Test_BasePlugin.cxx
-/ReadGet_Test_BasePlugin.h
-/ReadGet_Test_BaseSupport.cxx
-/ReadGet_Test_BaseSupport.h
-/ReadGet_Test_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.idl
deleted file mode 100644
index b61d30c7687..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file ReadGet_Starter.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERYCONDITION_STARTER_IDL
-#define QUERYCONDITION_STARTER_IDL
-
-#pragma ciao lem "Base/ReadGet_StarterE.idl"
-
-interface ReadGetStarter
-{
-  void set_reader_properties (in unsigned short nr_keys,
-                              in unsigned short nr_iterations);
-  void start_read (in unsigned short run);
-};
-
-interface ReadGetRestarter
-{
-  void restart_write ();
-};
-
-#endif /* QUERYCONDITION_STARTER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc
deleted file mode 100644
index 806cd6640ad..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc
+++ /dev/null
@@ -1,109 +0,0 @@
-project(CFT_ReadGet_Starter_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
-              -Wb,stub_export_include=ReadGet_Starter_stub_export.h \
-              -Wb,skel_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,skel_export_include=ReadGet_Starter_svnt_export.h \
-              -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,svnt_export_include=ReadGet_Starter_svnt_export.h \
-              -Wb,exec_export_macro=READER_STARTER_EXEC_Export \
-              -Wb,exec_export_include=ReadGet_Starter_exec_export.h -I..
-
-  IDL_Files {
-    ReadGet_Starter.idl
-  }
-}
-
-project(CFT_ReadGet_Starter_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += CFT_ReadGet_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \
-              -Wb,stub_export_include=ReadGet_Starter_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    ReadGet_StarterE.idl
-  }
-}
-
-project(CFT_ReadGet_Starter_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += CFT_ReadGet_Starter_lem_gen CFT_ReadGet_Starter_stub
-  libs  += CFT_ReadGet_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = CFT_ReadGet_Starter_lem_stub
-  dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_StarterEC.cpp
-  }
-
-  Header_Files {
-    ReadGet_StarterEC.h
-    ReadGet_Starter_lem_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_StarterEC.inl
-  }
-}
-
-project(CFT_ReadGet_Starter_stub) : ccm_stub, dds4ccm_base {
-  after += CFT_ReadGet_Starter_idl_gen
-  libs  +=
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = CFT_ReadGet_Starter_stub
-  dynamicflags += READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_StarterC.cpp
-  }
-
-  Header_Files {
-    ReadGet_StarterC.h
-    ReadGet_Starter_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_StarterC.inl
-  }
-}
-
-
-project(CFT_ReadGet_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += CFT_ReadGet_Starter_lem_stub CFT_ReadGet_Starter_stub
-  sharedname  = CFT_ReadGet_Starter_svnt
-  libs       += CFT_ReadGet_Starter_stub CFT_ReadGet_Starter_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += READER_STARTER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_StarterS.cpp
-    ReadGet_Starter_svnt.cpp
-  }
-
-  Header_Files {
-    ReadGet_StarterS.h
-    ReadGet_Starter_svnt.h
-    ReadGet_Starter_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl
deleted file mode 100644
index 7fadf380e9f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file ReadGet_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_TEST_BASE_IDL
-#define QUERY_CONDITION_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/ReadGet_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/ReadGet_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "QueryConditionTest"
-#pragma DCPS_DATA_KEY "QueryConditionTest symbol"
-
-struct QueryConditionTest {
-  string symbol; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<QueryConditionTest> QueryConditionTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.mpc
deleted file mode 100644
index 9feeba0ab26..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project(CFT_ReadGet_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = CFT_ReadGet_Test_Base_stub
-  dynamicflags += QUERY_CONDITION_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=QUERY_CONDITION_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=ReadGet_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    ReadGet_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=QUERY_CONDITION_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    ReadGet_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/.gitignore
deleted file mode 100644
index 652f3acd8d5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/ReadGet_Test_ConnectorE.idl
-/ReadGet_Test_Connector_conn.cpp
-/ReadGet_Test_Connector_conn.h
-/ReadGet_Test_Connector_conn_export.h
-/ReadGet_Test_Connector_lem_stub_export.h
-/ReadGet_Test_Connector_stub_export.h
-/ReadGet_Test_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl
deleted file mode 100644
index 7a280e41771..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file ReadGet_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_TEST_CONNECTOR_IDL_
-#define QUERY_CONDITION_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/ReadGet_Test_Base.idl"
-
-#pragma ciao lem "Connector/ReadGet_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/ReadGet_Test_BaseTypeSupport.idl"
-#endif
-
-module ReadGet_Test
-{
-  module ::CCM_DDS::Typed < ::QueryConditionTest, ::QueryConditionTestSeq> QueryConditionTestConnector;
-};
-
-#endif /* QUERY_CONDITION_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc
deleted file mode 100644
index 1b1e27f6218..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p ReadGet_Test_Base -l .. -o ../lib -u DDS ReadGet_Test_Connector"
-
-project(CFT_ReadGet_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen CFT_ReadGet_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=ReadGet_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=ReadGet_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=ReadGet_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=QUERY_CONDITION_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=ReadGet_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    ReadGet_Test_Connector.idl
-  }
-}
-
-project(CFT_ReadGet_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += CFT_ReadGet_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=ReadGet_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    ReadGet_Test_ConnectorE.idl
-  }
-}
-
-project(CFT_ReadGet_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += CFT_ReadGet_Test_Connector_lem_gen CFT_ReadGet_Test_Connector_stub \
-           CFT_ReadGet_Test_Base_stub
-  libs  += CFT_ReadGet_Test_Base_stub CFT_ReadGet_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = CFT_ReadGet_Test_Connector_lem_stub
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_ConnectorEC.h
-    ReadGet_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_Test_ConnectorEC.inl
-  }
-}
-
-project(CFT_ReadGet_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += CFT_ReadGet_Test_Connector_idl_gen CFT_ReadGet_Test_Base_stub
-  libs  += CFT_ReadGet_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = CFT_ReadGet_Test_Connector_stub
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_ConnectorC.h
-    ReadGet_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_Test_ConnectorC.inl
-  }
-}
-
-project(CFT_ReadGet_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += CFT_ReadGet_Test_Connector_lem_stub CFT_ReadGet_Test_Connector_stub \
-             CFT_ReadGet_Test_Base_stub
-  sharedname = CFT_ReadGet_Test_Connector_exec
-  libs += CFT_ReadGet_Test_Connector_stub CFT_ReadGet_Test_Connector_lem_stub \
-          CFT_ReadGet_Test_Base_stub CFT_ReadGet_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_Connector_conn.h
-    ReadGet_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(CFT_ReadGet_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += CFT_ReadGet_Test_Connector_lem_stub CFT_ReadGet_Test_Connector_exec \
-                CFT_ReadGet_Test_Connector_stub
-  sharedname  = CFT_ReadGet_Test_Connector_svnt
-  libs       += CFT_ReadGet_Test_Connector_stub \
-                CFT_ReadGet_Test_Connector_lem_stub  \
-                CFT_ReadGet_Test_Base_stub \
-                CFT_ReadGet_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_ConnectorS.cpp
-    ReadGet_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_ConnectorS.h
-    ReadGet_Test_Connector_svnt.h
-    ReadGet_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/README b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/README
deleted file mode 100644
index 3f742b997d4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/README
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-This test will test whether the ContentFilteredTopic
-on the DDS_Get and DDS_Read port works and that these ContentFilteredTopics are
-not shared among the ports.
-
-The sender writes a number of samples to DDS and informs the receiver the amount
-of samples written. The samples will stay in DDS (KEEP_ALL).
-The receiver than starts reading the samples.
-
-This test will also test whether the parameters can be changed and if so, whether
-they were changed correctly.
-
-The Sender writes a number of keys (adjustable by deployment plan) each with
-20 iterations (fixed) to DDS.
-
-#The test consists of three runs:
-1. No samples are written. Just test whether the correct exception is thrown and
-   that the filters are set correctly.
-2. The sender writes no. keys * 20 iterations to DDS and informs the Receiver
-   that these samples were written. Once read, the Receiver will set a new set of
-   query parameters. After that it'll inform the Sender that the next bunch of
-   samples can be written to DDS.
-3. Once written, the sender again will inform the Receiver that the samples were
-   written upon which the Receiver will start reading.
-
-#The following actions are taken by the Receiver component:
-1. Each run, it'll poll whether the last sample is received.
-2. If received, it performs the following tasks:
-  a. Invoke get_one on the getter of the Getter and get sample by sample.
-  b. Invoke the read_all on the reader of the Getter port.
-  c. Invoke the read_all on the reader of the Reader port.
-3. Everytime a unexpected sample is received an error message is written.
-4. Afterwards a status message is shown whether the correct number of samples
-   were read.
-
-#Queries:
-The queries are set by the deployment plan.
-The query expression for the getter (pull_observer_filter) looks like this:
-  ( (iteration > %0) AND (iteration < %1) )
-The query expression for the reader (passive_observer_filter) looks like this:
-  ( (iteration < %0) OR (iteration > %1) )
-
-The parameters during the second run are 2 and 5
-The parameters during the third run are 22 and 34
-
-#Regarding the received number of samples:
-
-- Get actions
-The Getter port should receive 2 samples during the second run and 11 during the
-third run but since all samples of the last key are read when polling for the
-latest sample in DDS and the Getter will only get unread samples, the getter
-should get (#keys - 1) * (2 + 11).
-
-- Read actions
-* On the reader port
-The amount of data read on the reader port depends on the number of iterations
-written.
-
-Filtered out during the second run : 2, 3, 4 and 5 (4 samples)
-Filtered out during the third run : 22-34 (13 samples)
-
-Since the reader also reads read samples, the samples read during the second run
-will also be read during the third run. So the total number of samples on the
-Reader port will be :
-  ((this->iterations_ - 4) * this->keys_ * 2) +
-  ((this->iterations_ - 13) * this->keys_)
-
-There'll be also a read action on the Getter port. This'll result in the same amount
-of samples as on the Getter port but the samples of the second run will be read
-twice and we don't need to decrement the number of keys with one since the Reader
-reads also read samples. The following formule determines the number of samples on
-the Getter port:
-  Filtered in during the second run : 3 and 4 (2 samples)
-  Filtered in during the third run : 22-34 (11 samples)
-
-  ((2 + 2 + 11) * this->keys_);
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/.gitignore
deleted file mode 100644
index 0adde6366f3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/ReadGet_Test_ReceiverE.idl
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.idl
deleted file mode 100644
index b9e00adc9fa..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/ReadGet_Test_Connector.idl"
-#include "Base/ReadGet_Starter.idl"
-
-module ReadGet_Test
-{
-  component Receiver
-  {
-    port QueryConditionTestConnector::DDS_Get get_port;
-
-    port QueryConditionTestConnector::DDS_Read read_port;
-
-    provides ReadGetStarter reader_start;
-    uses ReadGetRestarter writer_restart;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc
deleted file mode 100644
index 6f8f07619f3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc
+++ /dev/null
@@ -1,155 +0,0 @@
-project(CFT_ReadGet_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += CFT_ReadGet_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 {
-    ReadGet_Test_Receiver.idl
-  }
-}
-
-project(CFT_ReadGet_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += CFT_ReadGet_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 {
-    ReadGet_Test_ReceiverE.idl
-  }
-}
-
-project(CFT_ReadGet_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += CFT_ReadGet_Test_Receiver_lem_gen CFT_ReadGet_Test_Receiver_stub  \
-           CFT_ReadGet_Test_Connector_stub CFT_ReadGet_Test_Base_stub \
-           CFT_ReadGet_Starter_stub
-  libs  +=  Receiver_stub CFT_ReadGet_Test_Connector_stub \
-            CFT_ReadGet_Test_Base_stub CFT_ReadGet_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_Test_ReceiverEC.inl
-  }
-}
-
-project(CFT_ReadGet_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += CFT_ReadGet_Test_Receiver_idl_gen  CFT_ReadGet_Test_Connector_stub \
-           CFT_ReadGet_Test_Base_stub CFT_ReadGet_Test_Connector_lem_gen \
-           CFT_ReadGet_Starter_stub CFT_ReadGet_Starter_lem_stub
-  libs  += CFT_ReadGet_Test_Connector_stub CFT_ReadGet_Test_Base_stub \
-           CFT_ReadGet_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_Test_ReceiverC.inl
-  }
-}
-
-project(CFT_ReadGet_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += CFT_ReadGet_Test_Receiver_lem_stub CFT_ReadGet_Test_Receiver_stub \
-             CFT_ReadGet_Test_Base_stub CFT_ReadGet_Test_Connector_stub \
-             CFT_ReadGet_Test_Connector_lem_stub \
-             CFT_ReadGet_Starter_lem_stub CFT_ReadGet_Starter_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub CFT_ReadGet_Test_Base_stub \
-          CFT_ReadGet_Test_Connector_stub CFT_ReadGet_Test_Connector_lem_stub \
-          CFT_ReadGet_Starter_lem_stub CFT_ReadGet_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(CFT_ReadGet_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   CFT_ReadGet_Test_Receiver_lem_stub CFT_ReadGet_Test_Base_stub \
-                  CFT_ReadGet_Test_Connector_stub CFT_ReadGet_Test_Connector_svnt \
-                  CFT_ReadGet_Test_Receiver_exec CFT_ReadGet_Test_Connector_lem_stub \
-                  CFT_ReadGet_Starter_stub \
-                  CFT_ReadGet_Starter_svnt CFT_ReadGet_Starter_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub CFT_ReadGet_Test_Base_stub \
-                CFT_ReadGet_Test_Connector_stub CFT_ReadGet_Test_Connector_svnt \
-                Receiver_exec CFT_ReadGet_Test_Connector_lem_stub \
-                CFT_ReadGet_Starter_stub CFT_ReadGet_Starter_svnt \
-                CFT_ReadGet_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_ReceiverS.cpp
-    ReadGet_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_ReceiverS.h
-    ReadGet_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp
deleted file mode 100644
index 600cece9081..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,1004 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "ReadGet_Test_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-#define QUERY_GETTER_PORT "( (iteration > %0) AND (iteration < %1) )"
-#define QUERY_READER_PORT "( (iteration < %0) OR (iteration > %1) )"
-
-// initial values set in deploymentplan as well.
-// Need to be the same
-#define ITER1_VALUE1 "2"
-#define ITER1_VALUE2 "5"
-
-#define ITER2_VALUE1 "22"
-#define ITER2_VALUE2 "34"
-
-// Samples received on the getter port:
-// 2 during the first run.
-// 12 during the second run
-// Beware that the last key (key no 5) is
-// not read by the getter since this one is
-// already read during check_last
-// (see constructor Receiver_exec_i).
-#define SAMPLES_PER_KEY_GETTER (2 + 11)
-
-// Samples received on the Reader port depend on the
-// number of iterations send. The sender informs the
-// Receiver about this number by invoking set_reader_properties.
-// The number of expected samples on the receiver port are set
-// when the iterations are set (see Receiver_exec_i::iterations).
-// Besides this, this test also reads on the reader port. This'll
-// result in the same amount of samples of the read on the getter
-// port.
-
-namespace CIAO_ReadGet_Test_Receiver_Impl
-{
-  /**
-   * read_action_Generator
-   */
-
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback,
-                                                int run)
-    : callback_ (callback),
-      run_ (run)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Checking if last sample ")
-                          ACE_TEXT ("is available in DDS...\n")));
-    if (this->run_ == 1 || this->callback_.check_last ())
-      {
-        this->callback_.run (this->run_);
-      }
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: get_port_status_exec_i
-   */
-
-  get_port_status_exec_i::get_port_status_exec_i (
-        ::ReadGet_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::ReadGet_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  get_port_status_exec_i::~get_port_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  get_port_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  get_port_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: read_port_status_exec_i
-   */
-
-  read_port_status_exec_i::read_port_status_exec_i (
-        ::ReadGet_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::ReadGet_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  read_port_status_exec_i::~read_port_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  read_port_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  read_port_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: reader_start_exec_i
-   */
-
-  reader_start_exec_i::reader_start_exec_i (
-        ::ReadGet_Test::CCM_Receiver_Context_ptr ctx,
-        Receiver_exec_i & callback)
-    : ciao_context_ (
-        ::ReadGet_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  reader_start_exec_i::~reader_start_exec_i (void)
-  {
-  }
-
-  // Operations from ::ReadGetStarter
-
-  void
-  reader_start_exec_i::set_reader_properties (::CORBA::UShort nr_keys,
-  ::CORBA::UShort nr_iterations)
-  {
-    this->callback_.keys (nr_keys);
-    this->callback_.iterations (nr_iterations);
-  }
-
-  void
-  reader_start_exec_i::start_read (::CORBA::UShort run)
-  {
-    this->callback_.start_read (run);
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : iterations_ (20),
-      keys_ (5),
-      has_run_ (false),
-      current_iter_value1_ (ACE_OS::atoi (ITER1_VALUE1)),
-      current_iter_value2_ (ACE_OS::atoi (ITER1_VALUE2)),
-      ticker_ (0),
-      samples_expected_reader_ (0),
-      samples_received_reader_ (0),
-      samples_expected_getter_ (0),
-      samples_received_getter_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  bool
-  Receiver_exec_i::check_last ()
-  {
-    bool retvalue = false;
-    try
-      {
-        ::ReadGet_Test::QueryConditionTestConnector::Reader_var get_reader =
-          this->ciao_context_->get_connection_get_port_data ();
-        if (::CORBA::is_nil (get_reader.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_last - ")
-                                  ACE_TEXT ("Reader of DDS_Get is nil.\n")));
-            return false;
-          }
-        QueryConditionTest queryfiltertest_info;
-        ::CCM_DDS::ReadInfo readinfo;
-        char key[10];
-        ACE_OS::sprintf (key, "KEY_%d", this->keys_);
-        queryfiltertest_info.symbol = CORBA::string_dup (key);
-        get_reader->read_one_last (
-                queryfiltertest_info,
-                readinfo,
-                ::DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver_exec_i::check_last - ")
-                              ACE_TEXT ("last iteration <%d> - <%d>\n"),
-                              queryfiltertest_info.iteration,
-                              this->current_iter_value2_ - 1));
-        retvalue = queryfiltertest_info.iteration >= this->current_iter_value2_ - 1;
-      }
-    catch (const ::CCM_DDS::InternalError &)
-      {
-        retvalue = false;
-      }
-    catch (const ::CCM_DDS::NonExistent &)
-      {
-        retvalue = false;
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: "
-                              "ERROR: Unexpected exception caught\n"));
-        retvalue = false;
-      }
-    return retvalue;
-  }
-
-  // Supported operations and attributes.
-  void
-  Receiver_exec_i::check_iter_on_reader_port (const QueryConditionTest & sample)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ALL ON READER PORT : ")
-        ACE_TEXT ("sample received for <%C>: iteration <%u>\n"),
-        sample.symbol.in (),
-        sample.iteration));
-    if (sample.iteration > this->current_iter_value1_ &&
-        sample.iteration < this->current_iter_value2_ &&
-        sample.iteration > 20) //don't count the first run...
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL ON READER PORT : ")
-                              ACE_TEXT ("Didn't expect samples between ")
-                              ACE_TEXT ("%d and %d\n"),
-                              this->current_iter_value1_,
-                              this->current_iter_value2_));
-      }
-  }
-
-  void
-  Receiver_exec_i::check_iter_on_getter_port (const QueryConditionTest & sample,
-                                              const char * test)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%C ALL ON GETTER PORT : ")
-        ACE_TEXT ("sample received for <%C>: iteration <%u>\n"),
-        test,
-        sample.symbol.in (),
-        sample.iteration));
-    if (sample.iteration <= ACE_OS::atoi (ITER1_VALUE1))
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: %C ALL ON GETTER PORT : ")
-                              ACE_TEXT ("Didn't expect samples with iterations ")
-                              ACE_TEXT ("<= %d\n"),
-                              test,
-                              this->current_iter_value1_));
-      }
-    if (sample.iteration > this->current_iter_value2_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: %C ALL ON GETTER PORT : ")
-                              ACE_TEXT ("Didn't expect samples with iterations ")
-                              ACE_TEXT ("> %d\n"),
-                              test,
-                              this->current_iter_value2_));
-      }
-  }
-
-  void
-  Receiver_exec_i::read_all_on_reader_port (void)
-  {
-    ::ReadGet_Test::QueryConditionTestConnector::Reader_var read_reader =
-      this->ciao_context_->get_connection_read_port_data ();
-
-    if (::CORBA::is_nil (read_reader))
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Receiver_exec_i::read_all_on_reader_port - ")
-                              ACE_TEXT ("ERROR: No Reader on Reader port\n")));
-        return;
-      }
-    QueryConditionTestSeq queryfiltertest_info_seq;
-    ::CCM_DDS::ReadInfoSeq readinfo_seq;
-    read_reader->read_all (queryfiltertest_info_seq, readinfo_seq);
-    if (queryfiltertest_info_seq.length () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR : Receiver_exec_i::read_all_on_reader_port : ")
-                              ACE_TEXT ("No samples available in Reader!\n")));
-      }
-    for (CORBA::ULong it = 0; it < queryfiltertest_info_seq.length (); ++it)
-      {
-        this->check_iter_on_reader_port (queryfiltertest_info_seq[it]);
-      }
-    this->samples_received_reader_ += queryfiltertest_info_seq.length ();
-  }
-
-  void
-  Receiver_exec_i::read_all_on_getter_port (void)
-  {
-    ::ReadGet_Test::QueryConditionTestConnector::Reader_var get_reader =
-      this->ciao_context_->get_connection_get_port_data ();
-
-    if (::CORBA::is_nil (get_reader))
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::read_all_on_getter_port - ")
-                              ACE_TEXT ("No Reader on Getter port\n")));
-        return;
-      }
-    QueryConditionTestSeq queryfiltertest_info_seq;
-    ::CCM_DDS::ReadInfoSeq readinfo_seq;
-    get_reader->read_all (queryfiltertest_info_seq, readinfo_seq);
-    if (queryfiltertest_info_seq.length () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR : Receiver_exec_i::read_all_on_getter_port : ")
-                              ACE_TEXT ("No samples available in Reader!\n")));
-      }
-    for (CORBA::ULong it = 0; it < queryfiltertest_info_seq.length (); ++it)
-      {
-        this->check_iter_on_getter_port (queryfiltertest_info_seq[it], "READ");
-      }
-    this->samples_received_reader_ += queryfiltertest_info_seq.length ();
-  }
-
-  void
-  Receiver_exec_i::get_all_on_getter_port (void)
-  {
-    ::ReadGet_Test::QueryConditionTestConnector::Getter_var get_getter =
-      this->ciao_context_->get_connection_get_port_fresh_data ();
-
-    if (::CORBA::is_nil (get_getter))
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::get_all_on_getter_port - ")
-                              ACE_TEXT ("No Getter on Getter port\n")));
-        return;
-      }
-    // Set time_out on getter
-    DDS::Duration_t to;
-    to.sec = 5;
-    to.nanosec = 0;
-    get_getter->time_out (to);
-
-    QueryConditionTest_var qf_info;
-    ::CCM_DDS::ReadInfo readinfo;
-    CORBA::Boolean result = get_getter->get_one (qf_info.out (), readinfo);
-    if (result)
-      {
-        if (ACE_OS::strlen (qf_info->symbol.in ()) == 0)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::get_all_on_getter_port - ")
-                                  ACE_TEXT ("Name of key seems to be empty-> bailing out\n")));
-            return;
-          }
-        this->check_iter_on_getter_port (*qf_info, "GET");
-        ++this->samples_received_getter_;
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::get_all_on_getter_port - ")
-                              ACE_TEXT ("time out when retrieving ")
-                              ACE_TEXT ("first sample.\n")));
-      }
-    while (result)
-      {
-        result = get_getter->get_one (qf_info.out (), readinfo);
-        if (result)
-          {
-            this->check_iter_on_getter_port (*qf_info, "GET");
-            ++this->samples_received_getter_;
-          }
-      }
-  }
-
-  void
-  Receiver_exec_i::test_all ()
-  {
-    const char * test = "GET ALL";
-    try
-      {
-        get_all_on_getter_port ();
-        ACE_DEBUG ((LM_DEBUG, "=================================="
-                              "==================================\n"));
-
-        test = "READ ALL GETTER";
-        read_all_on_getter_port ();
-        ACE_DEBUG ((LM_DEBUG, "=================================="
-                              "==================================\n"));
-
-        test = "READ ALL READER";
-        read_all_on_reader_port ();
-        ACE_DEBUG ((LM_DEBUG, "=================================="
-                              "==================================\n"));
-      }
-    catch (const CCM_DDS::NonExistent& ex)
-      {
-        for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ERROR %C: ")
-                  ACE_TEXT ("caught expected exception: index <%u>\n"),
-                  test,
-                  ex.indexes[i]));
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: %C: ")
-              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-              test,
-              ex.error_code));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception (test);
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::test_all : Exception caught\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::check_filter ()
-  {
-    this->check_filter_getter ();
-    this->check_filter_reader ();
-  }
-
-  void
-  Receiver_exec_i::check_filter_getter (void)
-  {
-    ::CCM_DDS::QueryFilter_var filter;
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver_exec_i::check_filter <GETTER> - ")
-                          ACE_TEXT ("checking filter\n")));
-
-    try
-      {
-        ::ReadGet_Test::QueryConditionTestConnector::Getter_var get_getter =
-          this->ciao_context_->get_connection_get_port_fresh_data ();
-        if (::CORBA::is_nil (get_getter.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <GETTER> - ")
-                                  ACE_TEXT ("Unable to get getter interface\n")));
-            throw ::CCM_DDS::InternalError ();
-          }
-        CORBA::Object_var cmp = get_getter->_get_component ();
-        if (::CORBA::is_nil (cmp.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <GETTER> - ")
-                                  ACE_TEXT ("Unable to get component interface\n")));
-            throw ::CCM_DDS::InternalError ();
-          }
-        ::ReadGet_Test::QueryConditionTestConnector::CCM_DDS_State_var conn =
-          ::ReadGet_Test::QueryConditionTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <GETTER> - ")
-                                  ACE_TEXT ("Unable to narrow connector interface\n")));
-            throw ::CCM_DDS::InternalError ();
-          }
-
-        filter = conn->pull_observer_filter ();
-        if (!filter)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <GETTER> - ")
-                                  ACE_TEXT ("Filter is nil\n")));
-            return;
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <GETTER> - ")
-                              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-                              ex.error_code));
-        return;
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Receiver_exec_i::check_filter: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <GETTER> - ")
-                              ACE_TEXT ("Exception caught\n")));
-        return;
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <GETTER> - ")
-                              ACE_TEXT ("caught unknown exception\n")));
-        return;
-      }
-
-    //check query
-    bool error = false;
-    ::CORBA::String_var expression = filter->expression.in ();
-    if (ACE_OS::strcmp (expression.in (), QUERY_GETTER_PORT) != 0)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <GETTER> - ")
-                              ACE_TEXT ("Unexpected query when retrieving filter: ")
-                              ACE_TEXT ("expected <%C> - received <%C>\n"),
-                              QUERY_GETTER_PORT, expression.in ()));
-        error = true;
-      }
-    //check current parameters.
-    if (filter->parameters.length () != 2)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <GETTER> - ")
-                              ACE_TEXT ("Unexpected number of parameters: ")
-                              ACE_TEXT ("expected <%d> - received <%d>\n"),
-                              2, filter->parameters.length ()));
-        error = true;
-      }
-
-    if (filter->parameters.length () >= 1)
-      {
-        CORBA::String_var param = ::CORBA::string_dup (filter->parameters[0].in ());
-        if (ACE_OS::atoi (param.in ()) != this->current_iter_value1_)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <GETTER> - ")
-                                  ACE_TEXT ("Unexpected param value: ")
-                                  ACE_TEXT ("expected <%d> - received <%C>\n"),
-                                  this->current_iter_value1_,
-                                  param.in ()));
-            error = true;
-          }
-      }
-    if (filter->parameters.length () >= 2)
-      {
-        CORBA::String_var param = ::CORBA::string_dup (filter->parameters[1].in ());
-        if (ACE_OS::atoi (param.in ()) != this->current_iter_value2_)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <GETTER> - ")
-                                  ACE_TEXT ("Unexpected param value: ")
-                                  ACE_TEXT ("expected <%d> - received <%C>\n"),
-                                  this->current_iter_value2_,
-                                  param.in ()));
-            error = true;
-          }
-      }
-    if (!error)
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver_exec_i::check_filter <GETTER> - ")
-                              ACE_TEXT ("Passed check_filter test.\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::check_filter_reader (void)
-  {
-    ::CCM_DDS::QueryFilter_var filter;
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver_exec_i::check_filter <READER> - ")
-                          ACE_TEXT ("checking filter\n")));
-
-    try
-      {
-        ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader =
-          this->ciao_context_->get_connection_read_port_data ();
-        if (::CORBA::is_nil (reader.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <READER> - ")
-                                  ACE_TEXT ("Unable to get getter interface\n")));
-            throw ::CCM_DDS::InternalError ();
-          }
-        CORBA::Object_var cmp = reader->_get_component ();
-        if (::CORBA::is_nil (cmp.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <READER> - ")
-                                  ACE_TEXT ("Unable to get component interface\n")));
-            throw ::CCM_DDS::InternalError ();
-          }
-        ::ReadGet_Test::QueryConditionTestConnector::CCM_DDS_State_var conn =
-          ::ReadGet_Test::QueryConditionTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <READER> - ")
-                                  ACE_TEXT ("Unable to narrow connector interface\n")));
-            throw ::CCM_DDS::InternalError ();
-          }
-
-        filter = conn->passive_observer_filter ();
-        if (!filter)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <READER> - ")
-                                  ACE_TEXT ("Filter is nil\n")));
-            return;
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <READER> - ")
-                              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-                              ex.error_code));
-        return;
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Receiver_exec_i::check_filter: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <READER> - ")
-                              ACE_TEXT ("Exception caught\n")));
-        return;
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <READER> - ")
-                              ACE_TEXT ("caught unknown exception\n")));
-        return;
-      }
-
-    //check query
-    bool error = false;
-    ::CORBA::String_var expression = ::CORBA::string_dup (filter->expression.in  ());
-    if (ACE_OS::strcmp (expression.in (), QUERY_READER_PORT) != 0)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <READER> - ")
-                              ACE_TEXT ("Unexpected query when retrieving filter: ")
-                              ACE_TEXT ("expected <%C> - received <%C>\n"),
-                              QUERY_READER_PORT, expression.in ()));
-        error = true;
-      }
-    //check current parameters.
-    if (filter->parameters.length () != 2)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <READER> - ")
-                              ACE_TEXT ("Unexpected number of parameters: ")
-                              ACE_TEXT ("expected <%d> - received <%d>\n"),
-                              2, filter->parameters.length ()));
-        error = true;
-      }
-
-    if (filter->parameters.length () >= 1)
-      {
-        CORBA::String_var param = ::CORBA::string_dup (filter->parameters[0].in ());
-        if (ACE_OS::atoi (param.in ()) != this->current_iter_value1_)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <READER> - ")
-                                  ACE_TEXT ("Unexpected param value: ")
-                                  ACE_TEXT ("expected <%d> - received <%C>\n"),
-                                  this->current_iter_value1_,
-                                  param.in ()));
-            error = true;
-          }
-      }
-    if (filter->parameters.length () >= 2)
-      {
-        CORBA::String_var param = ::CORBA::string_dup (filter->parameters[1].in ());
-        if (ACE_OS::atoi (param.in ()) != this->current_iter_value2_)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <READER> - ")
-                                  ACE_TEXT ("Unexpected param value: ")
-                                  ACE_TEXT ("expected <%d> - received <%C>\n"),
-                                  this->current_iter_value2_,
-                                  param.in ()));
-            error = true;
-          }
-      }
-    if (!error)
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver_exec_i::check_filter <READER> - ")
-                              ACE_TEXT ("Passed check_filter test.\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::test_set_query_parameters ()
-  {
-    try
-      {
-        ::CCM_DDS::ContentFilterSetting_var get_filter_setting =
-          this->ciao_context_->get_connection_get_port_filter_config ();
-        if (::CORBA::is_nil (get_filter_setting.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::test_set_query_parameters - ")
-                                  ACE_TEXT ("Filter config interface for Getter port is nil.\n")));
-            throw ::CCM_DDS::InternalError ();
-          }
-        ::CCM_DDS::ContentFilterSetting_var read_filter_setting =
-          this->ciao_context_->get_connection_read_port_filter_config ();
-        if (::CORBA::is_nil (read_filter_setting.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::test_set_query_parameters - ")
-                                  ACE_TEXT ("Filter config interface for Reader port is nil.\n")));
-            throw ::CCM_DDS::InternalError ();
-          }
-
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver_exec_i::test_set_query_parameters: Set parameters\n")));
-        ::DDS::StringSeq parameters;
-        parameters.length (2);
-        parameters[0] = ::CORBA::string_dup (ITER2_VALUE1);
-        parameters[1] = ::CORBA::string_dup (ITER2_VALUE2);
-        get_filter_setting->set_filter_parameters (parameters);
-        read_filter_setting->set_filter_parameters (parameters);
-
-        this->current_iter_value1_ = ACE_OS::atoi (ITER2_VALUE1);
-        this->current_iter_value2_ = ACE_OS::atoi (ITER2_VALUE2);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("DONE Receiver_exec_i::test_set_query_parameters\n")));
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::test_set_query_parameters - ")
-                              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-                              ex.error_code));
-        return;
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Receiver_exec_i::test_set_query_parameters: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::test_set_query_parameters - ")
-                              ACE_TEXT ("Exception caught\n")));
-        return;
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::test_set_query_parameters - ")
-                              ACE_TEXT ("caught unknown exception\n")));
-        return;
-      }
-  }
-
-  void
-  Receiver_exec_i::start_read (CORBA::UShort run)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      read_action_Generator (*this, run),
-                      ::CORBA::INTERNAL ());
-
-    if (this->reactor ()->schedule_timer (this->ticker_,
-                                          0,
-                                          ACE_Time_Value(1, 0),
-                                          ACE_Time_Value(1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to schedule Timer\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::run (CORBA::UShort run)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-
-    ReadGetRestarter_var restarter = this->ciao_context_->get_connection_writer_restart ();
-    if (::CORBA::is_nil (restarter.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::run - ")
-                              ACE_TEXT ("Unable to start run since restarter ")
-                              ACE_TEXT ("is nil.\n")));
-        return;
-      }
-
-    this->has_run_ = true;
-
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver_exec_i::run - ")
-                          ACE_TEXT ("Starting run number <%d>\n"),
-                          run));
-    switch (run)
-    {
-      case 1:
-        {
-          check_filter ();
-          restarter->restart_write ();
-        }
-        break;
-      case 2:
-        {
-          test_all ();
-          check_filter ();
-          test_set_query_parameters ();
-          restarter->restart_write ();
-        }
-        break;
-      case 3:
-        {
-          test_all ();
-          check_filter ();
-        }
-        break;
-    }
-  }
-
-  void
-  Receiver_exec_i::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-    // during first iteration, 2,3,4 and 5 are filtered out
-    // during the second iteration 22-34 are fitered out but the
-    // iterations of the first run are also received during the
-    // second run
-    // The last addition is from the read action on the getter port.
-    // During the first run, two samples are received. The second run
-    // includes the two samples from the first run and 11 samples (22-34)
-    // from the second run.
-    this->samples_expected_reader_ =
-      ((this->iterations_ - 4) * this->keys_ * 2) +
-      ((this->iterations_ - 13) * this->keys_) +
-      ((2 + 2 + 11) * this->keys_);
-  }
-
-  void
-  Receiver_exec_i::keys (::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-    this->samples_expected_getter_ = (keys_ - 1) * SAMPLES_PER_KEY_GETTER;
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_get_port_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_get_port_status_.in ()))
-      {
-        get_port_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          get_port_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_get_port_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_get_port_status_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_read_port_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_read_port_status_.in ()))
-      {
-        read_port_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          read_port_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_read_port_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_read_port_status_.in ());
-  }
-
-  ::CCM_ReadGetStarter_ptr
-  Receiver_exec_i::get_reader_start (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_reader_start_.in ()))
-      {
-        reader_start_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          reader_start_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_ReadGetStarter::_nil ());
-
-          this->ciao_reader_start_ = tmp;
-      }
-
-    return
-      ::CCM_ReadGetStarter::_duplicate (
-        this->ciao_reader_start_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::ReadGet_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->samples_received_reader_ != this->samples_expected_reader_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: READGET READER: "
-                              "Unexpected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_reader_,
-                              this->samples_received_reader_));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "READGET READER: "
-                              "Expected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_reader_,
-                              this->samples_received_reader_));
-      }
-    if (this->samples_received_getter_ != this->samples_expected_getter_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: READGET GETTER: "
-                              "Unexpected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_getter_,
-                              this->samples_received_getter_));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "READGET GETTER: "
-                              "Expected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_getter_,
-                              this->samples_received_getter_));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_ReadGet_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/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h
deleted file mode 100644
index 424abbe32c5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h
+++ /dev/null
@@ -1,256 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_READGET_TEST_RECEIVER_EXEC_MX3XMT_H_
-#define CIAO_READGET_TEST_RECEIVER_EXEC_MX3XMT_H_
-
-#include /**/ "ace/pre.h"
-
-#include "ReadGet_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_ReadGet_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  /**
-   * read_action_Generator
-   */
-
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback,
-                           int run);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Receiver_exec_i &callback_;
-    int run_;
-
-  };
-
-  /**
-   * Provider Executor Implementation Class: get_port_status_exec_i
-   */
-
-  class get_port_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    get_port_status_exec_i (
-      ::ReadGet_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~get_port_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::ReadGet_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: read_port_status_exec_i
-   */
-
-  class read_port_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    read_port_status_exec_i (
-      ::ReadGet_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~read_port_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::ReadGet_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: reader_start_exec_i
-   */
-
-  class reader_start_exec_i
-    : public virtual ::CCM_ReadGetStarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    reader_start_exec_i (
-      ::ReadGet_Test::CCM_Receiver_Context_ptr ctx,
-      Receiver_exec_i & callback);
-    virtual ~reader_start_exec_i (void);
-
-    //@{
-    /** Operations and attributes from ReadGetStarter. */
-
-    virtual
-    void set_reader_properties (::CORBA::UShort nr_keys,
-    ::CORBA::UShort nr_iterations);
-
-    virtual
-    void start_read (::CORBA::UShort run);
-    //@}
-
-  private:
-    ::ReadGet_Test::CCM_Receiver_Context_var ciao_context_;
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_get_port_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_read_port_status (void);
-
-    virtual ::CCM_ReadGetStarter_ptr
-    get_reader_start (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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void iterations (::CORBA::UShort iterations);
-    void keys (::CORBA::UShort keys);
-
-    bool check_last ();
-    void start_read (CORBA::UShort run);
-    void run (CORBA::UShort run);
-    //@}
-
-  private:
-    ::ReadGet_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_get_port_status_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_read_port_status_;
-    ::CCM_ReadGetStarter_var ciao_reader_start_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    CORBA::UShort   iterations_;
-    CORBA::UShort   keys_;
-    bool            has_run_;
-
-    int current_iter_value1_;
-    int current_iter_value2_;
-
-    read_action_Generator *ticker_;
-
-    CORBA::ULong samples_expected_reader_;
-    CORBA::ULong samples_received_reader_;
-    CORBA::ULong samples_expected_getter_;
-    CORBA::ULong samples_received_getter_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void test_all (void);
-    void read_all_on_getter_port (void);
-    void get_all_on_getter_port (void);
-    void read_all_on_reader_port (void);
-    void check_iter_on_getter_port (const QueryConditionTest & sample,
-                                    const char * test);
-    void check_iter_on_reader_port (const QueryConditionTest & sample);
-
-    void check_filter (void);
-    void check_filter_reader (void);
-    void check_filter_getter (void);
-    void test_set_query_parameters (void);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_ReadGet_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.idl
deleted file mode 100644
index 7c4c9a22ae9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_QUERY_CONDITION_TEST_SENDER_IDL
-#define DDS_QUERY_CONDITION_TEST_SENDER_IDL
-
-#include "Connector/ReadGet_Test_Connector.idl"
-#include "Base/ReadGet_Starter.idl"
-
-module ReadGet_Test
-{
-  component Sender
-  {
-    port ReadGet_Test::QueryConditionTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener sender_connector_status;
-
-    uses ReadGetStarter start_reader;
-    provides ReadGetRestarter restart_writer;
-
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc
deleted file mode 100644
index f0cd858c212..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc
+++ /dev/null
@@ -1,153 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p ReadGet_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(CFT_ReadGet_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += CFT_ReadGet_Test_Connector_idl_gen CFT_ReadGet_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 {
-    ReadGet_Test_Sender.idl
-  }
-}
-
-project(CFT_ReadGet_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += CFT_ReadGet_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 {
-    ReadGet_Test_SenderE.idl
-  }
-}
-
-project(CFT_ReadGet_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += CFT_ReadGet_Test_Sender_lem_gen CFT_ReadGet_Test_Sender_stub \
-           CFT_ReadGet_Test_Base_stub CFT_ReadGet_Starter_stub
-  libs  += CFT_ReadGet_Test_Base_stub Sender_stub CFT_ReadGet_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_Test_SenderEC.inl
-  }
-}
-
-project(CFT_ReadGet_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += CFT_ReadGet_Test_Sender_idl_gen CFT_ReadGet_Test_Base_stub \
-           CFT_ReadGet_Test_Connector_stub CFT_CFT_ReadGet_Starter_stub \
-           CFT_CFT_ReadGet_Starter_lem_stub
-  libs  += CFT_ReadGet_Test_Base_stub CFT_ReadGet_Test_Connector_stub \
-           CFT_ReadGet_Starter_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_Test_SenderC.inl
-  }
-}
-
-project(CFT_ReadGet_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += CFT_ReadGet_Test_Sender_lem_stub CFT_ReadGet_Test_Sender_stub \
-             CFT_ReadGet_Test_Connector_lem_stub CFT_ReadGet_Test_Connector_stub \
-             CFT_ReadGet_Starter_lem_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub CFT_ReadGet_Test_Base_stub \
-             CFT_ReadGet_Test_Connector_lem_stub CFT_ReadGet_Test_Connector_stub \
-             CFT_ReadGet_Starter_stub CFT_ReadGet_Starter_lem_stub \
-             CFT_ReadGet_Starter_lem_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(CFT_ReadGet_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += CFT_ReadGet_Test_Base_stub  CFT_ReadGet_Test_Sender_lem_stub \
-                CFT_ReadGet_Test_Connector_stub \
-                CFT_ReadGet_Test_Connector_svnt CFT_ReadGet_Test_Connector_lem_stub \
-                CFT_ReadGet_Starter_stub CFT_ReadGet_Starter_svnt \
-                CFT_ReadGet_Starter_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub CFT_ReadGet_Test_Base_stub \
-                CFT_ReadGet_Test_Connector_stub CFT_ReadGet_Test_Connector_svnt \
-                CFT_ReadGet_Test_Connector_lem_stub CFT_ReadGet_Starter_stub \
-                CFT_ReadGet_Starter_svnt CFT_ReadGet_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_SenderS.cpp
-    ReadGet_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_SenderS.h
-    ReadGet_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp
deleted file mode 100644
index 15937591fce..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,338 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "ReadGet_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#define ITERATIONS 20
-
-namespace CIAO_ReadGet_Test_Sender_Impl
-{
-  /**
-   * WriteHandler
-   */
-
-  WriteHandler::WriteHandler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteHandler::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.start ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: restart_writer_exec_i
-   */
-
-  restart_writer_exec_i::restart_writer_exec_i (
-        ::ReadGet_Test::CCM_Sender_Context_ptr ctx,
-        Sender_exec_i & callback)
-    : ciao_context_ (
-        ::ReadGet_Test::CCM_Sender_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  restart_writer_exec_i::~restart_writer_exec_i (void)
-  {
-  }
-
-  // Operations from ::ReadGetRestarter
-
-  void
-  restart_writer_exec_i::restart_write (void)
-  {
-    this->callback_.restart ();
-  }
-
-  /**
-   * Component Executor Implementation Class: ConnectorStatusListener_exec_i
-   */
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Sender_exec_i &callback)
-    : callback_ (callback)
-    , started_ (false)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (!this->started_ && status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        this->started_ = true;
-        this->callback_.get_started ();
-      }
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (5)
-      , iterations_ (ITERATIONS)
-      , run_ (1)
-      , wh_ (0)
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  // Component attributes and port operations.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  ::CCM_ReadGetRestarter_ptr
-  Sender_exec_i::get_restart_writer (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_restart_writer_.in ()))
-      {
-        restart_writer_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          restart_writer_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_ReadGetRestarter::_nil ());
-
-          this->ciao_restart_writer_ = tmp;
-      }
-
-    return
-      ::CCM_ReadGetRestarter::_duplicate (
-        this->ciao_restart_writer_.in ());
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_sender_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (*this);
-  }
-
-  void
-  Sender_exec_i::restart (void)
-  {
-    ++this->run_;
-    delete this->wh_;
-    ACE_NEW_THROW_EX (this->wh_,
-                      WriteHandler (*this),
-                      CORBA::INTERNAL ());
-    this->reactor ()->notify (this->wh_);
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    ::ReadGet_Test::QueryConditionTestConnector::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-    ReadGetStarter_var starter =
-      this->ciao_context_->get_connection_start_reader ();
-
-    if (::CORBA::is_nil (starter.in ()) ||
-        ::CORBA::is_nil (writer.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender_exec_i::start - ")
-                              ACE_TEXT ("Unable to start the reader\n")));
-        return;
-      }
-    starter->set_reader_properties (this->keys_, this->iterations_);
-
-    if (this->run_ > 1)
-      {
-        for (CORBA::UShort iter_key = 1; iter_key < this->keys_ + 1; ++iter_key)
-          {
-            char key[7];
-            QueryConditionTest new_key;
-            ACE_OS::sprintf (key, "KEY_%d", iter_key);
-            new_key.symbol = CORBA::string_dup(key);
-            CORBA::UShort iter = 1;
-            if (this->run_ == 3)
-              {
-                iter = this->iterations_ + 1;
-              }
-            while (iter < (this->run_ - 1) * this->iterations_ + 1)
-              {
-                new_key.iteration = iter;
-                writer->write_one (new_key, ::DDS::HANDLE_NIL);
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written key <%C> with <%d>\n"),
-                            key, iter));
-                ++iter;
-              }
-          }
-        ACE_OS::sleep (1);
-      }
-    starter->start_read (this->run_);
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    try
-      {
-        ACE_NEW_THROW_EX (this->wh_,
-                          WriteHandler (*this),
-                          CORBA::INTERNAL ());
-        this->reactor ()->notify (this->wh_);
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: GET_CONNECTION_START_READER : Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: GET_CONNECTION_START_READER : Unknown exception caught\n")));
-      }
-  }
-
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::ReadGet_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    delete this->wh_;
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_ReadGet_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/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h
deleted file mode 100644
index 48723c18067..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h
+++ /dev/null
@@ -1,195 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_READGET_TEST_SENDER_EXEC_2M2XYF_H_
-#define CIAO_READGET_TEST_SENDER_EXEC_2M2XYF_H_
-
-#include /**/ "ace/pre.h"
-
-#include "ReadGet_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_ReadGet_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * WriteHandler
-   */
-  class WriteHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteHandler (Sender_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: restart_writer_exec_i
-   */
-
-  class restart_writer_exec_i
-    : public virtual ::CCM_ReadGetRestarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    restart_writer_exec_i (
-      ::ReadGet_Test::CCM_Sender_Context_ptr ctx,
-      Sender_exec_i & callback);
-    virtual ~restart_writer_exec_i (void);
-
-    //@{
-    /** Operations and attributes from ReadGetRestarter. */
-
-    virtual
-    void restart_write (void);
-    //@}
-
-  private:
-    ::ReadGet_Test::CCM_Sender_Context_var ciao_context_;
-    Sender_exec_i & callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-    bool started_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_ReadGetRestarter_ptr
-    get_restart_writer (void);
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_sender_connector_status (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void get_started (void);
-    void start (void);
-    void restart (void);
-    //@}
-
-  private:
-    ::ReadGet_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_ReadGetRestarter_var ciao_restart_writer_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    CORBA::UShort iterations_;
-    CORBA::UShort run_;
-    WriteHandler *wh_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_ReadGet_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/Plan.cdp
deleted file mode 100644
index a972b294dd1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/Plan.cdp
+++ /dev/null
@@ -1,622 +0,0 @@
-<!--  -->
-<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>ReadGet_Test_Depl_1</label>
-  <UUID>ReadGet_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_ReadGet_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_ReadGet_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="ReadGet_Test_ReceiverConnectorImplementation">
-    <name>ReadGet_Test_ReceiverConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="ReadGet_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="ReadGet_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_ReadGet_Test_QueryConditionTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ReadGet_Test_QueryConditionTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFT_ReadGet_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFT_ReadGet_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="ReadGet_Test_SenderConnectorImplementation">
-    <name>ReadGet_Test_ReceiverConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="ReadGet_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="ReadGet_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_ReadGet_Test_QueryConditionTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ReadGet_Test_QueryConditionTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFT_ReadGet_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFT_ReadGet_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_ReadGet_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_ReadGet_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="ReadGet_Test_SenderConnectorInstance">
-    <name>ReadGet_Test_SenderConnector</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReadGet_Test_SenderConnectorImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QueryCondition_Library#QueryConditionProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReadGet_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="ReadGet_Test_ReceiverConnectorInstance">
-    <name>ReadGet_Test_ReceiverConnector</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReadGet_Test_ReceiverConnectorImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QueryCondition_Library#QueryConditionProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReadGet_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>pull_observer_filter</name>
-      <value>
-        <type>
-          <kind>tk_struct</kind>
-          <struct>
-            <name>QueryFilter</name>
-            <typeId>IDL:CCM_DDS/QueryFilter:1.0</typeId>
-            <member>
-              <name>expression</name>
-              <type>
-                <kind>tk_string</kind>
-              </type>
-            </member>
-            <member>
-              <name>parameters</name>
-              <type>
-                <kind>tk_sequence</kind>
-                <sequence>
-                  <elementType>
-                    <kind>tk_string</kind>
-                  </elementType>
-                </sequence>
-              </type>
-            </member>
-          </struct>
-        </type>
-        <value>
-          <member>
-            <name>expression</name>
-            <value>
-              <string>( (iteration > %0) AND (iteration &lt; %1) )</string>
-            </value>
-          </member>
-          <member>
-            <name>parameters</name>
-            <value>
-              <element>
-                <string>2</string>
-              </element>
-              <element>
-                <string>5</string>
-              </element>
-            </value>
-          </member>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>passive_observer_filter</name>
-      <value>
-        <type>
-          <kind>tk_struct</kind>
-          <struct>
-            <name>QueryFilter</name>
-            <typeId>IDL:CCM_DDS/QueryFilter:1.0</typeId>
-            <member>
-              <name>expression</name>
-              <type>
-                <kind>tk_string</kind>
-              </type>
-            </member>
-            <member>
-              <name>parameters</name>
-              <type>
-                <kind>tk_sequence</kind>
-                <sequence>
-                  <elementType>
-                    <kind>tk_string</kind>
-                  </elementType>
-                </sequence>
-              </type>
-            </member>
-          </struct>
-        </type>
-        <value>
-          <member>
-            <name>expression</name>
-            <value>
-              <string>( (iteration &lt; %0) OR (iteration > %1) )</string>
-            </value>
-          </member>
-          <member>
-            <name>parameters</name>
-            <value>
-              <element>
-                <string>2</string>
-              </element>
-              <element>
-                <string>5</string>
-              </element>
-            </value>
-          </member>
-        </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_ushort</kind>
-        </type>
-        <value>
-          <ushort>8</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>read_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>read_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReadGet_Test_ReceiverConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>get_port_fresh_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReadGet_Test_ReceiverConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>get_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReadGet_Test_ReceiverConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>get_port_filter_config</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReadGet_Test_ReceiverConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>read_port_filter_config</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>read_port_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReadGet_Test_ReceiverConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="ReadGet_Test_SenderConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>reader_starter</name>
-    <internalEndpoint>
-      <portName>start_reader</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>reader_start</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>restart_writer</name>
-    <internalEndpoint>
-      <portName>writer_restart</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>restart_writer</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>sender_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>sender_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReadGet_Test_SenderConnectorInstance" />
-    </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="ReadGet_Test_Connector_ExecArtifact">
-    <name>CFT_ReadGet_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>CFT_ReadGet_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="ReadGet_Test_Connector_SvntArtifact">
-    <name>CFT_ReadGet_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>CFT_ReadGet_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="ReadGet_Test_Connector_StubArtifact">
-    <name>CFT_ReadGet_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>ReadGet_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/ContentFilteredTopic/ReadGet/descriptors/QueryCondition_Library.xml b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/QueryCondition_Library.xml
deleted file mode 100644
index b9cba6277a3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/QueryCondition_Library.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="QueryConditionProfile">
-    <!-- QoS used to configure the data writer created in the example code -->
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 37e7ff8dec9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="QueryCondition_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="QueryConditionProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/run_test.pl
deleted file mode 100755
index 638d55cd247..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl
deleted file mode 100644
index da7e51836c0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file CFTLS_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_BASE_IDL
-#define CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/CFTLS_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/CFTLS_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "ContentFilteredTopicListenStateTest"
-#pragma DCPS_DATA_KEY "ContentFilteredTopicListenStateTest key"
-
-struct ContentFilteredTopicListenStateTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<ContentFilteredTopicListenStateTest> ContentFilteredTopicListenStateTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.mpc
deleted file mode 100644
index 5b30e442ccf..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_CFTLS_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_CFTLS_Test_Base_stub
-  dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=CFTLS_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    CFTLS_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    CFTLS_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl
deleted file mode 100644
index 84dbf35b5a0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file CFTLS_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_IDL_
-#define CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/CFTLS_Test_Base.idl"
-
-#pragma ciao lem "Connector/CFTLS_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/CFTLS_Test_BaseTypeSupport.idl"
-#endif
-
-module CFTLS_Test
-{
-  module ::CCM_DDS::Typed < ::ContentFilteredTopicListenStateTest, ::ContentFilteredTopicListenStateTestSeq> ContentFilteredTopicListenStateTestConnector;
-};
-
-#endif /* CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc
deleted file mode 100644
index 8ac8d9af7a9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_CFTLS_Test_Base -l .. -o ../lib -u DDS CFTLS_Test_Connector"
-
-project(DDS_CFTLS_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_CFTLS_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=CFTLS_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=CFTLS_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=CFTLS_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=CFTLS_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    CFTLS_Test_Connector.idl
-  }
-}
-
-project(DDS_CFTLS_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_CFTLS_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=CFTLS_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    CFTLS_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_CFTLS_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_CFTLS_Test_Connector_lem_gen DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Base_stub
-  libs  += DDS_CFTLS_Test_Base_stub DDS_CFTLS_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_CFTLS_Test_Connector_lem_stub
-  dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLS_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    CFTLS_Test_ConnectorEC.h
-    CFTLS_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CFTLS_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_CFTLS_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CFTLS_Test_Connector_idl_gen DDS_CFTLS_Test_Base_stub
-  libs  += DDS_CFTLS_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_CFTLS_Test_Connector_stub
-  dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLS_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    CFTLS_Test_ConnectorC.h
-    CFTLS_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    CFTLS_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_CFTLS_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_CFTLS_Test_Connector_lem_stub DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Base_stub
-  sharedname = DDS_CFTLS_Test_Connector_exec
-  libs += DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Connector_lem_stub DDS_CFTLS_Test_Base_stub DDS_CFTLS_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLS_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    CFTLS_Test_Connector_conn.h
-    CFTLS_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CFTLS_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_CFTLS_Test_Connector_lem_stub DDS_CFTLS_Test_Connector_exec DDS_CFTLS_Test_Connector_stub
-  sharedname  = DDS_CFTLS_Test_Connector_svnt
-  libs       += DDS_CFTLS_Test_Connector_stub \
-                DDS_CFTLS_Test_Connector_lem_stub  \
-                DDS_CFTLS_Test_Base_stub \
-                DDS_CFTLS_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLS_Test_ConnectorS.cpp
-    CFTLS_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    CFTLS_Test_ConnectorS.h
-    CFTLS_Test_Connector_svnt.h
-    CFTLS_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.idl
deleted file mode 100644
index c0a22c26b01..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/CFTLS_Test_Connector.idl"
-
-module CFTLS_Test
-{
-  component Receiver
-  {
-    port ContentFilteredTopicListenStateTestConnector::DDS_StateListen info_state;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc
deleted file mode 100644
index f881b671225..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(DDS_CFTLS_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_CFTLS_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 {
-    CFTLS_Test_Receiver.idl
-  }
-}
-
-project(DDS_CFTLS_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_CFTLS_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 {
-    CFTLS_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_CFTLS_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_CFTLS_Test_Receiver_lem_gen DDS_CFTLS_Test_Receiver_stub  \
-           DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Base_stub
-  libs  +=  Receiver_stub DDS_CFTLS_Test_Connector_stub \
-            DDS_CFTLS_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLS_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    CFTLS_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CFTLS_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_CFTLS_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CFTLS_Test_Receiver_idl_gen  DDS_CFTLS_Test_Connector_stub \
-           DDS_CFTLS_Test_Base_stub DDS_CFTLS_Test_Connector_lem_gen
-  libs  += DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLS_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    CFTLS_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    CFTLS_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_CFTLS_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_CFTLS_Test_Receiver_lem_stub DDS_CFTLS_Test_Receiver_stub \
-             DDS_CFTLS_Test_Base_stub DDS_CFTLS_Test_Connector_stub \
-             DDS_CFTLS_Test_Connector_lem_stub 
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_CFTLS_Test_Base_stub \
-          DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLS_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    CFTLS_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CFTLS_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_CFTLS_Test_Receiver_lem_stub DDS_CFTLS_Test_Base_stub \
-                  DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Connector_svnt \
-                  DDS_CFTLS_Test_Receiver_exec DDS_CFTLS_Test_Connector_lem_stub 
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_CFTLS_Test_Base_stub \
-                DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Connector_svnt \
-                Receiver_exec DDS_CFTLS_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLS_Test_ReceiverS.cpp
-    CFTLS_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    CFTLS_Test_ReceiverS.h
-    CFTLS_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp
deleted file mode 100644
index 5aeaa515d78..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,271 +0,0 @@
-// -*- C++ -*-
-#include "CFTLS_Test_Receiver_exec.h"
-#include "ace/Log_Msg.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-#define QUERY "( (iteration > %0) AND (iteration < %1) )"
-
-#define MIN_ITERATION "2"
-#define MAX_ITERATION "5"
-
-#define SAMPLES_PER_KEY 2 //only iteration 3 and 4 should be coming in....
-
-namespace CIAO_CFTLS_Test_Receiver_Impl
-{
-  //============================================================
-  // ContentFilteredTopicListenStateTest_Listener_exec_i
-  //============================================================
-  ContentFilteredTopicListenStateTest_Listener::ContentFilteredTopicListenStateTest_Listener (
-                                              ACE_Thread_ID &thread_id,
-                                              Atomic_Long &samples_received)
-    : thread_id_ (thread_id),
-      samples_received_ (samples_received)
-  {
-  }
-
-  ContentFilteredTopicListenStateTest_Listener::~ContentFilteredTopicListenStateTest_Listener (void)
-  {
-  }
-
-  void
-  ContentFilteredTopicListenStateTest_Listener::on_creation (
-                      const ContentFilteredTopicListenStateTest& an_instance,
-                      const CCM_DDS::ReadInfo& /*read_info*/)
-  {
-    ++this->samples_received_;
-
-    ACE_DEBUG ((LM_DEBUG, "ContentFilteredTopicListenStateTest_Listener::on_creation: "
-                            "key <%C> - iteration <%d>\n",
-                            an_instance.key.in (),
-                            an_instance.iteration));
-    if (an_instance.iteration <= ACE_OS::atoi (MIN_ITERATION) ||
-        an_instance.iteration  > ACE_OS::atoi (MAX_ITERATION) )
-      {
-        ACE_ERROR ((LM_ERROR, "ContentFilteredTopicListenStateTest_Listener::on_creation: "
-                              "ERROR: Unexpected iteration received.\n"));
-      }
-  }
-
-  void
-  ContentFilteredTopicListenStateTest_Listener::on_one_update (
-                      const ContentFilteredTopicListenStateTest& an_instance,
-                      const CCM_DDS::ReadInfo& /*read_info*/)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_ = t_id;
-    ++this->samples_received_;
-
-    ACE_DEBUG ((LM_DEBUG, "ContentFilteredTopicListenStateTest_Listener::on_one_update: "
-                            "key <%C> - iteration <%d>\n",
-                            an_instance.key.in (),
-                            an_instance.iteration));
-
-    if (an_instance.iteration <= ACE_OS::atoi (MIN_ITERATION) ||
-        an_instance.iteration  > ACE_OS::atoi (MAX_ITERATION) )
-      {
-        ACE_ERROR ((LM_ERROR, "ContentFilteredTopicListenStateTest_Listener::on_one_update: "
-                              "ERROR: Unexpected iteration received.\n"));
-      }
-  }
-
-  void
-  ContentFilteredTopicListenStateTest_Listener::on_many_updates (
-                      const ContentFilteredTopicListenStateTestSeq& /*an_instance*/,
-                      const CCM_DDS::ReadInfoSeq& /*read_info*/)
-  {
-  }
-
-  void
-  ContentFilteredTopicListenStateTest_Listener::on_deletion (
-                      const ContentFilteredTopicListenStateTest& /*an_instance*/,
-                      const CCM_DDS::ReadInfo& /*read_info*/)
-  {
-  }
-
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  Receiver_exec_i::Receiver_exec_i (void)
-    : thread_id_listener_ (0, 0),
-      iterations_ (10),
-      keys_ (5),
-      samples_expected_ (keys_ * SAMPLES_PER_KEY),
-      samples_received_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::start ()
-  {
-    ::CCM_DDS::DataListenerControl_var dlc =
-        this->context_->get_connection_info_state_data_control ();
-    dlc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  ::CFTLS_Test::ContentFilteredTopicListenStateTestConnector::CCM_StateListener_ptr
-  Receiver_exec_i::get_info_state_data_listener (void)
-  {
-    return new ContentFilteredTopicListenStateTest_Listener (
-                this->thread_id_listener_,
-                this->samples_received_);
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_state_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Receiver_exec_i::keys (::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-
-    this->samples_expected_ = SAMPLES_PER_KEY * this->keys_;
-  }
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::CFTLS_Test::CCM_Receiver_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    ::CFTLS_Test::ContentFilteredTopicListenStateTestConnector::Reader_var reader =
-      this->context_->get_connection_info_state_data ();
-    if (CORBA::is_nil (reader.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::configuration_complete - "
-                              "Error get reader connection.\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - "
-                          "Start listening.\n"));
-    start ();
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_.to_string (list_buf);
-
-
-    if (this->thread_id_listener_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for ReaderListener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "CFT_STATE: "
-                              "Thread switch for ReaderListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                               "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: CFT_STATE: "
-                              "Thread switch for ReaderListener "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    #else
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: CFT_STATE: ReaderListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "CFT_STATE: ReaderListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    #endif
-
-    if (this->samples_received_ != this->samples_expected_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: CFT_STATE: ReaderListener: "
-                              "Unexpected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_,
-                              this->samples_received_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "CFT_STATE: ReaderListener: "
-                              "Expected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_,
-                              this->samples_received_.value ()));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CFTLS_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/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.h
deleted file mode 100644
index 656dbaa4846..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.h
+++ /dev/null
@@ -1,111 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_RECEIVER_EXEC_H_
-#define CIAO_RECEIVER_EXEC_H_
-
-#include "CFTLS_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/OS_NS_Thread.h"
-
-#include "ace/Task.h"
-
-namespace CIAO_CFTLS_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Long> Atomic_Long;
-
-  //============================================================
-  // ContentFilteredTopicListenStateTest_Listener_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export ContentFilteredTopicListenStateTest_Listener
-    : public virtual ::CFTLS_Test::ContentFilteredTopicListenStateTestConnector::CCM_StateListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ContentFilteredTopicListenStateTest_Listener (
-                            ACE_Thread_ID &thread_id,
-                            Atomic_Long &samples_received);
-    virtual ~ContentFilteredTopicListenStateTest_Listener (void);
-
-    virtual void
-    on_creation (const ContentFilteredTopicListenStateTest& an_instance,
-                 const CCM_DDS::ReadInfo& read_info);
-
-    virtual void
-    on_one_update (const ContentFilteredTopicListenStateTest& an_instance,
-                   const CCM_DDS::ReadInfo& read_info);
-
-    virtual void
-    on_many_updates (const ContentFilteredTopicListenStateTestSeq& an_instance,
-                     const CCM_DDS::ReadInfoSeq& read_info);
-
-    virtual void
-    on_deletion (const ContentFilteredTopicListenStateTest& an_instance,
-                 const CCM_DDS::ReadInfo& read_info);
-
-  private:
-    ACE_Thread_ID &thread_id_;
-    Atomic_Long &samples_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);
-
-    void start ();
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CFTLS_Test::ContentFilteredTopicListenStateTestConnector::CCM_StateListener_ptr
-    get_info_state_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_state_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);
-
-  private:
-    ::CFTLS_Test::CCM_Receiver_Context_var context_;
-
-    ACE_Thread_ID thread_id_listener_;
-
-    CORBA::UShort iterations_;
-    CORBA::UShort keys_;
-
-    CORBA::Long samples_expected_;
-    Atomic_Long samples_received_;
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CFTLS_Test_Receiver_Impl (void);
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.idl
deleted file mode 100644
index 1d30d34f57a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_SENDER_IDL
-#define DDS_CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_SENDER_IDL
-
-#include "Connector/CFTLS_Test_Connector.idl"
-
-module CFTLS_Test
-{
-  component Sender
-  {
-    port ContentFilteredTopicListenStateTestConnector::DDS_Update info_update;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc
deleted file mode 100644
index 1fdabb4b0cc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_CFTLS_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_CFTLS_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_CFTLS_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 {
-    CFTLS_Test_Sender.idl
-  }
-}
-
-project(DDS_CFTLS_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_CFTLS_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 {
-    CFTLS_Test_SenderE.idl
-  }
-}
-
-project(DDS_CFTLS_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_CFTLS_Test_Sender_lem_gen DDS_CFTLS_Test_Sender_stub \
-           DDS_CFTLS_Test_Base_stub
-  libs  += DDS_CFTLS_Test_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLS_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    CFTLS_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    CFTLS_Test_SenderEC.inl
-  }
-}
-
-project(DDS_CFTLS_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CFTLS_Test_Sender_idl_gen DDS_CFTLS_Test_Base_stub \
-           DDS_CFTLS_Test_Connector_stub
-  libs  += DDS_CFTLS_Test_Base_stub DDS_CFTLS_Test_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLS_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    CFTLS_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    CFTLS_Test_SenderC.inl
-  }
-}
-
-project(DDS_CFTLS_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_CFTLS_Test_Sender_lem_stub DDS_CFTLS_Test_Sender_stub \
-             DDS_CFTLS_Test_Connector_lem_stub DDS_CFTLS_Test_Connector_stub 
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub DDS_CFTLS_Test_Base_stub \
-             DDS_CFTLS_Test_Connector_lem_stub DDS_CFTLS_Test_Connector_stub 
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLS_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    CFTLS_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_CFTLS_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_CFTLS_Test_Base_stub  DDS_CFTLS_Test_Sender_lem_stub \
-                DDS_CFTLS_Test_Connector_stub \
-                DDS_CFTLS_Test_Connector_svnt DDS_CFTLS_Test_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub DDS_CFTLS_Test_Base_stub \
-                DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Connector_svnt \
-                DDS_CFTLS_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CFTLS_Test_SenderS.cpp
-    CFTLS_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    CFTLS_Test_SenderS.h
-    CFTLS_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp
deleted file mode 100644
index ba27bdbbc04..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,241 +0,0 @@
-// -*- C++ -*-
-#include "CFTLS_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "ace/Log_Msg.h"
-#include "ace/Date_Time.h"
-
-namespace CIAO_CFTLS_Test_Sender_Impl
-{
-  /**
-   * StartHandler
-   */
-  StartHandler::StartHandler(Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-    this->reference_counting_policy ().value
-      (ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
-  }
-
-  int
-  StartHandler::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.run ();
-    return 0;
-  }
-
-  /**
-   * UpdateTicker
-   */
-  UpdateTicker::UpdateTicker (Sender_exec_i &callback)
-    : callback_ (callback),
-      last_iter_ (0)
-  {
-  }
-
-  int
-  UpdateTicker::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.update_one (++this->last_iter_);
-    return 0;
-  }
-
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (5)
-      , iterations_ (10)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      UpdateTicker (*this),
-                      CORBA::INTERNAL ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  void
-  Sender_exec_i::update_one (CORBA::UShort iter)
-  {
-    ::CFTLS_Test::ContentFilteredTopicListenStateTestConnector::Updater_var
-      updater = this->ciao_context_->get_connection_info_update_data ();
-    if (iter <= this->iterations ())
-      {
-        for (CORBA::UShort i = 1; i < this->keys () + 1; ++i)
-          {
-            char key[7];
-            ACE_OS::sprintf (key, "KEY_%d", i);
-            ContentFilteredTopicListenStateTest update_key;
-            update_key.key = CORBA::string_dup (key);
-            update_key.iteration = iter;
-            updater->update_one (update_key, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, "Updated key <%C> - <%u>\n",
-                          key, iter));
-
-          }
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::update_one - "
-                              "Finished updating. Cancel Timer.\n"));
-        this->reactor ()->cancel_timer (this->ticker_);
-      }
-  }
-
-  void
-  Sender_exec_i::run ()
-  {
-    ::CFTLS_Test::ContentFilteredTopicListenStateTestConnector::Updater_var
-      updater = this->ciao_context_->get_connection_info_update_data ();
-
-    // First create the instances for consecutive updating.
-    for (CORBA::UShort i = 1; i < this->keys () + 1; ++i)
-      {
-        char key[7];
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        ContentFilteredTopicListenStateTest new_key;
-        new_key.key = CORBA::string_dup(key);
-        new_key.iteration = 0;
-        updater->create_one (new_key);
-      }
-
-   if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (5, 50000),
-                ACE_Time_Value (0, 50000)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::run : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    StartHandler* rh = 0;
-    ACE_NEW (rh,
-             StartHandler (*this));
-    ACE_Event_Handler_var safe_handler (rh);
-    this->reactor ()->notify (rh);
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::CFTLS_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    try
-      {
-        start ();
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_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_CFTLS_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/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.h
deleted file mode 100644
index df81462c9e2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.h
+++ /dev/null
@@ -1,123 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_CFTLS_TEST_SENDER_EXEC_NYP61D_H_
-#define CIAO_CFTLS_TEST_SENDER_EXEC_NYP61D_H_
-
-#include /**/ "ace/pre.h"
-
-#include "CFTLS_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_CFTLS_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * StartHandler
-   */
-  class StartHandler : public ACE_Event_Handler
-  {
-  public:
-    StartHandler (Sender_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * UpdateTicker
-   */
-  class UpdateTicker : public ACE_Event_Handler
-  {
-  public:
-    UpdateTicker (Sender_exec_i &callback);
-    int handle_timeout (const ACE_Time_Value &, const void *);
-  private:
-    /// Maintains a handle that actually process the event
-    Sender_exec_i &callback_;
-    CORBA::UShort last_iter_;
-  };
-
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-    void run (void);
-    void update_one (CORBA::UShort iter);
-    //@}
-
-  private:
-    ::CFTLS_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    UpdateTicker *ticker_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CFTLS_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/Plan.cdp
deleted file mode 100644
index e9c9826a614..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/Plan.cdp
+++ /dev/null
@@ -1,441 +0,0 @@
-<!--  -->
-<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>CFTLS_Test_Depl_1</label>
-  <UUID>CFTLS_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_CFTLS_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_CFTLS_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="CFTLS_Test_ConnectorComponentImplementation">
-    <name>CFTLS_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="CFTLS_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="CFTLS_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_CFTLS_Test_ContentFilteredTopicListenStateTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_CFTLS_Test_ContentFilteredTopicListenStateTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFTLS_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFTLS_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_CFTLS_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_CFTLS_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" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CFTLS_Test_ConnectorComponentInstance">
-    <name>CFTLS_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CFTLS_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFTLS_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="CFTLS_Test_ConnectorComponentInstance2">
-    <name>CFTLS_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="CFTLS_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CFTLS_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>push_state_observer_filter</name>
-      <value>
-        <type>
-          <kind>tk_struct</kind>
-          <struct>
-            <name>QueryFilter</name>
-            <typeId>IDL:CCM_DDS/QueryFilter:1.0</typeId>
-            <member>
-              <name>expression</name>
-              <type>
-                <kind>tk_string</kind>
-              </type>
-            </member>
-            <member>
-              <name>parameters</name>
-              <type>
-                <kind>tk_sequence</kind>
-                <sequence>
-                  <elementType>
-                    <kind>tk_string</kind>
-                  </elementType>
-                </sequence>
-              </type>
-            </member>
-          </struct>
-        </type>
-        <value>
-          <member>
-            <name>expression</name>
-            <value>
-              <string>( (iteration > %0) AND (iteration &lt; %1) )</string>
-            </value>
-          </member>
-          <member>
-            <name>parameters</name>
-            <value>
-              <element>
-                <string>2</string>
-              </element>
-              <element>
-                <string>5</string>
-              </element>
-            </value>
-          </member>
-        </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_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_state_rdr</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_state_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CFTLS_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_state_dl</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_state_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="CFTLS_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_state_dc</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_state_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CFTLS_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>updater_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CFTLS_Test_ConnectorComponentInstance" />
-    </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="CFTLS_Test_Connector_ExecArtifact">
-    <name>CFTLS_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_CFTLS_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="CFTLS_Test_Connector_SvntArtifact">
-    <name>CFTLS_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_CFTLS_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="CFTLS_Test_Connector_StubArtifact">
-    <name>CFTLS_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_CFTLS_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/ContentFilteredTopic/StateListener/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl
deleted file mode 100755
index 0fd038e4fe3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 40 seconds to allow task to complete\n";
-sleep (40);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/.gitignore b/CIAO/connectors/dds4ccm/tests/DDSEntity/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/.gitignore
deleted file mode 100644
index e2af81adef2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Writer_Base.cxx
-/Writer_Base.h
-/Writer_BasePlugin.cxx
-/Writer_BasePlugin.h
-/Writer_BaseSupport.cxx
-/Writer_BaseSupport.h
-/Writer_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl
deleted file mode 100644
index 525042673a8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file Writer_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WRITER_BASE_IDL
-#define WRITER_BASE_IDL
-
-#pragma ndds typesupport "Base/Writer_BaseSupport.h"
-#pragma opendds typesupport "Base/Writer_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "WriterTest"
-#pragma DCPS_DATA_KEY "WriterTest key"
-
-struct WriterTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<WriterTest> WriterTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.mpc
deleted file mode 100644
index ee28c32ab45..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_DDSWriterEntityBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_DDSWriterEntityBase_stub
-  dynamicflags += WRITER_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=WRITER_BASE_STUB_Export \
-              -Wb,stub_export_include=Writer_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Writer_Base.idl
-  }
-
-  opendds_ts_flags += --export=WRITER_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Writer_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/.gitignore
deleted file mode 100644
index e8f96f6e9cb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Writer_ConnectorE.idl
-/Writer_Connector_conn.cpp
-/Writer_Connector_conn.h
-/Writer_Connector_conn_export.h
-/Writer_Connector_lem_stub_export.h
-/Writer_Connector_stub_export.h
-/Writer_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.idl
deleted file mode 100644
index 421f8585ccd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file Writer_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WRITER_CONNECTOR_IDL_
-#define WRITER_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Writer_Base.idl"
-
-#pragma ciao lem "Connector/Writer_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Writer_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTestConnector;
-
-#endif /* Writer_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc
deleted file mode 100644
index 9412a344dc9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_DDSWriterEntityBase -l .. -o ../lib -u DDS Writer_Connector"
-
-project(DDS_DDSWriterEntityConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_DDSWriterEntityBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Writer_Connector_stub_export.h \
-              -Wb,skel_export_macro=WRITER_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Writer_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=WRITER_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Writer_Connector_svnt_export.h \
-              -Wb,conn_export_macro=WRITER_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Writer_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Writer_Connector.idl
-  }
-}
-
-project(DDS_DDSWriterEntityConnector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_DDSWriterEntityConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Writer_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Writer_ConnectorE.idl
-  }
-}
-
-project(DDS_DDSWriterEntityConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_DDSWriterEntityConnector_lem_gen DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityBase_stub
-  libs  += DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_DDSWriterEntityConnector_lem_stub
-  dynamicflags += WRITER_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Writer_ConnectorEC.h
-    Writer_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ConnectorEC.inl
-  }
-}
-
-project(DDS_DDSWriterEntityConnector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_DDSWriterEntityConnector_idl_gen DDS_DDSWriterEntityBase_stub
-  libs  += DDS_DDSWriterEntityBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_DDSWriterEntityConnector_stub
-  dynamicflags += WRITER_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Writer_ConnectorC.h
-    Writer_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ConnectorC.inl
-  }
-}
-
-project(DDS_DDSWriterEntityConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_stub
-  sharedname = DDS_DDSWriterEntityConnector_exec
-  libs += DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += WRITER_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Writer_Connector_conn.h
-    Writer_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_DDSWriterEntityConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_exec DDS_DDSWriterEntityConnector_stub
-  sharedname  = DDS_DDSWriterEntityConnector_svnt
-  libs       += DDS_DDSWriterEntityConnector_stub \
-                DDS_DDSWriterEntityConnector_lem_stub  \
-                DDS_DDSWriterEntityBase_stub \
-                DDS_DDSWriterEntityConnector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += WRITER_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ConnectorS.cpp
-    Writer_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Writer_ConnectorS.h
-    Writer_Connector_svnt.h
-    Writer_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/README b/CIAO/connectors/dds4ccm/tests/DDSEntity/README
deleted file mode 100644
index b38dcbae1ca..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/README
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-Test which shows how to use the DDSDataWriter and DDSDataReader
-directly.
-
-We use the Datawriter and DataReader from the DDS4CCM library.
-After typecasting it can be used to perform operations on DDS directly.
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/.gitignore
deleted file mode 100644
index f2f7d84b894..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
-/Writer_ReceiverE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.idl b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.idl
deleted file mode 100644
index 344e3826c91..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Writer_Connector.idl"
-
-module Writer
-{
-  component Receiver
-  {
-    port WriterTestConnector::DDS_Listen info_out;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc
deleted file mode 100644
index 399ff061ff2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-project(DDS_DDSWriterEntityReceiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_DDSWriterEntityConnector_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 {
-    Writer_Receiver.idl
-  }
-}
-
-project(DDS_DDSWriterEntityReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_DDSWriterEntityReceiver_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 {
-    Writer_ReceiverE.idl
-  }
-}
-
-project(DDS_DDSWriterEntityReceiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_DDSWriterEntityReceiver_lem_gen DDS_DDSWriterEntityReceiver_stub  DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityBase_stub
-  libs  +=  Receiver_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Writer_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ReceiverEC.inl
-  }
-}
-
-project(DDS_DDSWriterEntityReceiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_DDSWriterEntityReceiver_idl_gen  DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_lem_gen
-  libs  += DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Writer_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ReceiverC.inl
-  }
-}
-
-project(DDS_DDSWriterEntityReceiver_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_DDSWriterEntityReceiver_lem_stub DDS_DDSWriterEntityReceiver_stub DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-  requires += dds4ccm_ndds
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Writer_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_DDSWriterEntityReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_DDSWriterEntityReceiver_lem_stub DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_svnt DDS_DDSWriterEntityReceiver_exec DDS_DDSWriterEntityConnector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_svnt Receiver_exec DDS_DDSWriterEntityConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-  requires += dds4ccm_ndds
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ReceiverS.cpp
-    Writer_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Writer_ReceiverS.h
-    Writer_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.cpp
deleted file mode 100644
index 616c6e25646..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.cpp
+++ /dev/null
@@ -1,308 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Writer_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#include "Connector/Writer_Connector_conn.h"
-#include <dds4ccm/impl/CCM_DataReader.h>
-
-namespace CIAO_Writer_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::Writer::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Writer::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::WriterTestConnector::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::WriterTest & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("WriterTest_Listener: ")
-            ACE_TEXT ("received writer info for <%C> at %u\n"),
-            datum.key.in (),
-            datum.iteration));
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::WriterTestSeq & data,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    for (CORBA::ULong i = 0; i < data.length (); ++i)
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("WriterTest_Listener: ")
-                ACE_TEXT ("received writer info for <%C> at %u\n"),
-                data[i].key.in (),
-                data[i].iteration));
-      }
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::Writer::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Writer::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void){
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::WriterTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in ()),
-            ::WriterTestConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::WriterTestConnector::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Writer::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    WriterTestDataReader * reader = 0;
-
-    ::DDS::DataReader_var dds_dr =
-      this->ciao_context_->get_connection_info_out_dds_entity ();
-
-    if (::CORBA::is_nil (dds_dr.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                    "Datareader connection is NIL.\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-
-    ::CIAO::DDS4CCM::CCM_DataReader * ccm_dr =
-      dynamic_cast < ::CIAO::DDS4CCM::CCM_DataReader *  > (dds_dr.in ());
-
-    if (ccm_dr)
-      {
-        typedef ::CIAO::NDDS::DDS_DataReader_Base DataReader_type;
-
-        ::DDS::DataReader_var tmp = ccm_dr->get_dds_entity ();
-        if (! ::CORBA::is_nil (tmp.in ()))
-          {
-            DataReader_type * typed_ccm_dr =
-              dynamic_cast <DataReader_type*> (tmp.in ());
-            if (typed_ccm_dr)
-              {
-                DDSDataReader* dds_reader = typed_ccm_dr->get_rti_entity ();
-                if (dds_reader)
-                  {
-                    reader = ::CIAO_WriterTestConnector_DDS_Event_Impl
-                             ::WriterTest_DDS_Traits
-                             ::datareader_type::narrow (dds_reader);
-                    if (!reader)
-                      {
-                        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                    "Error narrowing to a typed "
-                                    "DDS DataReader.\n"));
-                        throw ::CORBA::INTERNAL ();
-                      }
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                "Error getting DDS Datareader.\n"));
-                    throw ::CORBA::INTERNAL ();
-                  }
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                            "Error casting DataReader to typed DataReader\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                        "::DDS::DataReader of CCM DataReader seems nil\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                    "Error casting DDS::DataReader to CCM_DataReader\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-
-    ::CIAO_WriterTestConnector_DDS_Event_Impl::WriterTest_DDS_Traits::dds_seq_type
-      data;
-    ::CIAO_WriterTestConnector_DDS_Event_Impl::WriterTest_DDS_Traits::sampleinfo_seq_type
-      sample_info_seq;
-
-    ::DDS::ReturnCode_t const result = reader->take (
-                data,
-                sample_info_seq,
-                1,
-                0);
-
-    ACE_DEBUG ((LM_DEBUG, "Take returned %C with %d samples\n",
-                ::CIAO::DDS4CCM::translate_retcode (result), data.length ()));
-
-    ::DDS::ReturnCode_t const result_loan = reader->return_loan (data, sample_info_seq);
-
-    ACE_DEBUG ((LM_DEBUG, "Return loan returned %C\n",
-                ::CIAO::DDS4CCM::translate_retcode (result_loan)));
-
-    ::CCM_DDS::DataListenerControl_var lc =
-      this->ciao_context_->get_connection_info_out_data_control ();
-
-    if (::CORBA::is_nil (lc.in ()))
-      {
-        ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-    lc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_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/DDSEntity/Receiver/Writer_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.h
deleted file mode 100644
index 82201909a1b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.h
+++ /dev/null
@@ -1,169 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_WRITER_RECEIVER_EXEC_VZNVAP_H_
-#define CIAO_WRITER_RECEIVER_EXEC_VZNVAP_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Writer_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-class WriterTestDataReader;
-
-namespace CIAO_Writer_Receiver_Impl
-{
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::WriterTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::Writer::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from WriterTestConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::WriterTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::WriterTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::Writer::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::Writer::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Writer::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::WriterTestConnector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-
-    //@}
-
-  private:
-    ::Writer::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::WriterTestConnector::CCM_Listener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    //@}
-
-    //@{
-    /** User defined members. */
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/.gitignore
deleted file mode 100644
index 809d63704bc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
-/Writer_SenderE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.idl
deleted file mode 100644
index 13bdad07c59..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_WRITER_ENTITY_SENDER_IDL
-#define DDS_WRITER_ENTITY_SENDER_IDL
-
-#include "Connector/Writer_Connector.idl"
-
-module Writer
-{
-  component Sender
-  {
-    port WriterTestConnector::DDS_Write info_write;
-    attribute unsigned short rate;
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-  };
-};
-
-#endif /* DDS_WRITER_ENTITY_SENDER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc
deleted file mode 100644
index 82039febd68..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc
+++ /dev/null
@@ -1,150 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_DDSWriterEntityBase -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_DDSWriterEntitySender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_DDSWriterEntityConnector_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 {
-    Writer_Sender.idl
-  }
-}
-
-project(DDS_DDSWriterEntitySender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_DDSWriterEntitySender_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 {
-    Writer_SenderE.idl
-  }
-}
-
-project(DDS_DDSWriterEntitySender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_DDSWriterEntitySender_lem_gen DDS_DDSWriterEntitySender_stub \
-           DDS_DDSWriterEntityBase_stub
-  libs  += DDS_DDSWriterEntityBase_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_SenderEC.cpp
-  }
-
-  Header_Files {
-    Writer_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_SenderEC.inl
-  }
-}
-
-project(DDS_DDSWriterEntitySender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_DDSWriterEntitySender_idl_gen DDS_DDSWriterEntityBase_stub \
-           DDS_DDSWriterEntityConnector_stub
-  libs  += DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_SenderC.cpp
-  }
-
-  Header_Files {
-    Writer_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_SenderC.inl
-  }
-}
-
-project(DDS_DDSWriterEntitySender_exec) : ciao_executor, dds4ccm_impl {
-  after += DDS_DDSWriterEntitySender_lem_stub DDS_DDSWriterEntitySender_stub \
-           DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_stub \
-           DDS_DDSWriterEntityConnector_exec
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_DDSWriterEntityBase_stub \
-          DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_stub \
-          DDS_DDSWriterEntityConnector_exec
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  requires += dds4ccm_ndds
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Writer_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_DDSWriterEntitySender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after += DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntitySender_lem_stub \
-           DDS_DDSWriterEntityConnector_stub \
-           DDS_DDSWriterEntityConnector_svnt DDS_DDSWriterEntityConnector_lem_stub
-  sharedname = Sender_svnt
-  libs += Sender_stub Sender_lem_stub DDS_DDSWriterEntityBase_stub \
-          DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_svnt \
-          DDS_DDSWriterEntityConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-  requires += dds4ccm_ndds
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_SenderS.cpp
-    Writer_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Writer_SenderS.h
-    Writer_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp
deleted file mode 100644
index c9301a67feb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp
+++ /dev/null
@@ -1,386 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Writer_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#include "Base/Writer_BaseSupport.h"
-#include "Connector/Writer_Connector_conn.h"
-
-namespace CIAO_Writer_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;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : rate_ (0)
-      , iterations_ (0)
-      , keys_ (0)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::unregister_handles ()
-  {
-    for (Writer_Table::iterator i = this->ktests_.begin ();
-         i != this->ktests_.end ();
-         ++i)
-      {
-        try
-          {
-            DDS_InstanceHandle_t hnd = this->handles_[i->first.c_str ()];
-            this->writer_->unregister_instance (i->second, hnd);
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Unregistered <%C> - iteration <%d> - valid handle <%d>\n"),
-                      i->first.c_str (),
-                      i->second->iteration,
-                      hnd));
-          }
-        catch (...)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: ")
-                    ACE_TEXT ("unknown exception caught during unregister_instance.\n")));
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::register_handles()
-  {
-    Writer_Table::iterator i = this->ktests_.begin ();
-    for (i = this->ktests_.begin(); i != this->ktests_.end(); ++i)
-      {
-        DDS_InstanceHandle_t const hnd = this->writer_->register_instance (i->second);
-        if (DDS_InstanceHandle_is_nil (&hnd))
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to register handle for <%C> - iteration <%d>\n"),
-              i->first.c_str (), i->second->iteration));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Registering instance for <%C>\n"),
-                        i->second->key.in ()));
-            this->handles_[i->first.c_str ()] = hnd;
-          }
-     }
-  }
-
-  void
-  Sender_exec_i::write_keyed ()
-  {
-    if (this->last_key != this->ktests_.end ())
-      {
-        ++this->last_key->second->iteration;
-        DDS_InstanceHandle_t hnd = this->handles_[this->last_key->first.c_str ()];
-        DDS_ReturnCode_t const retval = this->writer_->write (this->last_key->second, hnd);
-        if (retval == DDS_RETCODE_OK)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written keyed <%C> - iteration <%d> - valid handle <%d>\n"),
-                    this->last_key->first.c_str (),
-                    this->last_key->second->iteration,
-                    hnd.isValid));
-          }
-        else ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error writing key <%C> - retcode %C\n"),
-                    CIAO::DDS4CCM::translate_retcode (retval)));
-
-        ++this->last_key;
-      }
-    else
-      {
-        //onto the next iteration
-        this->last_key = this->ktests_.begin ();
-        while (this->last_key != this->ktests_.end ())
-          {
-            if (this->last_key->second->iteration == this->iterations_)
-              {
-                // Next key
-                ++this->last_key;
-              }
-            else
-              {
-                break;
-              }
-          }
-        if (this->last_key == this->ktests_.end ())
-          {
-            unregister_handles ();
-            this->stop ();
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::tick ()
-  {
-    write_keyed ();
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    long usec = 1000000 / this->rate_;
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (0, usec),
-                ACE_Time_Value (0, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::rate (void)
-  {
-    return this->rate_;
-  }
-
-  void
-  Sender_exec_i::rate (
-    const ::CORBA::UShort rate)
-  {
-    this->rate_ = rate;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Writer::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    ::DDS::DataWriter_var dds_dw =
-      this->ciao_context_->get_connection_info_write_dds_entity ();
-
-    if (::CORBA::is_nil (dds_dw.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - "
-                    "Datawriter connection is NIL.\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-
-    ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw =
-      dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dds_dw.in ());
-
-    if (ccm_dw)
-      {
-        ::DDS::DataWriter_var tmp = ccm_dw->get_dds_entity ();
-        if (! ::CORBA::is_nil (tmp.in ()))
-          {
-            typedef ::CIAO::NDDS::DDS_DataWriter_Base DataWriter_type;
-            DataWriter_type * typed_ccm_dw = dynamic_cast <DataWriter_type *> (tmp.in ());
-            if (typed_ccm_dw)
-              {
-                DDSDataWriter* dds_datawriter = typed_ccm_dw->get_rti_entity ();
-                if (dds_datawriter)
-                  {
-                    this->writer_ =
-                      ::CIAO_WriterTestConnector_DDS_Event_Impl::WriterTest_DDS_Traits::datawriter_type::narrow (dds_datawriter);
-                    if (!this->writer_)
-                      {
-                        ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - "
-                                    "Error narrowing to a typed "
-                                    "DDS DataWriter.\n"));
-                        throw ::CORBA::INTERNAL ();
-                      }
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - "
-                                "Error getting DDS DataWriter.\n"));
-                    throw ::CORBA::INTERNAL ();
-                  }
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - "
-                            "Error casting DataWriter to typed DataWriter\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - "
-                    "::DDS::DataWriter of CCM DataWriter seems nil\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - "
-                    "Error casting DataWriter to CCM_DataWriter\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-
-    this->start ();
-
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        WriterTest *new_key = new WriterTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->iteration = 0;
-
-        this->ktests_[key] = new_key;
-      }
-    this->last_key = this->ktests_.begin ();
-    register_handles ();
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_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/DDSEntity/Sender/Writer_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.h
deleted file mode 100644
index 8164d4b4f58..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.h
+++ /dev/null
@@ -1,162 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_WRITER_SENDER_EXEC_CPQPH1_H_
-#define CIAO_WRITER_SENDER_EXEC_CPQPH1_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Writer_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include "dds4ccm/impl/ndds/DataWriter_T.h"
-
-#include <map>
-
-class WriterTestDataWriter;
-namespace CIAO_Writer_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * Pulse Generator
-   */
-  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_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::UShort rate (void);
-
-    virtual void rate (::CORBA::UShort rate);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void tick (void);
-    //@}
-
-  private:
-    ::Writer::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort rate_;
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-
-    WriterTestDataWriter * writer_;
-
-    pulse_Generator * ticker_;
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, WriterTest_var> Writer_Table;
-    Writer_Table ktests_;
-
-    typedef std::map<ACE_CString, DDS_InstanceHandle_t> Writer_Table_Handles;
-    Writer_Table_Handles handles_;
-
-    Writer_Table::iterator last_key;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start (void);
-    void stop (void);
-
-    void register_handles ();
-    void unregister_handles ();
-    void write_keyed ();
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/DDSEntity/descriptors/Plan.cdp
deleted file mode 100644
index 0565cc072ff..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/descriptors/Plan.cdp
+++ /dev/null
@@ -1,382 +0,0 @@
-<!--  -->
-<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>DDSWriterEntity_Depl_1</label>
-  <UUID>DDSWriterEntity_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_Writer_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Writer_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="Writer_ConnectorComponentImplementation">
-    <name>Writer_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Writer_Connector_ExecArtifact" />
-    <artifact xmi:idref="Writer_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_WriterTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WriterTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Writer_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Writer_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_Writer_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Writer_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="Writer_ConnectorComponentInstance">
-    <name>Writer_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Writer_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDSWriterEntity</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Writer_ConnectorComponentInstance2">
-    <name>Writer_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Writer_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDSWriterEntity</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_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="Writer_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>_datacontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_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="Writer_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Writer_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>reader_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Writer_ConnectorComponentInstance2" />
-    </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="Writer_Connector_ExecArtifact">
-    <name>Writer_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_DDSWriterEntityConnector_exec</location>
-  </artifact>
-  <artifact xmi:id="Writer_Connector_SvntArtifact">
-    <name>Writer_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_DDSWriterEntityConnector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Writer_Connector_StubArtifact">
-    <name>Writer_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_DDSWriterEntityConnector_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/DDSEntity/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/DDSEntity/descriptors/run_test.pl
deleted file mode 100755
index 87984594507..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 60 seconds to allow task to complete\n";
-sleep (60);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h b/CIAO/connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h
deleted file mode 100644
index 392479178a2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#if !defined DERIVED_CONNECTOR_T
-#define DERIVED_CONNECTOR_T
-
-#include "connectors/dds4ccm/impl/DDS_Event_Connector_T.h"
-#include "connectors/dds4ccm/impl/DDS_State_Connector_T.h"
-
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, typename SEQ_TYPE>
-class MyEvent_Connector_T
-  : public virtual DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, SEQ_TYPE>
-{
-  virtual ::CCM_fooA_ptr get_my_foo (void)
-  {
-    return ::CCM_fooA::_nil ();
-  }
-};
-
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, typename SEQ_TYPE>
-class MyState_Connector_T
-  : public virtual DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, SEQ_TYPE>
-{
-  virtual ::CCM_fooB_ptr get_my_foo (void)
-  {
-    return ::CCM_fooB::_nil ();
-  }
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Derived/Derived.idl b/CIAO/connectors/dds4ccm/tests/Derived/Derived.idl
deleted file mode 100644
index c6b05f3fdfe..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Derived/Derived.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef DERIVED_IDL
-#define DERIVED_IDL
-
-#pragma ndds typesupport "DerivedSupport.h"
-#pragma opendds typesupport "DerivedTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "DerivedType"
-#pragma DCPS_DATA_KEY "DerivedType value"
-
-struct DerivedType {
-  string value; //@key
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<DerivedType> DerivedTypeSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Derived/Derived.mpc b/CIAO/connectors/dds4ccm/tests/Derived/Derived.mpc
deleted file mode 100644
index 8d33e93b753..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Derived/Derived.mpc
+++ /dev/null
@@ -1,22 +0,0 @@
-project (Derived_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = Derived_stub
-  dynamicflags += NOMODULE_COMMON_STUB_BUILD_DLL
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=NOMODULE_COMMON_STUB_Export \
-              -Wb,stub_export_include=Derived_Common_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Derived.idl
-  }
-
-  opendds_ts_flags += --export=NOMODULE_COMMON_STUB_Export
-
-  DDSGenerator_Files {
-    Derived.idl
-  }
-
-  Source_Files {
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl b/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl
deleted file mode 100644
index ed4059534f7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef DERIVED_CONNECTOR_IDL
-#define DERIVED_CONNECTOR_IDL
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Derived.idl"
-
-#pragma ciao lem "Derived_ConnectorE.idl"
-
-#pragma dds4ccm impl "DDS_Derived_Connector_T.h"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "DerivedTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::DerivedType, ::DerivedTypeSeq> DerivedTypeConnector;
-
-interface fooA
-{
-  void send (in long value);
-};
-
-interface fooB
-{
-  void send (in long value);
-};
-
-// @todo, module here should go away again
-module DerivedTypeConnector {
-  connector MyEvent : DerivedTypeConnector::DDS_Event
-  {
-    provides fooA my_foo;
-  };
-
-  connector MyState : DerivedTypeConnector::DDS_State
-  {
-    provides fooB my_foo;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc
deleted file mode 100644
index ad959acfab8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc
+++ /dev/null
@@ -1,129 +0,0 @@
-project(Derived_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  custom_only = 1
-  after += Derived_stub
-  idlflags += -Wb,stub_export_macro=DERIVED_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Derived_Connector_stub_export.h \
-              -Wb,skel_export_macro=DERIVED_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Derived_Connector_svnt_export.h \
-              -Wb,conn_export_macro=DERIVED_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Derived_Connector_conn_export.h \
-              -Gxhex -Gxhsk -Gxhst
-  IDL_Files {
-    Derived_Connector.idl
-  }
-}
-
-project(Derived_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += Derived_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=DERIVED_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Derived_Connector_lem_stub_export.h \
-              -SS -Gxhst
-
-  IDL_Files {
-    Derived_ConnectorE.idl
-  }
-}
-
-project(Derived_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub  {
-  after += Derived_Connector_lem_gen Derived_Connector_stub
-  libs  +=  Derived_Connector_stub
-
-
-  sharedname = Derived_Connector_lem_stub
-  dynamicflags += DERIVED_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Derived_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Derived_ConnectorEC.h
-    Derived_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Derived_ConnectorEC.inl
-  }
-}
-
-project(Derived_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += Derived_Connector_idl_gen Derived_stub
-  libs  += Derived_stub
-
-
-  sharedname = Derived_Connector_stub
-  dynamicflags += DERIVED_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Derived_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Derived_ConnectorC.h
-    Derived_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Derived_ConnectorC.inl
-  }
-}
-
-project(Derived_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += Derived_Connector_lem_stub Derived_Connector_stub
-  sharedname = Derived_Connector_exec
-  libs += Derived_Connector_stub Derived_Connector_lem_stub Derived_stub
-
-  dynamicflags += DERIVED_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Derived_Connector_conn.cpp
-  }
-
-  Header_Files {
-    DDS_Derived_Connector_T.h
-    Derived_Connector_conn.h
-    Derived_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(Derived_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += Derived_Connector_lem_stub
-  sharedname  = Derived_Connector_svnt
-  libs       += Derived_Connector_stub Derived_Connector_lem_stub  Derived_stub
-
-
-  dynamicflags += DERIVED_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Derived_ConnectorS.cpp
-    Derived_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Derived_ConnectorS.h
-    Derived_Connector_svnt.h
-    Derived_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/.gitignore b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/.gitignore
deleted file mode 100644
index e1cae80e694..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/DNM_Base.cxx
-/DNM_Base.h
-/DNM_BasePlugin.cxx
-/DNM_BasePlugin.h
-/DNM_BaseSupport.cxx
-/DNM_BaseSupport.h
-/DNM_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl
deleted file mode 100644
index 69588857156..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * @file DNM_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DOUBLE_NESTED_MODULE_BASE_IDL
-#define DOUBLE_NESTED_MODULE_BASE_IDL
-
-#pragma ndds typesupport "Base/DNM_BaseSupport.h"
-#pragma opendds typesupport "Base/DNM_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "X::Y::Z::DNM_Test_Struct"
-#pragma DCPS_DATA_KEY "X::Y::Z::DNM_Test_Struct key"
-
-module X
-{
-  module Y
-  {
-    module Z
-    {
-      struct DNM_Test_Struct {
-        string key; //@key
-        long iter;
-      };
-      #if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<DNM_Test_Struct> DNM_Test_StructSeq;
-#endif
-    };
-  };
-};
-
-
-#endif /* DOUBLE_NESTED_MODULE_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc
deleted file mode 100644
index 8e0e78a1536..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_DNM_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_DNM_Base_stub
-  dynamicflags += DOUBLE_NESTED_MODULE_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=DOUBLE_NESTED_MODULE_BASE_STUB_Export \
-              -Wb,stub_export_include=DNM_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    DNM_Base.idl
-  }
-
-  opendds_ts_flags += --export=DOUBLE_NESTED_MODULE_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    DNM_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/.gitignore
deleted file mode 100644
index c99c27aaf24..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/DNM_ConnectorE.idl
-/DNM_Connector_conn.cpp
-/DNM_Connector_conn.h
-/DNM_Connector_conn_export.h
-/DNM_Connector_lem_stub_export.h
-/DNM_Connector_stub_export.h
-/DNM_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl
deleted file mode 100644
index 68ad2eec4e9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * @file DNM_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DOUBLE_NESTED_MODULE_CONNECTOR_IDL_
-#define DOUBLE_NESTED_MODULE_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/DNM_Base.idl"
-
-#pragma ciao lem "Connector/DNM_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/DNM_BaseTypeSupport.idl"
-#endif
-
-module DNM_Test_Connector
-{
-  module Nested_Connector
-  {
-    module ::CCM_DDS::Typed < X::Y::Z::DNM_Test_Struct, X::Y::Z::DNM_Test_StructSeq> DNM_TestConnector;
-  };
-};
-
-#endif /* DOUBLE_NESTED_MODULE_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc
deleted file mode 100644
index c9c973ddf85..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc
+++ /dev/null
@@ -1,140 +0,0 @@
-project(DDS_DNM_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_DNM_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=DOUBLE_NESTED_MODULE_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=DNM_Connector_stub_export.h \
-              -Wb,skel_export_macro=DOUBLE_NESTED_MODULE_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=DNM_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=DOUBLE_NESTED_MODULE_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=DNM_Connector_svnt_export.h \
-              -Wb,conn_export_macro=DOUBLE_NESTED_MODULE_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=DNM_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    DNM_Connector.idl
-  }
-}
-
-project(DDS_DNM_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_DNM_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=DOUBLE_NESTED_MODULE_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=DNM_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    DNM_ConnectorE.idl
-  }
-}
-
-project(DDS_DNM_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_DNM_Connector_lem_gen DDS_DNM_Connector_stub DDS_DNM_Base_stub
-  libs  += DDS_DNM_Base_stub DDS_DNM_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_DNM_Connector_lem_stub
-  dynamicflags += DOUBLE_NESTED_MODULE_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DNM_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    DNM_ConnectorEC.h
-    DNM_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    DNM_ConnectorEC.inl
-  }
-}
-
-project(DDS_DNM_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_DNM_Connector_idl_gen DDS_DNM_Base_stub
-  libs  += DDS_DNM_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_DNM_Connector_stub
-  dynamicflags += DOUBLE_NESTED_MODULE_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DNM_ConnectorC.cpp
-  }
-
-  Header_Files {
-    DNM_ConnectorC.h
-    DNM_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    DNM_ConnectorC.inl
-  }
-}
-
-project(DDS_DNM_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_DNM_Connector_lem_stub DDS_DNM_Connector_stub
-  sharedname = DDS_DNM_Connector_exec
-  libs += DDS_DNM_Connector_stub DDS_DNM_Connector_lem_stub DDS_DNM_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += DOUBLE_NESTED_MODULE_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DNM_Connector_conn.cpp
-  }
-
-  Header_Files {
-    DNM_Connector_conn.h
-    DNM_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_DNM_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_DNM_Connector_lem_stub DDS_DNM_Connector_exec DDS_DNM_Connector_stub
-  sharedname  = DDS_DNM_Connector_svnt
-  libs       += DDS_DNM_Connector_stub \
-                DDS_DNM_Connector_lem_stub  \
-                DDS_DNM_Base_stub \
-                DDS_DNM_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += DOUBLE_NESTED_MODULE_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DNM_ConnectorS.cpp
-    DNM_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    DNM_ConnectorS.h
-    DNM_Connector_svnt.h
-    DNM_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/.gitignore
deleted file mode 100644
index 102a5abb4c9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl
deleted file mode 100644
index afa5b6ce2f2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file DNM_Sender.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DNM_SENDER_IDL
-#define DNM_SENDER_IDL
-
-#include "Connector/DNM_Connector.idl"
-
-module DNM_Test_Sender
-{
-  module Nested_Sender
-  {
-    component Sender
-    {
-      port DNM_Test_Connector::Nested_Connector::DNM_TestConnector::DDS_Write info_write;
-    };
-  };
-};
-
-#endif /* DNM_SENDER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc
deleted file mode 100644
index 1bd753bbdb3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc
+++ /dev/null
@@ -1,143 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_DNM_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DNM_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_DNM_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 {
-    DNM_Sender.idl
-  }
-}
-
-project(DNM_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DNM_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 {
-    DNM_SenderE.idl
-  }
-}
-
-project(DNM_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DNM_Sender_lem_gen DNM_Sender_stub DDS_DNM_Base_stub
-  libs  += DDS_DNM_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DNM_SenderEC.cpp
-  }
-
-  Header_Files {
-    DNM_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    DNM_SenderEC.inl
-  }
-}
-
-project(DNM_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DNM_Sender_idl_gen DDS_DNM_Base_stub DDS_DNM_Connector_stub
-  libs  += DDS_DNM_Base_stub DDS_DNM_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DNM_SenderC.cpp
-  }
-
-  Header_Files {
-    DNM_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    DNM_SenderC.inl
-  }
-}
-
-project(DNM_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DNM_Sender_lem_stub DNM_Sender_stub \
-             DDS_DNM_Connector_lem_stub DDS_DNM_Connector_stub 
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub DDS_DNM_Base_stub \
-             DDS_DNM_Connector_lem_stub DDS_DNM_Connector_stub 
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DNM_Sender_exec.cpp
-  }
-
-  Header_Files {
-    DNM_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DNM_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_DNM_Base_stub  DNM_Sender_lem_stub \
-                DDS_DNM_Connector_stub \
-                DDS_DNM_Connector_svnt DDS_DNM_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub DDS_DNM_Base_stub \
-                DDS_DNM_Connector_stub DDS_DNM_Connector_svnt \
-                DDS_DNM_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    DNM_SenderS.cpp
-    DNM_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    DNM_SenderS.h
-    DNM_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.cpp
deleted file mode 100644
index 7e5830ccb3e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-// -*- C++ -*-
-#include "DNM_Sender_exec.h"
-#include "Base/DNM_BaseC.h"
-
-namespace CIAO_DNM_Test_Sender_Nested_Sender_Sender_Impl
-{
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-  Sender_exec_i::Sender_exec_i (void)
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  void
-  Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::DNM_Test_Sender::Nested_Sender::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)
-  {
-    ::DNM_Test_Connector::Nested_Connector::DNM_TestConnector::Writer_var writer =
-      this->context_->get_connection_info_write_data ();
-
-    ::X::Y::Z::DNM_Test_Struct dnm;
-    dnm.key = CORBA::string_dup ("KEY_1");
-    dnm.iter = 10;
-    writer->write_one (dnm, ::DDS::HANDLE_NIL);
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoherentWrite_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/DoubleNestedModule/Sender/DNM_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.h
deleted file mode 100644
index 9d9361ff4b5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender_exec.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_SENDER_EXEC_H_
-#define CIAO_SENDER_EXEC_H_
-
-
-#include "DNM_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_DNM_Test_Sender_Nested_Sender_Sender_Impl
-{
-  //============================================================
-  // Sender_exec_i
-  //============================================================
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (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);
-
-  private:
-    ::DNM_Test_Sender::Nested_Sender::CCM_Sender_Context_var context_;
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_CoherentWrite_Test_Sender_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/.gitignore b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/.gitignore
deleted file mode 100644
index c9d8f7c47b3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Event_Connection_Test_Base.cxx
-/Event_Connection_Test_Base.h
-/Event_Connection_Test_BasePlugin.cxx
-/Event_Connection_Test_BasePlugin.h
-/Event_Connection_Test_BaseSupport.cxx
-/Event_Connection_Test_BaseSupport.h
-/Event_Connection_Test_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl
deleted file mode 100644
index 5f4a523d5d7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file Event_Connection_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef EVENT_CONNECTION_TEST_BASE_IDL
-#define EVENT_CONNECTION_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/Event_Connection_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/Event_Connection_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "Event_ConnectionTest"
-#pragma DCPS_DATA_KEY "Event_ConnectionTest key"
-
-struct Event_ConnectionTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<Event_ConnectionTest> Event_ConnectionTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc
deleted file mode 100644
index e953e70512c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_ECT_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_ECT_Base_stub
-  dynamicflags += EVENT_CONNECTION_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=EVENT_CONNECTION_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=Event_Connection_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Event_Connection_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=EVENT_CONNECTION_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Event_Connection_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/.gitignore
deleted file mode 100644
index 985cef62666..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Event_Connection_Test_ConnectorE.idl
-/Event_Connection_Test_Connector_conn.cpp
-/Event_Connection_Test_Connector_conn.h
-/Event_Connection_Test_Connector_conn_export.h
-/Event_Connection_Test_Connector_lem_stub_export.h
-/Event_Connection_Test_Connector_stub_export.h
-/Event_Connection_Test_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl
deleted file mode 100644
index 771620f19c7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file Event_Connection_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef KEYED_TEST_CONNECTOR_IDL_
-#define KEYED_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Event_Connection_Test_Base.idl"
-
-#pragma ciao lem "Connector/Event_Connection_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Event_Connection_Test_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::Event_ConnectionTest, ::Event_ConnectionTestSeq> Event_ConnectionConnector;
-
-#endif /* Event_Connection_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc
deleted file mode 100644
index 3a53d8ad1b7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_ECT_Base -l .. -o ../lib -u DDS Event_Connection_Test_Connector"
-
-project(DDS_ECT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_ECT_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=EVENT_CONNECTION_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Event_Connection_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=EVENT_CONNECTION_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Event_Connection_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=EVENT_CONNECTION_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Event_Connection_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=EVENT_CONNECTION_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Event_Connection_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Event_Connection_Test_Connector.idl
-  }
-}
-
-project(DDS_ECT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_ECT_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=EVENT_CONNECTION_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Event_Connection_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Event_Connection_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_ECT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_ECT_Connector_lem_gen DDS_ECT_Connector_stub DDS_ECT_Base_stub
-  libs  += DDS_ECT_Base_stub DDS_ECT_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_ECT_Connector_lem_stub
-  dynamicflags += EVENT_CONNECTION_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_Connection_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Event_Connection_Test_ConnectorEC.h
-    Event_Connection_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Event_Connection_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_ECT_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_ECT_Connector_idl_gen DDS_ECT_Base_stub
-  libs  += DDS_ECT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_ECT_Connector_stub
-  dynamicflags += EVENT_CONNECTION_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_Connection_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Event_Connection_Test_ConnectorC.h
-    Event_Connection_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Event_Connection_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_ECT_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_ECT_Connector_lem_stub DDS_ECT_Connector_stub
-  sharedname = DDS_ECT_Connector_exec
-  libs += DDS_ECT_Connector_stub DDS_ECT_Connector_lem_stub DDS_ECT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += EVENT_CONNECTION_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_Connection_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Event_Connection_Test_Connector_conn.h
-    Event_Connection_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_ECT_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_ECT_Connector_lem_stub DDS_ECT_Connector_exec DDS_ECT_Connector_stub
-  sharedname  = DDS_ECT_Connector_svnt
-  libs       += DDS_ECT_Connector_stub \
-                DDS_ECT_Connector_lem_stub  \
-                DDS_ECT_Base_stub \
-                DDS_ECT_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += EVENT_CONNECTION_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_Connection_Test_ConnectorS.cpp
-    Event_Connection_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Event_Connection_Test_ConnectorS.h
-    Event_Connection_Test_Connector_svnt.h
-    Event_Connection_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/README b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/README
deleted file mode 100644
index a0d80b6fb37..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/README
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-This test tests all possible connections between
-a Sender and a DDS Event connector and a Receiver and a
-DDS Event connector.
-The Sender requests the following connections:
-  * A writer
-  * A DDS writer
-
-The Receiver expects the following listeners to be created:
-  * A ConnectorStatusListener
-  * A PortStatusListener for the DDS_Listen port
-  * A PortStatusListener for the DDS_Get port
-  * A 'normal' listener
-
-The Receiver requests the following connections:
-  * A reader
-  * A getter
-  * A DDS reader
-  * A DataControlListener
-
-This test tests every single connection and reports an error when
-a connections couldn't be esthablished.
-
-No actual read/write/listen operations are performed.
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/.gitignore
deleted file mode 100644
index 10c2d70efdc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Event_Connection_Test_ReceiverE.idl
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl
deleted file mode 100644
index 627c3e4909b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Event_Connection_Test_Connector.idl"
-
-module Event_Connection_Test
-{
-  component Receiver
-  {
-    port Event_ConnectionConnector::DDS_Listen  info_listen;
-    port Event_ConnectionConnector::DDS_Get     info_get;
-    provides CCM_DDS::ConnectorStatusListener status_listener;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc
deleted file mode 100644
index dc9166a24d9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc
+++ /dev/null
@@ -1,135 +0,0 @@
-project(DDS_ECT_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_ECT_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 {
-    Event_Connection_Test_Receiver.idl
-  }
-}
-
-project(DDS_ECT_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_ECT_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 {
-    Event_Connection_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_ECT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_ECT_Receiver_lem_gen DDS_ECT_Receiver_stub  DDS_ECT_Connector_stub DDS_ECT_Base_stub
-  libs  +=  Receiver_stub DDS_ECT_Connector_stub DDS_ECT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_Connection_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Event_Connection_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Event_Connection_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_ECT_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_ECT_Receiver_idl_gen  DDS_ECT_Connector_stub DDS_ECT_Base_stub DDS_ECT_Connector_lem_gen
-  libs  += DDS_ECT_Connector_stub DDS_ECT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_Connection_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Event_Connection_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Event_Connection_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_ECT_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_ECT_Receiver_lem_stub DDS_ECT_Receiver_stub DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_lem_stub 
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_Connection_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Event_Connection_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_ECT_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_ECT_Receiver_lem_stub DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_svnt DDS_ECT_Receiver_exec DDS_ECT_Connector_lem_stub 
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_svnt Receiver_exec DDS_ECT_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_Connection_Test_ReceiverS.cpp
-    Event_Connection_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Event_Connection_Test_ReceiverS.h
-    Event_Connection_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp
deleted file mode 100644
index 4a1f6c95500..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,264 +0,0 @@
-// -*- C++ -*-
-#include "Event_Connection_Test_Receiver_exec.h"
-#include "ace/Log_Msg.h"
-
-namespace CIAO_Event_Connection_Test_Receiver_Impl
-{
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  Receiver_exec_i::Receiver_exec_i (void)
-    : //DDS_Get
-      getter_ok_ (false),
-      getter_reader_ok_ (false),
-      getter_dds_data_reader_ok_ (false),
-      getter_filter_config_ok_ (false),
-      //DDS_Listen
-      listen_data_control_ok_ (false),
-      listen_reader_ok_ (false),
-      listen_dds_data_reader_ok_ (false),
-      listen_filter_config_ok_ (false),
-      //Provides
-      listen_port_status_created_ (false),
-      get_port_status_created_ (false),
-      get_status_listener_created_ (false),
-      raw_listener_created_ (false)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Port operations.
-  ::Event_ConnectionConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_listen_data_listener (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new Event_ConnectionTest RAW listener\n")));
-    this->raw_listener_created_ = true;
-    return ::Event_ConnectionConnector::CCM_Listener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_listen_status (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener for DDS_Listen\n")));
-    this->listen_port_status_created_ = true;
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_get_status (void)
-  {
-    this->get_port_status_created_ = true;
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Receiver_exec_i::get_status_listener(void)
-  {
-    this->get_status_listener_created_ = true;
-    return ::CCM_DDS::CCM_ConnectorStatusListener::_nil ();
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::Event_Connection_Test::CCM_Receiver_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    //DDS_Get
-    ::Event_ConnectionConnector::Getter_var getter_getter =
-      this->context_->get_connection_info_get_fresh_data ();
-    if (! ::CORBA::is_nil (getter_getter))
-      {
-        this->getter_ok_ = true;
-      }
-    ::DDS::DataReader_var getter_dds_data_reader =
-      this->context_->get_connection_info_get_dds_entity ();
-    if (! ::CORBA::is_nil (getter_dds_data_reader))
-      {
-        this->getter_dds_data_reader_ok_ = true;
-      }
-
-    ::Event_ConnectionConnector::Reader_var getter_reader =
-      this->context_->get_connection_info_get_data ();
-    if (! ::CORBA::is_nil (getter_reader))
-      {
-        this->getter_reader_ok_ = true;
-      }
-
-    ::CCM_DDS::ContentFilterSetting_var getter_filter_config =
-      this->context_->get_connection_info_get_filter_config ();
-    if (! ::CORBA::is_nil (getter_filter_config))
-      {
-        this->getter_filter_config_ok_ = true;
-      }
-
-    //DDS_Listen
-    ::CCM_DDS::DataListenerControl_var listen_data_control =
-      this->context_->get_connection_info_listen_data_control ();
-    if (! ::CORBA::is_nil (listen_data_control))
-      {
-        this->listen_data_control_ok_ = true;
-      }
-
-    ::Event_ConnectionConnector::Reader_var listen_reader =
-      this->context_->get_connection_info_listen_data ();
-    if (! ::CORBA::is_nil (listen_reader))
-      {
-        this->listen_reader_ok_ = true;
-      }
-
-    ::DDS::DataReader_var listen_dds_data_reader =
-      this->context_->get_connection_info_listen_dds_entity ();
-    if (! ::CORBA::is_nil (listen_dds_data_reader))
-      {
-        this->listen_dds_data_reader_ok_ = true;
-      }
-
-    ::CCM_DDS::ContentFilterSetting_var listen_filter_config =
-      this->context_->get_connection_info_listen_filter_config ();
-    if (! ::CORBA::is_nil (listen_filter_config))
-      {
-        this->listen_filter_config_ok_ = true;
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    //DDS_Get
-    if (!this->getter_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get getter failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get getter passed\n")));
-      }
-    if (!this->getter_dds_data_reader_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get DDS reader of DDS_Get failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get DDS reader of DDS_Get passed\n")));
-      }
-    if (!this->getter_reader_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get reader of DDS_Get failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get reader of DDS_Get passed\n")));
-      }
-    if (!this->getter_filter_config_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get filter config of DDS_Get failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get filter config of DDS_Get passed\n")));
-      }
-    //DDS_Listen
-    if (!this->listen_data_control_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get data listen control of DDS_Listen failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get data listen control of DDS_Listen passed\n")));
-      }
-    if (!this->listen_reader_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get reader of DDS_Listen failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get reader of DDS_Listen passed\n")));
-      }
-    if (!this->listen_dds_data_reader_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get dds reader of DDS_Listen failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get dds reader of DDS_Listen passed\n")));
-      }
-    if (!this->listen_filter_config_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get filter config of DDS_Listen failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get filter config of DDS_Listen passed\n")));
-      }
-    //Provides
-    if (!this->raw_listener_created_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : listener not created\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Listener was created\n")));
-      }
-    if (!this->listen_port_status_created_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : PortStatusListener of DDS_Listen not created\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : PortStatusListener of DDS_Listen was created\n")));
-      }
-    if (!this->get_port_status_created_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : PortStatusListener of DDS_Get not created\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : PortStatusListener of DDS_Get was created\n")));
-      }
-    if (!this->get_status_listener_created_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : ConnectorStatusListener not created\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : ConnectorStatusListener was created\n")));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Event_Connection_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/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h
deleted file mode 100644
index 1818e387d4f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// -*- C++ -*-
-#ifndef EVENT_CONNECTION_RECEIVER_EXEC_H_
-#define EVENT_CONNECTION_RECEIVER_EXEC_H_
-
-#include "Event_Connection_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"
-
-namespace CIAO_Event_Connection_Test_Receiver_Impl
-{
-  //============================================================
-  // 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);
-
-    // Port operations.
-    virtual ::Event_ConnectionConnector::CCM_Listener_ptr
-    get_info_listen_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_listen_status (void);
-
-    //DDS_Get
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_status (void);
-
-    virtual CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_status_listener(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:
-    ::Event_Connection_Test::CCM_Receiver_Context_var context_;
-
-    bool getter_ok_;
-    bool getter_reader_ok_;
-    bool getter_dds_data_reader_ok_;
-    bool getter_filter_config_ok_;
-
-    //DDS_Listen
-    bool listen_data_control_ok_;
-    bool listen_reader_ok_;
-    bool listen_dds_data_reader_ok_;
-    bool listen_filter_config_ok_;
-
-    //Provide checks
-    bool listen_port_status_created_;
-    bool get_port_status_created_;
-    bool get_status_listener_created_;
-    bool raw_listener_created_;
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Event_Connection_Test_Receiver_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/.gitignore
deleted file mode 100644
index 021736f2ef6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Event_Connection_Test_SenderE.idl
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl
deleted file mode 100644
index cd21c5158cb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_EVENT_CONNECTION_TEST_SENDER_IDL
-#define DDS_EVENT_CONNECTION_TEST_SENDER_IDL
-
-#include "Connector/Event_Connection_Test_Connector.idl"
-
-module Event_Connection_Test
-{
-  component Sender
-  {
-    port Event_ConnectionConnector::DDS_Write info_write;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc
deleted file mode 100644
index 70da2a16c63..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_ECT_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_ECT_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_ECT_Connector_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 {
-    Event_Connection_Test_Sender.idl
-  }
-}
-
-project(DDS_ECT_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_ECT_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 {
-    Event_Connection_Test_SenderE.idl
-  }
-}
-
-project(DDS_ECT_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_ECT_Sender_lem_gen DDS_ECT_Sender_stub DDS_ECT_Base_stub
-  libs  += DDS_ECT_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_Connection_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    Event_Connection_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Event_Connection_Test_SenderEC.inl
-  }
-}
-
-project(DDS_ECT_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_ECT_Sender_idl_gen DDS_ECT_Base_stub DDS_ECT_Connector_stub
-  libs  += DDS_ECT_Base_stub DDS_ECT_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_Connection_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    Event_Connection_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Event_Connection_Test_SenderC.inl
-  }
-}
-
-project(DDS_ECT_Sender_exec) : ciao_executor, dds4ccm_base {
-  after   += DDS_ECT_Sender_lem_stub DDS_ECT_Sender_stub DDS_ECT_Connector_lem_stub DDS_ECT_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_ECT_Base_stub DDS_ECT_Connector_lem_stub DDS_ECT_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_Connection_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Event_Connection_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_ECT_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_ECT_Base_stub  DDS_ECT_Sender_lem_stub DDS_ECT_Connector_stub DDS_ECT_Connector_svnt  DDS_ECT_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_svnt DDS_ECT_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_Connection_Test_SenderS.cpp
-    Event_Connection_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Event_Connection_Test_SenderS.h
-    Event_Connection_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp
deleted file mode 100644
index ab7d1aee693..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-// -*- C++ -*-
-#include "Event_Connection_Test_Sender_exec.h"
-
-namespace CIAO_Event_Connection_Test_Sender_Impl
-{
-  //============================================================
-  // Sender_exec_i
-  //============================================================
-  Sender_exec_i::Sender_exec_i (void)
-    : writer_ok_ (false),
-      writer_dds_datawriter_ok_ (false)
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  void
-  Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::Event_Connection_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    ::Event_ConnectionConnector::Writer_var writer =
-        this->context_->get_connection_info_write_data ();
-    if (! ::CORBA::is_nil (writer.in ()))
-      {
-        this->writer_ok_ = true;
-      }
-    ::DDS::DataWriter_var writer_dds_datawriter =
-        this->context_->get_connection_info_write_dds_entity ();
-    if (! ::CORBA::is_nil (writer_dds_datawriter.in ()))
-      {
-        this->writer_dds_datawriter_ok_ = true;
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    if (!this->writer_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender : get writer failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender : Get writer passed\n")));
-      }
-    if (!this->writer_dds_datawriter_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender : get dds writer failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender : Get dds writer passed\n")));
-      }
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Event_Connection_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/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h
deleted file mode 100644
index 4509c06bf87..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// -*- C++ -*-
-#ifndef EVENT_CONNECTION_SENDER_EXEC_H_
-#define EVENT_CONNECTION_SENDER_EXEC_H_
-
-
-#include "Event_Connection_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_Event_Connection_Test_Sender_Impl
-{
-  //============================================================
-  // Sender_exec_i
-  //============================================================
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (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);
-
-  private:
-    ::Event_Connection_Test::CCM_Sender_Context_var context_;
-
-    bool writer_ok_;
-    bool writer_dds_datawriter_ok_;
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Event_Connection_Test_Sender_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp
deleted file mode 100644
index 98af0e2eddb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp
+++ /dev/null
@@ -1,549 +0,0 @@
-<!--  -->
-<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>Event_Connection_Test_Depl_1</label>
-  <UUID>Event_Connection_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_Event_Connection_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_Event_Connection_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="Event_Connection_Test_ConnectorComponentImplementation">
-    <name>Event_Connection_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Event_Connection_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Event_Connection_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_Event_ConnectionConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_ConnectionConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_Connection_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_Connection_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_Event_Connection_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_Event_Connection_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="Event_Connection_Test_ConnectorComponentInstance">
-    <name>Event_Connection_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Event_Connection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_Connection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Event_Connection_Test_ConnectorComponentInstance2">
-    <name>Event_Connection_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Event_Connection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_Connection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Event_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_rawlistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="Event_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_datacontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="Event_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_dds_reader</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_filter_config</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>getter_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Event_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>getter_fresh_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>getter_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>getter_dds_reader</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>getter_filter_config</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>status_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-     <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Event_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="Event_Connection_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_dds_writer</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_Connection_Test_ConnectorComponentInstance" />
-    </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="Event_Connection_Test_Connector_ExecArtifact">
-    <name>Event_Connection_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_ECT_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Event_Connection_Test_Connector_SvntArtifact">
-    <name>Event_Connection_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_ECT_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Event_Connection_Test_Connector_StubArtifact">
-    <name>Event_Connection_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_ECT_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/Event_Connection_Test/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl
deleted file mode 100755
index c6321471979..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 10 seconds to allow task to complete\n";
-sleep (10);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/.gitignore b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/.gitignore
deleted file mode 100644
index 77e8d9f2fe7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/FSS_Event_Base.cxx
-/FSS_Event_Base.h
-/FSS_Event_BasePlugin.cxx
-/FSS_Event_BasePlugin.h
-/FSS_Event_BaseSupport.cxx
-/FSS_Event_BaseSupport.h
-/FSS_Event_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl
deleted file mode 100644
index 5f863dfc852..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file FSS_Event_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef FIXED_SIZE_STRUCT_EVENT_BASE_IDL
-#define FIXED_SIZE_STRUCT_EVENT_BASE_IDL
-
-#pragma ndds typesupport "Base/FSS_Event_BaseSupport.h"
-#pragma opendds typesupport "Base/FSS_Event_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "FixedStructSizeTest"
-
-struct FixedStructSizeTest {
-  long one;
-  long two;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<FixedStructSizeTest> FixedStructSizeTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc
deleted file mode 100644
index d3e00ad4ba2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_FSS_Event_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_FSS_Event_Base_stub
-  dynamicflags += FIXED_SIZE_STRUCT_EVENT_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=FIXED_SIZE_STRUCT_EVENT_BASE_STUB_Export \
-              -Wb,stub_export_include=FSS_Event_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    FSS_Event_Base.idl
-  }
-
-  opendds_ts_flags += --export=FIXED_SIZE_STRUCT_EVENT_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    FSS_Event_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/.gitignore
deleted file mode 100644
index 769eec5ea57..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/FSS_Event_ConnectorE.idl
-/FSS_Event_Connector_conn.cpp
-/FSS_Event_Connector_conn.h
-/FSS_Event_Connector_conn_export.h
-/FSS_Event_Connector_lem_stub_export.h
-/FSS_Event_Connector_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl
deleted file mode 100644
index 3f15d247191..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file FSS_Event_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef FIXED_SIZE_STRUCT_EVENT_CONNECTOR_IDL_
-#define FIXED_SIZE_STRUCT_EVENT_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/FSS_Event_Base.idl"
-
-#pragma ciao lem "Connector/FSS_Event_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/FSS_Event_BaseTypeSupport.idl"
-#endif
-
-module FSS_Event
-{
-  module ::CCM_DDS::Typed < ::FixedStructSizeTest, ::FixedStructSizeTestSeq> FixedStructSizeTestConnector;
-};
-
-#endif /* FSS_Event_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc
deleted file mode 100644
index 5a30d625af0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc
+++ /dev/null
@@ -1,140 +0,0 @@
-project(DDS_FSS_Event_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_FSS_Event_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=FIXED_SIZE_STRUCT_EVENT_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=FSS_Event_Connector_stub_export.h \
-              -Wb,skel_export_macro=FIXED_SIZE_STRUCT_EVENT_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=FSS_Event_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=FIXED_SIZE_STRUCT_EVENT_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=FSS_Event_Connector_svnt_export.h \
-              -Wb,conn_export_macro=FIXED_SIZE_STRUCT_EVENT_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=FSS_Event_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    FSS_Event_Connector.idl
-  }
-}
-
-project(DDS_FSS_Event_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_FSS_Event_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=FIXED_SIZE_STRUCT_EVENT_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=FSS_Event_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    FSS_Event_ConnectorE.idl
-  }
-}
-
-project(DDS_FSS_Event_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_FSS_Event_Connector_lem_gen DDS_FSS_Event_Connector_stub DDS_FSS_Event_Base_stub
-  libs  += DDS_FSS_Event_Base_stub DDS_FSS_Event_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_FSS_Event_Connector_lem_stub
-  dynamicflags += FIXED_SIZE_STRUCT_EVENT_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    FSS_Event_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    FSS_Event_ConnectorEC.h
-    FSS_Event_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    FSS_Event_ConnectorEC.inl
-  }
-}
-
-project(DDS_FSS_Event_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_FSS_Event_Connector_idl_gen DDS_FSS_Event_Base_stub
-  libs  += DDS_FSS_Event_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_FSS_Event_Connector_stub
-  dynamicflags += FIXED_SIZE_STRUCT_EVENT_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    FSS_Event_ConnectorC.cpp
-  }
-
-  Header_Files {
-    FSS_Event_ConnectorC.h
-    FSS_Event_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    FSS_Event_ConnectorC.inl
-  }
-}
-
-project(DDS_FSS_Event_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_FSS_Event_Connector_lem_stub DDS_FSS_Event_Connector_stub
-  sharedname = DDS_FSS_Event_Connector_exec
-  libs += DDS_FSS_Event_Connector_stub DDS_FSS_Event_Connector_lem_stub DDS_FSS_Event_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += FIXED_SIZE_STRUCT_EVENT_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    FSS_Event_Connector_conn.cpp
-  }
-
-  Header_Files {
-    FSS_Event_Connector_conn.h
-    FSS_Event_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_FSS_Event_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_FSS_Event_Connector_lem_stub DDS_FSS_Event_Connector_exec DDS_FSS_Event_Connector_stub
-  sharedname  = DDS_FSS_Event_Connector_svnt
-  libs       += DDS_FSS_Event_Connector_stub \
-                DDS_FSS_Event_Connector_lem_stub  \
-                DDS_FSS_Event_Base_stub \
-                DDS_FSS_Event_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += FIXED_SIZE_STRUCT_EVENT_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    FSS_Event_ConnectorS.cpp
-    FSS_Event_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    FSS_Event_ConnectorS.h
-    FSS_Event_Connector_svnt.h
-    FSS_Event_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/.gitignore b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/.gitignore
deleted file mode 100644
index 37d860c1fd1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/FSS_State_Base.cxx
-/FSS_State_Base.h
-/FSS_State_BasePlugin.cxx
-/FSS_State_BasePlugin.h
-/FSS_State_BaseSupport.cxx
-/FSS_State_BaseSupport.h
-/FSS_State_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl
deleted file mode 100644
index d09fc6a6884..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file FSS_State_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef FIXED_SIZE_STRUCT_STATE_BASE_IDL
-#define FIXED_SIZE_STRUCT_STATE_BASE_IDL
-
-#pragma ndds typesupport "Base/FSS_State_BaseSupport.h"
-#pragma opendds typesupport "Base/FSS_State_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "FixedStructSizeTest"
-
-struct FixedStructSizeTest {
-  long one;
-  long two;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<FixedStructSizeTest> FixedStructSizeTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc
deleted file mode 100644
index e5e929febc7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_FSS_State_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_FSS_State_Base_stub
-  dynamicflags += FIXED_SIZE_STRUCT_STATE_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=FIXED_SIZE_STRUCT_STATE_BASE_STUB_Export \
-              -Wb,stub_export_include=FSS_State_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    FSS_State_Base.idl
-  }
-
-  opendds_ts_flags += --export=FIXED_SIZE_STRUCT_STATE_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    FSS_State_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/.gitignore
deleted file mode 100644
index 6b972d0ecd6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/FSS_State_ConnectorE.idl
-/FSS_State_Connector_conn.cpp
-/FSS_State_Connector_conn.h
-/FSS_State_Connector_conn_export.h
-/FSS_State_Connector_lem_stub_export.h
-/FSS_State_Connector_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl
deleted file mode 100644
index 0ee2f8d5638..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file FSS_State_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef FIXED_SIZE_STRUCT_STATE_CONNECTOR_IDL_
-#define FIXED_SIZE_STRUCT_STATE_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/FSS_State_Base.idl"
-
-#pragma ciao lem "Connector/FSS_State_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/FSS_State_BaseTypeSupport.idl"
-#endif
-
-module FSS_State
-{
-  module ::CCM_DDS::Typed < ::FixedStructSizeTest, ::FixedStructSizeTestSeq> FixedStructSizeTestConnector;
-};
-
-#endif /* FSS_State_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc
deleted file mode 100644
index b92636ed14c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_FSS_State_Base -l .. -o ../lib -u DDS FSS_State_Connector"
-
-project(DDS_FSS_State_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_FSS_State_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=FIXED_SIZE_STRUCT_STATE_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=FSS_State_Connector_stub_export.h \
-              -Wb,skel_export_macro=FIXED_SIZE_STRUCT_STATE_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=FSS_State_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=FIXED_SIZE_STRUCT_STATE_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=FSS_State_Connector_svnt_export.h \
-              -Wb,conn_export_macro=FIXED_SIZE_STRUCT_STATE_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=FSS_State_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    FSS_State_Connector.idl
-  }
-}
-
-project(DDS_FSS_State_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_FSS_State_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=FIXED_SIZE_STRUCT_STATE_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=FSS_State_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    FSS_State_ConnectorE.idl
-  }
-}
-
-project(DDS_FSS_State_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_FSS_State_Connector_lem_gen DDS_FSS_State_Connector_stub DDS_FSS_State_Base_stub
-  libs  += DDS_FSS_State_Base_stub DDS_FSS_State_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_FSS_State_Connector_lem_stub
-  dynamicflags += FIXED_SIZE_STRUCT_STATE_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    FSS_State_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    FSS_State_ConnectorEC.h
-    FSS_State_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    FSS_State_ConnectorEC.inl
-  }
-}
-
-project(DDS_FSS_State_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_FSS_State_Connector_idl_gen DDS_FSS_State_Base_stub
-  libs  += DDS_FSS_State_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_FSS_State_Connector_stub
-  dynamicflags += FIXED_SIZE_STRUCT_STATE_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    FSS_State_ConnectorC.cpp
-  }
-
-  Header_Files {
-    FSS_State_ConnectorC.h
-    FSS_State_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    FSS_State_ConnectorC.inl
-  }
-}
-
-project(DDS_FSS_State_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_FSS_State_Connector_lem_stub DDS_FSS_State_Connector_stub DDS_FSS_State_Base_stub
-  sharedname = DDS_FSS_State_Connector_exec
-  libs += DDS_FSS_State_Connector_stub DDS_FSS_State_Connector_lem_stub DDS_FSS_State_Base_stub DDS_FSS_State_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += FIXED_SIZE_STRUCT_STATE_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    FSS_State_Connector_conn.cpp
-  }
-
-  Header_Files {
-    FSS_State_Connector_conn.h
-    FSS_State_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_FSS_State_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_FSS_State_Connector_lem_stub DDS_FSS_State_Connector_exec DDS_FSS_State_Connector_stub
-  sharedname  = DDS_FSS_State_Connector_svnt
-  libs       += DDS_FSS_State_Connector_stub \
-                DDS_FSS_State_Connector_lem_stub  \
-                DDS_FSS_State_Base_stub \
-                DDS_FSS_State_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += FIXED_SIZE_STRUCT_STATE_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    FSS_State_ConnectorS.cpp
-    FSS_State_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    FSS_State_ConnectorS.h
-    FSS_State_Connector_svnt.h
-    FSS_State_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl
deleted file mode 100644
index 9e56e98005b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file GCE_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef GET_COMPONENT_EVENT_TEST_BASE_IDL
-#define GET_COMPONENT_EVENT_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/GCE_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/GCE_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "GCETest"
-#pragma DCPS_DATA_KEY "GCETest symbol"
-
-struct GCETest {
-  string symbol; //@key
-  long x;
-  long y;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<GCETest> GCETestSeq;
-#endif
-
-#endif /* GET_COMPONENT_EVENT_TEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.mpc
deleted file mode 100644
index 7ac420f122b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (GCE_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = GCE_Test_Base_stub
-  dynamicflags += GET_COMPONENT_EVENT_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=GET_COMPONENT_EVENT_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=GCE_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    GCE_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=GET_COMPONENT_EVENT_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    GCE_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.idl
deleted file mode 100644
index cbf76c3a7d6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COMPONENT_IDL
-#define COMPONENT_IDL
-
-#include "Connector/GCE_Test_Connector.idl"
-
-module GCE_Test
-{
-  component GetComponentEventTestComponent
-  {
-    port GCETestConnector::DDS_Listen  info_listen;
-    port GCETestConnector::DDS_Get     info_get;
-    provides CCM_DDS::ConnectorStatusListener status_listener;
-
-    port GCETestConnector::DDS_Write info_write;
-
-    attribute boolean act_as_sender;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc
deleted file mode 100644
index ab3f20f1130..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(GCE_Test_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += GCE_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Component_stub_export.h \
-              -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Component_svnt_export.h \
-              -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Component_svnt_export.h \
-              -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Component_exec_export.h -I..
-
-  IDL_Files {
-    GCE_Test_Component.idl
-  }
-}
-
-project(GCE_Test_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += GCE_Test_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    GCE_Test_ComponentE.idl
-  }
-}
-
-project(GCE_Test_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += GCE_Test_Component_lem_gen GCE_Test_Component_stub  \
-           GCE_Test_Connector_stub GCE_Test_Base_stub
-  libs  +=  Component_stub GCE_Test_Connector_stub \
-            GCE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_lem_stub
-  dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCE_Test_ComponentEC.cpp
-  }
-
-  Header_Files {
-    GCE_Test_ComponentEC.h
-    Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    GCE_Test_ComponentEC.inl
-  }
-}
-
-project(GCE_Test_Component_stub) : ccm_stub, dds4ccm_base {
-  after += GCE_Test_Component_idl_gen  GCE_Test_Connector_stub \
-           GCE_Test_Base_stub GCE_Test_Connector_lem_gen
-  libs  += GCE_Test_Connector_stub GCE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_stub
-  dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCE_Test_ComponentC.cpp
-  }
-
-  Header_Files {
-    GCE_Test_ComponentC.h
-    Component_stub_export.h
-  }
-
-  Inline_Files {
-    GCE_Test_ComponentC.inl
-  }
-}
-
-project(GCE_Test_Component_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += GCE_Test_Component_lem_stub GCE_Test_Component_stub \
-             GCE_Test_Base_stub GCE_Test_Connector_stub \
-             GCE_Test_Connector_lem_stub 
-  sharedname = Component_exec
-  libs += Component_stub Component_lem_stub GCE_Test_Base_stub \
-          GCE_Test_Connector_stub GCE_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCE_Test_Component_exec.cpp
-  }
-
-  Header_Files {
-    GCE_Test_Component_exec.h
-    Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(GCE_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   GCE_Test_Component_lem_stub GCE_Test_Base_stub \
-                  GCE_Test_Connector_stub GCE_Test_Connector_svnt \
-                  GCE_Test_Component_exec GCE_Test_Connector_lem_stub 
-  sharedname  = Component_svnt
-  libs       += Component_stub Component_lem_stub GCE_Test_Base_stub \
-                GCE_Test_Connector_stub GCE_Test_Connector_svnt \
-                Component_exec GCE_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCE_Test_ComponentS.cpp
-    GCE_Test_Component_svnt.cpp
-  }
-
-  Header_Files {
-    GCE_Test_ComponentS.h
-    GCE_Test_Component_svnt.h
-    Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp
deleted file mode 100644
index e51b418c453..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp
+++ /dev/null
@@ -1,420 +0,0 @@
-// -*- C++ -*-
-#include "GCE_Test_Component_exec.h"
-
-namespace CIAO_GCE_Test_GetComponentEventTestComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  Component_exec_i::Component_exec_i (void)
-    : act_as_sender_ (false)
-  {
-  }
-
-  Component_exec_i::~Component_exec_i (void)
-  {
-  }
-
-  ::CORBA::Boolean
-  Component_exec_i::act_as_sender (void)
-  {
-    return this->act_as_sender_;
-  }
-
-  void
-  Component_exec_i::act_as_sender (::CORBA::Boolean act_as_sender)
-  {
-    this->act_as_sender_ = act_as_sender;
-  }
-
-  ::GCETestConnector::CCM_Listener_ptr
-  Component_exec_i::get_info_listen_data_listener (void)
-  {
-    return ::GCETestConnector::CCM_Listener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_info_listen_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_info_get_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Component_exec_i::get_status_listener (void)
-  {
-    return ::CCM_DDS::CCM_ConnectorStatusListener::_nil ();
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Component_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::GCE_Test::CCM_GetComponentEventTestComponent_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Component_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Component_exec_i::test_writer ()
-  {
-    //DDS_Update -> Writer
-    try
-      {
-        ::GCETestConnector::Writer_var writer_data =
-          this->context_->get_connection_info_write_data ();
-        if (! ::CORBA::is_nil (writer_data.in ()))
-          {
-            CORBA::Object_var cmp = writer_data->_get_component ();
-            ::GCETestConnector::CCM_DDS_Event_var conn =
-              ::GCETestConnector::CCM_DDS_Event::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("writer_data\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_writer - ")
-                                      ACE_TEXT ("Writer on DDS_Write port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - "
-                                  ACE_TEXT ("writer_data is NIL.\n"))));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_writer: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("writer_data\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("writer_data\n")));
-      }
-
-    try
-      {
-        ::DDS::DataWriter_var writer_dds_entity =
-          this->context_->get_connection_info_write_dds_entity ();
-        if (! ::CORBA::is_nil (writer_dds_entity.in ()))
-          {
-            CORBA::Object_var cmp = writer_dds_entity->_get_component ();
-            ::GCETestConnector::CCM_DDS_Event_var conn =
-              ::GCETestConnector::CCM_DDS_Event::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("writer_dds_entity\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_writer - ")
-                                      ACE_TEXT ("dds_entity on DDS_Write port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - "
-                                  ACE_TEXT ("writer_dds_entity is NIL.\n"))));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_writer: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("write_dds_entity\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("writer_data\n")));
-      }
-  }
-
-  void
-  Component_exec_i::test_getter ()
-  {
-    //Reader on DDS_Get
-    try
-      {
-        ::GCETestConnector::Reader_var getter_data =
-          this->context_->get_connection_info_get_data ();
-        if (! ::CORBA::is_nil (getter_data.in ()))
-          {
-            CORBA::Object_var cmp = getter_data->_get_component ();
-            ::GCETestConnector::CCM_DDS_Event_var conn =
-              ::GCETestConnector::CCM_DDS_Event::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("getter_data\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_getter - ")
-                                      ACE_TEXT ("Reader on DDS_Get port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                                  ACE_TEXT ("getter_data is NIL.\n")));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_getter: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("getter_data\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("getter_data\n")));
-      }
-
-    //Getter on DDS_Get
-    try
-      {
-        ::GCETestConnector::Getter_var getter_fresh_data =
-          this->context_->get_connection_info_get_fresh_data ();
-        if (! ::CORBA::is_nil (getter_fresh_data.in ()))
-          {
-            CORBA::Object_var cmp = getter_fresh_data->_get_component ();
-            ::GCETestConnector::CCM_DDS_Event_var conn =
-              ::GCETestConnector::CCM_DDS_Event::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("getter_fresh_data\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_getter - ")
-                                      ACE_TEXT ("Getter on DDS_Get port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                                  ACE_TEXT ("getter_fresh_data is NIL.\n")));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_getter: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("getter_fresh_data\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("getter_fresh_data\n")));
-      }
-
-    //Getter on DDS_Get
-    try
-      {
-        ::DDS::DataReader_var getter_dds_entity =
-          this->context_->get_connection_info_get_dds_entity ();
-        if (! ::CORBA::is_nil (getter_dds_entity.in ()))
-          {
-            CORBA::Object_var cmp = getter_dds_entity->_get_component ();
-            ::GCETestConnector::CCM_DDS_Event_var conn =
-              ::GCETestConnector::CCM_DDS_Event::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("getter_dds_entity\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_getter - ")
-                                      ACE_TEXT ("dds_entity on DDS_Get port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                                  ACE_TEXT ("getter_dds_entity is NIL.\n")));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_getter: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("get_dds_entity\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("get_dds_entity\n")));
-      }
-  }
-
-  void
-  Component_exec_i::test_listener ()
-  {
-    try
-      {
-         //DDS_Listen
-        ::GCETestConnector::Reader_var listen_data =
-          this->context_->get_connection_info_listen_data ();
-        if (! ::CORBA::is_nil (listen_data.in ()))
-          {
-            CORBA::Object_var cmp = listen_data->_get_component ();
-            ::GCETestConnector::CCM_DDS_Event_var conn =
-              ::GCETestConnector::CCM_DDS_Event::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("listen_data\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_listener - ")
-                                      ACE_TEXT ("Reader on DDS_Listen port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                                  ACE_TEXT ("listen_data is NIL.\n")));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_listener: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("listen_data\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("listen_data\n")));
-      }
-
-    try
-      {
-        ::CCM_DDS::DataListenerControl_var  listen_data_control =
-          this->context_->get_connection_info_listen_data_control ();
-        if (! ::CORBA::is_nil (listen_data_control.in ()))
-          {
-            CORBA::Object_var cmp = listen_data_control->_get_component ();
-            ::GCETestConnector::CCM_DDS_Event_var conn =
-              ::GCETestConnector::CCM_DDS_Event::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("listen_data_control\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_listener - ")
-                                      ACE_TEXT ("DataControl on DDS_Listen port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                                  ACE_TEXT ("listen_data_control is NIL.\n")));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_listener: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("listen_data_control\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("listen_data_control\n")));
-      }
-  }
-
-  void
-  Component_exec_i::ccm_activate (void)
-  {
-    if (this->act_as_sender_)
-      {
-        this->test_writer ();
-      }
-    else
-      {
-        this->test_getter ();
-        this->test_listener ();
-      }
-  }
-
-  void
-  Component_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_GetComponentEventTest_Component_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Component_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.h
deleted file mode 100644
index 79db6fd36e7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COMPONENT_EXEC_H_
-#define CIAO_COMPONENT_EXEC_H_
-
-#include "GCE_Test_ComponentEC.h"
-
-#include /**/ "Component_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_GCE_Test_GetComponentEventTestComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  class COMPONENT_EXEC_Export Component_exec_i
-    : public virtual GetComponentEventTestComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Component_exec_i (void);
-    virtual ~Component_exec_i (void);
-
-    ::CORBA::Boolean
-    act_as_sender (void);
-
-    void
-    act_as_sender (::CORBA::Boolean act_as_sender);
-
-    virtual ::GCETestConnector::CCM_Listener_ptr
-    get_info_listen_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_listen_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_status (void);
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_status_listener (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:
-    ::GCE_Test::CCM_GetComponentEventTestComponent_Context_var context_;
-    ::CORBA::Boolean act_as_sender_;
-    void test_writer (void);
-    void test_getter (void);
-    void test_listener (void);
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_GetComponentEventTest_Component_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl
deleted file mode 100644
index ae80f12bf6a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file GCE_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef GET_COMPONENT_EVENT_TEST_CONNECTOR_IDL_
-#define GET_COMPONENT_EVENT_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/GCE_Test_Base.idl"
-
-#pragma ciao lem "Connector/GCE_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/GCE_Test_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::GCETest, ::GCETestSeq> GCETestConnector;
-
-#endif /* GET_COMPONENT_EVENT_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc
deleted file mode 100644
index 802e33ce66d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p GCE_Test_Base -l .. -o ../lib -u DDS GCE_Test_Connector"
-
-project(GCE_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen GCE_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=GET_COMPONENT_EVENT_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=GCE_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=GET_COMPONENT_EVENT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=GCE_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=GET_COMPONENT_EVENT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=GCE_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=GET_COMPONENT_EVENT_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=GCE_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    GCE_Test_Connector.idl
-  }
-}
-
-project(GCE_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += GCE_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=GET_COMPONENT_EVENT_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=GCE_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    GCE_Test_ConnectorE.idl
-  }
-}
-
-project(GCE_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += GCE_Test_Connector_lem_gen GCE_Test_Connector_stub GCE_Test_Base_stub
-  libs  += GCE_Test_Base_stub GCE_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = GCE_Test_Connector_lem_stub
-  dynamicflags += GET_COMPONENT_EVENT_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCE_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    GCE_Test_ConnectorEC.h
-    GCE_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    GCE_Test_ConnectorEC.inl
-  }
-}
-
-project(GCE_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += GCE_Test_Connector_idl_gen GCE_Test_Base_stub
-  libs  += GCE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = GCE_Test_Connector_stub
-  dynamicflags += GET_COMPONENT_EVENT_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCE_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    GCE_Test_ConnectorC.h
-    GCE_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    GCE_Test_ConnectorC.inl
-  }
-}
-
-project(GCE_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += GCE_Test_Connector_lem_stub GCE_Test_Connector_stub GCE_Test_Base_stub
-  sharedname = GCE_Test_Connector_exec
-  libs += GCE_Test_Connector_stub GCE_Test_Connector_lem_stub GCE_Test_Base_stub GCE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += GET_COMPONENT_EVENT_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCE_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    GCE_Test_Connector_conn.h
-    GCE_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(GCE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += GCE_Test_Connector_lem_stub GCE_Test_Connector_exec GCE_Test_Connector_stub
-  sharedname  = GCE_Test_Connector_svnt
-  libs       += GCE_Test_Connector_stub \
-                GCE_Test_Connector_lem_stub  \
-                GCE_Test_Base_stub \
-                GCE_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += GET_COMPONENT_EVENT_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCE_Test_ConnectorS.cpp
-    GCE_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    GCE_Test_ConnectorS.h
-    GCE_Test_Connector_svnt.h
-    GCE_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/Plan.cdp
deleted file mode 100644
index de9f38b7dc6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/Plan.cdp
+++ /dev/null
@@ -1,361 +0,0 @@
-<!--  -->
-<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>GetComponentEventTest_Depl</label>
-  <UUID>GetComponentEventTest_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_GetComponentEventTest_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_GCE_Test_GetComponentEventTestComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="GCE_Test_ConnectorImplementation">
-    <name>GCE_Test_ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="GCE_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="GCE_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_GCETestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_GCETestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>GCE_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>GCE_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <!-- act as sender-->
-  <instance xmi:id="ComponentInstance1">
-    <name>Sender</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>act_as_sender</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="GCE_Test_ConnectorInstance1">
-    <name>GCE_Test_Connector1</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="GCE_Test_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>GetComponentEventTopic</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- act as receiver -->
-  <instance xmi:id="ComponentInstance2">
-    <name>Receiver</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>act_as_sender</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="GCE_Test_ConnectorInstance2">
-    <name>GCE_Test_Connector2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="GCE_Test_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>GetComponentEventTopic</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- SENDER COMPONENT CONNECTIONS -->
-  <connection>
-    <name>write_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance1" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCE_Test_ConnectorInstance1" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>write_dds_entity</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance1" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCE_Test_ConnectorInstance1" />
-    </internalEndpoint>
-  </connection>
-
-  <!-- RECEIVER COMPONENT CONNECTIONS -->
-  <!--   DDS_Get port -->
-  <connection>
-    <name>get_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCE_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>get_dds_entity_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCE_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>get_fresh_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCE_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <!--   DDS_Listen port -->
-  <connection>
-    <name>listen_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCE_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>listen_data_control_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCE_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="GCE_Test_Connector_ExecArtifact">
-    <name>GCE_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>GCE_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="GCE_Test_Connector_SvntArtifact">
-    <name>GCE_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>GCE_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="GCE_Test_Connector_StubArtifact">
-    <name>GCE_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>GCE_Test_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/run_test.pl
deleted file mode 100755
index 955469ac4bc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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 = ( "Sender.ior", "Receiver.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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 5 seconds to allow task to complete\n";
-sleep (5);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl
deleted file mode 100644
index 28624e01777..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file GCS_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef GET_COMPONENT_STATE_TEST_BASE_IDL
-#define GET_COMPONENT_STATE_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/GCS_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/GCS_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "GCSTest"
-#pragma DCPS_DATA_KEY "GCSTest symbol"
-
-struct GCSTest {
-  string symbol; //@key
-  long x;
-  long y;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<GCSTest> GCSTestSeq;
-#endif
-
-#endif /* GET_COMPONENT_STATE_TEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.mpc
deleted file mode 100644
index 7756e763040..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (GCS_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = GCS_Test_Base_stub
-  dynamicflags += GET_COMPONENT_STATE_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=GET_COMPONENT_STATE_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=GCS_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    GCS_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=GET_COMPONENT_STATE_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    GCS_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.idl
deleted file mode 100644
index ec5ce2468b9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COMPONENT_IDL
-#define COMPONENT_IDL
-
-#include "Connector/GCS_Test_Connector.idl"
-
-module GCS_Test
-{
-  component GetComponentStateTestComponent
-  {
-    port GCSTestConnector::DDS_Read info_read;
-    port GCSTestConnector::DDS_Get info_get;
-    port GCSTestConnector::DDS_Listen info_listen;
-    port GCSTestConnector::DDS_StateListen info_statelisten;
-
-    port GCSTestConnector::DDS_Update info_update;
-
-    attribute boolean act_as_sender;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc
deleted file mode 100644
index 929c3edd9f3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(GCS_Test_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += GCS_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Component_stub_export.h \
-              -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Component_svnt_export.h \
-              -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Component_svnt_export.h \
-              -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Component_exec_export.h -I..
-
-  IDL_Files {
-    GCS_Test_Component.idl
-  }
-}
-
-project(GCS_Test_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += GCS_Test_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    GCS_Test_ComponentE.idl
-  }
-}
-
-project(GCS_Test_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += GCS_Test_Component_lem_gen GCS_Test_Component_stub  \
-           GCS_Test_Connector_stub GCS_Test_Base_stub
-  libs  +=  Component_stub GCS_Test_Connector_stub \
-            GCS_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_lem_stub
-  dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCS_Test_ComponentEC.cpp
-  }
-
-  Header_Files {
-    GCS_Test_ComponentEC.h
-    Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    GCS_Test_ComponentEC.inl
-  }
-}
-
-project(GCS_Test_Component_stub) : ccm_stub, dds4ccm_base {
-  after += GCS_Test_Component_idl_gen  GCS_Test_Connector_stub \
-           GCS_Test_Base_stub GCS_Test_Connector_lem_gen
-  libs  += GCS_Test_Connector_stub GCS_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_stub
-  dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCS_Test_ComponentC.cpp
-  }
-
-  Header_Files {
-    GCS_Test_ComponentC.h
-    Component_stub_export.h
-  }
-
-  Inline_Files {
-    GCS_Test_ComponentC.inl
-  }
-}
-
-project(GCS_Test_Component_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += GCS_Test_Component_lem_stub GCS_Test_Component_stub \
-             GCS_Test_Base_stub GCS_Test_Connector_stub \
-             GCS_Test_Connector_lem_stub 
-  sharedname = Component_exec
-  libs += Component_stub Component_lem_stub GCS_Test_Base_stub \
-          GCS_Test_Connector_stub GCS_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCS_Test_Component_exec.cpp
-  }
-
-  Header_Files {
-    GCS_Test_Component_exec.h
-    Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(GCS_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   GCS_Test_Component_lem_stub GCS_Test_Base_stub \
-                  GCS_Test_Connector_stub GCS_Test_Connector_svnt \
-                  GCS_Test_Component_exec GCS_Test_Connector_lem_stub 
-  sharedname  = Component_svnt
-  libs       += Component_stub Component_lem_stub GCS_Test_Base_stub \
-                GCS_Test_Connector_stub GCS_Test_Connector_svnt \
-                Component_exec GCS_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCS_Test_ComponentS.cpp
-    GCS_Test_Component_svnt.cpp
-  }
-
-  Header_Files {
-    GCS_Test_ComponentS.h
-    GCS_Test_Component_svnt.h
-    Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp
deleted file mode 100644
index e4227a18f31..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp
+++ /dev/null
@@ -1,612 +0,0 @@
-// -*- C++ -*-
-#include "GCS_Test_Component_exec.h"
-
-namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  Component_exec_i::Component_exec_i (void)
-    : act_as_sender_ (false)
-  {
-  }
-
-  Component_exec_i::~Component_exec_i (void)
-  {
-  }
-
-  ::CORBA::Boolean
-  Component_exec_i::act_as_sender (void)
-  {
-    return this->act_as_sender_;
-  }
-
-  void
-  Component_exec_i::act_as_sender (::CORBA::Boolean act_as_sender)
-  {
-    this->act_as_sender_ = act_as_sender;
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_info_read_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_info_get_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::GCSTestConnector::CCM_Listener_ptr
-  Component_exec_i::get_info_listen_data_listener (void)
-  {
-    return ::GCSTestConnector::CCM_Listener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_info_listen_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::GCSTestConnector::CCM_StateListener_ptr
-  Component_exec_i::get_info_statelisten_data_listener (void)
-  {
-    return ::GCSTestConnector::CCM_StateListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_info_statelisten_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Component_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::GCS_Test::CCM_GetComponentStateTestComponent_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Component_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Component_exec_i::test_updater ()
-  {
-    //DDS_Update -> Writer
-    try
-      {
-        ::GCSTestConnector::Updater_var updater_data =
-          this->context_->get_connection_info_update_data ();
-        if (! ::CORBA::is_nil (updater_data.in ()))
-          {
-            CORBA::Object_var cmp = updater_data->_get_component ();
-            ::GCSTestConnector::CCM_DDS_State_var conn =
-              ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("updater_data\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_updater - ")
-                                      ACE_TEXT ("Writer on DDS_Update port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - "
-                                  ACE_TEXT ("updater_data is NIL.\n"))));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_updater: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("updater_data\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("updater_data\n")));
-      }
-
-    try
-      {
-        ::DDS::DataWriter_var updater_dds_entity =
-          this->context_->get_connection_info_update_dds_entity ();
-        if (! ::CORBA::is_nil (updater_dds_entity.in ()))
-          {
-            CORBA::Object_var cmp = updater_dds_entity->_get_component ();
-            ::GCSTestConnector::CCM_DDS_State_var conn =
-              ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("updater_dds_entity\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_updater - ")
-                                      ACE_TEXT ("dds entity on DDS_Update port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - "
-                                  ACE_TEXT ("updater_dds_entity is NIL.\n"))));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_updater: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("update_dds_entity\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("update_dds_entity\n")));
-      }
-  }
-
-  void
-  Component_exec_i::test_reader ()
-  {
-    //DDS_Read -> Reader
-    try
-      {
-        ::GCSTestConnector::Reader_var reader_data =
-          this->context_->get_connection_info_read_data ();
-        if (! ::CORBA::is_nil (reader_data.in ()))
-          {
-            CORBA::Object_var cmp = reader_data->_get_component ();
-            ::GCSTestConnector::CCM_DDS_State_var conn =
-              ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("data_reader\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_reader - ")
-                                      ACE_TEXT ("Reader on DDS_Read port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - "
-                                  ACE_TEXT ("reader_data is NIL.\n"))));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_reader: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("data_reader\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("data_reader\n")));
-      }
-
-    try
-      {
-        ::DDS::DataReader_var datareader =
-          this->context_->get_connection_info_read_dds_entity ();
-        if (! ::CORBA::is_nil (datareader.in ()))
-          {
-            CORBA::Object_var cmp = datareader->_get_component ();
-            ::GCSTestConnector::CCM_DDS_State_var conn =
-              ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("dds_entity\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_reader - ")
-                                      ACE_TEXT ("DDS Entity on DDS_Read port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - "
-                                  ACE_TEXT ("data entity is NIL.\n"))));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_reader: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("read_dds_entity\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("read_dds_entity\n")));
-      }
-  }
-
-  void
-  Component_exec_i::test_getter ()
-  {
-    //Reader on DDS_Get
-    try
-      {
-        ::GCSTestConnector::Reader_var getter_data =
-          this->context_->get_connection_info_get_data ();
-        if (! ::CORBA::is_nil (getter_data.in ()))
-          {
-            CORBA::Object_var cmp = getter_data->_get_component ();
-            ::GCSTestConnector::CCM_DDS_State_var conn =
-              ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("getter_data\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_getter - ")
-                                      ACE_TEXT ("Reader on DDS_Get port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                                  ACE_TEXT ("getter_data is NIL.\n")));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_getter: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("getter_data\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("getter_data\n")));
-      }
-
-    try
-      {
-        ::DDS::DataReader_var getter_dds_entity =
-          this->context_->get_connection_info_get_dds_entity ();
-        if (! ::CORBA::is_nil (getter_dds_entity.in ()))
-          {
-            CORBA::Object_var cmp = getter_dds_entity->_get_component ();
-            ::GCSTestConnector::CCM_DDS_State_var conn =
-              ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("getter_dds_entity\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_getter - ")
-                                      ACE_TEXT ("dds_entity on DDS_Get port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                                  ACE_TEXT ("getter_dds_entity is NIL.\n")));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_getter: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("get_dds_entity\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("get_dds_entity\n")));
-      }
-
-    //Getter on DDS_Get
-    try
-      {
-        ::GCSTestConnector::Getter_var getter_fresh_data =
-          this->context_->get_connection_info_get_fresh_data ();
-        if (! ::CORBA::is_nil (getter_fresh_data.in ()))
-          {
-            CORBA::Object_var cmp = getter_fresh_data->_get_component ();
-            ::GCSTestConnector::CCM_DDS_State_var conn =
-              ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("getter_fresh_data\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_getter - ")
-                                      ACE_TEXT ("Getter on DDS_Get port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                                  ACE_TEXT ("getter_fresh_data is NIL.\n")));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_getter: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("getter_fresh_data\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("getter_fresh_data\n")));
-      }
-  }
-
-  void
-  Component_exec_i::test_listener ()
-  {
-    try
-      {
-        //DDS_Listen
-        ::GCSTestConnector::Reader_var listen_data =
-          this->context_->get_connection_info_listen_data ();
-        if (! ::CORBA::is_nil (listen_data.in ()))
-          {
-            CORBA::Object_var cmp = listen_data->_get_component ();
-            ::GCSTestConnector::CCM_DDS_State_var conn =
-              ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("listen_data\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_listener - ")
-                                      ACE_TEXT ("Reader on DDS_Listen port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                                  ACE_TEXT ("listen_data is NIL.\n")));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_listener: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("listen_data\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("listen_data\n")));
-      }
-
-    try
-      {
-        ::CCM_DDS::DataListenerControl_var  listen_data_control =
-          this->context_->get_connection_info_listen_data_control ();
-        if (! ::CORBA::is_nil (listen_data_control.in ()))
-          {
-            CORBA::Object_var cmp = listen_data_control->_get_component ();
-            ::GCSTestConnector::CCM_DDS_State_var conn =
-              ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("listen_data_control\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_listener - ")
-                                      ACE_TEXT ("DataControl on DDS_Listen port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                                  ACE_TEXT ("listen_data_control is NIL.\n")));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_listener: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("listen_data_control\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("listen_data_control\n")));
-      }
-  }
-
-  void
-  Component_exec_i::test_statelistener ()
-  {
-    //DDS_StateListen
-    try
-      {
-        ::GCSTestConnector::Reader_var statelisten_data =
-          this->context_->get_connection_info_statelisten_data ();
-        if (! ::CORBA::is_nil (statelisten_data.in ()))
-          {
-            CORBA::Object_var cmp = statelisten_data->_get_component ();
-            ::GCSTestConnector::CCM_DDS_State_var conn =
-              ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_statelistener - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("statelisten_data\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_statelistener - ")
-                                      ACE_TEXT ("Reader on DDS_StateListen port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_statelistener - ")
-                                  ACE_TEXT ("statelisten_data is NIL.\n")));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_statelistener: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("statelisten_data\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_statelistener - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("statelisten_data\n")));
-      }
-
-    try
-      {
-        ::CCM_DDS::StateListenerControl_var statelisten_data_control =
-          this->context_->get_connection_info_statelisten_data_control ();
-        if (! ::CORBA::is_nil (statelisten_data_control.in ()))
-          {
-            CORBA::Object_var cmp = statelisten_data_control->_get_component ();
-            ::GCSTestConnector::CCM_DDS_State_var conn =
-              ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_statelistener - ")
-                                      ACE_TEXT ("Unable to get component interface of ")
-                                      ACE_TEXT ("statelisten_data_control\n")));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_statelistener - ")
-                                      ACE_TEXT ("DataControl on DDS_StateListen port returned a ")
-                                      ACE_TEXT ("reference on _get_component.\n")));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_statelistener - ")
-                                  ACE_TEXT ("statelisten_data_control is NIL.\n")));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Component_exec_i::test_statelistener: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ")
-                              ACE_TEXT ("CORBA exception caught while testing ")
-                              ACE_TEXT ("statelisten_data_control\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_statelistener - ")
-                              ACE_TEXT ("Unknown exception caught while testing ")
-                              ACE_TEXT ("statelisten_data_control\n")));
-      }
-  }
-
-  void
-  Component_exec_i::ccm_activate (void)
-  {
-    if (this->act_as_sender_)
-      {
-        this->test_updater ();
-      }
-    else
-      {
-        this->test_reader ();
-        this->test_getter ();
-        this->test_listener ();
-        this->test_statelistener ();
-      }
-  }
-
-  void
-  Component_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_GetComponentStateTest_Component_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Component_exec_i);
-
-    return retval;
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.h
deleted file mode 100644
index 0d749d19194..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COMPONENT_EXEC_H_
-#define CIAO_COMPONENT_EXEC_H_
-
-#include "GCS_Test_ComponentEC.h"
-
-#include /**/ "Component_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  class COMPONENT_EXEC_Export Component_exec_i
-    : public virtual GetComponentStateTestComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Component_exec_i (void);
-    virtual ~Component_exec_i (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_read_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_status (void);
-
-    virtual ::GCSTestConnector::CCM_Listener_ptr
-    get_info_listen_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_listen_status (void);
-
-    virtual ::GCSTestConnector::CCM_StateListener_ptr
-    get_info_statelisten_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_statelisten_status (void);
-
-    ::CORBA::Boolean
-    act_as_sender (void);
-
-    void
-    act_as_sender (::CORBA::Boolean act_as_sender);
-
-    // 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:
-    ::GCS_Test::CCM_GetComponentStateTestComponent_Context_var context_;
-    ::CORBA::Boolean act_as_sender_;
-    void test_updater (void);
-    void test_reader (void);
-    void test_getter (void);
-    void test_listener (void);
-    void test_statelistener (void);
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_GetComponentStateTest_Component_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl
deleted file mode 100644
index c4c89e62b17..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file GCS_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef GET_COMPONENT_STATE_TEST_CONNECTOR_IDL_
-#define GET_COMPONENT_STATE_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/GCS_Test_Base.idl"
-
-#pragma ciao lem "Connector/GCS_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/GCS_Test_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::GCSTest, ::GCSTestSeq> GCSTestConnector;
-
-#endif /* GET_COMPONENT_STATE_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc
deleted file mode 100644
index 033a3b36eda..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p GCS_Test_Base -l .. -o ../lib -u DDS GCS_Test_Connector"
-
-project(GCS_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen GCS_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=GET_COMPONENT_STATE_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=GCS_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=GET_COMPONENT_STATE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=GCS_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=GET_COMPONENT_STATE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=GCS_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=GET_COMPONENT_STATE_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=GCS_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    GCS_Test_Connector.idl
-  }
-}
-
-project(GCS_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += GCS_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=GET_COMPONENT_STATE_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=GCS_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    GCS_Test_ConnectorE.idl
-  }
-}
-
-project(GCS_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += GCS_Test_Connector_lem_gen GCS_Test_Connector_stub GCS_Test_Base_stub
-  libs  += GCS_Test_Base_stub GCS_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = GCS_Test_Connector_lem_stub
-  dynamicflags += GET_COMPONENT_STATE_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCS_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    GCS_Test_ConnectorEC.h
-    GCS_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    GCS_Test_ConnectorEC.inl
-  }
-}
-
-project(GCS_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += GCS_Test_Connector_idl_gen GCS_Test_Base_stub
-  libs  += GCS_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = GCS_Test_Connector_stub
-  dynamicflags += GET_COMPONENT_STATE_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCS_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    GCS_Test_ConnectorC.h
-    GCS_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    GCS_Test_ConnectorC.inl
-  }
-}
-
-project(GCS_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += GCS_Test_Connector_lem_stub GCS_Test_Connector_stub GCS_Test_Base_stub
-  sharedname = GCS_Test_Connector_exec
-  libs += GCS_Test_Connector_stub GCS_Test_Connector_lem_stub GCS_Test_Base_stub GCS_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += GET_COMPONENT_STATE_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCS_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    GCS_Test_Connector_conn.h
-    GCS_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(GCS_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += GCS_Test_Connector_lem_stub GCS_Test_Connector_exec GCS_Test_Connector_stub
-  sharedname  = GCS_Test_Connector_svnt
-  libs       += GCS_Test_Connector_stub \
-                GCS_Test_Connector_lem_stub  \
-                GCS_Test_Base_stub \
-                GCS_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += GET_COMPONENT_STATE_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    GCS_Test_ConnectorS.cpp
-    GCS_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    GCS_Test_ConnectorS.h
-    GCS_Test_Connector_svnt.h
-    GCS_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/Plan.cdp
deleted file mode 100644
index fa4016877d9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/Plan.cdp
+++ /dev/null
@@ -1,441 +0,0 @@
-<!--  -->
-<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>GetComponentStateTest_Depl</label>
-  <UUID>GetComponentStateTest_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_GetComponentStateTest_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_GCS_Test_GetComponentStateTestComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="GCS_Test_ConnectorImplementation">
-    <name>GCS_Test_ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="GCS_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="GCS_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_GCSTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_GCSTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>GCS_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>GCS_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <!-- act as sender-->
-  <instance xmi:id="ComponentInstance1">
-    <name>Sender</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>act_as_sender</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="GCS_Test_ConnectorInstance1">
-    <name>GCS_Test_Connector1</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="GCS_Test_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>GetComponentStateTopic</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- act as receiver -->
-  <instance xmi:id="ComponentInstance2">
-    <name>Receiver</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>act_as_sender</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="GCS_Test_ConnectorInstance2">
-    <name>GCS_Test_Connector2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="GCS_Test_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>GetComponentStateTopic</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- SENDER COMPONENT CONNECTIONS -->
-  <connection>
-    <name>update_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance1" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCS_Test_ConnectorInstance1" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>update_dds_entity</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance1" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCS_Test_ConnectorInstance1" />
-    </internalEndpoint>
-  </connection>
-
-  <!-- RECEIVER COMPONENT CONNECTIONS -->
-  <!--   DDS_Get port -->
-  <connection>
-    <name>get_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCS_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>get_fresh_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCS_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>get_dds_entity_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCS_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <!--   DDS_Read port -->
-  <connection>
-    <name>read_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_read_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCS_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>read_dds_entity_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_read_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCS_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <!--   DDS_Listen port -->
-  <connection>
-    <name>listen_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCS_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>listen_data_control_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCS_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <!--   DDS_StateListen port -->
-  <connection>
-    <name>statelisten_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCS_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>statelisten_data_control_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance2" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="GCS_Test_ConnectorInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="GCS_Test_Connector_ExecArtifact">
-    <name>GCS_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>GCS_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="GCS_Test_Connector_SvntArtifact">
-    <name>GCS_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>GCS_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="GCS_Test_Connector_StubArtifact">
-    <name>GCS_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>GCS_Test_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/run_test.pl
deleted file mode 100755
index 955469ac4bc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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 = ( "Sender.ior", "Receiver.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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 5 seconds to allow task to complete\n";
-sleep (5);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/.gitignore b/CIAO/connectors/dds4ccm/tests/Getter/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/Getter/Base/.gitignore
deleted file mode 100644
index f1884aa728c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-/Get_InvokerE.idl
-/Get_Invoker_exec_export.h
-/Get_Invoker_lem_stub_export.h
-/Get_Invoker_stub_export.h
-/Get_Invoker_svnt_export.h
-/Getter_Test_Base.cxx
-/Getter_Test_Base.h
-/Getter_Test_BasePlugin.cxx
-/Getter_Test_BasePlugin.h
-/Getter_Test_BaseSupport.cxx
-/Getter_Test_BaseSupport.h
-/Getter_Test_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl
deleted file mode 100644
index cc639fc2100..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @file Get_Invoker.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef GETTER_INVOKER_IDL
-#define GETTER_INVOKER_IDL
-
-#pragma ciao lem "Base/Get_InvokerE.idl"
-
-interface GetInvoker
-{
-  void start_timeout_get_one ();
-  void start_timeout_get_many ();
-  void start_get_one (in string key, in long fixed_key, in long iteration);
-  void start_get_many (in short keys, in long iterations);
-};
-
-#endif /* SAMPLE_INFO_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc
deleted file mode 100644
index 6db55753faf..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc
+++ /dev/null
@@ -1,111 +0,0 @@
-project(DDS_Get_Invoker_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after +=
-  idlflags += -Wb,stub_export_macro=GET_INVOKER_STUB_Export \
-              -Wb,stub_export_include=Get_Invoker_stub_export.h \
-              -Wb,skel_export_macro=GET_INVOKER_SVNT_Export \
-              -Wb,skel_export_include=Get_Invoker_svnt_export.h \
-              -Wb,svnt_export_macro=GET_INVOKER_SVNT_Export \
-              -Wb,svnt_export_include=Get_Invoker_svnt_export.h \
-              -Wb,exec_export_macro=GET_INVOKER_EXEC_Export \
-              -Wb,exec_export_include=Get_Invoker_exec_export.h -I..
-
-  IDL_Files {
-    Get_Invoker.idl
-  }
-}
-
-project(DDS_Get_Invoker_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Get_Invoker_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=GET_INVOKER_LEM_STUB_Export \
-              -Wb,stub_export_include=Get_Invoker_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Get_InvokerE.idl
-  }
-}
-
-project(DDS_Get_Invoker_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Get_Invoker_lem_gen DDS_Get_Invoker_stub
-  libs  += Get_Invoker_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Get_Invoker_lem_stub
-  dynamicflags += GET_INVOKER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Get_InvokerEC.cpp
-  }
-
-  Header_Files {
-    Get_InvokerEC.h
-    Get_Invoker_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Get_InvokerEC.inl
-  }
-}
-
-project(DDS_Get_Invoker_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Get_Invoker_idl_gen
-  libs  +=
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Get_Invoker_stub
-  dynamicflags += GET_INVOKER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Get_InvokerC.cpp
-  }
-
-  Header_Files {
-    Get_InvokerC.h
-    Get_Invoker_stub_export.h
-  }
-
-  Inline_Files {
-    Get_InvokerC.inl
-  }
-}
-
-
-project(DDS_Get_Invoker_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_Get_Invoker_lem_stub DDS_Get_Invoker_stub \
-                  DDS_Get_Invoker_idl_gen
-  sharedname  = Get_Invoker_svnt
-  libs       += Get_Invoker_stub Get_Invoker_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += GET_INVOKER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Get_InvokerS.cpp
-    Get_Invoker_svnt.cpp
-  }
-
-  Header_Files {
-    Get_InvokerS.h
-    Get_Invoker_svnt.h
-    Get_Invoker_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl
deleted file mode 100644
index e36c901337a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @file Getter_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef GETTER_TEST_BASE_IDL
-#define GETTER_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/Getter_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/Getter_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "GetterTest"
-
-struct GetterTest {
-  string key;
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<GetterTest> GetterTestSeq;
-#endif
-
-#pragma DCPS_DATA_TYPE "GetterFixed"
-
-struct GetterFixed {
-  long key;
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<GetterFixed> GetterFixedSeq;
-#endif
-
-#endif /* GETTER_TEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc
deleted file mode 100644
index e48e419a2a2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_Getter_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_Getter_Test_Base_stub
-  dynamicflags += GETTER_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=GETTER_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=Getter_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Getter_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=GETTER_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Getter_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/Getter/Connector/.gitignore
deleted file mode 100644
index 2f55a351484..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Getter_Test_ConnectorE.idl
-/Getter_Test_Connector_conn.cpp
-/Getter_Test_Connector_conn.h
-/Getter_Test_Connector_conn_export.h
-/Getter_Test_Connector_lem_stub_export.h
-/Getter_Test_Connector_stub_export.h
-/Getter_Test_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl
deleted file mode 100644
index ad8902eb561..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @file Getter_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef GETTER_TEST_CONNECTOR_IDL_
-#define GETTER_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Getter_Test_Base.idl"
-
-#pragma ciao lem "Connector/Getter_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Getter_Test_BaseTypeSupport.idl"
-#endif
-
-module Getter_Test
-{
-  module ::CCM_DDS::Typed < ::GetterTest, ::GetterTestSeq> GetterTestConnector;
-  module ::CCM_DDS::Typed < ::GetterFixed, ::GetterFixedSeq> GetterFixedConnector;
-};
-
-#endif /* GETTER_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
deleted file mode 100644
index 45c6a8b80ac..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Getter_Test_Base -l .. -o ../lib -u DDS Getter_Test_Connector"
-
-project(DDS_Getter_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_Getter_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=GETTER_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Getter_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=GETTER_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Getter_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=GETTER_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Getter_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=GETTER_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Getter_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Getter_Test_Connector.idl
-  }
-}
-
-project(DDS_Getter_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_Getter_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=GETTER_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Getter_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Getter_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_Getter_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_Getter_Test_Connector_lem_gen DDS_Getter_Test_Connector_stub DDS_Getter_Test_Base_stub
-  libs  += DDS_Getter_Test_Base_stub DDS_Getter_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Getter_Test_Connector_lem_stub
-  dynamicflags += GETTER_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Getter_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Getter_Test_ConnectorEC.h
-    Getter_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Getter_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_Getter_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Getter_Test_Connector_idl_gen DDS_Getter_Test_Base_stub
-  libs  += DDS_Getter_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Getter_Test_Connector_stub
-  dynamicflags += GETTER_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Getter_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Getter_Test_ConnectorC.h
-    Getter_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Getter_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_Getter_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Connector_stub DDS_Getter_Test_Base_stub
-  sharedname = DDS_Getter_Test_Connector_exec
-  libs += DDS_Getter_Test_Connector_stub DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Base_stub DDS_Getter_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += GETTER_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Getter_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Getter_Test_Connector_conn.h
-    Getter_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Getter_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Connector_exec DDS_Getter_Test_Connector_stub
-  sharedname  = DDS_Getter_Test_Connector_svnt
-  libs       += DDS_Getter_Test_Connector_stub \
-                DDS_Getter_Test_Connector_lem_stub  \
-                DDS_Getter_Test_Base_stub \
-                DDS_Getter_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += GETTER_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Getter_Test_ConnectorS.cpp
-    Getter_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Getter_Test_ConnectorS.h
-    Getter_Test_Connector_svnt.h
-    Getter_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/README b/CIAO/connectors/dds4ccm/tests/Getter/README
deleted file mode 100644
index b99c9300e05..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/README
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-This test tests the Getter.
-
-Before the Sender starts writing samples to DDS, he informs the
-Receiver (via a 'normal' CCM interface) about how many keys and
-iterations to get from DDS. The receiver starts waiting on those
-samples by calling get_one or get_many, using a timeout.
-
-In the meantime the Sender will sleep for half a second before actual
-writing the samples to DDS.
-Once the DDS connector on the receiver side receives the written samples,
-he should wake up and should return the samples to the user code.
-
-So the starting points for the Receiver to start 'working' are:
-. start_timeout_get_one ();
-. start_timeout_get_many ();
-. start_get_one (in string key, in long fixed_key, in long iteration);
-. start_get_many (in short keys, in long iterations);
-
-In order to prevent deadlocks an event handler on the reactor is created
-for each sample to be received. This event handler is created during invocation
-of the latter two methods.
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/.gitignore
deleted file mode 100644
index 0093957d491..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Getter_Test_ReceiverE.idl
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl
deleted file mode 100644
index 431bc426ae0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Getter_Test_Connector.idl"
-#include "Base/Get_Invoker.idl"
-
-module Getter_Test
-{
-  component Receiver
-  {
-    port GetterTestConnector::DDS_Get info_get;
-    port GetterFixedConnector::DDS_Get info_fixed;
-
-    provides GetInvoker getter_invoke;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
deleted file mode 100644
index fadaa44b2a5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
+++ /dev/null
@@ -1,154 +0,0 @@
-project(DDS_Getter_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_Getter_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 {
-    Getter_Test_Receiver.idl
-  }
-}
-
-project(DDS_Getter_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Getter_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 {
-    Getter_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_Getter_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Getter_Test_Receiver_lem_gen DDS_Getter_Test_Receiver_stub  \
-           DDS_Getter_Test_Connector_stub DDS_Getter_Test_Base_stub \
-           DDS_Get_Invoker_stub
-  libs  +=  Receiver_stub DDS_Getter_Test_Connector_stub \
-            DDS_Getter_Test_Base_stub Get_Invoker_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Getter_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Getter_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Getter_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_Getter_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Getter_Test_Receiver_idl_gen  DDS_Getter_Test_Connector_stub \
-           DDS_Getter_Test_Base_stub DDS_Getter_Test_Connector_lem_gen \
-           DDS_Get_Invoker_stub DDS_Get_Invoker_lem_stub
-  libs  += DDS_Getter_Test_Connector_stub DDS_Getter_Test_Base_stub \
-           Get_Invoker_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Getter_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Getter_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Getter_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_Getter_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_Getter_Test_Receiver_lem_stub DDS_Getter_Test_Receiver_stub \
-             DDS_Getter_Test_Base_stub DDS_Getter_Test_Connector_stub \
-             DDS_Getter_Test_Connector_lem_stub \
-             DDS_Get_Invoker_lem_stub DDS_Get_Invoker_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_Getter_Test_Base_stub \
-          DDS_Getter_Test_Connector_stub DDS_Getter_Test_Connector_lem_stub \
-          Get_Invoker_lem_stub Get_Invoker_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Getter_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Getter_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Getter_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_Getter_Test_Receiver_lem_stub DDS_Getter_Test_Base_stub \
-                  DDS_Getter_Test_Connector_stub DDS_Getter_Test_Connector_svnt \
-                  DDS_Getter_Test_Receiver_exec DDS_Getter_Test_Connector_lem_stub \
-                  DDS_Get_Invoker_stub \
-                  DDS_Get_Invoker_svnt DDS_Get_Invoker_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_Getter_Test_Base_stub \
-                DDS_Getter_Test_Connector_stub DDS_Getter_Test_Connector_svnt \
-                Receiver_exec DDS_Getter_Test_Connector_lem_stub \
-                Get_Invoker_stub Get_Invoker_svnt \
-                Get_Invoker_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Getter_Test_ReceiverS.cpp
-    Getter_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Getter_Test_ReceiverS.h
-    Getter_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
deleted file mode 100644
index bd20a56aec6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,868 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Getter_Test_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "ace/OS_NS_sys_time.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-#include "dds4ccm/impl/dds4ccm_utils.h"
-
-namespace CIAO_Getter_Test_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_get_status_exec_i
-   */
-
-  info_get_status_exec_i::info_get_status_exec_i (
-        ::Getter_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Getter_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_get_status_exec_i::~info_get_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_get_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_get_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_fixed_status_exec_i
-   */
-
-  info_fixed_status_exec_i::info_fixed_status_exec_i (
-        ::Getter_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Getter_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_fixed_status_exec_i::~info_fixed_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_fixed_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_fixed_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: getter_invoke_exec_i
-   */
-
-  getter_invoke_exec_i::getter_invoke_exec_i (
-        ::Getter_Test::CCM_Receiver_Context_ptr ctx,
-        Receiver_exec_i & callback)
-    : ciao_context_ (
-        ::Getter_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  getter_invoke_exec_i::~getter_invoke_exec_i (void)
-  {
-  }
-
-  // Operations from ::GetInvoker
-
-  void
-  getter_invoke_exec_i::start_timeout_get_one (void)
-  {
-    this->callback_.timeout_get_one ();
-  }
-
-  void
-  getter_invoke_exec_i::start_timeout_get_many (void)
-  {
-    this->callback_.timeout_get_many ();
-  }
-
-  void
-  getter_invoke_exec_i::start_get_one (const char * key,
-  ::CORBA::Long fixed_key,
-  ::CORBA::Long iteration)
-  {
-    this->callback_.start_get_one (key, fixed_key, iteration);
-  }
-
-  void
-  getter_invoke_exec_i::start_get_many (::CORBA::Short keys,
-  ::CORBA::Long iterations)
-  {
-    this->callback_.start_get_many (keys, iterations);
-  }
-
-  /**
-   * GetOneHandler
-   */
-  GetOneHandler::GetOneHandler (Receiver_exec_i &callback,
-                                const char * key,
-                                CORBA::Long fixed_key,
-                                CORBA::Long iteration)
-    : callback_ (callback)
-      , key_ (CORBA::string_dup (key))
-      , fixed_key_ (fixed_key)
-      , iteration_ (iteration)
-  {
-    this->reference_counting_policy ().value (
-      ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
-
-  }
-
-  GetOneHandler::~GetOneHandler (void)
-  {
-  }
-
-  int
-  GetOneHandler::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.get_one (this->key_.in (), this->fixed_key_, this->iteration_);
-    return 0;
-  }
-
-  /**
-   * GetManyHandler
-   */
-  GetManyHandler::GetManyHandler (Receiver_exec_i &callback,
-                                  CORBA::UShort keys,
-                                  CORBA::Long iterations)
-    : callback_ (callback),
-      keys_ (keys),
-      iterations_ (iterations)
-  {
-    this->reference_counting_policy ().value (
-      ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
-  }
-
-  GetManyHandler::~GetManyHandler (void)
-  {
-  }
-
-  int
-  GetManyHandler::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.get_many (this->keys_, this->iterations_);
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void) :
-    fixed_handle_ (DDS::HANDLE_NIL),
-    variable_handle_ (DDS::HANDLE_NIL)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Receiver_exec_i::start_get_one (const char * key,
-                                  CORBA::Long fixed_key,
-                                  CORBA::Long iteration)
-  {
-    GetOneHandler* rh = new GetOneHandler (*this,
-                                           key,
-                                           fixed_key,
-                                           iteration);
-    ACE_Event_Handler_var safe_event_handler (rh);
-    this->reactor ()->notify (rh);
-  }
-
-  void
-  Receiver_exec_i::start_get_many (CORBA::Short keys,
-                         CORBA::Long iterations)
-  {
-    GetManyHandler* rh = new  GetManyHandler (*this, keys, iterations);
-    ACE_Event_Handler_var safe_event_handler (rh);
-    this->reactor ()->notify (rh);
- }
-
-  void
-  Receiver_exec_i::get_many (CORBA::Short keys , CORBA::Long iterations)
-  {
-    // this is very hard to test in a controlled environment.
-    // When data arrives in DDS, the waiting ends and the
-    // Getter starts to read the data. In this test we expected
-    // therefor more then one, and less then but not exactly max_delivered_data.
-    // On the other hand, when the user want to have all the
-    // samples in DDS, one shouldn't use the wait method.
-    // Since the spec is not clear about this, the test will
-    // pass when at least one sample is returned.
-     ::Getter_Test::GetterTestConnector::Getter_var getter =
-      this->ciao_context_->get_connection_info_get_fresh_data ();
-
-    DDS::Duration_t to;
-    to.sec = 20;
-    to.nanosec = 0;
-    getter->time_out (to);
-    getter->max_delivered_data (40);
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_many: "
-                          "Start getting data from DDS: "
-                          "#keys <%d> - #iterations <%d> with timeout: "
-                          "sec <%d> - nanosec <%u>\n",
-                          keys, iterations,
-                          getter->time_out ().sec,
-                          getter->time_out ().nanosec));
-
-    GetterTestSeq gettertest_seq;
-    ::CCM_DDS::ReadInfoSeq readinfo;
-    bool const result = getter->get_many (gettertest_seq, readinfo);
-    if (result)
-      {
-        if (gettertest_seq.length () == 0)
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_many: "
-                                  "No data returned. "
-                                  "number of samples: "
-                                  "expected at least one - received <0>\n"));
-          }
-        if (gettertest_seq.length () == 1)
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_many: "
-                                  "Not enough data returned. "
-                                  "number of samples: "
-                                  "expected at least two - received <1>\n"));
-          }
-        if (gettertest_seq.length () > 40)
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_many: "
-                                  "To much data returned. "
-                                  "number of samples: "
-                                  "expected not more then 40 - received <1>\n"));
-           }
-        for (CORBA::ULong i = 0; i < gettertest_seq.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_many: "
-                                  "Returned data : key <%C> - iteration <%d> - handle "
-                                  DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER
-                                  "\n",
-                                  gettertest_seq[i].key.in (),
-                                  gettertest_seq[i].iteration,
-                                  DDS_INSTANCE_HANDLE_LOG(readinfo[i].instance_handle)));
-          }
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: GET MANY: "
-                              "Time out occurred\n"));
-      }
-    // Wait a while before reading.
-    ACE_Time_Value tv (3, 0);
-    ACE_OS::sleep (tv);
-    this->read_many (keys, iterations, gettertest_seq);
-  }
-
-  void
-  Receiver_exec_i::read_many (CORBA::Short keys ,
-                              CORBA::Long iterations,
-                              const GetterTestSeq& gettertest_seq)
-  {
-    ::Getter_Test::GetterTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_get_data ();
-
-    GetterTestSeq read_seq;
-    ::CCM_DDS::ReadInfoSeq readinfos;
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::read_many - "
-                "Start checking samples in DDS\n"));
-    reader->read_all (read_seq, readinfos);
-    // we expect all samples written during the test for get one (KEY_1)
-    // AND all samples written during the test for get many (number of keys)
-    ::CORBA::ULong expected =
-      static_cast < ::CORBA::ULong > (iterations * (keys + 1));
-    if (read_seq.length () != expected)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_many - "
-                              "Unexpected number of samples received: "
-                              "expected <%d> - received <%u>\n",
-                              expected, read_seq.length ()));
-      }
-    for (::CORBA::ULong i = 0; i < read_seq.length (); ++i)
-      {
-        ACE_DEBUG ((LM_DEBUG, "READ ALL : Receiver_exec_i::read_many - "
-                              "Sample received: key <%C> - iteration <%d> - "
-                              "sample_read_state <%C>\n",
-                              read_seq[i].key.in (),
-                              read_seq[i].iteration,
-                              CIAO::DDS4CCM::translate_ccm_dds_accessstatus (readinfos[i].access_status)));
-      }
-
-    for (::CORBA::Short key = 0; key < keys; ++key)
-      {
-        ::CORBA::Long iter = 0;
-        char str_key[8];
-        ACE_OS::sprintf (str_key, "KEY_%d", key + 1);
-        for (::CORBA::ULong i = 0; i < read_seq.length (); ++i)
-          {
-            if (ACE_OS::strcmp (read_seq[i].key.in (), str_key) == 0)
-              ++iter;
-            if (iter > iterations)
-              ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_many - "
-                          "Unexpected number of iterations received "
-                          "for key <%C>: <%d>\n",
-                          str_key,
-                          iter));
-          }
-      }
-    // check which sample states should be ALREADY_SEEN/FRESH_INFO
-    for (::CORBA::ULong readed = 0; readed < read_seq.length (); ++readed)
-      {
-        ::CCM_DDS::AccessStatus received_access_status =
-          readinfos[readed].access_status;
-        bool found = false;
-
-        for (::CORBA::ULong got = 0;
-             got < gettertest_seq.length () && !found;
-             ++got)
-          {
-            if (ACE_OS::strcmp (read_seq[readed].key.in (),
-                                gettertest_seq[got].key.in ()) == 0 &&
-                read_seq[readed].iteration == gettertest_seq[got].iteration)
-              {
-                found = true;
-                if (received_access_status != ::CCM_DDS::ALREADY_SEEN)
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_many - "
-                                "Unexpected access state received: "
-                                "expected <%C> - received <%C>\n",
-                                CIAO::DDS4CCM::translate_ccm_dds_accessstatus (::CCM_DDS::ALREADY_SEEN),
-                                CIAO::DDS4CCM::translate_ccm_dds_accessstatus (received_access_status)));
-                  }
-              }
-          }
-        // Samples which are not read by get_many or get_one (the samples belonging to
-        // KEY_1), should have FRESH_INFO as access status.
-        if (!found && ACE_OS::strcmp (read_seq[readed].key.in (), "KEY_1") != 0)
-          {
-            if (received_access_status != ::CCM_DDS::FRESH_INFO)
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_many - "
-                            "Unexpected access state received for sample "
-                            "<%C>:<%d> : "
-                            "expected <%C> - received <%C>\n",
-                            read_seq[readed].key.in (),
-                            read_seq[readed].iteration,
-                            CIAO::DDS4CCM::translate_ccm_dds_accessstatus (::CCM_DDS::FRESH_INFO),
-                            CIAO::DDS4CCM::translate_ccm_dds_accessstatus (received_access_status)));
-              }
-          }
-      }
-  }
-
-
-  void
-  Receiver_exec_i::get_one_fixed (CORBA::Long fixed_key, CORBA::Long iteration)
-  {
-    ::Getter_Test::GetterFixedConnector::Getter_var fixed =
-      this->ciao_context_->get_connection_info_fixed_fresh_data ();
-
-    DDS::Duration_t to;
-    to.sec = 5;
-    to.nanosec = 0;
-    fixed->time_out (to);
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_one_fixed: "
-                          "Start getting data from DDS: "
-                          "key <%u> - iteration <%d> "
-                          " with timeout: "
-                          "sec <%u> - nanosec <%u>\n",
-                          fixed_key, iteration,
-                          fixed->time_out ().sec,
-                          fixed->time_out ().nanosec));
-    GetterFixed gettertest_info;
-    ::CCM_DDS::ReadInfo readinfo;
-    ACE_Time_Value const tv = ACE_OS::gettimeofday ();
-    CORBA::Boolean const result = fixed->get_one (gettertest_info, readinfo);
-    if (result)
-      {
-        if (this->fixed_handle_ == DDS::HANDLE_NIL)
-          {
-            this->fixed_handle_ = readinfo.instance_handle;
-          }
-        ACE_Time_Value dur = ACE_OS::gettimeofday () - tv;
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_one_fixed: "
-                               "get_one took <%#T>\n",
-                               &dur));
-        if (gettertest_info.key != fixed_key)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR FIXED: GET ONE: "
-                                  "Expected key does "
-                                  "not match received key: "
-                                  "expected <%u> - received <%C>\n",
-                                  fixed_key,
-                                  gettertest_info.key));
-          }
-        if (gettertest_info.iteration != iteration)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR FIXED: GET ONE: "
-                                  "Expected iteration does "
-                                  "not match received iteration: "
-                                  "expected <%d> - received <%d>\n",
-                                  iteration,
-                                  gettertest_info.iteration));
-          }
-        // check readinfo struct.
-        if ((readinfo.instance_handle != ::DDS::HANDLE_NIL) &&
-            (this->fixed_handle_ != readinfo.instance_handle))
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR FIXED: GET MANY: ")
-                    ACE_TEXT ("received instance handle should be nil or not change ")
-                    ACE_TEXT ("for unkeyed data: ")
-                    ACE_TEXT ("key <%u> - iteration <%u> handle ")
-                    DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER
-                    ACE_TEXT ("\n"),
-                    gettertest_info.key,
-                    gettertest_info.iteration,
-                    DDS_INSTANCE_HANDLE_LOG(readinfo.instance_handle)));
-          }
-        if (readinfo.source_timestamp.sec == 0 &&
-            readinfo.source_timestamp.nanosec == 0)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR FIXED: READ ONE LAST: "
-                                "source timestamp seems to be invalid (nil) "
-                                "key <%u> - iteration <%d>\n",
-                                gettertest_info.key,
-                                gettertest_info.iteration));
-          }
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_one_fixed: "
-                              "Returned data : key <%u> - iteration <%d>\n",
-                              gettertest_info.key,
-                              gettertest_info.iteration));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR FIXED: GET ONE: "
-                              "Time out while waiting for "
-                              "key <%u> - iteration <%d>\n",
-                              fixed_key,
-                              iteration));
-      }
-  }
-
-  void
-  Receiver_exec_i::get_one_variable (const char * key, CORBA::Long iteration)
-  {
-    ::Getter_Test::GetterTestConnector::Getter_var getter =
-      this->ciao_context_->get_connection_info_get_fresh_data ();
-
-    DDS::Duration_t to;
-    to.sec = 5;
-    to.nanosec = 0;
-    getter->time_out (to);
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_one_variable: "
-                          "Start getting data from DDS: "
-                          "key <%C> - iteration <%d> "
-                          " with timeout: "
-                          "sec <%d> - nanosec <%u>\n",
-                          key, iteration,
-                          getter->time_out ().sec,
-                          getter->time_out ().nanosec));
-    GetterTest_var gettertest_info;
-    ::CCM_DDS::ReadInfo readinfo;
-    ACE_Time_Value tv = ACE_OS::gettimeofday ();
-    CORBA::Boolean const result = getter->get_one (gettertest_info.out (), readinfo);
-    if (result)
-      {
-        if (this->variable_handle_ == DDS::HANDLE_NIL)
-          {
-            this->variable_handle_ = readinfo.instance_handle;
-          }
-        ACE_Time_Value dur = ACE_OS::gettimeofday () - tv;
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_one_variable: "
-                               "get_one took <%#T>\n",
-                               &dur));
-        if (ACE_OS::strcmp (gettertest_info->key, key) != 0)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR VARIABLE: GET ONE: "
-                                  "Expected key does "
-                                  "not match received key: "
-                                  "expected <%C> - received <%C>\n",
-                                  key,
-                                  gettertest_info->key.in ()));
-          }
-        if (gettertest_info->iteration != iteration)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR VARIABLE: GET ONE: "
-                                  "Expected iteration does "
-                                  "not match received iteration: "
-                                  "expected <%d> - received <%d>\n",
-                                  iteration,
-                                  gettertest_info->iteration));
-          }
-        // check readinfo struct.
-        if ((readinfo.instance_handle != ::DDS::HANDLE_NIL) &&
-            (this->fixed_handle_ != readinfo.instance_handle))
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR VARIABLE: GET MANY: ")
-                    ACE_TEXT ("received instance handle should be nil or not change ")
-                    ACE_TEXT ("for unkeyed data: ")
-                    ACE_TEXT ("key <%C> - iteration <%u> - handle ")
-                    DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER
-                    ACE_TEXT ("\n"),
-                    gettertest_info->key.in (),
-                    gettertest_info->iteration,
-                    DDS_INSTANCE_HANDLE_LOG(readinfo.instance_handle)));
-          }
-        if (readinfo.source_timestamp.sec == 0 &&
-            readinfo.source_timestamp.nanosec == 0)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR VARIABLE: READ ONE LAST: "
-                                "source timestamp seems to be invalid (nil) "
-                                "key <%C> - iteration <%d>\n",
-                                gettertest_info->key.in (),
-                                gettertest_info->iteration));
-          }
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_one_variable: "
-                              "Returned data : key <%C> - iteration <%d>\n",
-                              gettertest_info->key.in (),
-                              gettertest_info->iteration));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR VARIABLE: GET ONE: "
-                              "Time out while waiting for "
-                              "key <%C> - iteration <%d>\n",
-                              key,
-                              iteration));
-      }
-  }
-
-  void
-  Receiver_exec_i::get_one (const char * key,
-                            CORBA::Long fixed_key,
-                            CORBA::Long iteration)
-  {
-    this->get_one_variable (key, iteration);
-    this->get_one_fixed (fixed_key, iteration);
-  }
-
-  void
-  Receiver_exec_i::timeout_get_one_fixed (void)
-  {
-    try
-      {
-        ::Getter_Test::GetterFixedConnector::Getter_var fixed =
-          this->ciao_context_->get_connection_info_fixed_fresh_data ();
-
-        DDS::Duration_t to;
-        to.sec = 1;
-        to.nanosec = 0;
-        fixed->time_out (to);
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::timeout_get_one_fixed: "
-                              "Start getting data from DDS: timeout: "
-                              "sec <%d> - nanosec <%u>\n",
-                              fixed->time_out ().sec,
-                              fixed->time_out ().nanosec));
-        GetterFixed gettertest_info;
-        ::CCM_DDS::ReadInfo readinfo;
-        CORBA::Boolean const result = fixed->get_one (gettertest_info, readinfo);
-        if (result)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR FIXED: TIMEOUT GET ONE: "
-                                  "Returning true when get no data.\n"));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::timeout_get_one_fixed: "
-                                  "Expected to return no data.\n"));
-          }
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR FIXED: TIMEOUT GET ONE: "
-                               "Caught unexcepted InternalError "
-                               "exception\n"));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR FIXED: TIMEOUT GET ONE:");
-        ACE_ERROR ((LM_ERROR,
-                "ERROR: Receiver_exec_i::timeout_get_one_fixed : Exception caught\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::timeout_get_one_variable (void)
-  {
-    try
-      {
-        ::Getter_Test::GetterTestConnector::Getter_var getter =
-          this->ciao_context_->get_connection_info_get_fresh_data ();
-
-        DDS::Duration_t to;
-        to.sec = 1;
-        to.nanosec = 0;
-        getter->time_out (to);
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::timeout_get_one_variable: "
-                              "Start getting data from DDS: timeout: "
-                              "sec <%d> - nanosec <%u>\n",
-                              getter->time_out ().sec,
-                              getter->time_out ().nanosec));
-        GetterTest_var gettertest_info;;
-        ::CCM_DDS::ReadInfo readinfo;
-        CORBA::Boolean result = getter->get_one (gettertest_info.out (), readinfo);
-        if (result)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR VARIABLE: TIMEOUT GET ONE: "
-                                  "Returning true when get no data.\n"));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::timeout_get_one_variable: "
-                                  "Expected to return no data.\n"));
-          }
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR VARIABLE: TIMEOUT GET ONE: "
-                               "Caught unexcepted InternalError "
-                               "exception\n"));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR VARIABLE: TIMEOUT GET ONE:");
-        ACE_ERROR ((LM_ERROR,
-                "ERROR: Receiver_exec_i::timeout_get_one_variable : Exception caught\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::timeout_get_one (void)
-  {
-    this->timeout_get_one_variable ();
-    this->timeout_get_one_fixed ();
-  }
-
-  void
-  Receiver_exec_i::timeout_get_many (void)
-  {
-    try
-      {
-        ::Getter_Test::GetterTestConnector::Getter_var getter =
-          this->ciao_context_->get_connection_info_get_fresh_data ();
-
-        DDS::Duration_t to;
-        to.sec = 3;
-        to.nanosec = 0;
-        getter->time_out (to);
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::timeout_get_many: "
-                              "Start getting data from DDS: timeout: "
-                              "sec <%d> - nanosec <%u>\n",
-                              getter->time_out ().sec,
-                              getter->time_out ().nanosec));
-        GetterTestSeq gettertest_seq;
-        ::CCM_DDS::ReadInfoSeq readinfo;
-        CORBA::Boolean const result = getter->get_many (gettertest_seq, readinfo);
-        if (result)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: TIMEOUT GET MANY: "
-                                  "Returning true when get no data.\n"));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::timeout_get_many: "
-                                  "Expected to return no data.\n"));
-          }
-      }
-    catch (const CCM_DDS::InternalError&)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: TIMEOUT GET MANY: "
-                               "Caught unexcepted InternalError "
-                               "exception\n"));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: TIMEOUT GET MANY:");
-        ACE_ERROR ((LM_ERROR,
-                      "ERROR: Receiver_exec_i::timeout_get_many : Exception caught\n"));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_get_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_get_status_.in ()))
-      {
-        info_get_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_get_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_get_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_get_status_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_fixed_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_fixed_status_.in ()))
-      {
-        info_fixed_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_fixed_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_fixed_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_fixed_status_.in ());
-  }
-
-  ::CCM_GetInvoker_ptr
-  Receiver_exec_i::get_getter_invoke (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_getter_invoke_.in ()))
-      {
-        getter_invoke_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          getter_invoke_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_GetInvoker::_nil ());
-
-          this->ciao_getter_invoke_ = tmp;
-      }
-
-    return
-      ::CCM_GetInvoker::_duplicate (
-        this->ciao_getter_invoke_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Getter_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Getter_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/Getter/Receiver/Getter_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h
deleted file mode 100644
index 4f9b4fd9ab5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h
+++ /dev/null
@@ -1,277 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_GETTER_TEST_RECEIVER_EXEC_5BQU2A_H_
-#define CIAO_GETTER_TEST_RECEIVER_EXEC_5BQU2A_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Getter_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_Getter_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  /**
-   * GetOneHandler
-   */
-  class GetOneHandler
-    : public ACE_Event_Handler
-  {
-  public:
-    GetOneHandler (Receiver_exec_i &,
-                   const char * key,
-                   CORBA::Long fixed_key,
-                   CORBA::Long iteration);
-    virtual ~GetOneHandler ();
-
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-
-  private:
-    Receiver_exec_i &callback_;
-    CORBA::String_var key_;
-    CORBA::Long fixed_key_;
-    CORBA::Long iteration_;
-  };
-
-  /**
-   * GetManyHandler
-   */
-  class GetManyHandler
-    : public ACE_Event_Handler
-  {
-  public:
-    GetManyHandler (Receiver_exec_i &,
-                   CORBA::UShort keys,
-                   CORBA::Long iterations);
-    virtual ~GetManyHandler ();
-
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-
-  private:
-    Receiver_exec_i &callback_;
-    CORBA::UShort keys_;
-    CORBA::Long   iterations_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_get_status_exec_i
-   */
-
-  class info_get_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_get_status_exec_i (
-      ::Getter_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_get_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Getter_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_fixed_status_exec_i
-   */
-
-  class info_fixed_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_fixed_status_exec_i (
-      ::Getter_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_fixed_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Getter_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: getter_invoke_exec_i
-   */
-
-  class getter_invoke_exec_i
-    : public virtual ::CCM_GetInvoker,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    getter_invoke_exec_i (
-      ::Getter_Test::CCM_Receiver_Context_ptr ctx,
-      Receiver_exec_i & callback);
-    virtual ~getter_invoke_exec_i (void);
-
-    //@{
-    /** Operations and attributes from GetInvoker. */
-
-    virtual
-    void start_timeout_get_one (void);
-
-    virtual
-    void start_timeout_get_many (void);
-
-    virtual
-    void start_get_one (const char * key,
-    ::CORBA::Long fixed_key,
-    ::CORBA::Long iteration);
-
-    virtual
-    void start_get_many (::CORBA::Short keys,
-    ::CORBA::Long iterations);
-    //@}
-
-  private:
-    ::Getter_Test::CCM_Receiver_Context_var ciao_context_;
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_fixed_status (void);
-
-    virtual ::CCM_GetInvoker_ptr
-    get_getter_invoke (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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start_get_one (const char * key,
-                        CORBA::Long fixed_key,
-                        CORBA::Long iteration);
-    void timeout_get_one (void);
-    void timeout_get_many (void);
-    void get_one (const char * key,
-                  CORBA::Long fixed_key,
-                  CORBA::Long iteration);
-
-    void start_get_many (CORBA::Short keys, CORBA::Long iterations);
-
-    void get_many (CORBA::Short keys, CORBA::Long iterations);
-
-    //@}
-
-  private:
-    ::Getter_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_get_status_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_fixed_status_;
-    ::CCM_GetInvoker_var ciao_getter_invoke_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    DDS::InstanceHandle_t fixed_handle_;
-    DDS::InstanceHandle_t variable_handle_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void timeout_get_one_fixed (void);
-    void timeout_get_one_variable (void);
-
-    void get_one_fixed (CORBA::Long fixed_key, CORBA::Long iteration);
-    void get_one_variable (const char * key, CORBA::Long iteration);
-
-    void read_many (CORBA::Short keys ,
-                    CORBA::Long iterations,
-                    const GetterTestSeq& gettertest_seq);
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Getter_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/Getter/Sender/.gitignore
deleted file mode 100644
index d9099de70bf..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Getter_Test_SenderE.idl
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl
deleted file mode 100644
index acc67383c3f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_GETTER_TEST_SENDER_IDL
-#define DDS_GETTER_TEST_SENDER_IDL
-
-#include "Connector/Getter_Test_Connector.idl"
-#include "Base/Get_Invoker.idl"
-
-module Getter_Test
-{
-  component Sender
-  {
-    port GetterTestConnector::DDS_Write info_write;
-    port GetterFixedConnector::DDS_Write info_fixed;
-
-    provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
-
-    uses GetInvoker invoke_getter;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc
deleted file mode 100644
index e08b4d402a0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc
+++ /dev/null
@@ -1,149 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Getter_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_Getter_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_Getter_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 {
-    Getter_Test_Sender.idl
-  }
-}
-
-project(DDS_Getter_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Getter_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 {
-    Getter_Test_SenderE.idl
-  }
-}
-
-project(DDS_Getter_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Getter_Test_Sender_lem_gen DDS_Getter_Test_Sender_stub \
-           DDS_Getter_Test_Base_stub DDS_Get_Invoker_stub
-  libs  += DDS_Getter_Test_Base_stub Sender_stub Get_Invoker_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Getter_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    Getter_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Getter_Test_SenderEC.inl
-  }
-}
-
-project(DDS_Getter_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Getter_Test_Sender_idl_gen DDS_Getter_Test_Base_stub \
-           DDS_Getter_Test_Connector_stub DDS_Get_Invoker_stub \
-           DDS_Get_Invoker_lem_stub
-  libs  += DDS_Getter_Test_Base_stub DDS_Getter_Test_Connector_stub \
-           Get_Invoker_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Getter_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    Getter_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Getter_Test_SenderC.inl
-  }
-}
-
-project(DDS_Getter_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_Getter_Test_Sender_lem_stub DDS_Getter_Test_Sender_stub \
-             DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Connector_stub 
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub DDS_Getter_Test_Base_stub \
-             DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Connector_stub \
-             Get_Invoker_stub 
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Getter_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Getter_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Getter_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_Getter_Test_Base_stub  DDS_Getter_Test_Sender_lem_stub \
-                DDS_Getter_Test_Connector_stub \
-                DDS_Getter_Test_Connector_svnt DDS_Getter_Test_Connector_lem_stub \
-                DDS_Get_Invoker_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub DDS_Getter_Test_Base_stub \
-                DDS_Getter_Test_Connector_stub DDS_Getter_Test_Connector_svnt \
-                DDS_Getter_Test_Connector_lem_stub Get_Invoker_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Getter_Test_SenderS.cpp
-    Getter_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Getter_Test_SenderS.h
-    Getter_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
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
deleted file mode 100644
index 86cce2badfc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,378 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Getter_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_Getter_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 *)
-  {
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_connector_status_exec_i
-   */
-
-  info_out_connector_status_exec_i::info_out_connector_status_exec_i (
-        ::Getter_Test::CCM_Sender_Context_ptr ctx,
-        Sender_exec_i &callback)
-    : ciao_context_ (
-        ::Getter_Test::CCM_Sender_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  info_out_connector_status_exec_i::~info_out_connector_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-
-  void
-  info_out_connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */,
-  const ::DDS::InconsistentTopicStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleRejectedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_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)
-    : keys_ (5)
-      , iterations_ (10)
-      , done_ (false)
-      , ccm_activated_ (false)
-      , last_iter_ (1)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  // Component attributes and port operations.
-  void
-  Sender_exec_i::start_timeout_tests (void)
-  {
-    GetInvoker_var invoker =
-      this->ciao_context_->get_connection_invoke_getter ();
-
-    invoker->start_timeout_get_one ();
-    invoker->start_timeout_get_many ();
-  }
-
-  void
-  Sender_exec_i::write_many (void)
-  {
-    ::Getter_Test::GetterTestConnector::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-    GetInvoker_var invoker =
-      this->ciao_context_->get_connection_invoke_getter ();
-
-    // Prepare the samples.
-    GetterTestSeq write_many (this->keys_ * this->iterations_);
-    write_many.length (this->keys_ * this->iterations_);
-
-    // since the test for get_one already writes samples to DDS with
-    // key=KEY_1 we start with key = 2 when writing many samples.
-    for (CORBA::UShort key = 2; key < this->keys_ + 2; ++key)
-      {
-        GetterTest 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[(iter - 1) + ((key - 2) * 10)] = new_key;
-          }
-      }
-    try
-      {
-        // Inform the receiver that the sender has written many
-        // samples to DDS.
-        invoker->start_get_many (this->keys_, this->iterations_);
-        // Wait a while before writing the samples.
-        ACE_Time_Value tv (2, 0);
-        ACE_OS::sleep (tv);
-        // Now start writing.
-        writer->write_many (write_many);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("write_many : written <%u> samples\n"),
-              write_many.length ()));
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_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->reactor ()->schedule_timer (
-                    this->ticker_,
-                    0,
-                    ACE_Time_Value (0, 500000),
-                    ACE_Time_Value (0, 500000)) == -1)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                                  ACE_TEXT ("Error scheduling timer\n")));
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::tick (void)
-  {
-    ::Getter_Test::GetterTestConnector::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-    ::Getter_Test::GetterFixedConnector::Writer_var fixed =
-      this->ciao_context_->get_connection_info_fixed_data ();
-    ::GetInvoker_var invoker =
-      this->ciao_context_->get_connection_invoke_getter ();
-
-    if (this->last_iter_ <= this->iterations_)
-      {
-        GetterFixed  fixed_key;
-        GetterTest *new_key = new GetterTest;
-        new_key->key = CORBA::string_dup ("KEY_1");
-        fixed_key.key = 1;
-        // Inform the receiver that this class (as the sender) is about to
-        // write samples to DDS.
-        invoker->start_get_one ("KEY_1", 1, last_iter_);
-
-        new_key->iteration = last_iter_;
-        fixed_key.iteration = last_iter_;
-
-        ACE_Time_Value tv (0, 50000);
-        ACE_OS::sleep (tv);
-
-        writer->write_one (*new_key, ::DDS::HANDLE_NIL);
-        fixed->write_one (fixed_key, ::DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG, "Written keys <%C> and <%u> with <%d>\n",
-                    new_key->key.in (), fixed_key.key, last_iter_));
-
-        ++last_iter_;
-        delete new_key;
-    }
-   else
-    {
-      // Stop the timer at forehand.
-      this->reactor ()->cancel_timer (this->ticker_);
-      // Perform the last test.
-      this->write_many ();
-    }
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_info_out_connector_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_connector_status_.in ()))
-      {
-        info_out_connector_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_connector_status_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_DDS::CCM_ConnectorStatusListener::_nil ());
-
-          this->ciao_info_out_connector_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate (
-        this->ciao_info_out_connector_status_.in ());
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Getter_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    this->ccm_activated_ = true;
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    if (!this->done_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::ccm_remove : ")
-                              ACE_TEXT ("Never got start signal\n")));
-      }
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Getter_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/Getter/Sender/Getter_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h
deleted file mode 100644
index cb017322f97..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h
+++ /dev/null
@@ -1,189 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_GETTER_TEST_SENDER_EXEC_HCBIGK_H_
-#define CIAO_GETTER_TEST_SENDER_EXEC_HCBIGK_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Getter_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_Getter_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * Pulse generator.
-   */
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_connector_status_exec_i
-   */
-
-  class info_out_connector_status_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_connector_status_exec_i (
-      ::Getter_Test::CCM_Sender_Context_ptr ctx,
-      Sender_exec_i & callback);
-    virtual ~info_out_connector_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-    const ::DDS::InconsistentTopicStatus & status);
-
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedIncompatibleQosStatus & status);
-
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleRejectedStatus & status);
-
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedDeadlineMissedStatus & status);
-
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedIncompatibleQosStatus & status);
-
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind status_kind);
-    //@}
-
-  private:
-    ::Getter_Test::CCM_Sender_Context_var ciao_context_;
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_info_out_connector_status (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-    void tick (void);
-    //@}
-
-  private:
-    ::Getter_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_info_out_connector_status_;
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    bool          done_;
-    bool          ccm_activated_;
-    CORBA::ULong last_iter_;
-    pulse_Generator * ticker_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start_timeout_tests (void);
-    void write_many (void);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Getter_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Getter_Library.xml b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Getter_Library.xml
deleted file mode 100644
index 7f8f5e589e4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Getter_Library.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--  -->
-
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-  <qos_profile name="GetterProfile">
-    <datawriter_qos>
-          <durability>
-               <kind>TRANSIENT_DURABILITY_QOS</kind>
-          </durability>
-          <reliability>
-               <kind>RELIABLE_RELIABILITY_QOS</kind>
-               <max_blocking_time>
-                    <sec>10</sec>
-                    <nanosec>0</nanosec>
-               </max_blocking_time>
-         </reliability>
-          <history>
-               <kind>KEEP_ALL_HISTORY_QOS</kind>
-               <depth>1</depth>
-          </history>
-    </datawriter_qos>
-    <datareader_qos>
-          <durability>
-                 <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-          </durability>
-          <reliability>
-               <kind>RELIABLE_RELIABILITY_QOS</kind>
-          </reliability>
-          <history>
-               <kind>KEEP_ALL_HISTORY_QOS</kind>
-          </history>
-     </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp
deleted file mode 100644
index bc1ffd81232..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp
+++ /dev/null
@@ -1,542 +0,0 @@
-<!--  -->
-<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>Getter_Test_Depl_1</label>
-  <UUID>Getter_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_Getter_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_Getter_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="Getter_Fixed_ConnectorComponentImplementation">
-    <name>Getter_Fixed_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Getter_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Getter_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_Getter_Test_GetterFixedConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Getter_Test_GetterFixedConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Getter_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Getter_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Getter_Test_ConnectorComponentImplementation">
-    <name>Getter_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Getter_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Getter_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_Getter_Test_GetterTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Getter_Test_GetterTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Getter_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Getter_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_Getter_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_Getter_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="Getter_Test_ConnectorComponentInstance">
-    <name>Getter_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Getter_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Getter_Library#GetterProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Getter_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Getter_Test_ConnectorComponentInstance2">
-    <name>Getter_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Getter_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Getter_Library#GetterProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Getter_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- FIXED -->
-  <instance xmi:id="Getter_Fixed_ConnectorComponentInstance">
-    <name>Getter_Fixed_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Getter_Fixed_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Getter_Fixed</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Getter_Fixed_ConnectorComponentInstance2">
-    <name>Getter_Fixed_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Getter_Fixed_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Getter_Fixed</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_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_get_fresh_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Getter_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_get_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Getter_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_fixed_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_fixed_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Getter_Fixed_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_out_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Getter_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="Getter_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>fixed_writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_fixed_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="Getter_Fixed_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>reader_starter</name>
-    <internalEndpoint>
-      <portName>invoke_getter</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>getter_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="Getter_Test_Connector_ExecArtifact">
-    <name>Getter_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Getter_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Getter_Test_Connector_SvntArtifact">
-    <name>Getter_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Getter_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Getter_Test_Connector_StubArtifact">
-    <name>Getter_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Getter_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/Getter/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 6c565b5b209..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="Getter_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="GetterProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl
deleted file mode 100755
index 5f6eda59235..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl
+++ /dev/null
@@ -1,249 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.idl b/CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.idl
deleted file mode 100644
index 262effa164f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file Hello_Base.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef HELLO_BASE_IDL
-#define HELLO_BASE_IDL
-
-#pragma ndds typesupport "Base/Hello_BaseSupport.h"
-#pragma opendds typesupport "Base/Hello_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "DDSHello"
-
-struct DDSHello {
-  string hello;
-  short iterator;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<DDSHello> DDSHelloSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.mpc b/CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.mpc
deleted file mode 100644
index ac400cd71d3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Base/Hello_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (Home_Hello_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = Home_Hello_Base_stub
-  dynamicflags += HELLO_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=HELLO_BASE_STUB_Export \
-              -Wb,stub_export_include=Hello_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Hello_Base.idl
-  }
-
-  opendds_ts_flags += --export=HELLO_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Hello_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.idl b/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.idl
deleted file mode 100644
index 4b20fa3c416..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file Hello_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef HELLO_CONNECTOR_IDL_
-#define HELLO_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Hello_Base.idl"
-
-#pragma ciao lem "Connector1/Hello_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Hello_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::DDSHello, ::DDSHelloSeq> Foo_conn;
-
-#endif /* HELLO_CONNECTOR_IDL_ */
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.mpc b/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.mpc
deleted file mode 100644
index 0071d626167..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector1/Hello_Connector.mpc
+++ /dev/null
@@ -1,149 +0,0 @@
-project(Home_Hello_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after  += DDS4CCM_idl_gen Home_Hello_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=HELLO_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Hello_Connector_stub_export.h \
-              -Wb,skel_export_macro=HELLO_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Hello_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=HELLO_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Hello_Connector_svnt_export.h \
-              -Wb,conn_export_macro=HELLO_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Hello_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Hello_Connector.idl
-  }
-}
-
-project(Home_Hello_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += Home_Hello_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=HELLO_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Hello_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Hello_ConnectorE.idl
-  }
-}
-
-project(Home_Hello_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after  += Home_Hello_Connector_lem_gen \
-            Home_Hello_Connector_stub \
-            Home_Hello_Base_stub
-  libs   += Home_Hello_Base_stub \
-            Home_Hello_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Home_Hello_Connector_lem_stub
-  dynamicflags += HELLO_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Hello_ConnectorEC.h
-    Hello_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Hello_ConnectorEC.inl
-  }
-}
-
-project(Home_Hello_Connector_stub) : ccm_stub, dds4ccm_base {
-  after  += Home_Hello_Connector_idl_gen Home_Hello_Base_stub
-  libs   += Home_Hello_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Home_Hello_Connector_stub
-  dynamicflags += HELLO_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Hello_ConnectorC.h
-    Hello_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Hello_ConnectorC.inl
-  }
-}
-
-project(Home_Hello_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after  += Home_Hello_Connector_lem_stub \
-            Home_Hello_Connector_stub \
-            Home_Hello_Base_stub
-  sharedname = Home_Hello_Connector_exec
-  libs += Home_Hello_Connector_stub \
-          Home_Hello_Connector_lem_stub \
-          Home_Hello_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += HELLO_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Hello_Connector_conn.h
-    Hello_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(Home_Hello_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += Home_Hello_Connector_lem_stub \
-                Home_Hello_Connector_exec \
-                Home_Hello_Connector_stub
-  sharedname  = Home_Hello_Connector_svnt
-  libs       += Home_Hello_Connector_stub \
-                Home_Hello_Connector_lem_stub  \
-                Home_Hello_Base_stub \
-                Home_Hello_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += HELLO_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_ConnectorS.cpp
-    Hello_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Hello_ConnectorS.h
-    Hello_Connector_svnt.h
-    Hello_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.idl b/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.idl
deleted file mode 100644
index db9a415bf82..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file Hello_Connector2.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef HELLO_CONNECTOR2_IDL_
-#define HELLO_CONNECTOR2_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Hello_Base.idl"
-
-#pragma ciao lem "Connector2/Hello_Connector2E.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Hello_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::DDSHello, ::DDSHelloSeq> Bar_conn;
-
-#endif /* HELLO_CONNECTOR_IDL_ */
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.mpc b/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.mpc
deleted file mode 100644
index 34106691416..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Connector2/Hello_Connector2.mpc
+++ /dev/null
@@ -1,149 +0,0 @@
-project(Home_Hello_Connector2_idl_gen) : connectoridldefaults, dds4ccm {
-  after  += DDS4CCM_idl_gen Home_Hello_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=HELLO_CONNECTOR2_STUB_Export \
-              -Wb,stub_export_include=Hello_Connector2_stub_export.h \
-              -Wb,skel_export_macro=HELLO_CONNECTOR2_SVNT_Export \
-              -Wb,skel_export_include=Hello_Connector2_svnt_export.h \
-              -Wb,svnt_export_macro=HELLO_CONNECTOR2_SVNT_Export \
-              -Wb,svnt_export_include=Hello_Connector2_svnt_export.h \
-              -Wb,conn_export_macro=HELLO_CONNECTOR2_CONN_Export \
-              -Wb,conn_export_include=Hello_Connector2_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Hello_Connector2.idl
-  }
-}
-
-project(Home_Hello_Connector2_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += Home_Hello_Connector2_idl_gen
-  idlflags += -Wb,stub_export_macro=HELLO_CONNECTOR2_LEM_STUB_Export \
-              -Wb,stub_export_include=Hello_Connector2_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Hello_Connector2E.idl
-  }
-}
-
-project(Home_Hello_Connector2_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after  += Home_Hello_Connector2_lem_gen \
-            Home_Hello_Connector2_stub \
-            Home_Hello_Base_stub
-  libs   += Home_Hello_Base_stub \
-            Home_Hello_Connector2_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Home_Hello_Connector2_lem_stub
-  dynamicflags += HELLO_CONNECTOR2_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_Connector2EC.cpp
-  }
-
-  Header_Files {
-    Hello_Connector2EC.h
-    Hello_Connector2_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Hello_Connector2EC.inl
-  }
-}
-
-project(Home_Hello_Connector2_stub) : ccm_stub, dds4ccm_base {
-  after  += Home_Hello_Connector2_idl_gen Home_Hello_Base_stub
-  libs   += Home_Hello_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Home_Hello_Connector2_stub
-  dynamicflags += HELLO_CONNECTOR2_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_Connector2C.cpp
-  }
-
-  Header_Files {
-    Hello_Connector2C.h
-    Hello_Connector2_stub_export.h
-  }
-
-  Inline_Files {
-    Hello_Connector2C.inl
-  }
-}
-
-project(Home_Hello_Connector2_exec) : ciao_executor, dds4ccm_impl {
-  after  += Home_Hello_Connector2_lem_stub \
-            Home_Hello_Connector2_stub \
-            Home_Hello_Base_stub
-  sharedname = Home_Hello_Connector2_exec
-  libs += Home_Hello_Connector2_stub \
-          Home_Hello_Connector2_lem_stub \
-          Home_Hello_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += HELLO_CONNECTOR2_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_Connector2_conn.cpp
-  }
-
-  Header_Files {
-    Hello_Connector2_conn.h
-    Hello_Connector2_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(Home_Hello_Connector2_svnt) : ciao_servant, dds4ccm_impl {
-  after      += Home_Hello_Connector2_lem_stub \
-                Home_Hello_Connector2_exec \
-                Home_Hello_Connector2_stub
-  sharedname  = Home_Hello_Connector2_svnt
-  libs       += Home_Hello_Connector2_stub \
-                Home_Hello_Connector2_lem_stub  \
-                Home_Hello_Base_stub \
-                Home_Hello_Connector2_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += HELLO_CONNECTOR2_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_Connector2S.cpp
-    Hello_Connector2_svnt.cpp
-  }
-
-  Header_Files {
-    Hello_Connector2S.h
-    Hello_Connector2_svnt.h
-    Hello_Connector2_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.idl b/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.idl
deleted file mode 100644
index d1692eb1582..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.idl
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_SENDER_IDL
-#define DDS_SENDER_IDL
-
-#include "Connector1/Hello_Connector.idl"
-#include "Connector2/Hello_Connector2.idl"
-
-module Hello
-{
-  interface Base_obj
-  {
-  };
-
-  interface Derived_obj : Base_obj
-  {
-  };
-
-  component Base_comp
-  {
-    provides Base_obj baseFacet;
-    uses Base_obj baseRecept;
-    port Foo_conn::DDS_Write fooPub;
-    port Foo_conn::DDS_Listen fooSub;
-    attribute short baseAttr;
-  };
-
-  home Base_compHome manages Base_comp {
-  };
-
-  component Derived_comp : Base_comp
-  {
-    provides Derived_obj derivedFacet;
-    uses Derived_obj derivedRecept;
-    attribute long long derivedAttr;
-    port Bar_conn::DDS_Write barPub;
-    port Bar_conn::DDS_Listen barSub;
-
-  };
-
-  home Derived_compHome : Base_compHome manages Derived_comp {
-  };
-
- component DerivedEmpty_comp : Base_comp {
-  };
-
-
-
-
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.mpc b/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.mpc
deleted file mode 100644
index accf17584fb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(Home_Hello_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  avoids += ace_for_tao
-  after  += Home_Hello_Connector_idl_gen Home_Hello_Connector2_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=HELLO_SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=HELLO_SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=HELLO_SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=HELLO_SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    Hello_Sender.idl
-  }
-}
-
-project(Home_Hello_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  avoids += ace_for_tao
-  after  += Home_Hello_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=HELLO_SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    Hello_SenderE.idl
-  }
-}
-
-project(Home_Hello_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  avoids += ace_for_tao
-  after  += Home_Hello_Sender_lem_gen Home_Hello_Sender_stub Home_Hello_Base_stub
-  libs   += Home_Hello_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += HELLO_SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_SenderEC.cpp
-  }
-
-  Header_Files {
-    Hello_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Hello_SenderEC.inl
-  }
-}
-
-project(Home_Hello_Sender_stub) : ccm_stub, dds4ccm_base {
-  avoids += ace_for_tao
-  after  += Home_Hello_Sender_idl_gen Home_Hello_Base_stub Home_Hello_Connector_stub Home_Hello_Connector2_stub
-  libs   += Home_Hello_Base_stub Home_Hello_Connector_stub Home_Hello_Connector2_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += HELLO_SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_SenderC.cpp
-  }
-
-  Header_Files {
-    Hello_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Hello_SenderC.inl
-  }
-}
-
-project(Home_Hello_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after  += Home_Hello_Sender_lem_stub Home_Hello_Sender_stub Home_Hello_Connector_lem_stub Home_Hello_Connector_stub \
-            Home_Hello_Connector2_lem_stub Home_Hello_Connector2_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub Home_Hello_Base_stub Home_Hello_Connector_lem_stub Home_Hello_Connector_stub \
-          Home_Hello_Connector2_lem_stub Home_Hello_Connector2_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += HELLO_SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Hello_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(Home_Hello_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  avoids     += ace_for_tao
-  after      += Home_Hello_Base_stub  Home_Hello_Sender_lem_stub Home_Hello_Connector_stub Home_Hello_Connector_svnt  Home_Hello_Connector_lem_stub \
-                Home_Hello_Connector2_stub Home_Hello_Connector2_svnt  Home_Hello_Connector2_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                Home_Hello_Base_stub Home_Hello_Connector_stub Home_Hello_Connector_svnt Home_Hello_Connector_lem_stub \
-                Home_Hello_Connector2_stub Home_Hello_Connector2_svnt Home_Hello_Connector2_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += HELLO_SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Hello_SenderS.cpp
-    Hello_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Hello_SenderS.h
-    Hello_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.cpp
deleted file mode 100644
index 7024dbf18ef..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.cpp
+++ /dev/null
@@ -1,723 +0,0 @@
-// -*- C++ -*-
-#include "Hello_Sender_exec.h"
-#include "ace/Guard_T.h"
-#include "ace/Log_Msg.h"
-#include "tao/ORB_Core.h"
-#include "ace/Date_Time.h"
-#include "ace/OS_NS_unistd.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_Hello_Base_comp_Impl
-{
-
-  fooSub_data_listener_exec_i::fooSub_data_listener_exec_i (
-        ::Hello::CCM_Base_comp_Context_ptr ctx)
-    : ciao_context_ (
-        ::Hello::CCM_Base_comp_Context::_duplicate (ctx))
-  {
-  }
-
-  fooSub_data_listener_exec_i::~fooSub_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from Listener
-  void
-  fooSub_data_listener_exec_i::on_one_data (
-    const ::DDSHello & /* datum */,
-    const ::CCM_DDS::ReadInfo & /* info */)
-  {
-  }
-
-  void
-  fooSub_data_listener_exec_i::on_many_data (
-    const ::DDSHelloSeq & /* data */,
-    const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  fooSub_status_exec_i::fooSub_status_exec_i (
-        ::Hello::CCM_Base_comp_Context_ptr ctx)
-    : ciao_context_ (
-        ::Hello::CCM_Base_comp_Context::_duplicate (ctx))
-  {
-  }
-
-  fooSub_status_exec_i::~fooSub_status_exec_i (void)
-  {
-    //ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("~fooSub_status_exec_i\n")));
-  }
-
-  void
-  fooSub_status_exec_i::on_requested_deadline_missed (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  fooSub_status_exec_i::on_sample_lost (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::SampleLostStatus & /* status */)
-  {
-     //ACE_DEBUG ((LM_ERROR, ACE_TEXT("port status listener::on_sample_lost\n")));
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Base_comp_exec_i
-  //============================================================
-
-  Base_comp_exec_i::Base_comp_exec_i (void)
-    : baseAttr_ (1)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Base_comp: -2- Base_comp_exec_i::"
-                                  "Base_comp_exec_i \n"));
-  }
-
-  Base_comp_exec_i::~Base_comp_exec_i (void)
-  {
-     ACE_DEBUG ((LM_DEBUG, "Base_comp: -10- Base_comp_exec_i::"
-                                      "~Base_comp_exec_i \n"));
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::CORBA::Short
-   Base_comp_exec_i::baseAttr (void)
-  {
-    return this->baseAttr_;
-  }
-
-  void
-  Base_comp_exec_i::baseAttr (
-    ::CORBA::Short baseAttr)
-  {
-    this->baseAttr_ = baseAttr;
-  }
-
-  ::Foo_conn::CCM_Listener_ptr
-   Base_comp_exec_i::get_fooSub_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_fooSub_data_listener_.in ()))
-      {
-        fooSub_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          fooSub_data_listener_exec_i (
-            this->ciao_context_.in ()),
-          ::Foo_conn::CCM_Listener::_nil ());
-
-        this->ciao_fooSub_data_listener_ = tmp;
-      }
-
-    return
-      ::Foo_conn::CCM_Listener::_duplicate (
-        this->ciao_fooSub_data_listener_.in ());
-  }
-
-
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-   Base_comp_exec_i::get_fooSub_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_fooSub_status_.in ()))
-      {
-        fooSub_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          fooSub_status_exec_i (
-            this->ciao_context_.in ()),
-           ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-        this->ciao_fooSub_status_ = tmp;
-      }
-
-    return
-       ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_fooSub_status_.in ());
-  }
-
-  ::Hello::CCM_Base_obj_ptr
-   Base_comp_exec_i::get_baseFacet (void)
-  {
-    return 0;
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Base_comp_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Hello::CCM_Base_comp_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Base_comp_exec_i::configuration_complete (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Base_comp: -3- Base_comp_exec_i::"
-                                      "configuration_complete \n"));
-  }
-
-  void
-  Base_comp_exec_i::ccm_activate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Base_comp: -4- Base_comp_exec_i::"
-                                      "ccm_activate \n"));
-  }
-
-  void
-  Base_comp_exec_i::ccm_passivate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Base_comp: -8- Base_comp_exec_i::"
-                                      "ccm_passivate \n"));
-  }
-
-  void
-  Base_comp_exec_i::ccm_remove (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Base_comp: -9- Base_comp_exec_i::"
-                                      "ccm_remove \n"));
-  }
-
-
-  extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Hello_Base_comp_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Base_comp_exec_i);
-
-    return retval;
-  }
-
-}
-namespace CIAO_Hello_Base_comp_Impl
-{
-  //============================================================
-  // Home Executor Implementation Class: SenderHome_exec_i
-  //============================================================
-
-  Base_compHome_exec_i::Base_compHome_exec_i ()
-  {
-    ACE_DEBUG ((LM_DEBUG, " Base_compHome: -2- Base_compHome_exec_i::"
-                              "Base_compHome_exec_i \n"));
-  }
-
-  Base_compHome_exec_i::~Base_compHome_exec_i (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, " Base_compHome: -11- Base_compHome_exec_i::"
-                              "~Base_compHome_exec_i \n"));
-  }
-
-  // All operations and attributes.
-
-  // Factory operations.
-
-  // Finder operations.
-
-  // Implicit operations.
-
-  ::Components::EnterpriseComponent_ptr
-   Base_compHome_exec_i::create (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, " Base_compHome: -3- Base_compHome_exec_i::create\n"));
-    ACE_DEBUG ((LM_DEBUG, "(%P|%t) creating Base_compHome\n"));
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-
-    ACE_NEW_THROW_EX (
-      retval,
-      CIAO_Hello_Base_comp_Impl::Base_comp_exec_i (),
-      ::CORBA::NO_MEMORY ());
-    return retval;
-  }
-
-  extern "C" HELLO_SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Hello_SenderHome_Impl (void)
-  {
-     ACE_DEBUG ((LM_DEBUG, " Base_compHome: -1- create_Hello_Base_compHome_Impl \n"));
-
-    ::Components::HomeExecutorBase_ptr retval =
-      ::Components::HomeExecutorBase::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Base_compHome_exec_i ());
-
-    return retval;
-  }
-}
-
-//============================================================
-  // Component Executor Implementation Class: Derived_comp_exec_i
-  //============================================================
-namespace CIAO_Hello_Derived_comp_Impl
-{
-  barSub_data_listener_exec_i::barSub_data_listener_exec_i (
-         ::Hello::CCM_Derived_comp_Context_ptr ctx)
-     : ciao_context_ (
-         ::Hello::CCM_Derived_comp_Context::_duplicate (ctx))
-  {
-  }
-
-  barSub_data_listener_exec_i::~barSub_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from Listener
-  void
-  barSub_data_listener_exec_i::on_one_data (
-     const ::DDSHello & /* datum */,
-     const ::CCM_DDS::ReadInfo & /* info */)
-  {
-  }
-
-  void
-  barSub_data_listener_exec_i::on_many_data (
-    const ::DDSHelloSeq & /* data */,
-    const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-     /* Your code here. */
-  }
-
-
-  barSub_status_exec_i::barSub_status_exec_i (
-           ::Hello::CCM_Base_comp_Context_ptr ctx)
-       : ciao_context_ (
-           ::Hello::CCM_Base_comp_Context::_duplicate (ctx))
-  {
-  }
-
-  barSub_status_exec_i::~barSub_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  barSub_status_exec_i::on_requested_deadline_missed (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  barSub_status_exec_i::on_sample_lost (
-     ::DDS::DataReader_ptr /* the_reader */,
-     const ::DDS::SampleLostStatus & /* status */)
-  {
-  }
-
-  Derived_comp_exec_i::Derived_comp_exec_i (void)
-    : baseAttr_ (10),
-      derivedAttr_ (100)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Derived_comp: -2- Derived_comp_exec_i::"
-                                  "Derived_comp_exec_i \n"));
-  }
-
-  Derived_comp_exec_i::~Derived_comp_exec_i (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Derived_comp: -10- Derived_comp_exec_i::"
-                                      "~Derived_comp_exec_i \n"));
-  }
-
-  // Supported operations and attributes.
-  ::CORBA::LongLong
-  Derived_comp_exec_i::derivedAttr (void)
-  {
-    return this->derivedAttr_;
-  }
-
-  void
-  Derived_comp_exec_i::derivedAttr (
-  ::CORBA::LongLong derivedAttr)
-  {
-    this->derivedAttr_ = derivedAttr;
-  }
-
-
-  ::CORBA::Short
-  Derived_comp_exec_i::baseAttr (void)
-  {
-    return this->baseAttr_;
-  }
-
-  void
-  Derived_comp_exec_i::baseAttr (
-     ::CORBA::Short baseAttr)
-  {
-    this->baseAttr_ = baseAttr;
-  }
-
-  // Component attributes and port operations.
-
-  ::Foo_conn::CCM_Listener_ptr
-  Derived_comp_exec_i::get_fooSub_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_fooSub_data_listener_.in ()))
-      {
-      CIAO_Hello_Base_comp_Impl::fooSub_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          CIAO_Hello_Base_comp_Impl::fooSub_data_listener_exec_i (
-            this->ciao_context_.in ()),
-          ::Foo_conn::CCM_Listener::_nil ());
-
-        this->ciao_fooSub_data_listener_ = tmp;
-      }
-
-    return
-      ::Foo_conn::CCM_Listener::_duplicate (
-        this->ciao_fooSub_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Derived_comp_exec_i::get_fooSub_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_fooSub_status_.in ()))
-      {
-      CIAO_Hello_Base_comp_Impl::fooSub_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          CIAO_Hello_Base_comp_Impl::fooSub_status_exec_i (
-            this->ciao_context_.in ()),
-           ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-        this->ciao_fooSub_status_ = tmp;
-      }
-
-    return
-       ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_fooSub_status_.in ());
-  }
-
-  ::Bar_conn::CCM_Listener_ptr
-  Derived_comp_exec_i::get_barSub_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_barSub_data_listener_.in ()))
-      {
-      barSub_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          barSub_data_listener_exec_i (
-            this->ciao_context_.in ()),
-          ::Bar_conn::CCM_Listener::_nil ());
-
-        this->ciao_barSub_data_listener_ = tmp;
-      }
-
-    return
-      ::Bar_conn::CCM_Listener::_duplicate (
-        this->ciao_barSub_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Derived_comp_exec_i::get_barSub_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_barSub_status_.in ()))
-      {
-        barSub_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          barSub_status_exec_i (
-            this->ciao_context_.in ()),
-           ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-        this->ciao_barSub_status_ = tmp;
-      }
-
-    return
-       ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_barSub_status_.in ());
-  }
-
-  ::Hello::CCM_Base_obj_ptr
-  Derived_comp_exec_i::get_baseFacet (void)
-  {
-    return 0;
-  }
-
-  ::Hello::CCM_Derived_obj_ptr
-  Derived_comp_exec_i::get_derivedFacet (void)
-  {
-    return 0;
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Derived_comp_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Derived_comp: -3- Derived_comp_exec_i::"
-                                          ":set_session_contexti \n"));
-    this->ciao_context_ =
-      ::Hello::CCM_Derived_comp_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Derived_comp_exec_i::configuration_complete (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Derived_comp: -4- Derived_comp_exec_i::"
-                                      "configuration_complete \n"));
-  }
-
-  void
-  Derived_comp_exec_i::ccm_activate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Derived_comp: -5- Derived_comp_exec_i::"
-                                      "ccm_activate \n"));
-  }
-
-  void
-  Derived_comp_exec_i::ccm_passivate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Derived_comp: -8- Derived_comp_exec_i::"
-                                      "ccm_passivate \n"));
-  }
-
-  void
-  Derived_comp_exec_i::ccm_remove (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Derived_comp: -9- Derived_comp_exec_i::"
-                                      "ccm_remove \n"));
-  }
-
-
-  extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Hello_Derived_comp_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Derived_comp_exec_i);
-
-    return retval;
-  }
-
-}
-namespace  CIAO_Hello_Derived_comp_Impl
-{
-  //============================================================
-  // Home Executor Implementation Class: Derived_compHome_exec_i
-  //============================================================
-
-  Derived_compHome_exec_i::Derived_compHome_exec_i ()
-  {
-    ACE_DEBUG ((LM_DEBUG, "Derived_compHome: -2- Derived_compHome_exec_i::"
-                              "Derived_compHome_exec_i \n"));
-
-    //compare current and original thread
-   }
-
-  Derived_compHome_exec_i::~Derived_compHome_exec_i (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Derived_compHome: -11- Derived_compHome_exec_i::"
-                          "~Derived_compHome_exec_i \n"));
-  }
-
-  // All operations and attributes.
-
-  // Factory operations.
-
-  // Finder operations.
-
-  // Implicit operations.
-
-  ::Components::EnterpriseComponent_ptr
-   Derived_compHome_exec_i::create (void)
-  {
-     ACE_DEBUG ((LM_DEBUG, "Derived_compHome: -3- Derived_compHome_exec_i::create\n"));
-    ACE_DEBUG ((LM_DEBUG, "(%P|%t) creating Derived_compHome\n"));
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-
-    ACE_NEW_THROW_EX (
-      retval,
-      CIAO_Hello_Derived_comp_Impl::Derived_comp_exec_i (),
-      ::CORBA::NO_MEMORY ());
-
-    return retval;
-  }
-
-  extern "C" HELLO_SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Hello_Derived_compHome_Impl (void)
-  {
-
-     ACE_DEBUG ((LM_DEBUG, "Derived_compHome: -1- create_Hello_Derived_compHome_Impl \n"));
-
-    ::Components::HomeExecutorBase_ptr retval =
-      ::Components::HomeExecutorBase::_nil ();
-
-
-    ACE_NEW_NORETURN (
-      retval,
-      Derived_compHome_exec_i ());
-
-   return retval;
-  }
-}
-//============================================================
-  // Component Executor Implementation Class: DerivedEmpty_comp_exec_i
-  //============================================================
-namespace CIAO_Hello_DerivedEmpty_comp_Impl
-{
-  DerivedEmpty_comp_exec_i::DerivedEmpty_comp_exec_i (void)
-    : baseAttr_ (1)
-  {
-    ACE_DEBUG ((LM_DEBUG, "DerivedEmpty_comp: -2- DerivedEmpty_comp_exec_i::"
-                                  "DerivedEmpty_comp_exec_i \n"));
-  }
-
-  DerivedEmpty_comp_exec_i::~DerivedEmpty_comp_exec_i (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "DerivedEmpty_comp: -10- DerivedEmpty_comp_exec_i::"
-                                      "~DerivedEmpty_comp_exec_i \n"));
-  }
-
-  // Supported operations and attributes.
-
-  ::CORBA::Short
-  DerivedEmpty_comp_exec_i::baseAttr (void)
-  {
-    return this->baseAttr_;
-  }
-
-  void
-  DerivedEmpty_comp_exec_i::baseAttr (
-     ::CORBA::Short baseAttr)
-  {
-    this->baseAttr_ = baseAttr;
-  }
-
-  // Component attributes and port operations.
-
-
-  ::Foo_conn::CCM_Listener_ptr
-  DerivedEmpty_comp_exec_i::get_fooSub_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_fooSub_data_listener_.in ()))
-      {
-      CIAO_Hello_Base_comp_Impl::fooSub_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          CIAO_Hello_Base_comp_Impl::fooSub_data_listener_exec_i (
-            this->ciao_context_.in ()),
-          ::Foo_conn::CCM_Listener::_nil ());
-
-        this->ciao_fooSub_data_listener_ = tmp;
-      }
-
-    return
-      ::Foo_conn::CCM_Listener::_duplicate (
-        this->ciao_fooSub_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  DerivedEmpty_comp_exec_i::get_fooSub_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_fooSub_status_.in ()))
-       {
-      CIAO_Hello_Base_comp_Impl::fooSub_status_exec_i *tmp = 0;
-         ACE_NEW_RETURN (
-           tmp,
-           CIAO_Hello_Base_comp_Impl::fooSub_status_exec_i (
-             this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-         this->ciao_fooSub_status_ = tmp;
-       }
-
-    return
-        ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-         this->ciao_fooSub_status_.in ());
-  }
-
-
-  ::Hello::CCM_Base_obj_ptr
-   DerivedEmpty_comp_exec_i::get_baseFacet (void)
-   {
-     return 0;
-   }
-  // Operations from Components::SessionComponent.
-
-  void
-  DerivedEmpty_comp_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Hello::CCM_DerivedEmpty_comp_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  DerivedEmpty_comp_exec_i::configuration_complete (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "DerivedEmpty_comp: -3- DerivedEmpty_comp_exec_i::"
-                                      "configuration_completei \n"));
-    /* Your code here. */
-  }
-
-  void
-  DerivedEmpty_comp_exec_i::ccm_activate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "DerivedEmpty_comp: -4- DerivedEmpty_comp_exec_i::"
-                                      "ccm_activate \n"));
-  }
-
-  void
-  DerivedEmpty_comp_exec_i::ccm_passivate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "DerivedEmpty_comp: -8- DerivedEmpty_comp_exec_i::"
-                                      "ccm_passivate \n"));
-  }
-
-  void
-  DerivedEmpty_comp_exec_i::ccm_remove (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "DerivedEmpty_comp: -9- DerivedEmpty_comp_exec_i::"
-                                      "ccm_remove \n"));
-  }
-
-
-  extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Hello_DerivedEmpty_comp_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      DerivedEmpty_comp_exec_i);
-
-    return retval;
-  }
-
-}
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.h
deleted file mode 100644
index de5a3d6d89b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/Sender/Hello_Sender_exec.h
+++ /dev/null
@@ -1,365 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_HELLO_SENDER_EXEC_YPB9XX_H_
-#define CIAO_HELLO_SENDER_EXEC_YPB9XX_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Hello_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-#include <map>
-
-namespace CIAO_Hello_Base_comp_Impl
-{
-
-  class HELLO_SENDER_EXEC_Export fooSub_data_listener_exec_i
-    : public virtual ::Foo_conn::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    fooSub_data_listener_exec_i (
-      ::Hello::CCM_Base_comp_Context_ptr ctx);
-
-    virtual ~fooSub_data_listener_exec_i (void);
-
-    // Operations and attributes from Hello::Listener
-
-    virtual
-    void on_one_data (
-      const ::DDSHello & datum,
-      const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (
-      const ::DDSHelloSeq & data,
-      const ::CCM_DDS::ReadInfoSeq & infos);
-
-  private:
-    ::Hello::CCM_Base_comp_Context_var ciao_context_;
-  };
-
-  class HELLO_SENDER_EXEC_Export fooSub_status_exec_i
-      : public virtual ::CCM_DDS::CCM_PortStatusListener,
-        public virtual ::CORBA::LocalObject
-  {
-  public:
-    fooSub_status_exec_i (
-      ::Hello::CCM_Base_comp_Context_ptr ctx);
-    virtual ~fooSub_status_exec_i (void);
-
-    // Operations and attributes from CCM_DDS::PortStatusListener
-
-    virtual
-    void on_requested_deadline_missed (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::SampleLostStatus & status);
-
-  private:
-    ::Hello::CCM_Base_comp_Context_var ciao_context_;
-  };
-
-
-  class Base_comp_exec_i;
-
-  class HELLO_SENDER_EXEC_Export Base_comp_exec_i
-    : public virtual Base_comp_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Base_comp_exec_i (void);
-    virtual ~Base_comp_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CORBA::Short
-    baseAttr (void);
-
-    virtual void
-    baseAttr (::CORBA::Short baseAttr);
-
-    virtual ::Foo_conn::CCM_Listener_ptr
-    get_fooSub_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_fooSub_status (void);
-
-    virtual ::Hello::CCM_Base_obj_ptr
-    get_baseFacet (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:
-    ::Hello::CCM_Base_comp_Context_var ciao_context_;
-    ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_connector_status_;
-    ::Foo_conn::CCM_Listener_var ciao_fooSub_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_fooSub_status_;
-    CORBA::Short baseAttr_;
- };
-
-  extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Hello_Base_comp_Impl (void);
-}
-namespace CIAO_Hello_Base_comp_Impl
-{
-  class HELLO_SENDER_EXEC_Export Base_compHome_exec_i
-    : public virtual Base_compHome_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Base_compHome_exec_i (void);
-
-    virtual ~Base_compHome_exec_i (void);
-
-    // All operations and attributes.
-
-    // Factory operations.
-
-    // Finder operations.
-
-    // Implicit operations.
-
-    virtual ::Components::EnterpriseComponent_ptr
-    create (void);
-  private:
-
-  };
-
-  extern "C" HELLO_SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Hello_Base_compHome_Impl (void);
-}
-
-namespace CIAO_Hello_Derived_comp_Impl
-{
-
-  class HELLO_SENDER_EXEC_Export barSub_data_listener_exec_i
-      : public virtual ::Bar_conn::CCM_Listener,
-        public virtual ::CORBA::LocalObject
-  {
-  public:
-    barSub_data_listener_exec_i (
-      ::Hello::CCM_Derived_comp_Context_ptr ctx);
-
-    virtual ~barSub_data_listener_exec_i (void);
-
-    // Operations and attributes from Hello::Listener
-
-    virtual
-    void on_one_data (
-      const ::DDSHello & datum,
-      const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (
-      const ::DDSHelloSeq & data,
-      const ::CCM_DDS::ReadInfoSeq & infos);
-
-  private:
-    ::Hello::CCM_Derived_comp_Context_var ciao_context_;
-  };
-
-  class HELLO_SENDER_EXEC_Export barSub_status_exec_i
-       : public virtual ::CCM_DDS::CCM_PortStatusListener,
-         public virtual ::CORBA::LocalObject
-  {
-  public:
-    barSub_status_exec_i (
-       ::Hello::CCM_Base_comp_Context_ptr ctx);
-    virtual ~barSub_status_exec_i (void);
-
-    // Operations and attributes from CCM_DDS::PortStatusListener
-
-    virtual
-    void on_requested_deadline_missed (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::SampleLostStatus & status);
-
-  private:
-    ::Hello::CCM_Base_comp_Context_var ciao_context_;
-  };
-
-  class HELLO_SENDER_EXEC_Export Derived_comp_exec_i
-    : public virtual Derived_comp_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Derived_comp_exec_i (void);
-    virtual ~Derived_comp_exec_i (void);
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CORBA::LongLong
-    derivedAttr (void);
-
-    virtual void
-    derivedAttr (::CORBA::LongLong);
-
-    virtual ::CORBA::Short
-    baseAttr (void);
-
-    virtual void
-    baseAttr (::CORBA::Short baseAttr);
-
-    virtual ::Foo_conn::CCM_Listener_ptr
-    get_fooSub_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_fooSub_status (void);
-
-    virtual ::Bar_conn::CCM_Listener_ptr
-    get_barSub_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_barSub_status (void);
-
-    virtual ::Hello::CCM_Base_obj_ptr
-    get_baseFacet (void);
-
-    virtual ::Hello::CCM_Derived_obj_ptr
-    get_derivedFacet (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:
-    ::Hello::CCM_Derived_comp_Context_var ciao_context_;
-    ::Foo_conn::CCM_Listener_var ciao_fooSub_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_fooSub_status_;
-    ::Bar_conn::CCM_Listener_var ciao_barSub_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_barSub_status_;
-
-    CORBA::Short baseAttr_;
-    CORBA::ULongLong derivedAttr_;
- //   Atomic_Boolean ready_to_start_;
-  };
-
-  extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Hello_Derived_comp_Impl (void);
-}
-
-
-namespace  CIAO_Hello_Derived_comp_Impl
-{
-  class HELLO_SENDER_EXEC_Export Derived_compHome_exec_i
-    : public virtual Derived_compHome_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Derived_compHome_exec_i (void);
-
-    virtual ~Derived_compHome_exec_i (void);
-
-    // All operations and attributes.
-
-    // Factory operations.
-    // Finder operations.
-
-    // Implicit operations.
-
-    virtual ::Components::EnterpriseComponent_ptr
-    create (void);
-  private:
-
-  };
-
-  extern "C" HELLO_SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Hello_Derived_compHome_Impl (void);
-}
-
-namespace CIAO_Hello_DerivedEmpty_comp_Impl
-{
- class HELLO_SENDER_EXEC_Export DerivedEmpty_comp_exec_i
-    : public virtual DerivedEmpty_comp_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-   DerivedEmpty_comp_exec_i (void);
-    virtual ~DerivedEmpty_comp_exec_i (void);
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CORBA::Short
-    baseAttr (void);
-
-    virtual void
-    baseAttr (::CORBA::Short baseAttr);
-
-    virtual ::Foo_conn::CCM_Listener_ptr
-    get_fooSub_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_fooSub_status (void);
-
-    virtual ::Hello::CCM_Base_obj_ptr
-    get_baseFacet (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:
-    ::Hello::CCM_DerivedEmpty_comp_Context_var ciao_context_;
-    ::Foo_conn::CCM_Listener_var ciao_fooSub_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_fooSub_status_;
-    CORBA::Short baseAttr_;
-    CORBA::ULongLong derivedAttr_;
-  };
-
-  extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Hello_DerivedEmpty_comp_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/descriptors/DeploymentPlan.cdp b/CIAO/connectors/dds4ccm/tests/HomeDerived/descriptors/DeploymentPlan.cdp
deleted file mode 100644
index 563002a03d0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/descriptors/DeploymentPlan.cdp
+++ /dev/null
@@ -1,753 +0,0 @@
-<!--  -->
-<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>Hello_Depl_1</label>
-  <UUID>Hello_Depl_1</UUID>
-
-  <implementation xmi:id="DerivedEmpty_compComponentImplementation">
-    <name>DerivedEmpty_compComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="DerivedEmpty_comp_ExecArtifact" />
-    <artifact xmi:idref="DerivedEmpty_comp_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_DerivedEmpty_comp_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_DerivedEmpty_comp_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DerivedEmpty_comp_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DerivedEmpty_comp_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Foo_ConnectorComponentImplementation">
-    <name>Foo_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Foo_Connector_ExecArtifact" />
-    <artifact xmi:idref="Foo_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_Foo_conn_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Foo_conn_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Foo_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Foo_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Bar_ConnectorComponentImplementation">
-    <name>Bar_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Bar_Connector_ExecArtifact" />
-    <artifact xmi:idref="Bar_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_Bar_conn_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Bar_conn_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Bar_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Bar_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-
-  <implementation xmi:id="Base_compHomeComponentImplementation">
-    <name>Base_compHomeComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Base_compHome_ExecArtifact" />
-    <artifact xmi:idref="Base_compHome_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>home factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Base_compHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Base_compHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Base_compHome_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Base_compHome_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Base_compComponentImplementation">
-    <name>Base_compComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Base_compHome_ExecArtifact" />
-    <artifact xmi:idref="Base_compHome_SvntArtifact" />
-    <execParameter>
-      <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>edu.vanderbilt.dre.CCM.HomedComponent</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Derived_compHomeComponentImplementation">
-    <name>Derived_compHomeComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Derived_compHome_ExecArtifact" />
-    <artifact xmi:idref="Derived_compHome_SvntArtifact" />
-    <execParameter>
-      <name>home factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Derived_compHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Derived_compHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Derived_compHome_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Derived_compHome_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Derived_compComponentImplementation">
-    <name>Derived_compComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Derived_compHome_ExecArtifact" />
-    <artifact xmi:idref="Derived_compHome_SvntArtifact" />
-    <execParameter>
-      <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>edu.vanderbilt.dre.CCM.HomedComponent</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-
-  <instance xmi:id="Foo_Connector_1_ComponentInstance">
-    <name>Foo_Connector_1_Component</name>
-    <node>Node1</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Foo_ConnectorComponentImplementation" />
-     <configProperty>
-      <name>domain_id</name>
-      <value>
-        <type>
-          <kind>tk_long</kind>
-        </type>
-        <value>
-          <long>9</long>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Foo_Connector_2_ComponentInstance">
-    <name>Foo_Connector_2_Component</name>
-    <node>Node1</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Foo_ConnectorComponentImplementation" />
-     <configProperty>
-      <name>domain_id</name>
-      <value>
-        <type>
-          <kind>tk_long</kind>
-        </type>
-        <value>
-          <long>9</long>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Bar_Connector_1_ComponentInstance">
-    <name>Bar_Connector_1_Component</name>
-    <node>Node1</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Bar_ConnectorComponentImplementation" />
-     <configProperty>
-      <name>domain_id</name>
-      <value>
-        <type>
-          <kind>tk_long</kind>
-        </type>
-        <value>
-          <long>99</long>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Bar_Connector_2_ComponentInstance">
-    <name>Bar_Connector_2_Component</name>
-    <node>Node1</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Bar_ConnectorComponentImplementation" />
-     <configProperty>
-      <name>domain_id</name>
-      <value>
-        <type>
-          <kind>tk_long</kind>
-        </type>
-        <value>
-          <long>99</long>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Derived_comp_1_ComponentInstance">
-    <name>Derived_comp_1_Component</name>
-    <node>Node1</node>
-    <source/>
-    <implementation xmi:idref="Derived_compComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Derived_compHome_1_Component</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Derived_comp_2_ComponentInstance">
-    <name>Derived_comp_2_Component</name>
-    <node>Node1</node>
-    <source/>
-    <implementation xmi:idref="Derived_compComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Derived_compHome_2_Component</string>
-        </value>
-      </value>
-    </configProperty>
- </instance>
-
- <instance xmi:id="Derived_compHome_1_ComponentInstance">
-    <name>Derived_compHome_1_Component</name>
-    <node>Node1</node>
-    <source/>
-    <implementation xmi:idref="Derived_compHomeComponentImplementation" />
-  </instance>
-
- <instance xmi:id="Derived_compHome_2_ComponentInstance">
-    <name>Derived_compHome_2_Component</name>
-    <node>Node1</node>
-    <source/>
-    <implementation xmi:idref="Derived_compHomeComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="DerivedEmpty_compComponentInstance">
-    <name>DerivedEmpty_compComponent</name>
-    <node>Node1</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="DerivedEmpty_compComponentImplementation" />
-  </instance>
-
-
-  <connection>
-    <name>writer_1_foo_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>fooPub_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Derived_comp_1_ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Foo_Connector_1_ComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_2_foo_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>fooPub_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Derived_comp_2_ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Foo_Connector_2_ComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_1_bar_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>barPub_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Derived_comp_1_ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Bar_Connector_1_ComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_2_bar_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>barPub_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Derived_comp_2_ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Bar_Connector_2_ComponentInstance" />
-    </internalEndpoint>
-   </connection>
-
-   <connection>
-   <name>MessageConnection1</name>
-    <internalEndpoint>
-      <portName>baseRecept</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Derived_comp_1_ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>baseFacet</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Derived_comp_2_ComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-   <name>MessageConnection2</name>
-    <internalEndpoint>
-      <portName>baseRecept</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Derived_comp_2_ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>baseFacet</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Derived_comp_1_ComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-   <name>MessageConnectionDerived1</name>
-    <internalEndpoint>
-      <portName>derivedRecept</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Derived_comp_1_ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>derivedFacet</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Derived_comp_2_ComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-   <name>MessageConnectionDerived2</name>
-    <internalEndpoint>
-      <portName>derivedRecept</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Derived_comp_2_ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>derivedFacet</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Derived_comp_1_ComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-
-  <artifact xmi:id="Base_compHome_ExecArtifact">
-    <name>Base_compHome_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Base_compHome_SvntArtifact">
-    <name>Base_compHome_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Base_compHome_StubArtifact">
-    <name>Base_compHome_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-
-
-  <artifact xmi:id="Derived_compHome_ExecArtifact">
-    <name>Derived_compHome_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Derived_compHome_SvntArtifact">
-    <name>Derived_compHome_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Derived_compHome_StubArtifact">
-    <name>Derived_compHome_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-
-
-
-  <artifact xmi:id="Foo_Connector_ExecArtifact">
-    <name>Foo_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>Home_Hello_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Foo_Connector_SvntArtifact">
-    <name>Foo_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>Home_Hello_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Foo_Connector_StubArtifact">
-    <name>Foo_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>Home_Hello_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Bar_Connector_ExecArtifact">
-    <name>Bar_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>Home_Hello_Connector2_exec</location>
-  </artifact>
-  <artifact xmi:id="Bar_Connector_SvntArtifact">
-    <name>Bar_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>Home_Hello_Connector2_svnt</location>
-  </artifact>
-  <artifact xmi:id="Bar_Connector_StubArtifact">
-    <name>Bar_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>Home_Hello_Connector2_stub</location>
-  </artifact>
-
-
-
-  <artifact xmi:id="DerivedEmpty_comp_ExecArtifact">
-    <name>DerivedEmpty_comp_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="DerivedEmpty_comp_SvntArtifact">
-    <name>DerivedEmpty_comp_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="DerivedEmpty_comp_StubArtifact">
-    <name>DerivedEmpty_comp_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-
-   <localityConstraint>
-    <constraint>DifferentProcess</constraint>
-    <constrainedInstance xmi:idref="Derived_comp_1_ComponentInstance" />
-    <constrainedInstance xmi:idref="Derived_comp_2_ComponentInstance" />
-  </localityConstraint>
-
-  <localityConstraint>
-    <constraint>SameProcess</constraint>
-    <constrainedInstance xmi:idref="Derived_comp_1_ComponentInstance" />
-    <constrainedInstance xmi:idref="Foo_Connector_1_ComponentInstance" />
-    <constrainedInstance xmi:idref="Bar_Connector_1_ComponentInstance" />
-    <constrainedInstance xmi:idref="Derived_compHome_1_ComponentInstance" />
-  </localityConstraint>
-
-  <localityConstraint>
-    <constraint>SameProcess</constraint>
-    <constrainedInstance xmi:idref="Derived_comp_2_ComponentInstance" />
-    <constrainedInstance xmi:idref="Foo_Connector_2_ComponentInstance" />
-    <constrainedInstance xmi:idref="Bar_Connector_2_ComponentInstance" />
-    <constrainedInstance xmi:idref="Derived_compHome_2_ComponentInstance" />
-  </localityConstraint>
-
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/HomeDerived/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/HomeDerived/descriptors/run_test.pl
deleted file mode 100755
index 5e41171ee32..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeDerived/descriptors/run_test.pl
+++ /dev/null
@@ -1,250 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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'}";
-$DDS4CCM_TRACE_ENABLE = "$ENV{'DDS4CCM_TRACE_ENABLE'}";
-
-#$ENV{'DANCE_LOG_LEVEL'}=10;
-#$ENV{'CIAO_LOG_LEVEL'}=10;
-#$ENV{'DANCE_TRACE_ENABLE'}=1;
-#$ENV{'CIAO_TRACE_ENABLE'}=1;
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "Node1.ior", "Node2.ior" );
-@iorfiles = 0;
-@nodenames = ( "Node1", "Node2" );
-
-# 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 = "DeploymentPlan.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 10 seconds to allow task to complete\n";
-sleep (10);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl b/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl
deleted file mode 100644
index ce6bd87d89a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file HomeT_Base.idl
- * @author  Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef HOMET_BASE_IDL
-#define HOMET_BASE_IDL
-
-#pragma ndds typesupport "Base/HomeT_BaseSupport.h"
-#pragma opendds typesupport "Base/HomeT_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "HomeTest"
-
-struct HomeTest {
-  string hello;
-  short iterator;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<HomeTest> HomeTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.mpc b/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.mpc
deleted file mode 100644
index 5c0feebd8a5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (HomeT_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname =HomeT_Base_stub
-  dynamicflags += HOMET_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=HOMET_BASE_STUB_Export \
-              -Wb,stub_export_include=HomeT_Base_stub_export.h              
-
-  IDL_Files {
-    idlflags += -Gxhst
-    HomeT_Base.idl
-  }
-
-  opendds_ts_flags += --export=HOMET_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    HomeT_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl b/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl
deleted file mode 100644
index a79e1fbba8c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file HomeT_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef HOMET_CONNECTOR_IDL_
-#define HOMET_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/HomeT_Base.idl"
-
-#pragma ciao lem "Connector/HomeT_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/HomeT_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::HomeTest, ::HomeTestSeq> ConnComp;
-
-#endif /* HOMET_CONNECTOR_IDL_ */
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc b/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc
deleted file mode 100644
index 55fe9a1a65d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc
+++ /dev/null
@@ -1,150 +0,0 @@
-project(HomeT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after  += DDS4CCM_idl_gen HomeT_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=HOMET_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=HomeT_Connector_stub_export.h \
-              -Wb,skel_export_macro=HOMET_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=HomeT_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=HOMET_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=HomeT_Connector_svnt_export.h \
-              -Wb,conn_export_macro=HOMET_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=HomeT_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    HomeT_Connector.idl
-  }
-}
-
-project(HomeT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += HomeT_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=HOMET_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=HomeT_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    HomeT_ConnectorE.idl
-  }
-}
-
-project(HomeT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after  += HomeT_Connector_lem_gen \
-            HomeT_Connector_stub \
-            HomeT_Base_stub
-  libs   += HomeT_Base_stub \
-            HomeT_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = HomeT_Connector_lem_stub
-  dynamicflags += HOMET_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    HomeT_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    HomeT_ConnectorEC.h
-    HomeT_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    HomeT_ConnectorEC.inl
-  }
-}
-
-project(HomeT_Connector_stub) : ccm_stub, dds4ccm_base {
-  after  += HomeT_Connector_idl_gen HomeT_Base_stub
-  libs   += HomeT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = HomeT_Connector_stub
-  dynamicflags += HOMET_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    HomeT_ConnectorC.cpp
-  }
-
-  Header_Files {
-    HomeT_ConnectorC.h
-    HomeT_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    HomeT_ConnectorC.inl
-  }
-}
-
-project(HomeT_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after  += HomeT_Connector_lem_stub \
-            HomeT_Connector_stub \
-            HomeT_Base_stub
-  sharedname = HomeT_Connector_exec
-  libs += HomeT_Connector_stub \
-          HomeT_Connector_lem_stub \
-          HomeT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += HOMET_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-   HomeT_Connector_conn.cpp
-  }
-
-  Header_Files {
-    HomeT_Connector_conn.h
-    HomeT_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(HomeT_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += HomeT_Connector_lem_stub \
-                HomeT_Connector_exec \
-                HomeT_Connector_stub
-  sharedname  = HomeT_Connector_svnt
-  libs       += HomeT_Connector_stub \
-                HomeT_Connector_lem_stub  \
-                HomeT_Base_stub \
-                HomeT_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += HOMET_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    HomeT_ConnectorS.cpp
-    HomeT_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    HomeT_ConnectorS.h
-    HomeT_Connector_svnt.h
-    HomeT_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-    HomeT_ConnectorS.inl
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc
deleted file mode 100644
index 2d7c73d6b01..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc
+++ /dev/null
@@ -1,167 +0,0 @@
-project(HomeT_HomeC_idl_gen): componentidldefaults, dds4ccm {
-  custom_only = 1
-  after = HomeT_Base_stub HomeT_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=HOMET_HOMEC_STUB_Export \
-              -Wb,stub_export_include=HomeT_HomeC_stub_export.h \
-              -Wb,skel_export_macro=HOMET_HOMEC_SVNT_Export \
-              -Wb,skel_export_include=HomeT_HomeC_svnt_export.h \
-              -Wb,exec_export_macro=HOMET_HOMEC_EXEC_Export \
-              -Wb,exec_export_include=HomeT_HomeC_exec_export.h \
-              -I..
-
-  IDL_Files {
-    HomeT_HomeC.idl
-  }
-}
-
-project(HomeT_HomeC_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += HomeT_HomeC_idl_gen
-  custom_only = 1
-
-  idlflags  +=  -Wb,export_macro=HOMET_HOMEC_LEM_STUB_Export \
-                -Wb,export_include=HomeT_HomeC_lem_stub_export.h \
-                -SS -Gxhst \
-                -I $CIAO_ROOT/connectors -I..
-
-  IDL_Files {
-    HomeT_HomeCE.idl
-  }
-}
-project(HomeT_HomeC_lem_stub) : ccm_svnt, dds4ccm_base {
-  after  += HomeT_HomeC_lem_gen HomeT_HomeC_stub HomeT_Base_stub \
-            HomeT_Connector_stub
-  libs   += HomeT_Base_stub HomeT_HomeC_stub HomeT_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = HomeT_HomeC_lem_stub
-  dynamicflags += HOMET_HOMEC_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    HomeT_HomeCEC.cpp
-  }
-
-  Header_Files {
-    HomeT_HomeCEC.h
-    HomeT_HomeC_lem_stub_export.h
-  }
-
-  Inline_Files {
-    HomeT_HomeCEC.inl
-  }
-}
-project(HomeT_HomeC_stub): ccm_stub,  dds4ccm_base {
- after += HomeT_Base_stub HomeT_HomeC_idl_gen HomeT_Connector_stub
-  sharedname = HomeT_HomeC_stub
-  libs   += HomeT_Base_stub HomeT_Connector_stub
-  includes += ..
-  libpaths += ..
-  libout = ../lib
-  libpaths += ../lib
-  dynamicflags += HOMET_HOMEC_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Header_Files {
-    HomeT_HomeCC.h
-    HomeT_HomeC_stub_export.h
-  }
-
-  Source_Files {
-    HomeT_HomeCC.cpp
-  }
-
-  Inline_Files {
-  }
-}
-
-project(HomeT_HomeC_exec) : ciao_executor, dds4ccm_lem_stub, dds4ccm_impl {
-  after      += HomeT_HomeC_lem_stub HomeT_HomeC_stub HomeT_Connector_lem_stub \
-                HomeT_Connector_stub HomeT_Connector_exec
-  sharedname = HomeT_HomeC_exec
-  libs       += HomeT_HomeC_stub \
-                HomeT_HomeC_lem_stub \
-                HomeT_Base_stub \
-                HomeT_Connector_lem_stub \
-                HomeT_Connector_stub \
-                HomeT_Connector_exec
-  includes += . ..
-  libout = ../lib
-  libpaths += ../lib
-
-  dynamicflags += HOMET_HOMEC_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Header_Files {
-    HomeT_HomeC_exec.h
-    HomeT_HomeC_exec_export.h
-  }
-
-  Source_Files {
-    HomeT_HomeC_exec.cpp
-  }
-
-  Inline_Files {
-  }
-}
- 
-project(HomeT_HomeC_svnt) : ciao_servant, dds4ccm_base {
-  after += HomeT_Base_svnt HomeT_HomeC_exec HomeT_Connector_svnt
-  includes += ..
-  sharedname = HomeT_HomeC_svnt
-
-  libs    += HomeT_HomeC_stub HomeT_HomeC_lem_stub HomeT_HomeC_exec
-  libs    += HomeT_Base_stub \
-             HomeT_Connector_stub \
-             HomeT_Connector_exec \
-             HomeT_Connector_svnt \
-             HomeT_Connector_lem_stub
-  
-  dynamicflags += HOMET_HOMEC_SVNT_BUILD_DLL
-  libout = ../lib
-  libpaths += ../lib
-
-  IDL_Files {
-  }
-
-  Header_Files {
-   HomeT_HomeCS.h
-   HomeT_HomeC_svnt.h
-   HomeT_HomeC_svnt_export.h
-  }
-
-  Source_Files {
-    HomeT_HomeCS.cpp
-    HomeT_HomeC_svnt.cpp
-  }
-}
-
-project (HomeT_HomeC_control) : ccm_stub, dds4ccm_base{
- after += HomeT_HomeC_svnt
-  exename = controller
-  libs += HomeT_HomeC_stub HomeT_Base_stub HomeT_Connector_stub
-  includes += ..
-  libout = ../lib
-  libpaths += ../lib
-
-  IDL_Files {
-  }
-
-  Header_Files {
-  }
-
-  Source_Files {
-    controller.cpp
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl
deleted file mode 100644
index d67b61385cd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @file HomeT_HomeC.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef HOMET_HOMEC_IDL_
-#define HOMET_HOMEC_IDL_
-
-#include <Components.idl>
-#include "Connector/HomeT_Connector.idl"
-
-home ConnHome manages ConnComp::DDS_Event
-{
-  factory new_ConnComp ();
-};
-
-#endif /* HOMET_HOMEC_IDL_ */
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp
deleted file mode 100644
index b9026cd86b6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.6
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "HomeT_HomeC_exec.h"
-#include "../Connector/HomeT_Connector_conn.h"
-
-namespace CIAO_ConnComp_DDS_Event_Impl
-{
-  /**
-   * Home Executor Implementation Class: ConnHome_exec_i
-   */
-
-  ConnHome_exec_i::ConnHome_exec_i (void)
-  {
-  }
-
-  ConnHome_exec_i::~ConnHome_exec_i (void)
-  {
-  }
-
-  ::Components::EnterpriseComponent_ptr
-  ConnHome_exec_i::new_ConnComp (void)
-  {
-    /* Your code here. */
-    ACE_DEBUG ((LM_DEBUG, "ConnHome_exec_i::new_ConnComp: create connector.\n"));
-
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_THROW_EX (
-      retval,
-      CIAO_ConnComp_DDS_Event_Impl::DDS_Event_exec_i,
-      ::CORBA::NO_MEMORY ());
-
-    return retval;
-  }
-
-  // Implicit operations.
-
-  ::Components::EnterpriseComponent_ptr
-  ConnHome_exec_i::create (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_THROW_EX (
-      retval,
-      CIAO_ConnComp_DDS_Event_Impl::DDS_Event_exec_i,
-      ::CORBA::NO_MEMORY ());
-
-    return retval;
-  }
-
-  extern "C" HOMET_HOMEC_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_ConnHome_Impl (void)
-  {
-    ::Components::HomeExecutorBase_ptr retval =
-      ::Components::HomeExecutorBase::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      ConnHome_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h
deleted file mode 100644
index 1a2c2fb5ec7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.6
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_HOMET_HOMEC_EXEC_P2A1KH_H_
-#define CIAO_HOMET_HOMEC_EXEC_P2A1KH_H_
-
-#include /**/ "ace/pre.h"
-
-#include "HomeT_HomeCEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "HomeT_HomeC_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_ConnComp_DDS_Event_Impl
-{
-  class HOMET_HOMEC_EXEC_Export ConnHome_exec_i
-    : public virtual ConnHome_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnHome_exec_i (void);
-
-    virtual ~ConnHome_exec_i (void);
-
-    virtual ::Components::EnterpriseComponent_ptr
-    new_ConnComp (void);
-
-    // Implicit operations.
-
-    virtual ::Components::EnterpriseComponent_ptr
-    create (void);
-  };
-
-  extern "C" HOMET_HOMEC_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_ConnHome_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/controller.cpp b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/controller.cpp
deleted file mode 100644
index 3ca362ae9b3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/controller.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-//==============================================================
-/**
- * @file controller.cpp
- *
- * This is a controller that interact with the Home-component implementation.
- * This test uses the explicit factory
- * operation in the home interface to create a connector component
- * instance, run it for a while, and destroy the component instance.
- */
-//==============================================================
-
-#include "HomeT_HomeCC.h"
-#include "Connector/HomeT_ConnectorEC.h"
-#include "ace/streams.h"
-#include "ace/OS_NS_unistd.h"
-#include "ace/Get_Opt.h"
-
-const ACE_TCHAR *home_comp_ior_ = 0;
-
-int
-parse_args (int argc, ACE_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:of"));
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    {
-      switch (c)
-        {
-        case 'o':
-           break;
-        case 'f':
-           break;
-        case 'k':
-         home_comp_ior_ = get_opts.opt_arg ();
-          break;
-        case '?':  // display help for use of the server.
-        default:
-          ACE_ERROR_RETURN ((LM_ERROR,
-                            "usage:  %s\n"
-                             "-k <HomeComponent IOR> (default is file://HomeC.ior)\n"
-                             "\n",
-                            argv [0]),
-                            -1);
-          break;
-        }
-    }
-
-  if (home_comp_ior_ == 0)
-    {
-      home_comp_ior_ = ACE_TEXT("file://HomeC.ior");
-    }
-
-  return 0;
-}
-
-
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  try
-    {
-      // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
-      if (parse_args (argc, argv) != 0)
-         {
-           return -1;
-         }
-
-      // Resolve Home interface
-      CORBA::Object_var obj
-        = orb->string_to_object (home_comp_ior_);
-
-      ConnHome_var home_comp
-        = ConnHome::_narrow (obj.in ());
-      if (CORBA::is_nil (home_comp.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR, "Unable to acquire ConnHome objref\n"), -1);
-
-      // starting Connector component
-      ACE_DEBUG ((LM_DEBUG, "Controller: Start create Connector component\n"));
-
-      CORBA::Object_var tmp  = home_comp->new_ConnComp ();
-      ConnComp::DDS_Event_var ce = ConnComp::DDS_Event::_narrow (tmp.in ());
-
-      if (CORBA::is_nil (ce.in ()))
-        ACE_ERROR((LM_ERROR, "Unable to start create Connector component\n"));
-
-      ACE_DEBUG ((LM_DEBUG, "Controller: Started Connector component\n"));
-
-      // Place to plug in some connector settings
-      ce->topic_name ("Shapes");
-      ce->configuration_complete();
-      // activate not possible
-      //ce->ccm_activate ();
-
-      ACE_OS::sleep (5);
-
-      ce->remove ();
-
-      ACE_DEBUG ((LM_DEBUG, "Controller: removed Connector component\n"));
-
-      orb->destroy ();
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("Exception\n");
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Uncaught CORBA exception\n"),
-                        1);
-    }
-
-  return 0;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/DeploymentPlanConnOnly.cdp b/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/DeploymentPlanConnOnly.cdp
deleted file mode 100644
index d3bfa3fced4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/DeploymentPlanConnOnly.cdp
+++ /dev/null
@@ -1,110 +0,0 @@
-<!--  -->
-<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>Hello_Depl_1</label>
-  <UUID>Hello_Depl_1</UUID>
-
-  <implementation xmi:id="HomeTest_HomeImplementation">
-    <name>HomeTest_HomeImplementation</name>
-    <source/>
-    <artifact xmi:idref="HomeTest_Home_ExecArtifact" />
-    <artifact xmi:idref="HomeTest_Home_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>home factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ConnHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ConnHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HomeT_HomeC_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HomeT_HomeC_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
- <instance xmi:id="HomeTest_HomeInstance">
-    <name>HomeTest_HomeInstance</name>
-    <node>ReceiverNode</node>
-    <source/>
-    <implementation xmi:idref="HomeTest_HomeImplementation" />
-   <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HomeC.ior</string>
-        </value>
-      </value>
-    </configProperty>
-     <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HomeC</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-   <artifact xmi:id="HomeTest_Home_ExecArtifact">
-    <name>HomeT_HomeC_exec</name>
-    <source/>
-    <node/>
-    <location>HomeT_HomeC_exec</location>
-  </artifact>
-  <artifact xmi:id="HomeTest_Home_SvntArtifact">
-    <name>HomeT_HomeC_svnt</name>
-    <source/>
-    <node/>
-    <location>HomeT_HomeC_svnt</location>
-  </artifact>
-    <artifact xmi:id="HomeTest_Home_StubArtifact">
-    <name>HomeT_HomeC_stub</name>
-    <source/>
-    <node/>
-    <location>HomeT_HomeC_stub</location>
-  </artifact>
-
- </Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 231c89482ad..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="HelloTest_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="HelloProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-       </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/run_test.pl
deleted file mode 100755
index 7efe33a5316..00000000000
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/run_test.pl
+++ /dev/null
@@ -1,267 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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'}";
-$DDS4CCM_TRACE_ENABLE = "$ENV{'DDS4CCM_TRACE_ENABLE'}";
-
-
-$ENV{'DANCE_LOG_LEVEL'}=0;
-$ENV{'CIAO_LOG_LEVEL'}=0;
-$ENV{'DANCE_TRACE_ENABLE'}=0;
-$ENV{'CIAO_TRACE_ENABLE'}=0;
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 1;
-@ports = ( 60001 );
-@iorbases = ( "HomeC.ior" );
-@iorfiles = 0;
-@nodenames = ("ReceiverNode");
-
-$controller_exec = "$CIAO_ROOT/connectors/dds4ccm/tests/HomeTest/HomeComp/controller";
-
-
-# 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 = "DeploymentPlanConnOnly.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 5 seconds to allow task to complete\n";
-sleep (5);
-print "Invoking the controller\n";
-$controller = $tg_executor->CreateProcess ("$controller_exec", "-k file://HomeC.ior -o");
-$result = $controller->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ());
-if ($result != 0) {
-    print STDERR "ERROR: The controller returned $result\n";
-    $status = 1;
-}
-
-# put some delay here.
-print "Sleeping 10 seconds to allow task to complete\n";
-sleep (5);
-
-
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl
deleted file mode 100644
index 4fbc838ea63..00000000000
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file IDL_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef IDL_TEST_BASE_IDL
-#define IDL_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/IDL_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/IDL_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "IDL_Test"
-#pragma DCPS_DATA_KEY "IDL_Test key"
-
-struct IDL_Test {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<IDL_Test> IDL_TestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.mpc
deleted file mode 100644
index fcc12c2898c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (IDL_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = IDL_Test_Base_stub
-  dynamicflags += IDL_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=IDL_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=IDL_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    IDL_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=IDL_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    IDL_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.idl
deleted file mode 100644
index c8806788e3e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.idl
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef IDL_TEST_INTERFACES_IDL
-#define IDL_TEST_INTERFACES_IDL
-
-#pragma ciao lem "Base/IDL_Test_InterfacesE.idl"
-
-interface idl_test_base_interface {
-  void do_something_base ();
-  readonly attribute string base_string_attr;
-};
-
-interface idl_test_derived_interface : idl_test_base_interface {
-  void do_something_derived ();
-  attribute string derived_string_attr;
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc
deleted file mode 100644
index 30886127db2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc
+++ /dev/null
@@ -1,105 +0,0 @@
-// This file is generated with "generate_component_mpc.pl IDL_Test_Interfaces"
-
-project(IDL_Test_Interfaces_idl_gen) : componentidldefaults {
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=IDL_TEST_INTERFACES_STUB_Export \
-              -Wb,stub_export_include=IDL_Test_Interfaces_stub_export.h \
-              -Wb,skel_export_macro=IDL_TEST_INTERFACES_SVNT_Export \
-              -Wb,skel_export_include=IDL_Test_Interfaces_svnt_export.h \
-              -Wb,exec_export_macro=IDL_TEST_INTERFACES_EXEC_Export \
-              -Wb,exec_export_include=IDL_Test_Interfaces_exec_export.h
-
-  IDL_Files {
-    IDL_Test_Interfaces.idl
-  }
-}
-
-project(IDL_Test_Interfaces_lem_gen) : ciaoidldefaults {
-  after += IDL_Test_Interfaces_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=IDL_TEST_INTERFACES_LEM_STUB_Export \
-              -Wb,stub_export_include=IDL_Test_Interfaces_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    IDL_Test_InterfacesE.idl
-  }
-}
-
-project(IDL_Test_Interfaces_lem_stub) : ccm_svnt   {
-  after +=  IDL_Test_Interfaces_lem_gen \
-            IDL_Test_Interfaces_stub
-  libs  +=  IDL_Test_Interfaces_stub
-  libout = ../lib
-  libpaths += ../lib
-
-  sharedname = IDL_Test_Interfaces_lem_stub
-  dynamicflags += IDL_TEST_INTERFACES_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_InterfacesEC.cpp
-  }
-
-  Header_Files {
-    IDL_Test_InterfacesEC.h
-    IDL_Test_Interfaces_lem_stub_export.h
-  }
-
-  Inline_Files {
-    IDL_Test_InterfacesEC.inl
-  }
-}
-
-project(IDL_Test_Interfaces_stub) : ccm_stub   {
-  after += IDL_Test_Interfaces_idl_gen
-  libs  +=
-  libout = ../lib
-  libpaths += ../lib
-
-  sharedname = IDL_Test_Interfaces_stub
-  dynamicflags += IDL_TEST_INTERFACES_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_InterfacesC.cpp
-  }
-
-  Header_Files {
-    IDL_Test_InterfacesC.h
-    IDL_Test_Interfaces_stub_export.h
-  }
-
-  Inline_Files {
-    IDL_Test_InterfacesC.inl
-  }
-}
-
-project(IDL_Test_Interfaces_svnt) : ccm_svnt {
-  after += IDL_Test_Interfaces_idl_gen IDL_Test_Interfaces_stub
-  libs  += IDL_Test_Interfaces_stub
-  libout = ../lib
-  libpaths += ../lib
-
-  sharedname = IDL_Test_Interfaces_svnt
-  dynamicflags += IDL_TEST_INTERFACES_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_InterfacesS.cpp
-  }
-
-  Header_Files {
-    IDL_Test_InterfacesS.h
-    IDL_Test_Interfaces_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.idl
deleted file mode 100644
index fe8ba84ad89..00000000000
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.idl
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef BASE_COMPONENT_IDL
-#define BASE_COMPONENT_IDL
-
-#include "Connector/IDL_Test_Connector.idl"
-#include "Base/IDL_Test_Interfaces.idl"
-
-#pragma ciao lem "IDL_Test_Base_ComponentE.idl"
-// #pragma ciao lem "Base/IDL_Test_BaseE.idl"
-
-component IDL_Test_Base_Component
-{
-  port IDL_Connector::DDS_Update  info_base_update;
-  port IDL_Connector::DDS_Read    info_base_read;
-  port IDL_Connector::DDS_Get     info_base_get;
-  port IDL_Connector::DDS_Listen  info_base_listen;
-  port IDL_Connector::DDS_StateListen info_base_state_listen;
-  port IDL_Connector::DDS_Write   info_base_write;
-
-  provides CCM_DDS::ConnectorStatusListener base_status_listener;
-
-  attribute long base_attr;
-
-  uses idl_test_derived_interface uses_derived_interface;
-  provides idl_test_base_interface prov_base_interface;
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc
deleted file mode 100644
index 60f17b07315..00000000000
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc
+++ /dev/null
@@ -1,175 +0,0 @@
-project(IDL_Test_Base_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += IDL_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=BASE_COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Base_Component_stub_export.h \
-              -Wb,skel_export_macro=BASE_COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Base_Component_svnt_export.h \
-              -Wb,svnt_export_macro=BASE_COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Base_Component_svnt_export.h \
-              -Wb,exec_export_macro=BASE_COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Base_Component_exec_export.h \
-              -I.. -Gex
-
-  IDL_Files {
-    IDL_Test_Base_Component.idl
-  }
-}
-
-project(IDL_Test_Base_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += IDL_Test_Base_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=BASE_COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Base_Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    IDL_Test_Base_ComponentE.idl
-  }
-}
-
-project(IDL_Test_Base_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after +=  IDL_Test_Base_Component_lem_gen \
-            IDL_Test_Base_Component_stub  \
-            IDL_Test_Connector_stub \
-            IDL_Test_Interfaces_stub \
-            IDL_Test_Interfaces_lem_stub
-  libs  +=  Base_Component_stub \
-            IDL_Test_Connector_stub \
-            IDL_Test_Interfaces_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Base_Component_lem_stub
-  dynamicflags += BASE_COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_Base_ComponentEC.cpp
-  }
-
-  Header_Files {
-    IDL_Test_Base_ComponentEC.h
-    Base_Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    IDL_Test_Base_ComponentEC.inl
-  }
-}
-
-project(IDL_Test_Base_Component_stub) : ccm_stub, dds4ccm_base {
-  after +=  IDL_Test_Base_Component_idl_gen  \
-            IDL_Test_Connector_stub \
-            IDL_Test_Base_stub \
-            IDL_Test_Connector_lem_gen
-  libs  +=  IDL_Test_Connector_stub \
-            IDL_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Base_Component_stub
-  dynamicflags += BASE_COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_Base_ComponentC.cpp
-  }
-
-  Header_Files {
-    IDL_Test_Base_ComponentC.h
-    Base_Component_stub_export.h
-  }
-
-  Inline_Files {
-    IDL_Test_Base_ComponentC.inl
-  }
-}
-
-project(IDL_Test_Base_Component_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   +=  IDL_Test_Base_Component_lem_stub \
-              IDL_Test_Base_Component_stub \
-              IDL_Test_Base_stub \
-              IDL_Test_Connector_stub \
-              IDL_Test_Connector_lem_stub \
-              IDL_Test_Interfaces_stub \
-              IDL_Test_Interfaces_lem_stub
-  sharedname = Base_Component_exec
-  libs +=   Base_Component_stub \
-            Base_Component_lem_stub \
-            IDL_Test_Base_stub \
-            IDL_Test_Connector_stub \
-            IDL_Test_Connector_lem_stub \
-            IDL_Test_Interfaces_stub \
-            IDL_Test_Interfaces_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += BASE_COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_Base_Component_exec.cpp
-  }
-
-  Header_Files {
-    IDL_Test_Base_Component_exec.h
-    Base_Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(IDL_Test_Base_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after +=  IDL_Test_Base_Component_lem_stub \
-            IDL_Test_Base_stub \
-            IDL_Test_Connector_stub \
-            IDL_Test_Connector_svnt \
-            IDL_Test_Base_Component_exec \
-            IDL_Test_Connector_lem_stub \
-            IDL_Test_Interfaces_svnt \
-            IDL_Test_Interfaces_lem_stub \
-            IDL_Test_Interfaces_stub
-  sharedname = Base_Component_svnt
-  libs +=   Base_Component_stub \
-            Base_Component_lem_stub \
-            IDL_Test_Base_stub \
-            IDL_Test_Connector_stub \
-            IDL_Test_Connector_svnt \
-            Base_Component_exec \
-            IDL_Test_Connector_lem_stub \
-            IDL_Test_Interfaces_svnt \
-            IDL_Test_Interfaces_lem_stub \
-            IDL_Test_Interfaces_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += BASE_COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_Base_ComponentS.cpp
-    IDL_Test_Base_Component_svnt.cpp
-  }
-
-  Header_Files {
-    IDL_Test_Base_ComponentS.h
-    IDL_Test_Base_Component_svnt.h
-    Base_Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.idl
deleted file mode 100644
index b3d92882fb9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.idl
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DERIVED_COMPONENT_IDL
-#define DERIVED_COMPONENT_IDL
-
-#include "IDL_Test_Base_Component.idl"
-
-#pragma ciao lem "IDL_Test_Derived_ComponentE.idl"
-// #pragma ciao lem "Base/IDL_Test_BaseE.idl"
-
-component IDL_Test_Derived_Component : IDL_Test_Base_Component
-{
-  port IDL_Connector::DDS_Update  info_derived_update;
-  port IDL_Connector::DDS_Read    info_derived_read;
-  port IDL_Connector::DDS_Get     info_derived_get;
-  port IDL_Connector::DDS_Listen  info_derived_listen;
-  port IDL_Connector::DDS_StateListen info_derived_state_listen;
-  port IDL_Connector::DDS_Write   info_derived_write;
-
-  provides CCM_DDS::ConnectorStatusListener derived_status_listener;
-
-  attribute long derived_attr;
-
-  provides idl_test_derived_interface prov_derived_interface;
-  uses idl_test_base_interface uses_base_interface;
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc
deleted file mode 100644
index 8ed2357e068..00000000000
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc
+++ /dev/null
@@ -1,194 +0,0 @@
-project(IDL_Test_Derived_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += IDL_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=DERIVED_COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Derived_Component_stub_export.h \
-              -Wb,skel_export_macro=DERIVED_COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Derived_Component_svnt_export.h \
-              -Wb,svnt_export_macro=DERIVED_COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Derived_Component_svnt_export.h \
-              -Wb,exec_export_macro=DERIVED_COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Derived_Component_exec_export.h \
-              -I.. -Gex
-
-  IDL_Files {
-    IDL_Test_Derived_Component.idl
-  }
-}
-
-project(IDL_Test_Derived_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += IDL_Test_Derived_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=DERIVED_COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Derived_Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    IDL_Test_Derived_ComponentE.idl
-  }
-}
-
-project(IDL_Test_Derived_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after +=  IDL_Test_Derived_Component_lem_gen \
-            IDL_Test_Derived_Component_stub \
-            IDL_Test_Connector_stub \
-            IDL_Test_Base_stub \
-            IDL_Test_Interfaces_stub \
-            IDL_Test_Interfaces_lem_stub \
-            IDL_Test_Base_Component_lem_stub
-  libs  +=  Derived_Component_stub \
-            IDL_Test_Connector_stub \
-            IDL_Test_Base_stub \
-            IDL_Test_Interfaces_stub \
-            Base_Component_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Derived_Component_lem_stub
-  dynamicflags += DERIVED_COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_Derived_ComponentEC.cpp
-  }
-
-  Header_Files {
-    IDL_Test_Derived_ComponentEC.h
-    Derived_Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    IDL_Test_Derived_ComponentEC.inl
-  }
-}
-
-project(IDL_Test_Derived_Component_stub) : ccm_stub, dds4ccm_base {
-  after +=  IDL_Test_Derived_Component_idl_gen \
-            IDL_Test_Connector_stub \
-            IDL_Test_Base_stub \
-            IDL_Test_Connector_lem_gen \
-            IDL_Test_Base_Component_stub \
-            IDL_Test_Base_Component_lem_stub
-  libs  +=  IDL_Test_Connector_stub \
-            IDL_Test_Base_stub \
-            Base_Component_stub \
-            Base_Component_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Derived_Component_stub
-  dynamicflags += DERIVED_COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_Derived_ComponentC.cpp
-  }
-
-  Header_Files {
-    IDL_Test_Derived_ComponentC.h
-    Derived_Component_stub_export.h
-  }
-
-  Inline_Files {
-    IDL_Test_Derived_ComponentC.inl
-  }
-}
-
-project(IDL_Test_Derived_Component_exec) : ciao_executor, dds4ccm_lem_stub {
-  after +=  IDL_Test_Derived_Component_lem_stub \
-            IDL_Test_Derived_Component_stub \
-            IDL_Test_Base_stub \
-            IDL_Test_Connector_stub \
-            IDL_Test_Connector_lem_stub \
-            IDL_Test_Base_Component_exec \
-            IDL_Test_Base_Component_lem_stub \
-            IDL_Test_Interfaces_lem_stub \
-            IDL_Test_Interfaces_lem
-  sharedname = Derived_Component_exec
-  libs +=   Derived_Component_stub \
-            Derived_Component_lem_stub \
-            IDL_Test_Base_stub \
-            IDL_Test_Connector_stub \
-            IDL_Test_Connector_lem_stub \
-            Base_Component_exec \
-            Base_Component_lem_stub \
-            IDL_Test_Interfaces_lem_stub \
-            IDL_Test_Interfaces_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += DERIVED_COMPONENT_EXEC_BUILD_DLL BASE_COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_Derived_Component_exec.cpp
-  }
-
-  Header_Files {
-    IDL_Test_Derived_Component_exec.h
-    Derived_Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(IDL_Test_Derived_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after +=  IDL_Test_Derived_Component_lem_stub \
-            IDL_Test_Base_stub \
-            IDL_Test_Connector_stub \
-            IDL_Test_Connector_svnt \
-            IDL_Test_Derived_Component_exec \
-            IDL_Test_Connector_lem_stub \
-            IDL_Test_Interfaces_stub \
-            IDL_Test_Interfaces_lem_stub \
-            IDL_Test_Interfaces_svnt \
-            IDL_Test_Base_Component_svnt \
-            IDL_Test_Base_Component_lem_stub \
-            IDL_Test_Base_Component_stub
-  sharedname = Derived_Component_svnt
-  libs  +=  Derived_Component_stub \
-            Derived_Component_lem_stub \
-            IDL_Test_Base_stub \
-            IDL_Test_Connector_stub \
-            IDL_Test_Connector_svnt \
-            Derived_Component_exec \
-            IDL_Test_Connector_lem_stub \
-            IDL_Test_Interfaces_stub \
-            IDL_Test_Interfaces_lem_stub \
-            IDL_Test_Interfaces_svnt \
-            Base_Component_svnt \
-            Base_Component_lem_stub \
-            Base_Component_stub
-
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += DERIVED_COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_Derived_ComponentS.cpp
-    IDL_Test_Derived_Component_svnt.cpp
-  }
-
-  Header_Files {
-    IDL_Test_Derived_ComponentS.h
-    IDL_Test_Derived_Component_svnt.h
-    Derived_Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl
deleted file mode 100644
index 68b04ad6255..00000000000
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file IDL_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef IDL_TEST_CONNECTOR_IDL_
-#define IDL_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/IDL_Test_Base.idl"
-
-#pragma ciao lem "Connector/IDL_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/IDL_Test_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::IDL_Test, ::IDL_TestSeq> IDL_Connector;
-
-#endif /* IDL_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc
deleted file mode 100644
index fe9c859e55f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p IDL_Test_Base -l .. -o ../lib -u DDS IDL_Test_Connector"
-
-project(IDL_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen IDL_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=IDL_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=IDL_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=IDL_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=IDL_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    IDL_Test_Connector.idl
-  }
-}
-
-project(IDL_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += IDL_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=IDL_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    IDL_Test_ConnectorE.idl
-  }
-}
-
-project(IDL_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += IDL_Test_Connector_lem_gen IDL_Test_Connector_stub IDL_Test_Base_stub
-  libs  += IDL_Test_Base_stub IDL_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = IDL_Test_Connector_lem_stub
-  dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    IDL_Test_ConnectorEC.h
-    IDL_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    IDL_Test_ConnectorEC.inl
-  }
-}
-
-project(IDL_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += IDL_Test_Connector_idl_gen IDL_Test_Base_stub
-  libs  += IDL_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = IDL_Test_Connector_stub
-  dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    IDL_Test_ConnectorC.h
-    IDL_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    IDL_Test_ConnectorC.inl
-  }
-}
-
-project(IDL_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += IDL_Test_Connector_lem_stub IDL_Test_Connector_stub
-  sharedname = IDL_Test_Connector_exec
-  libs += IDL_Test_Connector_stub IDL_Test_Connector_lem_stub IDL_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    IDL_Test_Connector_conn.h
-    IDL_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(IDL_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += IDL_Test_Connector_lem_stub IDL_Test_Connector_exec IDL_Test_Connector_stub
-  sharedname  = IDL_Test_Connector_svnt
-  libs       += IDL_Test_Connector_stub \
-                IDL_Test_Connector_lem_stub  \
-                IDL_Test_Base_stub \
-                IDL_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    IDL_Test_ConnectorS.cpp
-    IDL_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    IDL_Test_ConnectorS.h
-    IDL_Test_Connector_svnt.h
-    IDL_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/.gitignore b/CIAO/connectors/dds4ccm/tests/InstanceHandle/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/.gitignore
deleted file mode 100644
index e2af81adef2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Writer_Base.cxx
-/Writer_Base.h
-/Writer_BasePlugin.cxx
-/Writer_BasePlugin.h
-/Writer_BaseSupport.cxx
-/Writer_BaseSupport.h
-/Writer_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl
deleted file mode 100644
index 40b51ede68e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file Writer_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WRITER_BASE_IDL
-#define WRITER_BASE_IDL
-
-#pragma ndds typesupport "Base/Writer_BaseSupport.h"
-#pragma opendds typesupport "Base/Writer_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "WriterTest"
-#pragma DCPS_DATA_KEY "WriterTest key"
-
-struct WriterTest {
-  string key; //@key
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<WriterTest> WriterTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc
deleted file mode 100644
index 352e236cdbc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_DDSInstanceHandleBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_DDSInstanceHandleBase_stub
-  dynamicflags += WRITER_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=WRITER_BASE_STUB_Export \
-              -Wb,stub_export_include=Writer_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Writer_Base.idl
-  }
-
-  opendds_ts_flags += --export=WRITER_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Writer_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/.gitignore
deleted file mode 100644
index e8f96f6e9cb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Writer_ConnectorE.idl
-/Writer_Connector_conn.cpp
-/Writer_Connector_conn.h
-/Writer_Connector_conn_export.h
-/Writer_Connector_lem_stub_export.h
-/Writer_Connector_stub_export.h
-/Writer_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl
deleted file mode 100644
index 421f8585ccd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file Writer_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WRITER_CONNECTOR_IDL_
-#define WRITER_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Writer_Base.idl"
-
-#pragma ciao lem "Connector/Writer_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Writer_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTestConnector;
-
-#endif /* Writer_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
deleted file mode 100644
index 5358384a9ed..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_DDSInstanceHandleBase -l .. -o ../lib -u DDS Writer_Connector"
-
-project(DDS_InstanceHandleConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_DDSInstanceHandleBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Writer_Connector_stub_export.h \
-              -Wb,skel_export_macro=WRITER_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Writer_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=WRITER_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Writer_Connector_svnt_export.h \
-              -Wb,conn_export_macro=WRITER_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Writer_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Writer_Connector.idl
-  }
-}
-
-project(DDS_InstanceHandleConnector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_InstanceHandleConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Writer_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Writer_ConnectorE.idl
-  }
-}
-
-project(DDS_InstanceHandleConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_InstanceHandleConnector_lem_gen DDS_InstanceHandleConnector_stub DDS_DDSInstanceHandleBase_stub
-  libs  += DDS_DDSInstanceHandleBase_stub DDS_InstanceHandleConnector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_InstanceHandleConnector_lem_stub
-  dynamicflags += WRITER_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Writer_ConnectorEC.h
-    Writer_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ConnectorEC.inl
-  }
-}
-
-project(DDS_InstanceHandleConnector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_InstanceHandleConnector_idl_gen DDS_DDSInstanceHandleBase_stub
-  libs  += DDS_DDSInstanceHandleBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_InstanceHandleConnector_stub
-  dynamicflags += WRITER_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Writer_ConnectorC.h
-    Writer_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ConnectorC.inl
-  }
-}
-
-project(DDS_InstanceHandleConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_InstanceHandleConnector_lem_stub DDS_InstanceHandleConnector_stub DDS_DDSInstanceHandleBase_stub
-  sharedname = DDS_InstanceHandleConnector_exec
-  libs += DDS_InstanceHandleConnector_stub DDS_InstanceHandleConnector_lem_stub DDS_DDSInstanceHandleBase_stub DDS_DDSInstanceHandleBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += WRITER_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Writer_Connector_conn.h
-    Writer_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_InstanceHandleConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_InstanceHandleConnector_lem_stub DDS_InstanceHandleConnector_exec DDS_InstanceHandleConnector_stub
-  sharedname  = DDS_InstanceHandleConnector_svnt
-  libs       += DDS_InstanceHandleConnector_stub \
-                DDS_InstanceHandleConnector_lem_stub  \
-                DDS_DDSInstanceHandleBase_stub \
-                DDS_InstanceHandleConnector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += WRITER_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ConnectorS.cpp
-    Writer_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Writer_ConnectorS.h
-    Writer_Connector_svnt.h
-    Writer_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/README b/CIAO/connectors/dds4ccm/tests/InstanceHandle/README
deleted file mode 100644
index b53b09d7a3c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/README
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-Test which shows how to use the DDSDataWriter directly.
-
-We use the Datawriter from the DDS4CCM library. After typecasting
-it can be used to perform operations on DDS directly.
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/.gitignore
deleted file mode 100644
index 809d63704bc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
-/Writer_SenderE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl
deleted file mode 100644
index 7f022778f2e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_WRITER_ENTITY_SENDER_IDL
-#define DDS_WRITER_ENTITY_SENDER_IDL
-
-#include "Connector/Writer_Connector.idl"
-
-module Writer
-{
-  component Sender
-  {
-    port WriterTestConnector::DDS_Write info_write;
-    attribute unsigned short keys;
-  };
-};
-
-#endif /* DDS_WRITER_ENTITY_SENDER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc
deleted file mode 100644
index a3867be6e49..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_DDSInstanceHandleBase -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_DDSInstanceHandleSender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_InstanceHandleConnector_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 {
-    Writer_Sender.idl
-  }
-}
-
-project(DDS_DDSInstanceHandleSender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_DDSInstanceHandleSender_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 {
-    Writer_SenderE.idl
-  }
-}
-
-project(DDS_DDSInstanceHandleSender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_DDSInstanceHandleSender_lem_gen DDS_DDSInstanceHandleSender_stub \
-           DDS_DDSInstanceHandleBase_stub
-  libs  += DDS_DDSInstanceHandleBase_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_SenderEC.cpp
-  }
-
-  Header_Files {
-    Writer_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_SenderEC.inl
-  }
-}
-
-project(DDS_DDSInstanceHandleSender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_DDSInstanceHandleSender_idl_gen DDS_DDSInstanceHandleBase_stub \
-           DDS_InstanceHandleConnector_stub
-  libs  += DDS_DDSInstanceHandleBase_stub DDS_InstanceHandleConnector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_SenderC.cpp
-  }
-
-  Header_Files {
-    Writer_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_SenderC.inl
-  }
-}
-
-project(DDS_DDSInstanceHandleSender_exec) : ciao_executor, dds4ccm_impl {
-  after += DDS_DDSInstanceHandleSender_lem_stub DDS_DDSInstanceHandleSender_stub \
-           DDS_InstanceHandleConnector_lem_stub DDS_InstanceHandleConnector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_DDSInstanceHandleBase_stub \
-          DDS_InstanceHandleConnector_lem_stub DDS_InstanceHandleConnector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Writer_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_DDSInstanceHandleSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after += DDS_DDSInstanceHandleBase_stub DDS_DDSInstanceHandleSender_lem_stub \
-           DDS_InstanceHandleConnector_stub \
-           DDS_InstanceHandleConnector_svnt DDS_InstanceHandleConnector_lem_stub
-  sharedname = Sender_svnt
-  libs += Sender_stub Sender_lem_stub DDS_DDSInstanceHandleBase_stub \
-          DDS_InstanceHandleConnector_stub DDS_InstanceHandleConnector_svnt \
-          DDS_InstanceHandleConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_SenderS.cpp
-    Writer_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Writer_SenderS.h
-    Writer_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp
deleted file mode 100644
index 1016da9ffcf..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp
+++ /dev/null
@@ -1,368 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Writer_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#include "Connector/Writer_Connector_conn.h"
-#include "dds4ccm/impl/Utils.h"
-#if (CIAO_DDS4CCM_NDDS == 1)
-# include "dds4ccm/impl/ndds/DataWriter_T.h"
-#endif
-
-namespace CIAO_Writer_Sender_Impl
-{
-  /**
-   * Starter
-   */
-
-  StartHandler::StartHandler(Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  StartHandler::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.run ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (5),
-      dds_writer_ (0)
-  {
-    ACE_NEW_THROW_EX (this->rh_,
-                      StartHandler (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->rh_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::unregister_handles ()
-  {
-    ::WriterTestConnector::Writer_var ccm_writer =
-      this->ciao_context_->get_connection_info_write_data ();
-
-    for (Writer_Table::iterator i = this->ktests_.begin ();
-         i != this->ktests_.end ();
-         ++i)
-      {
-        try
-          {
-            ::DDS::InstanceHandle_t const hnd = this->handles_[i->first.c_str ()];
-            ccm_writer->unregister_instance (i->second, hnd);
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("Unregistered <%C> - valid ")
-                        DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("\n"),
-                        i->first.c_str (),
-                        DDS_INSTANCE_HANDLE_LOG(hnd)));
-          }
-        catch (...)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: ")
-                    ACE_TEXT ("unknown exception caught during unregister_instance.\n")));
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::register_handles ()
-  {
-    ::WriterTestConnector::Writer_var ccm_writer =
-      this->ciao_context_->get_connection_info_write_data ();
-    Writer_Table::iterator i = this->ktests_.begin ();
-    for (i = this->ktests_.begin(); i != this->ktests_.end(); ++i)
-      {
-        DDS::InstanceHandle_t const hnd =
-          ccm_writer->register_instance (i->second);
-        if (hnd == ::DDS::HANDLE_NIL)
-          {
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("ERROR: Unable to register handle for <%C>\n"),
-                        i->first.c_str ()));
-          }
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Registering instance for <%C>\n"),
-                    i->second->key.in ()));
-        this->handles_[i->first.c_str ()] = hnd;
-     }
-  }
-
-  void
-  Sender_exec_i::test_equality ()
-  {
-#if (CIAO_DDS4CCM_NDDS == 1)
-    Writer_Table::iterator i = this->ktests_.begin ();
-    for (i = this->ktests_.begin(); i != this->ktests_.end(); ++i)
-      {
-        ::DDS::InstanceHandle_t ccm_hnd = this->handles_[i->first.c_str ()];
-
-        DDS_InstanceHandle_t dds_hnd =
-          this->dds_writer_->lookup_instance (i->second);
-        ::DDS::InstanceHandle_t ccm_dds_hnd;
-        ccm_dds_hnd <<= dds_hnd;
-        if (ccm_hnd == ccm_dds_hnd)
-          {
-            ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::test_equality - "
-                          "== operator seems to work for CCM handles "
-                          "for key <%C>\n",
-                          i->first.c_str ()));
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::test_equality - "
-                          "== operator doesn't seem to work for CCM "
-                          "handles for key <%C>\n",
-                          i->first.c_str ()));
-          }
-      }
-#endif
-  }
-
-  void
-  Sender_exec_i::test_non_equality ()
-  {
-#if (CIAO_DDS4CCM_NDDS == 1)
-    Writer_Table::iterator i = this->ktests_.begin ();
-    for (i = this->ktests_.begin(); i != this->ktests_.end(); ++i)
-      {
-        ::DDS::InstanceHandle_t ccm_hnd = this->handles_[i->first.c_str ()];
-
-        Writer_Table::iterator unequal = i;
-        ++unequal;
-        if (unequal == this->ktests_.end ())
-          {
-            unequal = this->ktests_.begin ();
-          }
-
-        DDS_InstanceHandle_t const dds_hnd =
-          this->dds_writer_->lookup_instance (unequal->second);
-        DDS::InstanceHandle_t ccm_dds_hnd;
-        ccm_dds_hnd <<= dds_hnd;
-        if (ccm_dds_hnd != ccm_hnd)
-          {
-            ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::test_equality - "
-                          "!= operator seems to work for CCM "
-                          "handles for key <%C>\n",
-                          i->first.c_str ()));
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::test_equality - "
-                          "!= operator doesn't seem to work for CCM "
-                          "handles for key <%C>\n",
-                          i->first.c_str ()));
-          }
-      }
-    unregister_handles ();
-#endif
-  }
-
-  void
-  Sender_exec_i::run ()
-  {
-    test_equality ();
-    test_non_equality ();
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    this->reactor ()->notify (this->rh_);
-  }
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Writer::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-#if (CIAO_DDS4CCM_NDDS == 1)
-    typedef ::CIAO::NDDS::DDS_DataWriter_Base DataWriter_type;
-
-    ::DDS::DataWriter_var dds_dw =
-      this->ciao_context_->get_connection_info_write_dds_entity ();
-
-    ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw =
-      dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dds_dw.in ());
-
-    if (ccm_dw)
-      {
-
-        ::DDS::DataWriter_var tmp = ccm_dw->get_dds_entity ();
-        if (! ::CORBA::is_nil (tmp.in ()))
-          {
-            DataWriter_type * typed_ccm_dw = dynamic_cast <DataWriter_type *> (tmp.in ());
-            if (typed_ccm_dw)
-              {
-                DDSDataWriter* dds_datawriter = typed_ccm_dw->get_rti_entity ();
-                if (dds_datawriter)
-                  {
-                    this->dds_writer_ =
-                      ::CIAO_WriterTestConnector_DDS_Event_Impl::WriterTest_DDS_Traits::datawriter_type::narrow (dds_datawriter);
-                    if (!this->dds_writer_)
-                      {
-                        ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - "
-                                    "Error narrowing to a typed "
-                                    "DDS DataWriter.\n"));
-                        throw ::CORBA::INTERNAL ();
-                      }
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - "
-                                "Error getting DDS DataWriter.\n"));
-                    throw ::CORBA::INTERNAL ();
-                  }
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - "
-                            "Error casting DataWriter to typed DataWriter\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::ccm_activate - "
-                    "::DDS::DataWriter of CCM DataWriter seems nil\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::configuration_complete - "
-                    "Error casting DataWriter to CCM DataWriter\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-#endif
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    this->start ();
-
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        WriterTest *new_key = 0;
-        ACE_NEW_THROW_EX (new_key,
-                          WriterTest,
-                          ::CORBA::NO_MEMORY ());
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-
-        this->ktests_[key] = new_key;
-      }
-    register_handles ();
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_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/InstanceHandle/Sender/Writer_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h
deleted file mode 100644
index e58efe30434..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h
+++ /dev/null
@@ -1,145 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_WRITER_SENDER_EXEC_TJDDGS_H_
-#define CIAO_WRITER_SENDER_EXEC_TJDDGS_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Writer_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-class WriterTestDataWriter;
-
-namespace CIAO_Writer_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * Starter
-   */
-
-  class StartHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    StartHandler (Sender_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void run (void);
-
-    //@}
-
-  private:
-    ::Writer::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    StartHandler *rh_;
-    WriterTestDataWriter *dds_writer_;
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, WriterTest_var> Writer_Table;
-    Writer_Table ktests_;
-
-    typedef std::map<ACE_CString, ::DDS::InstanceHandle_t> CCM_Handles;
-    CCM_Handles handles_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start (void);
-
-    void register_handles (void);
-    void unregister_handles (void);
-    void test_equality (void);
-    void test_non_equality (void);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/Plan.cdp
deleted file mode 100644
index 667af39b5f4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/Plan.cdp
+++ /dev/null
@@ -1,225 +0,0 @@
-<!--  -->
-<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>DDSWriterEntity_Depl_1</label>
-  <UUID>DDSWriterEntity_Depl_1</UUID>
-
-  <implementation xmi:id="Writer_ConnectorComponentImplementation">
-    <name>Writer_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Writer_Connector_ExecArtifact" />
-    <artifact xmi:idref="Writer_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_WriterTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WriterTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Writer_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Writer_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_Writer_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Writer_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="Writer_ConnectorComponentInstance">
-    <name>Writer_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Writer_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDSWriterEntity</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_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>dds_writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Writer_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>ccm_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="Writer_ConnectorComponentInstance" />
-    </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="Writer_Connector_ExecArtifact">
-    <name>Writer_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_InstanceHandleConnector_exec</location>
-  </artifact>
-  <artifact xmi:id="Writer_Connector_SvntArtifact">
-    <name>Writer_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_InstanceHandleConnector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Writer_Connector_StubArtifact">
-    <name>Writer_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_InstanceHandleConnector_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl
deleted file mode 100755
index b4aa8bc1187..00000000000
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 5 seconds to allow task to complete\n";
-sleep (5);
-
-# 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 -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedSamples/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/.gitignore
deleted file mode 100644
index 81427ef4af0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Keyed_Test_Base.cxx
-/Keyed_Test_Base.h
-/Keyed_Test_BasePlugin.cxx
-/Keyed_Test_BasePlugin.h
-/Keyed_Test_BaseSupport.cxx
-/Keyed_Test_BaseSupport.h
-/Keyed_Test_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl
deleted file mode 100644
index 8e4b306067e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file Keyed_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef KEYED_TEST_BASE_IDL
-#define KEYED_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/Keyed_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/Keyed_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "KeyedTest"
-#pragma DCPS_DATA_KEY "KeyedTest key"
-
-struct KeyedTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<KeyedTest> KeyedTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc
deleted file mode 100644
index 078218a4403..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_Keyed_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_Keyed_Test_Base_stub
-  dynamicflags += KEYED_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=KEYED_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=Keyed_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Keyed_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=KEYED_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Keyed_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/.gitignore
deleted file mode 100644
index 45abed70a3b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Keyed_Test_ConnectorE.idl
-/Keyed_Test_Connector_conn.cpp
-/Keyed_Test_Connector_conn.h
-/Keyed_Test_Connector_conn_export.h
-/Keyed_Test_Connector_lem_stub_export.h
-/Keyed_Test_Connector_stub_export.h
-/Keyed_Test_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl
deleted file mode 100644
index ec6bf377372..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file Keyed_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef KEYED_TEST_CONNECTOR_IDL_
-#define KEYED_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Keyed_Test_Base.idl"
-
-#pragma ciao lem "Connector/Keyed_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Keyed_Test_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::KeyedTest, ::KeyedTestSeq> KeyedTestConnector;
-
-#endif /* KEYED_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
deleted file mode 100644
index d2561449876..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Keyed_Test_Base -l .. -o ../lib -u DDS Keyed_Test_Connector"
-
-project(DDS_Keyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_Keyed_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=KEYED_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Keyed_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=KEYED_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Keyed_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=KEYED_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Keyed_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=KEYED_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Keyed_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Keyed_Test_Connector.idl
-  }
-}
-
-project(DDS_Keyed_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_Keyed_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=KEYED_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Keyed_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Keyed_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_Keyed_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_Keyed_Test_Connector_lem_gen DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Base_stub
-  libs  += DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Keyed_Test_Connector_lem_stub
-  dynamicflags += KEYED_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Keyed_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Keyed_Test_ConnectorEC.h
-    Keyed_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Keyed_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_Keyed_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Keyed_Test_Connector_idl_gen DDS_Keyed_Test_Base_stub
-  libs  += DDS_Keyed_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Keyed_Test_Connector_stub
-  dynamicflags += KEYED_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Keyed_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Keyed_Test_ConnectorC.h
-    Keyed_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Keyed_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_Keyed_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Base_stub
-  sharedname = DDS_Keyed_Test_Connector_exec
-  libs += DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += KEYED_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Keyed_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Keyed_Test_Connector_conn.h
-    Keyed_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Keyed_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Connector_exec DDS_Keyed_Test_Connector_stub
-  sharedname  = DDS_Keyed_Test_Connector_svnt
-  libs       += DDS_Keyed_Test_Connector_stub \
-                DDS_Keyed_Test_Connector_lem_stub  \
-                DDS_Keyed_Test_Base_stub \
-                DDS_Keyed_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += KEYED_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Keyed_Test_ConnectorS.cpp
-    Keyed_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Keyed_Test_ConnectorS.h
-    Keyed_Test_Connector_svnt.h
-    Keyed_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/README b/CIAO/connectors/dds4ccm/tests/KeyedSamples/README
deleted file mode 100644
index 815c984d9f9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/README
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-This test creates instances in DDS by using the
-updater port. After that, every instance is updated.
-The number of instances (keys) and the number of
-updates (iterations) per key can be defined in
-the deployment plan.
-
-The Receiver checks whether the keys were updated
-correctly by using the read_one method on the reader.
-The Receiver should know the number of instances (keys) and
-the number of iterations per key. These should be configured
-in the deployment plan.
-
-An error is reported when the receiver did not receive
-the correct number of samples.
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/.gitignore
deleted file mode 100644
index b91d247a16e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Keyed_Test_ReceiverE.idl
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl
deleted file mode 100644
index 3625c4df97a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Keyed_Test_Connector.idl"
-
-module Keyed_Test
-{
-  component Receiver
-  {
-    port KeyedTestConnector::DDS_Get info_out;
-    attribute unsigned long rate;
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc
deleted file mode 100644
index 2e5f6338f89..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_Keyed_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_Keyed_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 {
-    Keyed_Test_Receiver.idl
-  }
-}
-
-project(DDS_Keyed_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Keyed_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 {
-    Keyed_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_Keyed_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Keyed_Test_Receiver_lem_gen DDS_Keyed_Test_Receiver_stub  DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Base_stub
-  libs  +=  Receiver_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Keyed_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Keyed_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Keyed_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_Keyed_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Keyed_Test_Receiver_idl_gen  DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_lem_gen
-  libs  += DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Keyed_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Keyed_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Keyed_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_Keyed_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_Keyed_Test_Receiver_lem_stub DDS_Keyed_Test_Receiver_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Keyed_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Keyed_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Keyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_Keyed_Test_Receiver_lem_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_svnt DDS_Keyed_Test_Receiver_exec DDS_Keyed_Test_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_svnt Receiver_exec DDS_Keyed_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Keyed_Test_ReceiverS.cpp
-    Keyed_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Keyed_Test_ReceiverS.h
-    Keyed_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp
deleted file mode 100644
index 3efe7830874..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,336 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Keyed_Test_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "ace/OS_NS_time.h"
-#include "dds4ccm/impl/TimeUtilities.h"
-#include "dds4ccm/impl/Utils.h"
-
-namespace CIAO_Keyed_Test_Receiver_Impl
-{
-  /**
-   * Read action generator
-   */
-
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->pulse_callback_.read ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::Keyed_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Keyed_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : rate_ (1)
-      , iterations_ (10)
-      , keys_ (5)
-      , expected_ (50)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      read_action_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Receiver_exec_i::check_received_samples ()
-  {
-    bool all_received = true;
-    for (Last_Iteration_Table::iterator iter = this->last_iters_.begin ();
-         iter != this->last_iters_.end () && all_received;
-         ++iter)
-      {
-        all_received = iter->second == this->iterations_;
-        if (iter->second > this->iterations_)
-          {
-            all_received = true;
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_received_samples - "
-                       "ERROR: Unexpected iteration received-> Bailing out\n"));
-          }
-      }
-    if (all_received)
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("All samples received. Stop the timer\n")));
-        this->reactor ()->cancel_timer (this->ticker_);
-      }
-  }
-
-  void
-  Receiver_exec_i::read (void)
-  {
-    ::KeyedTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data();
-
-    if (::CORBA::is_nil (reader.in ()))
-      {
-        return;
-      }
-    try
-      {
-        for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-          {
-            KeyedTest keyedtest_info;
-            char key[10];
-            ACE_OS::sprintf (key, "KEY_%d", i);
-            keyedtest_info.key = CORBA::string_dup (key);
-            ::CCM_DDS::ReadInfo readinfo;
-            reader->read_one_last (keyedtest_info, readinfo, ::DDS::HANDLE_NIL);
-
-            ACE_Time_Value tv;
-            tv <<= readinfo.source_timestamp;
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ONE Read_Info ")
-                                  ACE_TEXT (" -> date =%#T\n"),
-                                  &tv));
-
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ONE keyed test info : ")
-                ACE_TEXT ("received keyedtest_info for <%C> at %u\n"),
-                keyedtest_info.key.in (),
-                keyedtest_info.iteration));
-            this->last_iters_[key] = keyedtest_info.iteration;
-            check_received_samples ();
-          }
-      }
-    catch(const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: KeyedTest_Read: ")
-                  ACE_TEXT ("Unexpected InternalError exception received <%C>\n"),
-                  ::CIAO::DDS4CCM::translate_retcode (ex.error_code)));
-      }
-    catch(const CCM_DDS::NonExistent& )
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("KeyedTest_Read: ")
-                  ACE_TEXT ("Expected NonExistent received\n")));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  ::CORBA::ULong
-  Receiver_exec_i::rate (void)
-  {
-    return this->rate_;
-  }
-
-  void
-  Receiver_exec_i::rate (
-    const ::CORBA::ULong rate)
-  {
-    this->rate_ = rate;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-    this->expected_ = this->iterations_ * this->keys_;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Receiver_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-    this->expected_ = this->iterations_ * this->keys_;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Keyed_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    long const usec = 1000000 / this->rate_;
-    if (this->reactor ()->schedule_timer (this->ticker_,
-                                          0,
-                                          ACE_Time_Value(0, usec),
-                                          ACE_Time_Value(0, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    CORBA::UShort received_ = 0;
-    for (Last_Iteration_Table::iterator iter = this->last_iters_.begin ();
-         iter != this->last_iters_.end ();
-         ++iter)
-      {
-        ACE_DEBUG ((LM_INFO, "Receiver_exec_i summary for <%C>: last sample <%u> - expected <%u>\n",
-                      iter->first.c_str(),
-                      iter->second,
-                      this->iterations_));
-        received_ += iter->second;
-      }
-
-    if (received_ < this->expected_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR : Expected to receive %u samples, actually got %u\n",
-            this->expected_, received_));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Keyed_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/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h
deleted file mode 100644
index 5007c45e48e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h
+++ /dev/null
@@ -1,185 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_KEYED_TEST_RECEIVER_EXEC_YGE5UB_H_
-#define CIAO_KEYED_TEST_RECEIVER_EXEC_YGE5UB_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Keyed_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_Keyed_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  /**
-   * Read action Generator
-   */
-
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Receiver_exec_i &pulse_callback_;
-
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::Keyed_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Keyed_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CORBA::ULong rate (void);
-
-    virtual void rate (::CORBA::ULong rate);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void read (void);
-
-    //@}
-
-  private:
-    ::Keyed_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-
-    ::CORBA::ULong rate_;
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    CORBA::ULong expected_;
-
-    read_action_Generator * ticker_;
-
-    typedef std::map<ACE_CString, CORBA::UShort> Last_Iteration_Table;
-    Last_Iteration_Table last_iters_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void check_received_samples (void);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Keyed_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/.gitignore
deleted file mode 100644
index c1b2aa59427..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Keyed_Test_SenderE.idl
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl
deleted file mode 100644
index 53d1d773a02..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_KEYED_TEST_SENDER_IDL
-#define DDS_KEYED_TEST_SENDER_IDL
-
-#include "Connector/Keyed_Test_Connector.idl"
-
-module Keyed_Test
-{
-  component Sender
-  {
-    port KeyedTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    attribute unsigned long rate;
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc
deleted file mode 100644
index 08b009018c2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Keyed_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_Keyed_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_Keyed_Test_Connector_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 {
-    Keyed_Test_Sender.idl
-  }
-}
-
-project(DDS_Keyed_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Keyed_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 {
-    Keyed_Test_SenderE.idl
-  }
-}
-
-project(DDS_Keyed_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Keyed_Test_Sender_lem_gen DDS_Keyed_Test_Sender_stub DDS_Keyed_Test_Base_stub
-  libs  += DDS_Keyed_Test_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Keyed_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    Keyed_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Keyed_Test_SenderEC.inl
-  }
-}
-
-project(DDS_Keyed_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Keyed_Test_Sender_idl_gen DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub
-  libs  += DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Keyed_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    Keyed_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Keyed_Test_SenderC.inl
-  }
-}
-
-project(DDS_Keyed_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_Keyed_Test_Sender_lem_stub DDS_Keyed_Test_Sender_stub DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Keyed_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Keyed_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Keyed_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_Keyed_Test_Base_stub  DDS_Keyed_Test_Sender_lem_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_svnt  DDS_Keyed_Test_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_svnt DDS_Keyed_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Keyed_Test_SenderS.cpp
-    Keyed_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Keyed_Test_SenderS.h
-    Keyed_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp
deleted file mode 100644
index 27a0fadf166..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,309 +0,0 @@
-// -*- C++ -*-
-#include "Keyed_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_Keyed_Test_Sender_Impl
-{
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  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 /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.get_started ();
-      }
-  }
-
-  /**
-   * Write action generator
-   */
-
-  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : rate_ (1)
-      , keys_ (5)
-      , iterations_ (10)
-      , ready_to_start_ (false)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::tick (void)
-  {
-    if (this->last_key_ != this->ktests_.end ())
-      {
-        try
-          {
-            KeyedTestConnector::Writer_var writer =
-              this->ciao_context_->get_connection_info_write_data ();
-            ++this->last_key_->second->iteration;
-            writer->write_one (this->last_key_->second, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written key <%C> with <%d>\n"),
-                    this->last_key_->first.c_str (),
-                    this->last_key_->second->iteration));
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Internal Error while writing KeyedTest info for <%C>.\n",
-                        this->last_key_->first.c_str ()));
-          }
-        ++this->last_key_;
-      }
-    else
-      {
-        // Onto the next iteration
-        this->last_key_ = this->ktests_.begin ();
-        while (this->last_key_ != this->ktests_.end ())
-          {
-            if (this->last_key_->second->iteration == this->iterations_)
-              {
-                ++this->last_key_;
-              }
-            else
-              {
-                break;
-              }
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    long const usec = 1000000 / this->rate_;
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (0, usec),
-                ACE_Time_Value (0, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    this->ready_to_start_ = true;
-    this->start ();
-
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        KeyedTest *new_key = new KeyedTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->iteration = 0;
-
-        this->ktests_[key] = new_key;
-      }
-     this->last_key_ = this->ktests_.begin ();
-}
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-
-    if (!this->ready_to_start_.value())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::stop - ")
-                              ACE_TEXT ("ERROR Sender never got ready to start\n")));
-      }
-  }
-
-  // Component attributes and port operations.
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  ::CORBA::ULong
-  Sender_exec_i::rate (void)
-  {
-    return this->rate_;
-  }
-
-  void
-  Sender_exec_i::rate (
-    const ::CORBA::ULong rate)
-  {
-    this->rate_ = rate;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Keyed_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Keyed_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/KeyedSamples/Sender/Keyed_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h
deleted file mode 100644
index d4fe9f73c97..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h
+++ /dev/null
@@ -1,166 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_KEYED_TEST_SENDER_EXEC_LVAFIH_H_
-#define CIAO_KEYED_TEST_SENDER_EXEC_LVAFIH_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Keyed_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_Keyed_Test_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-  class Sender_exec_i;
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Write generator
-   */
-
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CORBA::ULong rate (void);
-
-    virtual void rate (::CORBA::ULong rate);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void get_started (void);
-    void tick (void);
-
-    //@}
-
-  private:
-    ::Keyed_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::ULong rate_;
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    void start (void);
-    void stop (void);
-
-    pulse_Generator * ticker_;
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, KeyedTest_var> Keyed_Test_Table;
-
-    Keyed_Test_Table ktests_;
-    Keyed_Test_Table::iterator last_key_;
-    Atomic_Boolean ready_to_start_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Keyed_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/Plan.cdp
deleted file mode 100644
index 42100b2f165..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/Plan.cdp
+++ /dev/null
@@ -1,414 +0,0 @@
-<!--  -->
-<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>Keyed_Test_Depl_1</label>
-  <UUID>Keyed_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_Keyed_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_Keyed_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="Keyed_Test_ConnectorComponentImplementation">
-    <name>Keyed_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Keyed_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Keyed_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_KeyedTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_KeyedTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Keyed_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Keyed_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_Keyed_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_Keyed_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" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>9</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Keyed_Test_ConnectorComponentInstance">
-    <name>Keyed_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Keyed_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Keyed_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Keyed_Test_ConnectorComponentInstance2">
-    <name>Keyed_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Keyed_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Keyed_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>9</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Keyed_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Keyed_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="Keyed_Test_ConnectorComponentInstance" />
-    </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="Keyed_Test_Connector_ExecArtifact">
-    <name>Keyed_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Keyed_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Keyed_Test_Connector_SvntArtifact">
-    <name>Keyed_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Keyed_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Keyed_Test_Connector_StubArtifact">
-    <name>Keyed_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Keyed_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/KeyedSamples/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl
deleted file mode 100755
index 87984594507..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 60 seconds to allow task to complete\n";
-sleep (60);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedWriter/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/.gitignore
deleted file mode 100644
index e2af81adef2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Writer_Base.cxx
-/Writer_Base.h
-/Writer_BasePlugin.cxx
-/Writer_BasePlugin.h
-/Writer_BaseSupport.cxx
-/Writer_BaseSupport.h
-/Writer_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl
deleted file mode 100644
index 525042673a8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file Writer_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WRITER_BASE_IDL
-#define WRITER_BASE_IDL
-
-#pragma ndds typesupport "Base/Writer_BaseSupport.h"
-#pragma opendds typesupport "Base/Writer_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "WriterTest"
-#pragma DCPS_DATA_KEY "WriterTest key"
-
-struct WriterTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<WriterTest> WriterTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc
deleted file mode 100644
index 3bd9e122988..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_KeyedWriterBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_KeyedWriterBase_stub
-  dynamicflags += WRITER_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=WRITER_BASE_STUB_Export \
-              -Wb,stub_export_include=Writer_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Writer_Base.idl
-  }
-
-  opendds_ts_flags += --export=WRITER_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Writer_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/.gitignore
deleted file mode 100644
index 6f350aec5b1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Writer_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl
deleted file mode 100644
index 421f8585ccd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file Writer_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WRITER_CONNECTOR_IDL_
-#define WRITER_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Writer_Base.idl"
-
-#pragma ciao lem "Connector/Writer_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Writer_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTestConnector;
-
-#endif /* Writer_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
deleted file mode 100644
index 740baf34850..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_KeyedWriterBase -l .. -o ../lib -u DDS Writer_Connector"
-
-project(DDS_KeyedWriterConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_KeyedWriterBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Writer_Connector_stub_export.h \
-              -Wb,skel_export_macro=WRITER_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Writer_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=WRITER_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Writer_Connector_svnt_export.h \
-              -Wb,conn_export_macro=WRITER_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Writer_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Writer_Connector.idl
-  }
-}
-
-project(DDS_KeyedWriterConnector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_KeyedWriterConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Writer_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Writer_ConnectorE.idl
-  }
-}
-
-project(DDS_KeyedWriterConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_KeyedWriterConnector_lem_gen DDS_KeyedWriterConnector_stub DDS_KeyedWriterBase_stub
-  libs  += DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_KeyedWriterConnector_lem_stub
-  dynamicflags += WRITER_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Writer_ConnectorEC.h
-    Writer_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ConnectorEC.inl
-  }
-}
-
-project(DDS_KeyedWriterConnector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_KeyedWriterConnector_idl_gen DDS_KeyedWriterBase_stub
-  libs  += DDS_KeyedWriterBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_KeyedWriterConnector_stub
-  dynamicflags += WRITER_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Writer_ConnectorC.h
-    Writer_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ConnectorC.inl
-  }
-}
-
-project(DDS_KeyedWriterConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterBase_stub
-  sharedname = DDS_KeyedWriterConnector_exec
-  libs += DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += WRITER_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Writer_Connector_conn.h
-    Writer_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_KeyedWriterConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterConnector_exec DDS_KeyedWriterConnector_stub
-  sharedname  = DDS_KeyedWriterConnector_svnt
-  libs       += DDS_KeyedWriterConnector_stub \
-                DDS_KeyedWriterConnector_lem_stub  \
-                DDS_KeyedWriterBase_stub \
-                DDS_KeyedWriterConnector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += WRITER_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ConnectorS.cpp
-    Writer_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Writer_ConnectorS.h
-    Writer_Connector_svnt.h
-    Writer_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/README b/CIAO/connectors/dds4ccm/tests/KeyedWriter/README
deleted file mode 100644
index 1f985b8a361..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/README
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-KeyedWriter tests the DDS_Writer. It tests write_one
-and write_many, in combination with register_instance.
-
-In descriptors/USER_QOS_PROFILE.xml, max_instances is
-set to one. An exception should be thrown when the second
-instance is registered. Every subsequent write of
-unregistered keys, should result in an error.
-
-When invoking write_many, writing the first sample should succeed.
-Writing every subsequent sample should fail.
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/.gitignore
deleted file mode 100644
index f2f7d84b894..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
-/Writer_ReceiverE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl
deleted file mode 100644
index 2d720fba655..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Writer_Connector.idl"
-
-module Writer
-{
-  component Receiver
-  {
-    port WriterTestConnector::DDS_Listen info_out;
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc
deleted file mode 100644
index 97e9a371bc2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_KeyedWriterReceiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_KeyedWriterConnector_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 {
-    Writer_Receiver.idl
-  }
-}
-
-project(DDS_KeyedWriterReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_KeyedWriterReceiver_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 {
-    Writer_ReceiverE.idl
-  }
-}
-
-project(DDS_KeyedWriterReceiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_KeyedWriterReceiver_lem_gen DDS_KeyedWriterReceiver_stub  DDS_KeyedWriterConnector_stub DDS_KeyedWriterBase_stub
-  libs  +=  Receiver_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Writer_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ReceiverEC.inl
-  }
-}
-
-project(DDS_KeyedWriterReceiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_KeyedWriterReceiver_idl_gen  DDS_KeyedWriterConnector_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_lem_gen
-  libs  += DDS_KeyedWriterConnector_stub DDS_KeyedWriterBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Writer_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ReceiverC.inl
-  }
-}
-
-project(DDS_KeyedWriterReceiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_KeyedWriterReceiver_lem_stub DDS_KeyedWriterReceiver_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Writer_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_KeyedWriterReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_KeyedWriterReceiver_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_svnt DDS_KeyedWriterReceiver_exec DDS_KeyedWriterConnector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_svnt Receiver_exec DDS_KeyedWriterConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ReceiverS.cpp
-    Writer_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Writer_ReceiverS.h
-    Writer_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp
deleted file mode 100644
index 61de3516863..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp
+++ /dev/null
@@ -1,278 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Writer_Receiver_exec.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_Writer_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::Writer::CCM_Receiver_Context_ptr ctx,
-        const ::CORBA::UShort iterations,
-        Atomic_ULong &samples_received)
-    : ciao_context_ (
-        ::Writer::CCM_Receiver_Context::_duplicate (ctx))
-      , iterations_ (iterations)
-      , samples_received_ (samples_received)
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::WriterTestConnector::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::WriterTest & datum,
-  const ::CCM_DDS::ReadInfo & info)
-  {
-    ++samples_received_;
-    ACE_DEBUG ((LM_DEBUG, "WriterTest_Listener: "
-            "received writer info for <%C> at <%u> handle "
-            DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER
-            "\n",
-            datum.key.in (),
-            datum.iteration,
-            DDS_INSTANCE_HANDLE_LOG(info.instance_handle)));
-    if (datum.iteration > this->iterations_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: received iteration ")
-                        ACE_TEXT ("greater than expected : ")
-                        ACE_TEXT ("expected <%u> - received <%u>\n"),
-                        this->iterations_, datum.iteration));
-      }
-    if (datum.iteration == 0)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: received iteration ")
-                        ACE_TEXT ("is zero\n")));
-      }
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::WriterTestSeq & /*data*/,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("WriterTest_Listener: ")
-            ACE_TEXT ("on_many_data has been called.\n")));
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::Writer::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Writer::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : iterations_ (10)
-    , keys_ (0)
-    , samples_received_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::WriterTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->iterations_ * this->iterations_,
-            this->samples_received_),
-            ::WriterTestConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::WriterTestConnector::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Receiver_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Writer::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::DataListenerControl_var lc =
-      this->ciao_context_->get_connection_info_out_data_control ();
-
-    if (::CORBA::is_nil (lc.in ()))
-      {
-        ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-    lc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->samples_received_.value () !=
-        (::CORBA::ULong)this->iterations () * this->keys ())
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::ccm_remove - "
-                  "ERROR: did not receive the expected number "
-                  "of samples. expected <%u> - received <%u>\n",
-                  this->iterations() * this->keys (),
-                  this->samples_received_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_remove - "
-                  "OK: received the expected number of samples <%u>\n",
-                  this->iterations() * this->keys ()));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_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/KeyedWriter/Receiver/Writer_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h
deleted file mode 100644
index 5cb2cf2a135..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h
+++ /dev/null
@@ -1,185 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_WRITER_RECEIVER_EXEC_X2WLXX_H_
-#define CIAO_WRITER_RECEIVER_EXEC_X2WLXX_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Writer_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_Writer_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong> Atomic_ULong;
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::WriterTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::Writer::CCM_Receiver_Context_ptr ctx,
-      const ::CORBA::UShort iterations,
-      Atomic_ULong &samples_received);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from WriterTestConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::WriterTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::WriterTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::Writer::CCM_Receiver_Context_var ciao_context_;
-    ::CORBA::UShort iterations_;
-    Atomic_ULong &samples_received_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::Writer::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Writer::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::WriterTestConnector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-
-    //@}
-
-  private:
-    ::Writer::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::WriterTestConnector::CCM_Listener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Atomic_ULong samples_received_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/.gitignore
deleted file mode 100644
index 809d63704bc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
-/Writer_SenderE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl
deleted file mode 100644
index 64984e084f9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_KEYED_TEST_SENDER_IDL
-#define DDS_KEYED_TEST_SENDER_IDL
-
-#include "Connector/Writer_Connector.idl"
-
-module Writer
-{
-  component Sender
-  {
-    port WriterTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    attribute unsigned short rate;
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc
deleted file mode 100644
index ae3e8824de0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_KeyedWriterBase -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_KeyedWriterSender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_KeyedWriterConnector_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 {
-    Writer_Sender.idl
-  }
-}
-
-project(DDS_KeyedWriterSender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_KeyedWriterSender_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 {
-    Writer_SenderE.idl
-  }
-}
-
-project(DDS_KeyedWriterSender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_KeyedWriterSender_lem_gen DDS_KeyedWriterSender_stub DDS_KeyedWriterBase_stub
-  libs  += DDS_KeyedWriterBase_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_SenderEC.cpp
-  }
-
-  Header_Files {
-    Writer_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_SenderEC.inl
-  }
-}
-
-project(DDS_KeyedWriterSender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_KeyedWriterSender_idl_gen DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub
-  libs  += DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_SenderC.cpp
-  }
-
-  Header_Files {
-    Writer_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_SenderC.inl
-  }
-}
-
-project(DDS_KeyedWriterSender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_KeyedWriterSender_lem_stub DDS_KeyedWriterSender_stub DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterConnector_stub 
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterConnector_stub 
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Writer_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_KeyedWriterSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_KeyedWriterBase_stub  DDS_KeyedWriterSender_lem_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_svnt  DDS_KeyedWriterConnector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_svnt DDS_KeyedWriterConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_SenderS.cpp
-    Writer_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Writer_SenderS.h
-    Writer_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp
deleted file mode 100644
index e379640308a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp
+++ /dev/null
@@ -1,482 +0,0 @@
-// -*- C++ -*-
-#include "Writer_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Guard_T.h"
-#include "ace/Log_Msg.h"
-#include "ace/Reactor.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_Writer_Sender_Impl
-{
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  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 /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.get_started ();
-      }
-  }
-
-  //============================================================
-  // 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;
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-
-  Sender_exec_i::Sender_exec_i (void)
-    : rate_ (1)
-      , iterations_ (10)
-      , keys_ (5)
-      , assignment_ (WRITE_KEYED)
-      , last_iteration_ (0)
-  {
-    this->ticker_ = new pulse_Generator (*this);
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  // Component attributes and port operations.
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::rate (void)
-  {
-    return
-      this->rate_;
-  }
-
-  void
-  Sender_exec_i::rate (
-    const ::CORBA::UShort rate)
-  {
-    this->rate_ =
-      rate;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return
-      this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations + 2; //for extra tests.
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return
-      this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys + 1; //for extra tests.
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Writer::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-  }
-
-  void
-  Sender_exec_i::reset_iterations ()
-  {
-    for (Writer_Table::iterator i = this->ktests_.begin ();
-         i != this->ktests_.end ();
-         ++i)
-      {
-        i->second->iteration = 0;
-      }
-  }
-
-  void
-  Sender_exec_i::unregister_handles ()
-  {
-    for (Writer_Table::iterator i = this->ktests_.begin ();
-         i != this->ktests_.end ();
-         ++i)
-      {
-        try
-          {
-            ::DDS::InstanceHandle_t const hnd = this->handles_[i->first.c_str ()];
-            WriterTestConnector::Writer_var writer =
-              this->ciao_context_->get_connection_info_write_data ();
-            writer->unregister_instance (i->second, hnd);
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Unregistered <%C> - iteration <%d> - ")
-                      DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT("\n"),
-                      i->first.c_str (),
-                      i->second->iteration,
-                      DDS_INSTANCE_HANDLE_LOG(hnd)));
-          }
-        catch (...)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: ")
-                    ACE_TEXT ("unknown exception caught during unregister_instance.\n")));
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::register_handles()
-  {
-    WriterTestConnector::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-
-    Writer_Table::iterator i = this->ktests_.begin ();
-    ::DDS::InstanceHandle_t hnd = writer->register_instance (i->second);
-    if (hnd == ::DDS::HANDLE_NIL)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to register handle for <%C> - iteration <%d>\n"),
-          i->first.c_str (), i->second->iteration));
-      }
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Registering instance with <%C> - iteration <%d> - ")
-                DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT("\n"),
-                i->second->key.in (),
-                i->second->iteration,
-                DDS_INSTANCE_HANDLE_LOG(hnd)));
-    this->handles_[i->first.c_str ()] = hnd;
-    ++i;
-    // Test exception. In Qos, max_instances is set to 1
-    // so only one instance may be registered.
-    hnd = writer->register_instance (i->second);
-    if (hnd != ::DDS::HANDLE_NIL)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Shouldn't be able to register instance for <%C> - iteration <%d>\n"),
-          i->first.c_str (), i->second->iteration));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Expected : Registering second key not succeeded.\n"),
-          i->first.c_str (), i->second->iteration));
-      }
-  }
-
-  void
-  Sender_exec_i::start_new_assignment (WRITER_ASSIGNMENT assignment)
-  {
-    this->last_key_ = this->ktests_.begin ();
-    this->assignment_ = assignment;
-    reset_iterations ();
-  }
-
-  void
-  Sender_exec_i::write_keyed ()
-  {
-    WriterTestConnector::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-
-    if (this->last_key_ != this->ktests_.end ())
-      {
-        bool exception_caught = false;
-        try
-          {
-            ++this->last_key_->second->iteration;
-            ::DDS::InstanceHandle_t const hnd =
-              this->handles_[this->last_key_->first.c_str ()];
-            writer->write_one (this->last_key_->second, hnd);
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written keyed <%C> - iteration <%d> - handle ")
-                    DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("\n"),
-                    this->last_key_->first.c_str (),
-                    this->last_key_->second->iteration,
-                    DDS_INSTANCE_HANDLE_LOG(hnd)));
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            exception_caught = true;
-            if (this->last_key_ == this->ktests_.begin ())
-              {
-                // The first key should throw this exception; all others
-                // shouldn't
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                            ACE_TEXT ("while updating writer info for <%C>.\n"),
-                              this->last_key_->first.c_str ()));
-              }
-          }
-        // Only the first iterations are registered.
-        if (this->last_key_ != this->ktests_.begin () && !exception_caught)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: No exception caught ")
-                    ACE_TEXT ("while writing unregistered data\n")));
-          }
-        ++this->last_key_;
-      }
-    else
-      {
-        // Onto the next iteration
-        this->last_key_ = this->ktests_.begin ();
-        while (this->last_key_ != this->ktests_.end ())
-          {
-            if (this->last_key_->second->iteration == this->iterations_)
-              {
-                //next key
-                ++this->last_key_;
-              }
-            else
-              {
-                break;
-              }
-          }
-        if (this->last_key_ == this->ktests_.end ())
-          {
-            unregister_handles ();
-            start_new_assignment (WRITE_MULTI);
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::write_many ()
-  {
-    bool expected_exception_thrown = false;
-    WriterTestConnector::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-
-    WriterTestSeq write_many_seq;
-    write_many_seq.length (this->keys_ * this->iterations_);
-    ::CORBA::ULong iter_key = 0;
-    for (Writer_Table::iterator iter = this->ktests_.begin ();
-         iter != this->ktests_.end ();
-         ++iter)
-      {
-        ++iter_key;
-        for (int i = 1; i < this->iterations_ + 1; ++i)
-          {
-            char key[7];
-            WriterTest new_key;
-            ACE_OS::sprintf (key, "KEY_%d", iter_key);
-            new_key.key = CORBA::string_dup(key);
-            new_key.iteration = i;
-            write_many_seq[iter_key + i - 2] = new_key;
-          }
-      }
-    try
-      {
-        writer->write_many (write_many_seq);
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        if (ex.index == 0)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal excep ")
-                        ACE_TEXT ("while write many for first instance : index <%d> - retval <%d>\n"),
-                          ex.index, ex.error_code));
-          }
-        else
-          {
-            expected_exception_thrown = true;
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Expected Internal excep ")
-                    ACE_TEXT ("while write many writer info: index <%d> - retval <%d>\n"),
-                      ex.index, ex.error_code));
-          }
-      }
-    if (!expected_exception_thrown)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR : Expected Internal excep ")
-                ACE_TEXT ("was not thrown\n")));
-      }
-
-    this->assignment_ = WRITE_NONE;
-  }
-
-  void
-  Sender_exec_i::tick ()
-  {
-    switch (this->assignment_)
-      {
-        case WRITE_KEYED:
-          write_keyed ();
-          break;
-        case WRITE_MULTI:
-          write_many ();
-        default:
-          break;
-      }
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    this->start ();
-
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        WriterTest *new_key = new WriterTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->iteration = 1;
-
-        this->ktests_[key] = new_key;
-      }
-    this->last_key_ = this->ktests_.begin ();
-    register_handles ();
-    reset_iterations ();
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    long const usec = 1000000 / this->rate_;
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (0, usec),
-                ACE_Time_Value (0, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_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/KeyedWriter/Sender/Writer_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h
deleted file mode 100644
index 38e2567c28c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h
+++ /dev/null
@@ -1,173 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_WRITER_SENDER_EXEC_AJ8QK5_H_
-#define CIAO_WRITER_SENDER_EXEC_AJ8QK5_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Writer_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_Writer_Sender_Impl
-{
-  class Sender_exec_i;
-
-  enum WRITER_ASSIGNMENT {
-    WRITE_NONE,
-    WRITE_KEYED,
-    WRITE_MULTI
-  };
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  //============================================================
-  // pulse_Generator
-  //============================================================
-  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 Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CORBA::UShort
-    rate (void);
-
-    virtual void
-    rate (
-      ::CORBA::UShort rate);
-
-    virtual ::CORBA::UShort
-    iterations (void);
-
-    virtual void
-    iterations (
-      ::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort
-    keys (void);
-
-    virtual void
-    keys (
-      ::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    void tick ();
-    void get_started (void);
-
-  private:
-    void start (void);
-    void stop (void);
-
-    pulse_Generator * ticker_;
-    ::Writer::CCM_Sender_Context_var ciao_context_;
-
-    ::CORBA::UShort rate_;
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    WRITER_ASSIGNMENT assignment_;
-    CORBA::Long last_iteration_;
-
-    void reset_iterations ();
-    void register_handles ();
-    void unregister_handles ();
-    void start_new_assignment (
-        WRITER_ASSIGNMENT assignment);
-    void write_keyed ();
-    void write_many ();
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, WriterTest_var> Writer_Table;
-    Writer_Table ktests_;
-
-    typedef std::map<ACE_CString, ::DDS::InstanceHandle_t> Writer_Table_Handles;
-    Writer_Table_Handles handles_;
-
-    Writer_Table::iterator last_key_;
-
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/KeyedWriter_Library.xml b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/KeyedWriter_Library.xml
deleted file mode 100644
index 9a0058b545a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/KeyedWriter_Library.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="KeyedWriterProfile">
-    <!-- QoS used to configure the data writer created in the example code -->
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-      <resource_limits>
-        <max_instances>1</max_instances>
-        <initial_instances>1</initial_instances>
-      </resource_limits>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp
deleted file mode 100644
index bee6cd9054f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp
+++ /dev/null
@@ -1,427 +0,0 @@
-<!--  -->
-<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>KeyedWriter_Depl_1</label>
-  <UUID>KeyedWriter_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_Writer_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Writer_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="Writer_ConnectorComponentImplementation">
-    <name>Writer_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Writer_Connector_ExecArtifact" />
-    <artifact xmi:idref="Writer_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_WriterTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WriterTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Writer_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Writer_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_Writer_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Writer_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" />
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>3</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>2</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Writer_ConnectorComponentInstance">
-    <name>Writer_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Writer_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>KeyedWriter</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>KeyedWriter_Library#KeyedWriterProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Writer_ConnectorComponentInstance2">
-    <name>Writer_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Writer_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>KeyedWriter</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>KeyedWriter_Library#KeyedWriterProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>1</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>3</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>2</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_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="Writer_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>_datacontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_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="Writer_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="Writer_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Writer_ConnectorComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </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="Writer_Connector_ExecArtifact">
-    <name>Writer_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_KeyedWriterConnector_exec</location>
-  </artifact>
-  <artifact xmi:id="Writer_Connector_SvntArtifact">
-    <name>Writer_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_KeyedWriterConnector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Writer_Connector_StubArtifact">
-    <name>Writer_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_KeyedWriterConnector_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/KeyedWriter/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 4a2347f0029..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="KeyedWriter_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="KeyedWriterProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <resource_limits>
-          <max_instances>1</max_instances>
-          <initial_instances>1</initial_instances>
-        </resource_limits>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl
deleted file mode 100755
index 87984594507..00000000000
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 60 seconds to allow task to complete\n";
-sleep (60);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/README b/CIAO/connectors/dds4ccm/tests/LateBinding/README
deleted file mode 100644
index 91cd5ff4d98..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/README
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-Normally when a DDS4CCM connector starts, it prepares DDS by creating
-several DDS entities, like a domain participant and topic.
-LateBinding means that a DDS4CCM connector is started but doesn't prepare
-DDS (apart from a domain participant). The only thing the user has to do
-is leave the topic_name in the deployment plan blank.
-When a topic name is provided later on, the DDS4CCM connector will start
-to prepare DDS.
-
-There're two test created:
-1. ReadGet
-In this test, the topic name for the sender DDS4CCM connector is provided by
-the deployment plan. Therefor the sender is allowed to write samples a
-little while after the component is activated. After the sender has written
-its samples, it informs the receiver about this via the ReaderStarter interface
-(see Base/ReaderStarter.idl). ReaderStarter is a 'normal' interface (no DDS4CCM
-connector). The connection is listed in the deployment plan.
-
-The deployment plan doens't provide a topic name for the DDS4CCM connector
-on the receiver side. This means that the receiver need to set the topic name
-programmatically.
-When the receiver is signaled by the sender that is allowed to read the samples, it
-first tests whether an BAD_INV exception is thrown when a component starts reading
-without having set the topic name.
-After that the topic name is set programmatically (see RG_LateBinding_Receiver_impl.cpp,
-set_topic_name_reader ()).
-After that, the receiver starts to check whether the latest expected sample is
-available in DDS. If so, the receiver starts to read the data.
-The receiver also checks whether a NonChangeable exception is thrown when the topic
-name is set a second time.
-
-In this test, the executor code on the receiver side (RG_LateBinding_Receiver_exec.cpp)
-works as a proxy between CIAO and the actual implementation (RG_LateBinding_Receiver_impl.cpp).
-This is the best way since the executor code is separeted from the business logic.
-
-2. WriteUpdate
-
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl
deleted file mode 100644
index b5c6b38d89a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file RG_LateBinding_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RG_LATEBINDING_BASE_IDL
-#define RG_LATEBINDING_BASE_IDL
-
-#pragma ndds typesupport "Base/RG_LateBinding_BaseSupport.h"
-#pragma opendds typesupport "Base/RG_LateBinding_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "RG_LateBindingTest"
-#pragma DCPS_DATA_KEY "RG_LateBindingTest key"
-
-struct RG_LateBindingTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<RG_LateBindingTest> RG_LateBindingTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.mpc
deleted file mode 100644
index d5836d47455..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (RG_LateBindingBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = RG_LateBindingBase_stub
-  dynamicflags += RG_LATEBINDING_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=RG_LATEBINDING_BASE_STUB_Export \
-              -Wb,stub_export_include=LateBinding_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    RG_LateBinding_Base.idl
-  }
-
-  opendds_ts_flags += --export=RG_LATEBINDING_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    RG_LateBinding_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.idl
deleted file mode 100644
index 9fc6196148d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @file Reader_Starter.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef READER_STARTER_IDL
-#define READER_STARTER_IDL
-
-#pragma ciao lem "Base/Reader_StarterE.idl"
-
-interface ReaderStarter
-{
-  void start_read ();
-  void set_reader_properties (in unsigned short nr_keys,
-                              in unsigned short nr_iterations);
-};
-
-#endif /* READER_STARTER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.mpc
deleted file mode 100644
index 5d746aae933..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.mpc
+++ /dev/null
@@ -1,110 +0,0 @@
-project(Reader_Starter_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after +=
-  idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
-              -Wb,stub_export_include=Reader_Starter_stub_export.h \
-              -Wb,skel_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,skel_export_include=Reader_Starter_svnt_export.h \
-              -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,svnt_export_include=Reader_Starter_svnt_export.h \
-              -Wb,exec_export_macro=READER_STARTER_EXEC_Export \
-              -Wb,exec_export_include=Reader_Starter_exec_export.h -I..
-
-  IDL_Files {
-    Reader_Starter.idl
-  }
-}
-
-project(Reader_Starter_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += Reader_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \
-              -Wb,stub_export_include=Reader_Starter_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Reader_StarterE.idl
-  }
-}
-
-project(Reader_Starter_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += Reader_Starter_lem_gen Reader_Starter_stub
-  libs  += Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Reader_Starter_lem_stub
-  dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterEC.cpp
-  }
-
-  Header_Files {
-    Reader_StarterEC.h
-    Reader_Starter_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_StarterEC.inl
-  }
-}
-
-project(Reader_Starter_stub) : ccm_stub, dds4ccm_base {
-  after += Reader_Starter_idl_gen
-  libs  +=
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Reader_Starter_stub
-  dynamicflags += READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterC.cpp
-  }
-
-  Header_Files {
-    Reader_StarterC.h
-    Reader_Starter_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_StarterC.inl
-  }
-}
-
-
-project(Reader_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   Reader_Starter_lem_stub Reader_Starter_stub
-  sharedname  = Reader_Starter_svnt
-  libs       += Reader_Starter_stub Reader_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += READER_STARTER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterS.cpp
-    Reader_Starter_svnt.cpp
-  }
-
-  Header_Files {
-    Reader_StarterS.h
-    Reader_Starter_svnt.h
-    Reader_Starter_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl
deleted file mode 100644
index bed24d9fcac..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file RG_LateBinding_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RG_LATEBINDING_CONNECTOR_IDL_
-#define RG_LATEBINDING_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/RG_LateBinding_Base.idl"
-
-#pragma ciao lem "Connector/RG_LateBinding_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/RG_LateBinding_BaseTypeSupport.idl"
-#endif
-
-module RG_LateBinding
-{
-  module ::CCM_DDS::Typed < ::RG_LateBindingTest, ::RG_LateBindingTestSeq> RG_LateBindingTestConnector;
-};
-
-#endif /* RG_LateBinding_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc
deleted file mode 100644
index 36c96d27d93..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p RG_LateBindingBase -l .. -o ../lib -u DDS RG_LateBinding_Connector"
-
-project (RG_LateBindingConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen RG_LateBindingBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RG_LATEBINDING_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=LateBinding_Connector_stub_export.h \
-              -Wb,skel_export_macro=RG_LATEBINDING_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=LateBinding_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=RG_LATEBINDING_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=LateBinding_Connector_svnt_export.h \
-              -Wb,conn_export_macro=RG_LATEBINDING_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=LateBinding_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    RG_LateBinding_Connector.idl
-  }
-}
-
-project (RG_LateBindingConnector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += RG_LateBindingConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=RG_LATEBINDING_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=RG_LateBinding_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    RG_LateBinding_ConnectorE.idl
-  }
-}
-
-project (RG_LateBindingConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += RG_LateBindingConnector_lem_gen RG_LateBindingConnector_stub \
-           RG_LateBindingBase_stub
-  libs  += RG_LateBindingBase_stub RG_LateBindingConnector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = RG_LateBindingConnector_lem_stub
-  dynamicflags += RG_LATEBINDING_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_LateBinding_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    RG_LateBinding_ConnectorEC.h
-    RG_LateBinding_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    RG_LateBinding_ConnectorEC.inl
-  }
-}
-
-project (RG_LateBindingConnector_stub) : ccm_stub, dds4ccm_base {
-  after += RG_LateBindingConnector_idl_gen RG_LateBindingBase_stub
-  libs  += RG_LateBindingBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = RG_LateBindingConnector_stub
-  dynamicflags += RG_LATEBINDING_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_LateBinding_ConnectorC.cpp
-  }
-
-  Header_Files {
-    RG_LateBinding_ConnectorC.h
-    RG_LateBinding_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    RG_LateBinding_ConnectorC.inl
-  }
-}
-
-project (RG_LateBindingConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += RG_LateBindingConnector_lem_stub RG_LateBindingConnector_stub \
-             RG_LateBindingBase_stub
-  sharedname = RG_LateBindingConnector_exec
-  libs += RG_LateBindingConnector_stub RG_LateBindingConnector_lem_stub \
-          RG_LateBindingBase_stub RG_LateBindingBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RG_LATEBINDING_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_LateBinding_Connector_conn.cpp
-  }
-
-  Header_Files {
-    RG_LateBinding_Connector_conn.h
-    RG_LateBinding_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (RG_LateBindingConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += RG_LateBindingConnector_lem_stub RG_LateBindingConnector_exec \
-                RG_LateBindingConnector_stub
-  sharedname  = RG_LateBindingConnector_svnt
-  libs       += RG_LateBindingConnector_stub \
-                RG_LateBindingConnector_lem_stub  \
-                RG_LateBindingBase_stub \
-                RG_LateBindingConnector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RG_LATEBINDING_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_LateBinding_ConnectorS.cpp
-    RG_LateBinding_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    RG_LateBinding_ConnectorS.h
-    RG_LateBinding_Connector_svnt.h
-    RG_LateBinding_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.idl
deleted file mode 100644
index 1200b3f78b6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/RG_LateBinding_Connector.idl"
-#include "Base/Reader_Starter.idl"
-
-module RG_LateBinding
-{
-  component Receiver
-  {
-    port RG_LateBindingTestConnector::DDS_Get info_get;
-    port RG_LateBindingTestConnector::DDS_Read info_read;
-
-    provides ReaderStarter start_reading;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.mpc
deleted file mode 100644
index 7332a7f6d2a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.mpc
+++ /dev/null
@@ -1,155 +0,0 @@
-project (RG_LateBindingReceiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += RG_LateBindingConnector_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 {
-    RG_LateBinding_Receiver.idl
-  }
-}
-
-project (RG_LateBindingReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += RG_LateBindingReceiver_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 {
-    RG_LateBinding_ReceiverE.idl
-  }
-}
-
-project (RG_LateBindingReceiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after +=  RG_LateBindingReceiver_lem_gen RG_LateBindingReceiver_stub  RG_LateBindingConnector_stub \
-            RG_LateBindingBase_stub Reader_Starter_stub
-  libs  +=  Receiver_stub RG_LateBindingConnector_stub RG_LateBindingBase_stub \
-            Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_LateBinding_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    RG_LateBinding_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    RG_LateBinding_ReceiverEC.inl
-  }
-}
-
-project (RG_LateBindingReceiver_stub) : ccm_stub, dds4ccm_base {
-  after +=  RG_LateBindingReceiver_idl_gen  RG_LateBindingConnector_stub \
-            RG_LateBindingBase_stub RG_LateBindingConnector_lem_gen \
-            Reader_Starter_stub Reader_Starter_lem_stub
-  libs  +=  RG_LateBindingConnector_stub RG_LateBindingBase_stub \
-            Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_LateBinding_ReceiverC.cpp
-  }
-
-  Header_Files {
-    RG_LateBinding_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    RG_LateBinding_ReceiverC.inl
-  }
-}
-
-project (RG_LateBindingReceiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += RG_LateBindingReceiver_lem_stub RG_LateBindingReceiver_stub \
-             RG_LateBindingBase_stub RG_LateBindingConnector_stub \
-             RG_LateBindingConnector_lem_stub \
-             Reader_Starter_lem_stub Reader_Starter_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub RG_LateBindingBase_stub \
-          RG_LateBindingConnector_stub RG_LateBindingConnector_lem_stub \
-          Reader_Starter_lem_stub Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_LateBinding_Receiver_exec.cpp
-    RG_LateBinding_Receiver_impl.cpp
-  }
-
-  Header_Files {
-    RG_LateBinding_Receiver_exec.h
-    RG_LateBinding_Receiver_impl.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (RG_LateBindingReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   RG_LateBindingReceiver_lem_stub RG_LateBindingBase_stub \
-                  RG_LateBindingConnector_stub RG_LateBindingConnector_svnt \
-                  RG_LateBindingReceiver_exec RG_LateBindingConnector_lem_stub \
-                  Reader_Starter_stub \
-                  Reader_Starter_svnt Reader_Starter_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub RG_LateBindingBase_stub \
-                RG_LateBindingConnector_stub RG_LateBindingConnector_svnt \
-                Receiver_exec RG_LateBindingConnector_lem_stub \
-                Reader_Starter_stub Reader_Starter_svnt \
-                Reader_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_LateBinding_ReceiverS.cpp
-    RG_LateBinding_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    RG_LateBinding_ReceiverS.h
-    RG_LateBinding_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp
deleted file mode 100644
index b3aecb9d732..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp
+++ /dev/null
@@ -1,284 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "RG_LateBinding_Receiver_exec.h"
-#include "RG_LateBinding_Receiver_impl.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_RG_LateBinding_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_get_status_exec_i
-   */
-
-  info_get_status_exec_i::info_get_status_exec_i (
-        ::RG_LateBinding::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::RG_LateBinding::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_get_status_exec_i::~info_get_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_get_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_get_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_read_status_exec_i
-   */
-
-  info_read_status_exec_i::info_read_status_exec_i (
-        ::RG_LateBinding::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::RG_LateBinding::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_read_status_exec_i::~info_read_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_read_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_read_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: reader_start_exec_i
-   */
-
-  reader_start_exec_i::reader_start_exec_i (
-        ::RG_LateBinding::CCM_Receiver_Context_ptr ctx,
-        Receiver_exec_i &callback)
-    : ciao_context_ (
-        ::RG_LateBinding::CCM_Receiver_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  reader_start_exec_i::~reader_start_exec_i (void)
-  {
-  }
-
-  // Operations from ::ReaderStarter
-
-  void
-  reader_start_exec_i::start_read (void)
-  {
-    this->callback_.start_read ();
-  }
-
-  void
-  reader_start_exec_i::set_reader_properties (::CORBA::UShort nr_keys,
-  ::CORBA::UShort nr_iterations)
-  {
-    this->callback_.keys (nr_keys);
-    this->callback_.iterations (nr_iterations);
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : impl_ (0)
-      , keys_ (5)
-      , iterations_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-    delete this->impl_;
-  }
-
-  // Supported operations and attributes.
-
-  void
-  Receiver_exec_i::start_read (void)
-  {
-    ACE_NEW_THROW_EX (this->impl_,
-                      RG_LateBinding_Receiver_impl (
-                        this->ciao_context_.in (),
-                        this->iterations_,
-                        this->keys_),
-                      ::CORBA::INTERNAL ());
-    this->impl_->start ();
-  }
-
-  void
-  Receiver_exec_i::keys (::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  void
-  Receiver_exec_i::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_get_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_get_status_.in ()))
-      {
-        info_get_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_get_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_get_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_get_status_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_read_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_read_status_.in ()))
-      {
-        info_read_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_read_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_read_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_read_status_.in ());
-  }
-
-  ::CCM_ReaderStarter_ptr
-  Receiver_exec_i::get_start_reading (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_reader_start_.in ()))
-      {
-        reader_start_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          reader_start_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_ReaderStarter::_nil ());
-
-          this->ciao_reader_start_ = tmp;
-      }
-
-    return
-      ::CCM_ReaderStarter::_duplicate (
-        this->ciao_reader_start_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::RG_LateBinding::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_RG_LateBinding_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/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h
deleted file mode 100644
index 60016c8a865..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h
+++ /dev/null
@@ -1,214 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_RG_LATEBINDING_RECEIVER_EXEC_QLDZYF_H_
-#define CIAO_RG_LATEBINDING_RECEIVER_EXEC_QLDZYF_H_
-
-#include /**/ "ace/pre.h"
-
-#include "RG_LateBinding_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_RG_LateBinding_Receiver_Impl
-{
-  class RG_LateBinding_Receiver_impl;
-  class Receiver_exec_i;
-
-  /**
-   * Provider Executor Implementation Class: info_get_status_exec_i
-   */
-
-  class info_get_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_get_status_exec_i (
-      ::RG_LateBinding::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_get_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::RG_LateBinding::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_read_status_exec_i
-   */
-
-  class info_read_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_read_status_exec_i (
-      ::RG_LateBinding::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_read_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::RG_LateBinding::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: reader_start_exec_i
-   */
-
-  class reader_start_exec_i
-    : public virtual ::CCM_ReaderStarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    reader_start_exec_i (
-      ::RG_LateBinding::CCM_Receiver_Context_ptr ctx,
-      Receiver_exec_i &callback);
-    virtual ~reader_start_exec_i (void);
-
-    //@{
-    /** Operations and attributes from ReaderStarter. */
-
-    virtual
-    void start_read (void);
-
-    virtual
-    void set_reader_properties (::CORBA::UShort nr_keys,
-    ::CORBA::UShort nr_iterations);
-    //@}
-
-  private:
-    ::RG_LateBinding::CCM_Receiver_Context_var ciao_context_;
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_read_status (void);
-
-    virtual ::CCM_ReaderStarter_ptr
-    get_start_reading (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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void keys (::CORBA::UShort keys);
-    void iterations (::CORBA::UShort iterations);
-
-    void start_read (void);
-    //@}
-
-  private:
-    ::RG_LateBinding::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_get_status_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_read_status_;
-    ::CCM_ReaderStarter_var ciao_reader_start_;
-
-    RG_LateBinding_Receiver_impl *impl_;
-
-    //@}
-
-    //@{
-    /** User defined members. */
-    ::CORBA::UShort keys_;
-    ::CORBA::UShort iterations_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_RG_LateBinding_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp
deleted file mode 100644
index d41f01ef4f2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp
+++ /dev/null
@@ -1,373 +0,0 @@
-#include "RG_LateBinding_Receiver_impl.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_RG_LateBinding_Receiver_Impl
-{
-
-  /**
-   * Check last
-   */
-  LastSampleChecker::LastSampleChecker (RG_LateBinding_Receiver_impl &callback,
-                                        const ::CORBA::UShort &iterations)
-    : callback_ (callback)
-      , iterations_ (iterations)
-  {
-  }
-
-  LastSampleChecker::~LastSampleChecker ()
-  {
-  }
-
-  int
-  LastSampleChecker::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Checking if last sample "
-                          "is available in DDS...\n"));
-    if (this->callback_.check_last ())
-      {
-        this->callback_.start_read ();
-      }
-    return 0;
-  }
-
-  /**
-   * RG_LateBinding_Receiver_impl
-   */
-  RG_LateBinding_Receiver_impl::RG_LateBinding_Receiver_impl (
-      ::RG_LateBinding::CCM_Receiver_Context_ptr ctx,
-      const ::CORBA::UShort & iterations,
-      const ::CORBA::UShort & keys)
-    : ciao_context_ (
-        ::RG_LateBinding::CCM_Receiver_Context::_duplicate (ctx))
-    , iterations_ (iterations)
-    , keys_ (keys)
-    , checker_ (0)
-  {
-  }
-
-  RG_LateBinding_Receiver_impl::~RG_LateBinding_Receiver_impl ()
-  {
-    delete this->checker_;
-  }
-
-  ACE_Reactor*
-  RG_LateBinding_Receiver_impl::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  bool
-  RG_LateBinding_Receiver_impl::check_last (void)
-  {
-    ::RG_LateBinding::RG_LateBindingTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_read_data ();
-    try
-      {
-        RG_LateBindingTest datum;
-        ::CCM_DDS::ReadInfo readinfo;
-        char key[10];
-        ACE_OS::sprintf (key, "KEY_%d", this->keys_);
-        datum.key = CORBA::string_dup (key);
-        reader->read_one_last (
-                datum,
-                readinfo,
-                ::DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - "
-                              "last iteration <%02d> - <%02d>\n",
-                               datum.iteration,
-                               this->iterations_));
-        return datum.iteration >= this->iterations_;
-      }
-    catch (const ::CCM_DDS::InternalError &)
-      {
-      }
-    catch (const ::CCM_DDS::NonExistent &)
-      {
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: "
-                              "ERROR: Unexpected exception caught\n"));
-      }
-    return false;
-  }
-
-  void
-  RG_LateBinding_Receiver_impl::start (void)
-  {
-    this->test_exception ();
-    this->set_topic_name_reader ();
-
-    ACE_NEW_THROW_EX (this->checker_,
-                      LastSampleChecker (*this,
-                                         this->iterations_),
-                      ::CORBA::NO_MEMORY ());
-    if (this->reactor ()->schedule_timer (this->checker_,
-                                          0,
-                                          ACE_Time_Value (1, 0),
-                                          ACE_Time_Value (1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::schedule_timer - "
-                  "ERROR: Error while starting LastSampleChecker\n"));
-      }
-  }
-
-  void
-  RG_LateBinding_Receiver_impl::start_read ()
-  {
-    if (this->checker_)
-      {
-        this->reactor ()->cancel_timer (this->checker_);
-      }
-    this->start_reading ();
-    this->set_topic_name_getter ();
-    this->start_getting ();
-    this->set_topic_name_reader ();
-    this->set_topic_name_getter ();
-  }
-
-  void
-  RG_LateBinding_Receiver_impl::check_samples (
-    const char * test,
-    const RG_LateBindingTestSeq& samples,
-    const ::CORBA::UShort& expected)
-  {
-    bool error = samples.length () != expected;
-    if (ACE_OS::strcmp (test, "get") == 0)
-      {
-        error = !(samples.length () > 0);
-      }
-    if (error)
-      {
-        ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::check_samples - "
-                    "ERROR: Unexpected number of %C samples received: "
-                    "expected <%d> - received <%u>\n",
-                    test,
-                    expected,
-                    samples.length ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "RG_LateBinding_Receiver_impl::check_samples - "
-                    "%C Samples found: <%u>\n",
-                    test,
-                    samples.length ()));
-      }
-    for (::CORBA::ULong i = 0;
-         i < samples.length ();
-         ++i)
-      {
-        ACE_DEBUG ((LM_DEBUG, "RG_LateBinding_Receiver_impl::check_samples - "
-                    "Sample %C: sample <%d> - key <%C> - iteration <%d>\n",
-                    test,
-                    i,
-                    samples[i].key.in (),
-                    samples[i].iteration));
-      }
-  }
-
-  void
-  RG_LateBinding_Receiver_impl::test_exception (void)
-  {
-    try
-      {
-        if (! ::CORBA::is_nil (this->ciao_context_.in ()))
-          {
-            ::RG_LateBinding::RG_LateBindingTestConnector::Reader_var reader =
-              this->ciao_context_->get_connection_info_read_data ();
-            if (::CORBA::is_nil (reader.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::test_exception - "
-                            "ERROR: Unable to get writer interface from the "
-                            "CIAO context\n"));
-                return;
-              }
-
-            RG_LateBindingTest sample;
-            ::CCM_DDS::ReadInfo readinfo;
-            sample.key = CORBA::string_dup ("KEY_1");
-            reader->read_one_last (sample,
-                                   readinfo,
-                                   ::DDS::HANDLE_NIL);
-            ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::test_exception - "
-                        "ERROR: No exception caught before topic name has been set\n"));
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::test_exception - "
-                        "ERROR: CIAO context seems to be NIL\n"));
-          }
-      }
-    catch (const ::CORBA::BAD_INV_ORDER &)
-      {
-        ACE_DEBUG ((LM_DEBUG, "RG_LateBinding_Receiver_impl::test_exception - "
-                    "Expected BAD_INV_ORDER thrown.\n"));
-      }
-    catch (const CORBA::Exception &e)
-      {
-        e._tao_print_exception("RG_LateBinding_Receiver_impl::test_exception - "
-                               "ERROR: Unexpected exception");
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::test_exception - "
-                    "ERROR: expected and unknown exception caught\n"));
-      }
-  }
-
-  void
-  RG_LateBinding_Receiver_impl::start_reading (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "RG_LateBinding_Receiver_impl::start_reading - "
-                "Start reading\n"));
-    ::RG_LateBinding::RG_LateBindingTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_read_data ();
-    try
-      {
-        RG_LateBindingTestSeq samples;
-        ::CCM_DDS::ReadInfoSeq readinfo_seq;
-        reader->read_all (samples, readinfo_seq);
-        this->check_samples ("read", samples, this->iterations_ * this->keys_);
-      }
-    catch (const CORBA::Exception &e)
-      {
-        e._tao_print_exception("RG_LateBinding_Receiver_impl::start_reading - "
-                               "ERROR: Unexpected exception");
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::start_reading - "
-                    "ERROR: Caught unknow exception\n"));
-      }
-  }
-
-  void
-  RG_LateBinding_Receiver_impl::start_getting (void)
-  {
-    try
-      {
-        ::RG_LateBinding::RG_LateBindingTestConnector::Getter_var getter =
-          this->ciao_context_->get_connection_info_get_fresh_data ();
-        if (::CORBA::is_nil (getter.in ()))
-          {
-            ACE_DEBUG ((LM_DEBUG, "RG_LateBinding_Receiver_impl::start_getting - "
-                        "ERROR: Unable to get writer interface from the "
-                        "CIAO context\n"));
-            return;
-          }
-        DDS::Duration_t to;
-        to.sec = 1;
-        to.nanosec = 0;
-        getter->time_out (to);
-
-        RG_LateBindingTestSeq samples;
-        ::CCM_DDS::ReadInfoSeq readinfos;
-        getter->get_many (samples, readinfos);
-        this->check_samples ("get", samples);
-      }
-    catch (const CORBA::Exception &e)
-      {
-        e._tao_print_exception("RG_LateBinding_Receiver_impl::start_getting - "
-                               "ERROR: Unexpected exception");
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::start_getting - "
-                    "ERROR: expected and unknown exception caught\n"));
-      }
-  }
-
-  void
-  RG_LateBinding_Receiver_impl::set_topic_name_reader (void)
-  {
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, "RG_LateBinding_Receiver_impl::set_topic_name_reader - "
-                    "Setting topic name\n"));
-        ::RG_LateBinding::RG_LateBindingTestConnector::Reader_var reader =
-          this->ciao_context_->get_connection_info_read_data ();
-        if (::CORBA::is_nil (reader.in ()))
-            {
-              ACE_ERROR ((LM_ERROR, "ERROR: RG_LateBinding_Receiver_impl::set_topic_name_reader - "
-                                    "Unable to get reader interface\n"));
-              throw ::CORBA::INTERNAL ();
-            }
-        ::CORBA::Object_var cmp = reader->_get_component ();
-        if (::CORBA::is_nil (cmp.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: RG_LateBinding_Receiver_impl::set_topic_name_reader - "
-                                  "Unable to get component interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        ::RG_LateBinding::RG_LateBindingTestConnector::CCM_DDS_State_var conn =
-          ::RG_LateBinding::RG_LateBindingTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: RG_LateBinding_Receiver_impl::set_topic_name_reader - "
-                                  "Unable to narrow connector interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        conn->topic_name ("LateBindingTopic");
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: RG_LateBinding_Receiver_impl::set_topic_name_reader - "
-                    "Caught NonChangeable exception.\n"));
-      }
-  }
-
-  void
-  RG_LateBinding_Receiver_impl::set_topic_name_getter (void)
-  {
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, "RG_LateBinding_Receiver_impl::set_topic_name_getter - "
-                    "Setting topic name\n"));
-        ::RG_LateBinding::RG_LateBindingTestConnector::Getter_var getter =
-          this->ciao_context_->get_connection_info_get_fresh_data ();
-        if (::CORBA::is_nil (getter.in ()))
-            {
-              ACE_ERROR ((LM_ERROR, "ERROR: RG_LateBinding_Receiver_impl::set_topic_name_getter - "
-                                    "Unable to get getter interface\n"));
-              throw ::CORBA::INTERNAL ();
-            }
-          ::CORBA::Object_var cmp = getter->_get_component ();
-          if (::CORBA::is_nil (cmp.in ()))
-            {
-              ACE_ERROR ((LM_ERROR, "ERROR: RG_LateBinding_Receiver_impl::set_topic_name_getter - "
-                                    "Unable to get component interface\n"));
-              throw ::CORBA::INTERNAL ();
-            }
-        ::RG_LateBinding::RG_LateBindingTestConnector::CCM_DDS_Event_var conn =
-          ::RG_LateBinding::RG_LateBindingTestConnector::CCM_DDS_Event::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: RG_LateBinding_Receiver_impl::set_topic_name_getter - "
-                                  "Unable to narrow connector interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        conn->topic_name ("LateBindingTopic");
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::set_topic_name_getter - "
-                    "ERROR: Caught NonChangeable exception.\n"));
-      }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h
deleted file mode 100644
index 4a721f26dc5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#ifndef RG_LATEBINDING_RECEIVER_IMPL_H_
-#define RG_LATEBINDING_RECEIVER_IMPL_H_
-
-#include "RG_LateBinding_ReceiverEC.h"
-
-namespace CIAO_RG_LateBinding_Receiver_Impl
-{
-  class RG_LateBinding_Receiver_impl;
-
-  /**
-   * LastSampleChecker
-   */
-  class LastSampleChecker
-    : public ACE_Event_Handler
-  {
-  public:
-    LastSampleChecker (RG_LateBinding_Receiver_impl &callback,
-                       const ::CORBA::UShort &iterations);
-
-    virtual ~LastSampleChecker (void);
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    RG_LateBinding_Receiver_impl &callback_;
-    const ::CORBA::UShort iterations_;
-
-  };
-
-  /**
-   * RG_LateBinding_Receiver_impl
-   */
-  class RG_LateBinding_Receiver_impl
-  {
-  public:
-    RG_LateBinding_Receiver_impl (
-      ::RG_LateBinding::CCM_Receiver_Context_ptr ctx,
-      const ::CORBA::UShort & iterations,
-      const ::CORBA::UShort & keys);
-    ~RG_LateBinding_Receiver_impl (void);
-
-    void start (void);
-    bool check_last (void);
-    void start_read (void);
-
-  private:
-    ::RG_LateBinding::CCM_Receiver_Context_var ciao_context_;
-    ::CORBA::UShort iterations_;
-    ::CORBA::UShort keys_;
-
-    LastSampleChecker * checker_;
-
-    void set_topic_name_reader ();
-    void set_topic_name_getter ();
-
-    void start_reading (void);
-    void start_getting (void);
-    void test_exception (void);
-
-    void check_samples (
-      const char * test,
-      const RG_LateBindingTestSeq& samples,
-      const ::CORBA::UShort& expected=0);
-
-    ACE_Reactor* reactor (void);
-  };
-};
-
-#endif /* RG_LATEBINDING_RECEIVER_IMPL_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.idl
deleted file mode 100644
index 729bd69b7ff..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RG_LATEBINDING_SENDER_IDL
-#define RG_LATEBINDING_SENDER_IDL
-
-#include "Connector/RG_LateBinding_Connector.idl"
-#include "Base/Reader_Starter.idl"
-
-module RG_LateBinding
-{
-  component Sender
-  {
-    port RG_LateBindingTestConnector::DDS_Write  info_write;
-
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-
-    uses ReaderStarter reader_start;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.mpc
deleted file mode 100644
index 78eed5dedfb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.mpc
+++ /dev/null
@@ -1,150 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p RG_LateBindingBase -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project (RG_LateBindingSender_idl_gen) : componentidldefaults, dds4ccm {
-  after += RG_LateBindingConnector_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 {
-    RG_LateBinding_Sender.idl
-  }
-}
-
-project (RG_LateBindingSender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += RG_LateBindingSender_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 {
-    RG_LateBinding_SenderE.idl
-  }
-}
-
-project (RG_LateBindingSender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += RG_LateBindingSender_lem_gen RG_LateBindingSender_stub \
-           RG_LateBindingBase_stub Reader_Starter_stub
-  libs  += RG_LateBindingBase_stub Sender_stub Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_LateBinding_SenderEC.cpp
-  }
-
-  Header_Files {
-    RG_LateBinding_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    RG_LateBinding_SenderEC.inl
-  }
-}
-
-project (RG_LateBindingSender_stub) : ccm_stub, dds4ccm_base {
-  after += RG_LateBindingSender_idl_gen RG_LateBindingBase_stub \
-           RG_LateBindingConnector_stub Reader_Starter_stub \
-           Reader_Starter_lem_stub
-  libs  += RG_LateBindingBase_stub RG_LateBindingConnector_stub \
-           Reader_Starter_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_LateBinding_SenderC.cpp
-  }
-
-  Header_Files {
-    RG_LateBinding_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    RG_LateBinding_SenderC.inl
-  }
-}
-
-project (RG_LateBindingSender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += RG_LateBindingSender_lem_stub RG_LateBindingSender_stub \
-             RG_LateBindingConnector_lem_stub RG_LateBindingConnector_stub \
-             Reader_Starter_svnt Reader_Starter_lem_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub RG_LateBindingBase_stub \
-          RG_LateBindingConnector_lem_stub RG_LateBindingConnector_stub \
-          Reader_Starter_stub Reader_Starter_svnt Reader_Starter_lem_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_LateBinding_Sender_exec.cpp
-  }
-
-  Header_Files {
-    RG_LateBinding_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (RG_LateBindingSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += RG_LateBindingBase_stub  RG_LateBindingSender_lem_stub RG_LateBindingConnector_stub \
-                RG_LateBindingConnector_svnt RG_LateBindingConnector_lem_stub \
-                Reader_Starter_stub Reader_Starter_lem_stub Reader_Starter_svnt
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                RG_LateBindingBase_stub RG_LateBindingConnector_stub RG_LateBindingConnector_svnt \
-                RG_LateBindingConnector_lem_stub Reader_Starter_stub \
-                Reader_Starter_lem_stub Reader_Starter_svnt
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_LateBinding_SenderS.cpp
-    RG_LateBinding_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    RG_LateBinding_SenderS.h
-    RG_LateBinding_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp
deleted file mode 100644
index c09bc0d4593..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "RG_LateBinding_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_RG_LateBinding_Sender_Impl
-{
-
-  /**
-   * Timeout_Handler
-   */
-
-  Timeout_Handler::Timeout_Handler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->callback_.start_write ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : iterations_ (0)
-      , keys_ (0)
-      , to_handler_ (0)
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::start_write (void)
-  {
-    try
-      {
-        ::RG_LateBinding::RG_LateBindingTestConnector:: Writer_var writer =
-          this->ciao_context_->get_connection_info_write_data ();
-        for (::CORBA::UShort key = 1; key < this->keys_ + 1; ++key)
-          {
-            RG_LateBindingTest sample;
-            char tmp[7];
-            ACE_OS::sprintf (tmp, "KEY_%d", key);
-            sample.key = CORBA::string_dup(tmp);
-
-            for (::CORBA::UShort iter = 1; iter < this->iterations_ + 1; ++iter)
-              {
-                sample.iteration = iter;
-                writer->write_one (sample, ::DDS::HANDLE_NIL);
-                ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - "
-                            "Sample written : key <%C> - iteration <%d>\n",
-                            tmp, iter));
-              }
-          }
-        ACE_Time_Value tv (2, 0);
-        ACE_OS::sleep (tv);
-        ReaderStarter_var starter =
-          this->ciao_context_->get_connection_reader_start ();
-        if (!::CORBA::is_nil (starter.in ()))
-          {
-            ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - "
-                      "Inform the receiver that all samples were written\n"));
-            starter->set_reader_properties (this->keys (), this->iterations ());
-            starter->start_read ();
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - "
-                      "ERROR: unable to get connection to the ReaderStarter\n"));
-          }
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - "
-                              "ERROR: Caught NonChangeable exception.\n"));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - "
-                    "ERROR: Unexpected and unknown exception caught.\n"));
-      }
-  }
-
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::RG_LateBinding::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-     ACE_NEW_THROW_EX (this->to_handler_,
-                       Timeout_Handler (*this),
-                       ::CORBA::INTERNAL ());
-     if (this->reactor ()->schedule_timer (
-                 this->to_handler_,
-                 0,
-                 ACE_Time_Value (1, 0)) == -1)
-       {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                               ACE_TEXT ("Error scheduling timer")));
-       }
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    delete this->to_handler_;
-    this->to_handler_ = 0;
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_RG_LateBinding_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/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.h
deleted file mode 100644
index 8d50a38a418..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.h
+++ /dev/null
@@ -1,133 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_RG_LATEBINDING_SENDER_EXEC_YSJ9S8_H_
-#define CIAO_RG_LATEBINDING_SENDER_EXEC_YSJ9S8_H_
-
-#include /**/ "ace/pre.h"
-
-#include "RG_LateBinding_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_RG_LateBinding_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * Timeout_Handler
-   */
-  class Timeout_Handler :
-    public ACE_Event_Handler
-  {
-  public:
-    Timeout_Handler (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 &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start_write (void);
-    //@}
-
-  private:
-    ::RG_LateBinding::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Timeout_Handler *to_handler_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_RG_LateBinding_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/LateBinding_Library.xml b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/LateBinding_Library.xml
deleted file mode 100644
index 5e798c88e8a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/LateBinding_Library.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="LateBindingProfile">
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-    </datawriter_qos>
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/Plan.cdp
deleted file mode 100644
index 5840362a6d3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/Plan.cdp
+++ /dev/null
@@ -1,461 +0,0 @@
-<!--  -->
-<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>LateBinding_Depl_1</label>
-  <UUID>LateBinding_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_LateBinding_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_LateBinding_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="LateBinding_EventConnectorImplementation">
-    <name>LateBinding_EventConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="LateBinding_Connector_ExecArtifact" />
-    <artifact xmi:idref="LateBinding_Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_LateBinding_RG_LateBindingTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_LateBinding_RG_LateBindingTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>RG_LateBinding_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>RG_LateBinding_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="LateBinding_StateConnectorImplementation">
-    <name>LateBinding_StateConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="LateBinding_Connector_ExecArtifact" />
-    <artifact xmi:idref="LateBinding_Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_LateBinding_RG_LateBindingTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_LateBinding_RG_LateBindingTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>RG_LateBinding_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>RG_LateBinding_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>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_LateBinding_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_LateBinding_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>
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="LateBinding_SenderEventConnectorInstance">
-    <name>LateBinding_SenderEventConnectorInstance</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="LateBinding_EventConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LateBindingTopic</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LateBinding_Library#LateBindingProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="LateBinding_ReceiverEventConnectorInstance">
-    <name>LateBinding_ReceiverEventConnectorInstance</name>
-    <node>ReceiverNode</node>
-    <source/>
-    <implementation xmi:idref="LateBinding_EventConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string></string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LateBinding_Library#LateBindingProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="LateBinding_ReceiverStateConnectorInstance">
-    <name>LateBinding_ReceiverStateConnectorInstance</name>
-    <node>ReceiverNode</node>
-    <source/>
-    <implementation xmi:idref="LateBinding_StateConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string></string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LateBinding_Library#LateBindingProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>reader_starter</name>
-    <internalEndpoint>
-      <portName>reader_start</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>start_reading</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>reader_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_read_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="LateBinding_ReceiverStateConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>getter_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="LateBinding_ReceiverEventConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="LateBinding_SenderEventConnectorInstance" />
-    </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="LateBinding_Connector_ExecArtifact">
-    <name>RG_LateBinding_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>RG_LateBindingConnector_exec</location>
-  </artifact>
-  <artifact xmi:id="LateBinding_Connector_SvntArtifact">
-    <name>RG_LateBinding_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>RG_LateBindingConnector_svnt</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/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 84fcb573f76..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <qos_library name="LateBinding_Library">
-    <qos_profile name="LateBindingProfile" is_default_qos="false">
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/run_test.pl
deleted file mode 100755
index 87984594507..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 60 seconds to allow task to complete\n";
-sleep (60);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl
deleted file mode 100644
index 426f463bad1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file WU_LateBinding_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WU_LATEBINDING_BASE_IDL
-#define WU_LATEBINDING_BASE_IDL
-
-#pragma ndds typesupport "Base/WU_LateBinding_BaseSupport.h"
-#pragma opendds typesupport "Base/WU_LateBinding_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "WU_LateBindingTest"
-#pragma DCPS_DATA_KEY "WU_LateBindingTest key"
-
-struct WU_LateBindingTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<WU_LateBindingTest> WU_LateBindingTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.mpc
deleted file mode 100644
index 335ea30e1fd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (WU_LateBindingBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = WU_LateBindingBase_stub
-  dynamicflags += WU_LATEBINDING_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=WU_LATEBINDING_BASE_STUB_Export \
-              -Wb,stub_export_include=LateBinding_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    WU_LateBinding_Base.idl
-  }
-
-  opendds_ts_flags += --export=WU_LATEBINDING_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    WU_LateBinding_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl
deleted file mode 100644
index e8842df52d2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file WU_LateBinding_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WU_LATEBINDING_CONNECTOR_IDL_
-#define WU_LATEBINDING_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/WU_LateBinding_Base.idl"
-
-#pragma ciao lem "Connector/WU_LateBinding_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/WU_LateBinding_BaseTypeSupport.idl"
-#endif
-
-module WU_LateBinding
-{
-  module ::CCM_DDS::Typed < ::WU_LateBindingTest, ::WU_LateBindingTestSeq> WU_LateBindingTestConnector;
-};
-
-#endif /* WU_LateBinding_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc
deleted file mode 100644
index b79dd250fa6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p WU_LateBindingBase -l .. -o ../lib -u DDS WU_LateBinding_Connector"
-
-project (WU_LateBindingConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen WU_LateBindingBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=WU_LATEBINDING_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=LateBinding_Connector_stub_export.h \
-              -Wb,skel_export_macro=WU_LATEBINDING_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=LateBinding_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=WU_LATEBINDING_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=LateBinding_Connector_svnt_export.h \
-              -Wb,conn_export_macro=WU_LATEBINDING_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=LateBinding_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    WU_LateBinding_Connector.idl
-  }
-}
-
-project (WU_LateBindingConnector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += WU_LateBindingConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=WU_LATEBINDING_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=WU_LateBinding_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    WU_LateBinding_ConnectorE.idl
-  }
-}
-
-project (WU_LateBindingConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += WU_LateBindingConnector_lem_gen WU_LateBindingConnector_stub \
-           WU_LateBindingBase_stub
-  libs  += WU_LateBindingBase_stub WU_LateBindingConnector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = WU_LateBindingConnector_lem_stub
-  dynamicflags += WU_LATEBINDING_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WU_LateBinding_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    WU_LateBinding_ConnectorEC.h
-    WU_LateBinding_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    WU_LateBinding_ConnectorEC.inl
-  }
-}
-
-project (WU_LateBindingConnector_stub) : ccm_stub, dds4ccm_base {
-  after += WU_LateBindingConnector_idl_gen WU_LateBindingBase_stub
-  libs  += WU_LateBindingBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = WU_LateBindingConnector_stub
-  dynamicflags += WU_LATEBINDING_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WU_LateBinding_ConnectorC.cpp
-  }
-
-  Header_Files {
-    WU_LateBinding_ConnectorC.h
-    WU_LateBinding_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    WU_LateBinding_ConnectorC.inl
-  }
-}
-
-project (WU_LateBindingConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += WU_LateBindingConnector_lem_stub WU_LateBindingConnector_stub \
-             WU_LateBindingBase_stub
-  sharedname = WU_LateBindingConnector_exec
-  libs += WU_LateBindingConnector_stub WU_LateBindingConnector_lem_stub \
-          WU_LateBindingBase_stub WU_LateBindingBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += WU_LATEBINDING_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WU_LateBinding_Connector_conn.cpp
-  }
-
-  Header_Files {
-    WU_LateBinding_Connector_conn.h
-    WU_LateBinding_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (WU_LateBindingConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += WU_LateBindingConnector_lem_stub WU_LateBindingConnector_exec \
-                WU_LateBindingConnector_stub
-  sharedname  = WU_LateBindingConnector_svnt
-  libs       += WU_LateBindingConnector_stub \
-                WU_LateBindingConnector_lem_stub  \
-                WU_LateBindingBase_stub \
-                WU_LateBindingConnector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += WU_LATEBINDING_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WU_LateBinding_ConnectorS.cpp
-    WU_LateBinding_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    WU_LateBinding_ConnectorS.h
-    WU_LateBinding_Connector_svnt.h
-    WU_LateBinding_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.idl
deleted file mode 100644
index 23006b60fa6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/WU_LateBinding_Connector.idl"
-
-module WU_LateBinding
-{
-  component Receiver
-  {
-    port WU_LateBindingTestConnector::DDS_Listen info_out_event;
-    port WU_LateBindingTestConnector::DDS_StateListen info_out_state;
-
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.mpc
deleted file mode 100644
index 768ee30fdb4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.mpc
+++ /dev/null
@@ -1,140 +0,0 @@
-project (WU_LateBindingReceiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += WU_LateBindingConnector_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 {
-    WU_LateBinding_Receiver.idl
-  }
-}
-
-project (WU_LateBindingReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += WU_LateBindingReceiver_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 {
-    WU_LateBinding_ReceiverE.idl
-  }
-}
-
-project (WU_LateBindingReceiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += WU_LateBindingReceiver_lem_gen WU_LateBindingReceiver_stub  WU_LateBindingConnector_stub WU_LateBindingBase_stub
-  libs  +=  Receiver_stub WU_LateBindingConnector_stub WU_LateBindingBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WU_LateBinding_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    WU_LateBinding_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    WU_LateBinding_ReceiverEC.inl
-  }
-}
-
-project (WU_LateBindingReceiver_stub) : ccm_stub, dds4ccm_base {
-  after += WU_LateBindingReceiver_idl_gen  WU_LateBindingConnector_stub WU_LateBindingBase_stub WU_LateBindingConnector_lem_gen
-  libs  += WU_LateBindingConnector_stub WU_LateBindingBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WU_LateBinding_ReceiverC.cpp
-  }
-
-  Header_Files {
-    WU_LateBinding_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    WU_LateBinding_ReceiverC.inl
-  }
-}
-
-project (WU_LateBindingReceiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += WU_LateBindingReceiver_lem_stub WU_LateBindingReceiver_stub \
-             WU_LateBindingBase_stub WU_LateBindingConnector_stub \
-             WU_LateBindingConnector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub WU_LateBindingBase_stub \
-          WU_LateBindingConnector_stub WU_LateBindingConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WU_LateBinding_Receiver_exec.cpp
-    WU_LateBinding_Receiver_impl.cpp
-  }
-
-  Header_Files {
-    WU_LateBinding_Receiver_exec.h
-    WU_LateBinding_Receiver_impl.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (WU_LateBindingReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   WU_LateBindingReceiver_lem_stub WU_LateBindingBase_stub WU_LateBindingConnector_stub WU_LateBindingConnector_svnt WU_LateBindingReceiver_exec WU_LateBindingConnector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub WU_LateBindingBase_stub WU_LateBindingConnector_stub WU_LateBindingConnector_svnt Receiver_exec WU_LateBindingConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WU_LateBinding_ReceiverS.cpp
-    WU_LateBinding_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    WU_LateBinding_ReceiverS.h
-    WU_LateBinding_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.cpp
deleted file mode 100644
index 5f78d422ccb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.cpp
+++ /dev/null
@@ -1,332 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "WU_LateBinding_Receiver_exec.h"
-#include "WU_LateBinding_Receiver_impl.h"
-
-namespace CIAO_WU_LateBinding_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_out_event_data_listener_exec_i
-   */
-
-  info_out_event_data_listener_exec_i::info_out_event_data_listener_exec_i (
-        ::WU_LateBinding::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::WU_LateBinding::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_event_data_listener_exec_i::~info_out_event_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::WU_LateBinding::WU_LateBindingTestConnector::Listener
-
-  void
-  info_out_event_data_listener_exec_i::on_one_data (const ::WU_LateBindingTest & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    WU_LateBinding_Receiver_impl::on_one_data(datum);
-  }
-
-  void
-  info_out_event_data_listener_exec_i::on_many_data (const ::WU_LateBindingTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    WU_LateBinding_Receiver_impl::on_many_data();
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_event_status_exec_i
-   */
-
-  info_out_event_status_exec_i::info_out_event_status_exec_i (
-        ::WU_LateBinding::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::WU_LateBinding::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_event_status_exec_i::~info_out_event_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_event_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_event_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_state_data_listener_exec_i
-   */
-
-  info_out_state_data_listener_exec_i::info_out_state_data_listener_exec_i (
-        ::WU_LateBinding::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::WU_LateBinding::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_state_data_listener_exec_i::~info_out_state_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::WU_LateBinding::WU_LateBindingTestConnector::StateListener
-
-  void
-  info_out_state_data_listener_exec_i::on_creation (const ::WU_LateBindingTest & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    WU_LateBinding_Receiver_impl::on_creation(datum);
-  }
-
-  void
-  info_out_state_data_listener_exec_i::on_one_update (const ::WU_LateBindingTest & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    WU_LateBinding_Receiver_impl::on_one_update(datum);
-  }
-
-  void
-  info_out_state_data_listener_exec_i::on_many_updates (const ::WU_LateBindingTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_state_data_listener_exec_i::on_deletion (const ::WU_LateBindingTest & /* datum */,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_state_status_exec_i
-   */
-
-  info_out_state_status_exec_i::info_out_state_status_exec_i (
-        ::WU_LateBinding::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::WU_LateBinding::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_state_status_exec_i::~info_out_state_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_state_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_state_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : iterations_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::WU_LateBinding::WU_LateBindingTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_event_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_event_data_listener_.in ()))
-      {
-        info_out_event_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_event_data_listener_exec_i (
-            this->ciao_context_.in ()),
-            ::WU_LateBinding::WU_LateBindingTestConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_out_event_data_listener_ = tmp;
-      }
-
-    return
-      ::WU_LateBinding::WU_LateBindingTestConnector::CCM_Listener::_duplicate (
-        this->ciao_info_out_event_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_event_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_event_status_.in ()))
-      {
-        info_out_event_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_event_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_event_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_event_status_.in ());
-  }
-
-  ::WU_LateBinding::WU_LateBindingTestConnector::CCM_StateListener_ptr
-  Receiver_exec_i::get_info_out_state_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_state_data_listener_.in ()))
-      {
-        info_out_state_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_state_data_listener_exec_i (
-            this->ciao_context_.in ()),
-            ::WU_LateBinding::WU_LateBindingTestConnector::CCM_StateListener::_nil ());
-
-          this->ciao_info_out_state_data_listener_ = tmp;
-      }
-
-    return
-      ::WU_LateBinding::WU_LateBindingTestConnector::CCM_StateListener::_duplicate (
-        this->ciao_info_out_state_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_state_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_state_status_.in ()))
-      {
-        info_out_state_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_state_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_state_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_state_status_.in ());
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::WU_LateBinding::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    WU_LateBinding_Receiver_impl::start(
-      this->ciao_context_.in ());
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_WU_LateBinding_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/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.h
deleted file mode 100644
index af9db76cc06..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.h
+++ /dev/null
@@ -1,247 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_WU_LATEBINDING_RECEIVER_EXEC_KKU0OW_H_
-#define CIAO_WU_LATEBINDING_RECEIVER_EXEC_KKU0OW_H_
-
-#include /**/ "ace/pre.h"
-
-#include "WU_LateBinding_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_WU_LateBinding_Receiver_Impl
-{
-
-  /**
-   * Provider Executor Implementation Class: info_out_event_data_listener_exec_i
-   */
-
-  class info_out_event_data_listener_exec_i
-    : public virtual ::WU_LateBinding::WU_LateBindingTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_event_data_listener_exec_i (
-      ::WU_LateBinding::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_event_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from WU_LateBinding::WU_LateBindingTestConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::WU_LateBindingTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::WU_LateBindingTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::WU_LateBinding::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_event_status_exec_i
-   */
-
-  class info_out_event_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_event_status_exec_i (
-      ::WU_LateBinding::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_event_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::WU_LateBinding::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_state_data_listener_exec_i
-   */
-
-  class info_out_state_data_listener_exec_i
-    : public virtual ::WU_LateBinding::WU_LateBindingTestConnector::CCM_StateListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_state_data_listener_exec_i (
-      ::WU_LateBinding::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_state_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from WU_LateBinding::WU_LateBindingTestConnector::StateListener. */
-
-    virtual
-    void on_creation (const ::WU_LateBindingTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_one_update (const ::WU_LateBindingTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_updates (const ::WU_LateBindingTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-
-    virtual
-    void on_deletion (const ::WU_LateBindingTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-    //@}
-
-  private:
-    ::WU_LateBinding::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_state_status_exec_i
-   */
-
-  class info_out_state_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_state_status_exec_i (
-      ::WU_LateBinding::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_state_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::WU_LateBinding::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::WU_LateBinding::WU_LateBindingTestConnector::CCM_Listener_ptr
-    get_info_out_event_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_event_status (void);
-
-    virtual ::WU_LateBinding::WU_LateBindingTestConnector::CCM_StateListener_ptr
-    get_info_out_state_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_state_status (void);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-
-    //@}
-
-  private:
-    ::WU_LateBinding::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::WU_LateBinding::WU_LateBindingTestConnector::CCM_Listener_var ciao_info_out_event_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_event_status_;
-    ::WU_LateBinding::WU_LateBindingTestConnector::CCM_StateListener_var ciao_info_out_state_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_state_status_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_WU_LateBinding_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.cpp
deleted file mode 100644
index 849eaf56162..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "WU_LateBinding_Receiver_impl.h"
-
-WU_LateBinding_Receiver_impl::WU_LateBinding_Receiver_impl ()
-{
-}
-
-WU_LateBinding_Receiver_impl::~WU_LateBinding_Receiver_impl ()
-{
-}
-
-void
-WU_LateBinding_Receiver_impl::start (
-  ::WU_LateBinding::CCM_Receiver_Context_ptr ctx)
-{
-  ::CCM_DDS::DataListenerControl_var dlc =
-    ctx->get_connection_info_out_event_data_control ();
-  dlc->mode (::CCM_DDS::ONE_BY_ONE);
-
-  dlc = ctx->get_connection_info_out_state_data_control ();
-  dlc->mode (::CCM_DDS::ONE_BY_ONE);
-}
-
-void
-WU_LateBinding_Receiver_impl::on_one_data (const ::WU_LateBindingTest & datum)
-{
-  ACE_DEBUG ((LM_ERROR, ACE_TEXT ("WU_LateBinding_Receiver_impl::on_one_data - ")
-          ACE_TEXT ("received data for <%C> at %u\n"),
-          datum.key.in (),
-          datum.iteration));
-}
-
-void
-WU_LateBinding_Receiver_impl::on_many_data (void)
-{
-    ACE_ERROR ((LM_ERROR, "WU_LateBinding_Receiver_impl::on_many_data : "
-                          "Error: No callback to this method expected.\n"));
-}
-
-void
-WU_LateBinding_Receiver_impl::on_creation (const ::WU_LateBindingTest & datum)
-{
-  ACE_DEBUG ((LM_ERROR, ACE_TEXT ("WU_LateBinding_Receiver_impl::on_creation - ")
-          ACE_TEXT ("Data created for <%C> at %u\n"),
-          datum.key.in (),
-          datum.iteration));
-}
-
-void
-WU_LateBinding_Receiver_impl::on_one_update (const ::WU_LateBindingTest & datum)
-{
-  ACE_DEBUG ((LM_ERROR, ACE_TEXT ("WU_LateBinding_Receiver_impl::on_one_update - ")
-          ACE_TEXT ("received updated data for <%C> at %u\n"),
-          datum.key.in (),
-          datum.iteration));
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.h b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.h
deleted file mode 100644
index bd13e00c19c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_impl.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef WU_LATEBINDING_RECEIVER_IMPL_H_
-#define WU_LATEBINDING_RECEIVER_IMPL_H_
-
-#include "WU_LateBinding_ReceiverEC.h"
-
-class WU_LateBinding_Receiver_impl
-{
-public:
-  WU_LateBinding_Receiver_impl (void);
-  ~WU_LateBinding_Receiver_impl (void);
-
-  static void start (
-    ::WU_LateBinding::CCM_Receiver_Context_ptr ctx);
-
-  static void on_one_data (const ::WU_LateBindingTest & datum);
-  static void on_many_data (void);
-
-  static void on_creation (const ::WU_LateBindingTest & datum);
-  static void on_one_update (const ::WU_LateBindingTest & datum);
-};
-
-#endif /* WU_LATEBINDING_RECEIVER_IMPL_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.idl
deleted file mode 100644
index 8a2169dd68b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WU_LATEBINDING_SENDER_IDL
-#define WU_LATEBINDING_SENDER_IDL
-
-#include "Connector/WU_LateBinding_Connector.idl"
-
-module WU_LateBinding
-{
-  component Sender
-  {
-    port WU_LateBindingTestConnector::DDS_Write  info_write;
-    port WU_LateBindingTestConnector::DDS_Update info_update;
-
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.mpc
deleted file mode 100644
index e14ce1c88a2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.mpc
+++ /dev/null
@@ -1,141 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p WU_LateBindingBase -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project (WU_LateBindingSender_idl_gen) : componentidldefaults, dds4ccm {
-  after += WU_LateBindingConnector_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 {
-    WU_LateBinding_Sender.idl
-  }
-}
-
-project (WU_LateBindingSender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += WU_LateBindingSender_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 {
-    WU_LateBinding_SenderE.idl
-  }
-}
-
-project (WU_LateBindingSender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += WU_LateBindingSender_lem_gen WU_LateBindingSender_stub WU_LateBindingBase_stub
-  libs  += WU_LateBindingBase_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WU_LateBinding_SenderEC.cpp
-  }
-
-  Header_Files {
-    WU_LateBinding_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    WU_LateBinding_SenderEC.inl
-  }
-}
-
-project (WU_LateBindingSender_stub) : ccm_stub, dds4ccm_base {
-  after += WU_LateBindingSender_idl_gen WU_LateBindingBase_stub WU_LateBindingConnector_stub
-  libs  += WU_LateBindingBase_stub WU_LateBindingConnector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WU_LateBinding_SenderC.cpp
-  }
-
-  Header_Files {
-    WU_LateBinding_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    WU_LateBinding_SenderC.inl
-  }
-}
-
-project (WU_LateBindingSender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += WU_LateBindingSender_lem_stub WU_LateBindingSender_stub \
-             WU_LateBindingConnector_lem_stub WU_LateBindingConnector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub WU_LateBindingBase_stub \
-          WU_LateBindingConnector_lem_stub WU_LateBindingConnector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WU_LateBinding_Sender_exec.cpp
-  }
-
-  Header_Files {
-    WU_LateBinding_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (WU_LateBindingSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += WU_LateBindingBase_stub  WU_LateBindingSender_lem_stub WU_LateBindingConnector_stub \
-                WU_LateBindingConnector_svnt WU_LateBindingConnector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                WU_LateBindingBase_stub WU_LateBindingConnector_stub WU_LateBindingConnector_svnt WU_LateBindingConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WU_LateBinding_SenderS.cpp
-    WU_LateBinding_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    WU_LateBinding_SenderS.h
-    WU_LateBinding_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp
deleted file mode 100644
index 90932adb836..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp
+++ /dev/null
@@ -1,400 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "WU_LateBinding_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_WU_LateBinding_Sender_Impl
-{
-
-  /**
-   * Timeout_Handler
-   */
-
-  Timeout_Handler::Timeout_Handler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *arg)
-  {
-    // Notify the subscribers
-    unsigned long assingment = reinterpret_cast<unsigned long> (arg);
-    if (assingment == 0)
-      {
-        this->callback_.start_event_test ();
-      }
-    else if (assingment == 1)
-      {
-        this->callback_.start_state_test ();
-        this->callback_.set_topic_name_writer ();
-        this->callback_.set_topic_name_updater ();
-      }
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : iterations_ (0)
-      , keys_ (0)
-      , to_handler_ (0)
-  {
-     ACE_NEW_THROW_EX (this->to_handler_,
-                       Timeout_Handler (*this),
-                       ::CORBA::INTERNAL ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->to_handler_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::test_exception (void)
-  {
-    try
-      {
-        ::WU_LateBinding::WU_LateBindingTestConnector::Writer_var writer =
-          this->ciao_context_->get_connection_info_write_data ();
-        if (::CORBA::is_nil (writer.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::test_exception - "
-                        "ERROR: Unable to get writer interface from the "
-                        "CIAO context\n"));
-            return;
-          }
-        WU_LateBindingTest sample;
-        sample.key = ::CORBA::string_dup ("KEY_1");
-        sample.iteration = 1;
-        writer->write_one (sample, ::DDS::HANDLE_NIL);
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::test_exception - "
-                    "ERROR: No exception thrown while calling write_one "
-                    "on a late binded connector (port).\n"));
-      }
-    catch (const ::CORBA::BAD_INV_ORDER &)
-      {
-        ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::test_exception - "
-                    "Expected BAD_INV_ORDER thrown.\n"));
-      }
-    catch (const CORBA::Exception &e)
-      {
-        e._tao_print_exception("ERROR: Unexpected exception");
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::test_exception - "
-                    "ERROR: expected and unknown exception caught\n"));
-      }
-  }
-
-  void
-  Sender_exec_i::set_topic_name_writer (void)
-  {
-    try
-      {
-        ::WU_LateBinding::WU_LateBindingTestConnector:: Writer_var writer =
-          this->ciao_context_->get_connection_info_write_data ();
-        if (::CORBA::is_nil (writer.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                                  "Unable to get writer interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        ::CORBA::Object_var cmp = writer->_get_component ();
-        if (::CORBA::is_nil (cmp.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                                  "Unable to get component interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        ::WU_LateBinding::WU_LateBindingTestConnector::CCM_DDS_Event_var conn =
-          ::WU_LateBinding::WU_LateBindingTestConnector::CCM_DDS_Event::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                                  "Unable to narrow connector interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        conn->topic_name ("LateBindingTopic");
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                    "Caught NonChangeable exception.\n"));
-      }
-    catch (const ::CORBA::Exception &ex)
-      {
-        ex._tao_print_exception("ERROR: Sender_exec_i::set_topic_name_writer - ");
-      }
-  }
-
-  void
-  Sender_exec_i::start_event_test (void)
-  {
-    // Set the topic name on the connector first. Therefor we need to
-    // get to the connector first.
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - "
-                "Set topic name.\n"));
-    try
-      {
-        this->set_topic_name_writer ();
-        ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - "
-                    "Topic name set, start writing.\n"));
-
-        ::WU_LateBinding::WU_LateBindingTestConnector:: Writer_var writer =
-          this->ciao_context_->get_connection_info_write_data ();
-        for (::CORBA::UShort key = 1; key < this->keys_ + 1; ++key)
-          {
-            WU_LateBindingTest sample;
-            char tmp[7];
-            ACE_OS::sprintf (tmp, "KEY_%d", key);
-            sample.key = CORBA::string_dup(tmp);
-
-            for (::CORBA::UShort iter = 1; iter < this->iterations_ + 1; ++iter)
-              {
-                sample.iteration = iter;
-                writer->write_one (sample, ::DDS::HANDLE_NIL);
-                ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - "
-                            "Sample written : key <%C> - iteration <%d>\n",
-                            tmp, iter));
-                ACE_Time_Value tv (0, 50000);
-                ACE_OS::sleep (tv);
-              }
-          }
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - "
-                    "ERROR: Unexpected and unknown exception caught.\n"));
-      }
-  }
-
-  void
-  Sender_exec_i::set_topic_name_updater(void)
-  {
-    try
-      {
-        ::WU_LateBinding::WU_LateBindingTestConnector:: Updater_var updater =
-          this->ciao_context_->get_connection_info_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                                  "Unable to get updater interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        ::CORBA::Object_var cmp = updater->_get_component ();
-        if (::CORBA::is_nil (cmp.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                                  "Unable to get component interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        ::WU_LateBinding::WU_LateBindingTestConnector::CCM_DDS_State_var conn =
-          ::WU_LateBinding::WU_LateBindingTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                                  "Unable to narrow connector interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        conn->topic_name ("LateBindingTopic");
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                    "Caught NonChangeable exception.\n"));
-      }
-    catch (const ::CORBA::Exception &ex)
-      {
-        ex._tao_print_exception("ERROR: Sender_exec_i::set_topic_name_writer - ");
-      }
-  }
-
-  void
-  Sender_exec_i::start_state_test (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_state_test - "
-                          "Start\n"));
-    try
-      {
-        this->set_topic_name_updater ();
-        ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_state_test - "
-                    "Topic name set, start updating.\n"));
-        ::WU_LateBinding::WU_LateBindingTestConnector:: Updater_var updater =
-          this->ciao_context_->get_connection_info_update_data ();
-        for (::CORBA::UShort key = this->keys_ + 1;
-             key < (2 * this->keys_) + 1;
-             ++key)
-          {
-            WU_LateBindingTest sample;
-            char tmp[7];
-            ACE_OS::sprintf (tmp, "KEY_%d", key);
-            sample.key = CORBA::string_dup(tmp);
-            sample.iteration = 0;
-            updater->create_one (sample);
-
-            for (::CORBA::UShort iter = this->iterations_ + 1;
-                 iter < (2 * this->iterations_) + 1;
-                 ++iter)
-              {
-                sample.iteration = iter;
-                updater->update_one (sample, ::DDS::HANDLE_NIL);
-                ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_state_test - "
-                            "Sample updated : key <%C> - iteration <%d>\n",
-                            tmp, iter));
-                ACE_Time_Value tv (0, 50000);
-                ACE_OS::sleep (tv);
-              }
-          }
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_state_test - "
-                    "ERROR: Unexpected and unknown exception caught.\n"));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::WU_LateBinding::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-     this->test_exception ();
-     if (this->reactor ()->schedule_timer (
-                 this->to_handler_,
-                 reinterpret_cast<const void *> (0),
-                 ACE_Time_Value (5, 0)) == -1)
-       {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                               ACE_TEXT ("Error scheduling timer")));
-       }
-     if (this->reactor ()->schedule_timer (
-                 this->to_handler_,
-                 reinterpret_cast<const void *> (1),
-                 ACE_Time_Value (10, 0)) == -1)
-       {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                               ACE_TEXT ("Error scheduling timer")));
-       }
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_WU_LateBinding_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/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h
deleted file mode 100644
index 769eaa04ea9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h
+++ /dev/null
@@ -1,137 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_WU_LATEBINDING_SENDER_EXEC_YSJ9S8_H_
-#define CIAO_WU_LATEBINDING_SENDER_EXEC_YSJ9S8_H_
-
-#include /**/ "ace/pre.h"
-
-#include "WU_LateBinding_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_WU_LateBinding_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * Timeout_Handler
-   */
-  class Timeout_Handler :
-    public ACE_Event_Handler
-  {
-  public:
-    Timeout_Handler (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 &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void set_topic_name_writer (void);
-    void set_topic_name_updater (void);
-    void start_event_test (void);
-    void start_state_test (void);
-    //@}
-
-  private:
-    ::WU_LateBinding::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Timeout_Handler *to_handler_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void
-    test_exception (void);
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_WU_LateBinding_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/descriptors/Plan.cdp
deleted file mode 100644
index ee83b8b148b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/descriptors/Plan.cdp
+++ /dev/null
@@ -1,512 +0,0 @@
-<!--  -->
-<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>LateBinding_Depl_1</label>
-  <UUID>LateBinding_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WU_LateBinding_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WU_LateBinding_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="LateBinding_EventConnectorImplementation">
-    <name>LateBinding_EventConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="LateBinding_Connector_ExecArtifact" />
-    <artifact xmi:idref="LateBinding_Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WU_LateBinding_WU_LateBindingTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WU_LateBinding_WU_LateBindingTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>WU_LateBinding_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>WU_LateBinding_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="LateBinding_StateConnectorImplementation">
-    <name>LateBinding_StateConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="LateBinding_Connector_ExecArtifact" />
-    <artifact xmi:idref="LateBinding_Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WU_LateBinding_WU_LateBindingTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WU_LateBinding_WU_LateBindingTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>WU_LateBinding_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>WU_LateBinding_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>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WU_LateBinding_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WU_LateBinding_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>
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="LateBinding_SenderEventConnectorInstance">
-    <name>LateBinding_SenderEventConnectorInstance</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="LateBinding_EventConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string></string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="LateBinding_SenderStateConnectorInstance">
-    <name>LateBinding_SenderStateConnectorInstance</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="LateBinding_StateConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string></string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="LateBinding_ReceiverEventConnectorInstance">
-    <name>LateBinding_ReceiverEventConnectorInstance</name>
-    <node>ReceiverNode</node>
-    <source/>
-    <implementation xmi:idref="LateBinding_EventConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LateBindingTopic</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="LateBinding_ReceiverStateConnectorInstance">
-    <name>LateBinding_ReceiverStateConnectorInstance</name>
-    <node>ReceiverNode</node>
-    <source/>
-    <implementation xmi:idref="LateBinding_StateConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LateBindingTopic</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>15</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>event_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_event_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="LateBinding_ReceiverEventConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>event_datacontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_event_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="LateBinding_ReceiverEventConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>state_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_state_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="LateBinding_ReceiverStateConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>state_datacontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_state_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="LateBinding_ReceiverStateConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="LateBinding_SenderEventConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>updater_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="LateBinding_SenderStateConnectorInstance" />
-    </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="LateBinding_Connector_ExecArtifact">
-    <name>WU_LateBinding_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>WU_LateBindingConnector_exec</location>
-  </artifact>
-  <artifact xmi:id="LateBinding_Connector_SvntArtifact">
-    <name>WU_LateBinding_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>WU_LateBindingConnector_svnt</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/LateBinding/UpdateWrite/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/descriptors/run_test.pl
deleted file mode 100755
index d8b4eca445d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/.gitignore
deleted file mode 100644
index f7983c1daad..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/LMBM_Test_Base.cxx
-/LMBM_Test_Base.h
-/LMBM_Test_BasePlugin.cxx
-/LMBM_Test_BasePlugin.h
-/LMBM_Test_BaseSupport.cxx
-/LMBM_Test_BaseSupport.h
-/LMBM_Test_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl
deleted file mode 100644
index 6bf85749d83..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file LMBM_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef LISTEN_MANY_BY_MANY_TEST_BASE_IDL
-#define LISTEN_MANY_BY_MANY_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/LMBM_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/LMBM_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "ListenManyByManyTest"
-#pragma DCPS_DATA_KEY "ListenManyByManyTest key"
-
-struct ListenManyByManyTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<ListenManyByManyTest> ListenManyByManyTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc
deleted file mode 100644
index d1c40e1a642..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_LMBM_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_LMBM_Test_Base_stub
-  dynamicflags += LISTEN_MANY_BY_MANY_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=LISTEN_MANY_BY_MANY_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=LMBM_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    LMBM_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=LISTEN_MANY_BY_MANY_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    LMBM_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/.gitignore
deleted file mode 100644
index f2ddf77157f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/LMBM_Test_ConnectorE.idl
-/LMBM_Test_Connector_conn.cpp
-/LMBM_Test_Connector_conn.h
-/LMBM_Test_Connector_conn_export.h
-/LMBM_Test_Connector_lem_stub_export.h
-/LMBM_Test_Connector_stub_export.h
-/LMBM_Test_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl
deleted file mode 100644
index e0a84abc65d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file LMBM_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef LISTEN_MANY_BY_MANY_TEST_CONNECTOR_IDL_
-#define LISTEN_MANY_BY_MANY_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/LMBM_Test_Base.idl"
-
-#pragma ciao lem "Connector/LMBM_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/LMBM_Test_BaseTypeSupport.idl"
-#endif
-
-module LMBM_Test
-{
-  module ::CCM_DDS::Typed
-    < ::ListenManyByManyTest, ::ListenManyByManyTestSeq>
-    ListenManyByManyTestConnector;
-};
-
-#endif /* LMBM_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
deleted file mode 100644
index e7d1335755f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_LMBM_Test_Base -l .. -o ../lib -u DDS LMBM_Test_Connector"
-
-project(DDS_LMBM_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_LMBM_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=LISTEN_MANY_BY_MANY_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=LMBM_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=LISTEN_MANY_BY_MANY_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=LMBM_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=LISTEN_MANY_BY_MANY_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=LMBM_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=LISTEN_MANY_BY_MANY_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=LMBM_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    LMBM_Test_Connector.idl
-  }
-}
-
-project(DDS_LMBM_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_LMBM_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=LISTEN_MANY_BY_MANY_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=LMBM_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    LMBM_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_LMBM_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_LMBM_Test_Connector_lem_gen DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Base_stub
-  libs  += DDS_LMBM_Test_Base_stub DDS_LMBM_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_LMBM_Test_Connector_lem_stub
-  dynamicflags += LISTEN_MANY_BY_MANY_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LMBM_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    LMBM_Test_ConnectorEC.h
-    LMBM_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    LMBM_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_LMBM_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_LMBM_Test_Connector_idl_gen DDS_LMBM_Test_Base_stub
-  libs  += DDS_LMBM_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_LMBM_Test_Connector_stub
-  dynamicflags += LISTEN_MANY_BY_MANY_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LMBM_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    LMBM_Test_ConnectorC.h
-    LMBM_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    LMBM_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_LMBM_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Base_stub
-  sharedname = DDS_LMBM_Test_Connector_exec
-  libs += DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Base_stub DDS_LMBM_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += LISTEN_MANY_BY_MANY_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LMBM_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    LMBM_Test_Connector_conn.h
-    LMBM_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_LMBM_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Connector_exec DDS_LMBM_Test_Connector_stub
-  sharedname  = DDS_LMBM_Test_Connector_svnt
-  libs       += DDS_LMBM_Test_Connector_stub \
-                DDS_LMBM_Test_Connector_lem_stub  \
-                DDS_LMBM_Test_Base_stub \
-                DDS_LMBM_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += LISTEN_MANY_BY_MANY_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LMBM_Test_ConnectorS.cpp
-    LMBM_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    LMBM_Test_ConnectorS.h
-    LMBM_Test_Connector_svnt.h
-    LMBM_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/README b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/README
deleted file mode 100644
index ee5fd301c5e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/README
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-This test tests the listener.
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/.gitignore
deleted file mode 100644
index 5ee54e35bee..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/LMBM_Test_ReceiverE.idl
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl
deleted file mode 100644
index 9e3766eaf6d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/LMBM_Test_Connector.idl"
-
-module LMBM_Test
-{
-  component Receiver
-  {
-    port ListenManyByManyTestConnector::DDS_Listen info_listen;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc
deleted file mode 100644
index 2755f25ef87..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(DDS_LMBM_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_LMBM_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 {
-    LMBM_Test_Receiver.idl
-  }
-}
-
-project(DDS_LMBM_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_LMBM_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 {
-    LMBM_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_LMBM_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_LMBM_Test_Receiver_lem_gen DDS_LMBM_Test_Receiver_stub  \
-           DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Base_stub
-  libs  +=  Receiver_stub DDS_LMBM_Test_Connector_stub \
-            DDS_LMBM_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LMBM_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    LMBM_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    LMBM_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_LMBM_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_LMBM_Test_Receiver_idl_gen  DDS_LMBM_Test_Connector_stub \
-           DDS_LMBM_Test_Base_stub DDS_LMBM_Test_Connector_lem_gen
-  libs  += DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LMBM_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    LMBM_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    LMBM_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_LMBM_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_LMBM_Test_Receiver_lem_stub DDS_LMBM_Test_Receiver_stub \
-             DDS_LMBM_Test_Base_stub DDS_LMBM_Test_Connector_stub \
-             DDS_LMBM_Test_Connector_lem_stub 
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_LMBM_Test_Base_stub \
-          DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LMBM_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    LMBM_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_LMBM_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_LMBM_Test_Receiver_lem_stub DDS_LMBM_Test_Base_stub \
-                  DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Connector_svnt \
-                  DDS_LMBM_Test_Receiver_exec DDS_LMBM_Test_Connector_lem_stub 
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_LMBM_Test_Base_stub \
-                DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Connector_svnt \
-                Receiver_exec DDS_LMBM_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LMBM_Test_ReceiverS.cpp
-    LMBM_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    LMBM_Test_ReceiverS.h
-    LMBM_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp
deleted file mode 100644
index 5d44bb9e6e7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,259 +0,0 @@
-// -*- C++ -*-
-#include "LMBM_Test_Receiver_exec.h"
-#include "ace/Log_Msg.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_LMBM_Test_Receiver_Impl
-{
-  //============================================================
-  // ListenManyByManyTest_Listener_exec_i
-  //============================================================
-  ListenManyByManyTest_Listener_exec_i::ListenManyByManyTest_Listener_exec_i (
-    ::LMBM_Test::CCM_Receiver_Context_ptr context,
-    Atomic_ULong &received_one_by_one,
-    Atomic_ULong &received_many_by_many,
-    Atomic_ULong &samples_read)
-    : context_ (::LMBM_Test::CCM_Receiver_Context::_duplicate (context)),
-      received_one_by_one_ (received_one_by_one),
-      received_many_by_many_ (received_many_by_many),
-      samples_read_ (samples_read)
-  {
-  }
-
-  ListenManyByManyTest_Listener_exec_i::~ListenManyByManyTest_Listener_exec_i (void)
-  {
-  }
-
-  void
-  ListenManyByManyTest_Listener_exec_i::on_one_data (
-                                  const ListenManyByManyTest & /*an_instance*/,
-                                  const ::CCM_DDS::ReadInfo & /*info*/)
-  {
-    // Just count; this value is checked on ccm_remove.
-    ++this->received_one_by_one_;
-  }
-
-  void
-  ListenManyByManyTest_Listener_exec_i::on_many_data (
-                                  const ListenManyByManyTestSeq & an_instance,
-                                  const ::CCM_DDS::ReadInfoSeq & info)
-  {
-    if (an_instance.length () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ListenManyByManyTest_Listener_exec_i::on_many_data: "
-                              "instance sequence length is nil\n"));
-        return;
-      }
-    for (CORBA::ULong i = 0 ; i < info.length(); ++i)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ListenManyByManyTest_Listener_exec_i::on_many_data: "
-                               "key <%C> - iteration <%d>\n",
-                               an_instance[i].key.in (),
-                               an_instance[i].iteration));
-        if (info[i].instance_handle == ::DDS::HANDLE_NIL)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: ListenManyByManyTest_Listener_exec_i::on_many_data: "
-                                "instance handle %d seems to be nil"
-                                "key <%C> - iteration <%d>\n",
-                                 i,
-                                 an_instance[i].key.in (),
-                                 an_instance[i].iteration));
-          }
-        if (info[i].source_timestamp.sec == 0 &&
-            info[i].source_timestamp.nanosec == 0)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: ListenManyByManyTest_Listener_exec_i::on_many_data: "
-                                "source timestamp seems to be invalid (nil) "
-                                "key <%C> - iteration <%d>\n",
-                                an_instance[i].key.in (),
-                                an_instance[i].iteration));
-          }
-      }
-    this->received_many_by_many_ += an_instance.length ();
-    try
-      {
-        ::LMBM_Test::ListenManyByManyTestConnector::Reader_var reader =
-          this->context_->get_connection_info_listen_data ();
-        if (::CORBA::is_nil (reader.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ListenManyByManyTest_Listener_exec_i::on_many_data - "
-                      "ERROR: Reader seems nil\n"));
-          }
-        ::ListenManyByManyTestSeq seq;
-        ::CCM_DDS::ReadInfoSeq infos;
-        reader->read_all (seq, infos);
-        this->samples_read_ += seq.length ();
-
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ListenManyByManyTest_Listener_exec_i::on_many_data - ")
-                              ACE_TEXT ("Read <%u> samples\n"),
-                              seq.length ()));
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                     ACE_TEXT ("when using reader->read_all: index <%d> - retval <%d>\n"),
-                     ex.index, ex.error_code));
-      }
-  }
-
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  Receiver_exec_i::Receiver_exec_i (void)
-    : received_one_by_one_ (0),
-      received_many_by_many_ (0),
-      samples_read_ (0),
-      iterations_ (10),
-      keys_ (5)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::start ()
-  {
-    ::CCM_DDS::DataListenerControl_var dlc =
-        this->context_->get_connection_info_listen_data_control ();
-    dlc->mode (::CCM_DDS::MANY_BY_MANY);
-  }
-
-  ::LMBM_Test::ListenManyByManyTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_listen_data_listener (void)
-  {
-    return new ListenManyByManyTest_Listener_exec_i (
-      this->context_.in (),
-      this->received_one_by_one_,
-      this->received_many_by_many_,
-      this->samples_read_);
-  }
-
-  ::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::CCM_DDS::CCM_ConnectorStatusListener::_nil ();
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Receiver_exec_i::keys (::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::LMBM_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)
-  {
-    start ();
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    CORBA::ULong const expected = this->keys_ * this->iterations_;
-    if (this->received_many_by_many_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: MANY_BY_MANY: "
-                               "Didn't receive samples on many_by_many "
-                               "callback while mode is MANY_BY_MANY "
-                               "expected <%u> - received <%u>\n",
-                               expected,
-                               this->received_many_by_many_.value ()));
-      }
-    else if (expected != this->received_many_by_many_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: MANY_BY_MANY: "
-                               "Didn't receive the expected "
-                               "number of samples on many_by_many "
-                               "callback while mode is MANY_BY_MANY "
-                               "expected <%u> - received <%u>\n",
-                               expected,
-                               this->received_many_by_many_.value ()));
-      }
-    if (this->received_one_by_one_.value () > 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: MANY_BY_MANY: "
-                               "Received samples on one_by_one "
-                               "callback while mode is MANY_BY_MANY "
-                               "expected <0> - received <%u>\n",
-                               this->received_one_by_one_.value ()));
-      }
-    if (this->received_one_by_one_.value () == 0   &&
-        this->received_many_by_many_.value () > 0)
-      {
-        ACE_DEBUG ((LM_DEBUG, "MANY_BY_MANY: "
-                                "Received only data on "
-                                "many_by_many callback. "
-                                "Test passed!\n"));
-      }
-    if (this->samples_read_.value () == 0)
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: read no samples\n")));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: read <%u> samples\n"),
-                this->samples_read_.value ()));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_LMBM_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/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h
deleted file mode 100644
index 5ed192bd716..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_RECEIVER_EXEC_H_
-#define CIAO_RECEIVER_EXEC_H_
-
-#include "LMBM_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"
-
-namespace CIAO_LMBM_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;
-
-  //============================================================
-  // ListenManyByManyTest_Listener_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export ListenManyByManyTest_Listener_exec_i
-    : public virtual ::LMBM_Test::ListenManyByManyTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ListenManyByManyTest_Listener_exec_i (
-      ::LMBM_Test::CCM_Receiver_Context_ptr context,
-      Atomic_ULong &received_one_by_one,
-      Atomic_ULong &received_many_by_many,
-      Atomic_ULong &samples_read_);
-    virtual ~ListenManyByManyTest_Listener_exec_i (void);
-
-    virtual void
-    on_one_data (
-      const ListenManyByManyTest & an_instance,
-      const ::CCM_DDS::ReadInfo & info);
-    virtual void
-    on_many_data (
-      const ListenManyByManyTestSeq & an_instance,
-      const ::CCM_DDS::ReadInfoSeq & info);
-  private:
-    ::LMBM_Test::CCM_Receiver_Context_var context_;
-    Atomic_ULong &received_one_by_one_;
-    Atomic_ULong &received_many_by_many_;
-    Atomic_ULong &samples_read_;
-  };
-
-  //============================================================
-  // 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);
-
-    void start ();
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::LMBM_Test::ListenManyByManyTestConnector::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);
-
-    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:
-    ::LMBM_Test::CCM_Receiver_Context_var context_;
-
-    Atomic_ULong received_one_by_one_;
-    Atomic_ULong received_many_by_many_;
-    Atomic_ULong samples_read_;
-
-    CORBA::UShort iterations_;
-    CORBA::UShort keys_;
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_LMBM_Test_Receiver_Impl (void);
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/.gitignore
deleted file mode 100644
index 67fbbeecce3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/LMBM_Test_SenderE.idl
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl
deleted file mode 100644
index 212523aedbd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_LISTEN_MANY_BY_MANY_TEST_SENDER_IDL
-#define DDS_LISTEN_MANY_BY_MANY_TEST_SENDER_IDL
-
-#include "Connector/LMBM_Test_Connector.idl"
-
-module LMBM_Test
-{
-  component Sender
-  {
-    port ListenManyByManyTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener info_write_connector_status;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc
deleted file mode 100644
index 38d973b980a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_LMBM_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_LMBM_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_LMBM_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 {
-    LMBM_Test_Sender.idl
-  }
-}
-
-project(DDS_LMBM_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_LMBM_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 {
-    LMBM_Test_SenderE.idl
-  }
-}
-
-project(DDS_LMBM_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_LMBM_Test_Sender_lem_gen DDS_LMBM_Test_Sender_stub \
-           DDS_LMBM_Test_Base_stub
-  libs  += DDS_LMBM_Test_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LMBM_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    LMBM_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    LMBM_Test_SenderEC.inl
-  }
-}
-
-project(DDS_LMBM_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_LMBM_Test_Sender_idl_gen DDS_LMBM_Test_Base_stub \
-           DDS_LMBM_Test_Connector_stub
-  libs  += DDS_LMBM_Test_Base_stub DDS_LMBM_Test_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LMBM_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    LMBM_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    LMBM_Test_SenderC.inl
-  }
-}
-
-project(DDS_LMBM_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_LMBM_Test_Sender_lem_stub DDS_LMBM_Test_Sender_stub \
-             DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Connector_stub 
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub DDS_LMBM_Test_Base_stub \
-             DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Connector_stub 
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LMBM_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    LMBM_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_LMBM_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_LMBM_Test_Base_stub  DDS_LMBM_Test_Sender_lem_stub \
-                DDS_LMBM_Test_Connector_stub \
-                DDS_LMBM_Test_Connector_svnt DDS_LMBM_Test_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub DDS_LMBM_Test_Base_stub \
-                DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Connector_svnt \
-                DDS_LMBM_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LMBM_Test_SenderS.cpp
-    LMBM_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    LMBM_Test_SenderS.h
-    LMBM_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp
deleted file mode 100644
index 7651884518b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,317 +0,0 @@
-// -*- C++ -*-
-#include "LMBM_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "ace/Guard_T.h"
-#include "ace/Log_Msg.h"
-#include "ace/Date_Time.h"
-
-namespace CIAO_LMBM_Test_Sender_Impl
-{
-  //============================================================
-  // WriteTicker
-  //============================================================
-  WriteTicker::WriteTicker (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteTicker::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.write_one ();
-    return 0;
-  }
-
-  //============================================================
-  // WriteManyHandler
-  //============================================================
-  WriteManyHandler::WriteManyHandler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteManyHandler::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.write_one ();
-    return 0;
-  }
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  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 /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  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_.get_started ();
-      }
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (5)
-    , iterations_ (10)
-    , started_ (false)
-  {
-    this->ticker_ = new WriteTicker (*this);
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  void
-  Sender_exec_i::write_one (void)
-  {
-    ::LMBM_Test::ListenManyByManyTestConnector::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-    if (this->last_key_ != this->samples_.end ())
-      {
-        try
-          {
-            ++this->last_key_->second->iteration;
-            writer->write_one (this->last_key_->second, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, "Written key <%C> - <%u>\n",
-                          this->last_key_->first.c_str (),
-                          this->last_key_->second->iteration));
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                        ACE_TEXT ("while updating writer info for <%C>.\n"),
-                          this->last_key_->first.c_str ()));
-          }
-        ++this->last_key_;
-      }
-    else
-      {
-        // Onto the next iteration
-        this->last_key_ = this->samples_.begin ();
-        while (this->last_key_ != this->samples_.end ())
-          {
-            if (this->last_key_->second->iteration == this->iterations_)
-              {
-                // Next key
-                ++this->last_key_;
-              }
-            else
-              {
-                break;
-              }
-          }
-        if (this->last_key_ == this->samples_.end ())
-          {
-            this->reactor ()->cancel_timer (this->ticker_);
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    this->started_ = true;
-    try
-      {
-        this->start ();
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::get_started: Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::get_started: Unknown exception caught\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        ListenManyByManyTest *new_key = new ListenManyByManyTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->iteration = 0;
-
-        this->samples_[key] = new_key;
-      }
-   this->last_key_ = this->samples_.begin ();
-   if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (5, 50000),
-                ACE_Time_Value (0, 50000)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  // Component attributes and port operations.
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_info_write_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (*this);
-  }
-
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::LMBM_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    if (!this->started_)
-      {
-        ACE_ERROR ((LM_ERROR,
-          "Sender_exec_i::ccm_passivate - "
-          "ERROR: No publication matched received. "
-          "Test didn't run\n"));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_LMBM_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/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h
deleted file mode 100644
index 83efbc805d0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h
+++ /dev/null
@@ -1,164 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_LMBM_TEST_SENDER_EXEC_HRZ3NN_H_
-#define CIAO_LMBM_TEST_SENDER_EXEC_HRZ3NN_H_
-
-#include /**/ "ace/pre.h"
-
-#include "LMBM_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_LMBM_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  //============================================================
-  // WriteTicker
-  //============================================================
-  class WriteTicker :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteTicker (Sender_exec_i &callback);
-    int handle_timeout (const ACE_Time_Value &, const void *);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  //============================================================
-  // WriteManyHandler
-  //============================================================
-  class WriteManyHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteManyHandler (Sender_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_info_write_connector_status(void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void get_started (void);
-    void write_one (void);
-    //@}
-
-  private:
-    ::LMBM_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes and port operations. */
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-
-    bool started_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    WriteTicker *ticker_;
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, ListenManyByManyTest_var> Writer_Table;
-    Writer_Table samples_;
-    Writer_Table::iterator last_key_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start (void);
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_LMBM_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/ListenManyByMany_Library.xml b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/ListenManyByMany_Library.xml
deleted file mode 100644
index 7dc9f195e6c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/ListenManyByMany_Library.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="ListenManyByManyProfile">
-    <!-- QoS used to configure the data writer created in the example code -->
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp
deleted file mode 100644
index e01b4fb8d8c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp
+++ /dev/null
@@ -1,434 +0,0 @@
-<!--  -->
-<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>LMBM_Test_Depl_1</label>
-  <UUID>LMBM_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_LMBM_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_LMBM_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="LMBM_Test_ConnectorComponentImplementation">
-    <name>LMBM_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="LMBM_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="LMBM_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_LMBM_Test_ListenManyByManyTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LMBM_Test_ListenManyByManyTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LMBM_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LMBM_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_LMBM_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_LMBM_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" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="LMBM_Test_ConnectorComponentInstance">
-    <name>LMBM_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="LMBM_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ListenManyByMany_Library#ListenManyByManyProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LMBM_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="LMBM_Test_ConnectorComponentInstance2">
-    <name>LMBM_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="LMBM_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ListenManyByMany_Library#ListenManyByManyProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LMBM_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_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="LMBM_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="LMBM_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="LMBM_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="LMBM_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_write_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="LMBM_Test_ConnectorComponentInstance" />
-    </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="LMBM_Test_Connector_ExecArtifact">
-    <name>LMBM_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_LMBM_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="LMBM_Test_Connector_SvntArtifact">
-    <name>LMBM_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_LMBM_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="LMBM_Test_Connector_StubArtifact">
-    <name>LMBM_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_LMBM_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/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 556d5caa0a6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="ListenManyByMany_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="ListenManyByManyProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl
deleted file mode 100755
index d8b4eca445d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/.gitignore
deleted file mode 100644
index 114e9b43a72..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/LNE_Test_Base.cxx
-/LNE_Test_Base.h
-/LNE_Test_BasePlugin.cxx
-/LNE_Test_BasePlugin.h
-/LNE_Test_BaseSupport.cxx
-/LNE_Test_BaseSupport.h
-/LNE_Test_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl
deleted file mode 100644
index 5a602952dfc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @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
-
-#pragma ndds typesupport "Base/LNE_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/LNE_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "ListenNotEnabledTest"
-#pragma DCPS_DATA_KEY "ListenNotEnabledTest key"
-
-struct ListenNotEnabledTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<ListenNotEnabledTest> ListenNotEnabledTestSeq;
-#endif
-
-#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
deleted file mode 100644
index b5df76f5087..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_LNE_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_LNE_Test_Base_stub
-  dynamicflags += LISTEN_NOT_ENABLED_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=LISTEN_NOT_ENABLED_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=LNE_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    LNE_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=LISTEN_NOT_ENABLED_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    LNE_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/.gitignore
deleted file mode 100644
index f6572cdd875..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/LNE_Test_ConnectorE.idl
-/LNE_Test_Connector_conn.cpp
-/LNE_Test_Connector_conn.h
-/LNE_Test_Connector_conn_export.h
-/LNE_Test_Connector_lem_stub_export.h
-/LNE_Test_Connector_stub_export.h
-/LNE_Test_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl
deleted file mode 100644
index 6a2a85a04eb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file LNE_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef LISTEN_NOT_ENABLED_TEST_CONNECTOR_IDL_
-#define LISTEN_NOT_ENABLED_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/LNE_Test_Base.idl"
-
-#pragma ciao lem "Connector/LNE_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/LNE_Test_BaseTypeSupport.idl"
-#endif
-
-module LNE_Test
-{
-  module ::CCM_DDS::Typed < ::ListenNotEnabledTest, ::ListenNotEnabledTestSeq> ListenNotEnabledTestConnector;
-};
-
-#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
deleted file mode 100644
index f22272b8265..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// 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, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_LNE_Test_Base_stub
-  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,conn_export_macro=LISTEN_NOT_ENABLED_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=LNE_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    LNE_Test_Connector.idl
-  }
-}
-
-project(DDS_LNE_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  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 ..
-
-  IDL_Files {
-    LNE_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_LNE_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_LNE_Test_Connector_lem_gen DDS_LNE_Test_Connector_stub DDS_LNE_Test_Base_stub
-  libs  += DDS_LNE_Test_Base_stub DDS_LNE_Test_Connector_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_impl {
-  after   += DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_stub DDS_LNE_Test_Base_stub
-  sharedname = DDS_LNE_Test_Connector_exec
-  libs += DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Base_stub DDS_LNE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += LISTEN_NOT_ENABLED_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LNE_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    LNE_Test_Connector_conn.h
-    LNE_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_LNE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_exec DDS_LNE_Test_Connector_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
-  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 {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/README b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/README
deleted file mode 100644
index ee5fd301c5e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/README
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-This test tests the listener.
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/.gitignore
deleted file mode 100644
index 7b8c7f24fa3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/LNE_Test_ReceiverE.idl
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl
deleted file mode 100644
index 007ec0ba135..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/LNE_Test_Connector.idl"
-
-module LNE_Test
-{
-  component Receiver
-  {
-    port ListenNotEnabledTestConnector::DDS_Listen info_listen;
-  };
-};
-
-#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
deleted file mode 100644
index 1e0ddcdb130..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-project(DDS_LNE_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  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, dds4ccm {
-  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_lem_stub {
-  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
-  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
-  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_lem_stub, dds4ccm_skel {
-  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
-  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
-  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 {
-  }
-}
-
-
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
deleted file mode 100644
index d03b5ce15ce..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,234 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "LNE_Test_Receiver_exec.h"
-
-namespace CIAO_LNE_Test_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_listen_data_listener_exec_i
-   */
-
-  info_listen_data_listener_exec_i::info_listen_data_listener_exec_i (
-        ::LNE_Test::CCM_Receiver_Context_ptr ctx,
-        Atomic_ULong &received_one_by_one,
-        Atomic_ULong &received_many_by_many)
-    : ciao_context_ (
-        ::LNE_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , received_one_by_one_ (received_one_by_one)
-      , received_many_by_many_ (received_many_by_many)
-  {
-  }
-
-  info_listen_data_listener_exec_i::~info_listen_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::LNE_Test::ListenNotEnabledTestConnector::Listener
-
-  void
-  info_listen_data_listener_exec_i::on_one_data (const ::ListenNotEnabledTest & /* datum */,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    // Just count; this value is checked on ccm_remove.
-    ++this->received_one_by_one_;
-  }
-
-  void
-  info_listen_data_listener_exec_i::on_many_data (const ::ListenNotEnabledTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    // Just count; this value is checked on ccm_remove.
-    ++this->received_many_by_many_;
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_listen_status_exec_i
-   */
-
-  info_listen_status_exec_i::info_listen_status_exec_i (
-        ::LNE_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::LNE_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_listen_status_exec_i::~info_listen_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_listen_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_listen_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : received_one_by_one_ (0)
-      , received_many_by_many_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::LNE_Test::ListenNotEnabledTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_listen_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_listen_data_listener_.in ()))
-      {
-        info_listen_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_listen_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->received_one_by_one_,
-            this->received_many_by_many_),
-            ::LNE_Test::ListenNotEnabledTestConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_listen_data_listener_ = tmp;
-      }
-
-    return
-      ::LNE_Test::ListenNotEnabledTestConnector::CCM_Listener::_duplicate (
-        this->ciao_info_listen_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_listen_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_listen_status_.in ()))
-      {
-        info_listen_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_listen_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_listen_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_listen_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::LNE_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::DataListenerControl_var dlc =
-        this->ciao_context_->get_connection_info_listen_data_control ();
-    dlc->mode (::CCM_DDS::NOT_ENABLED);
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->received_one_by_one_.value () > 0)
-      {
-        ACE_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)
-      {
-        ACE_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->received_one_by_one_.value () == 0   &&
-        this->received_many_by_many_.value () == 0)
-      {
-        ACE_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
deleted file mode 100644
index 18929491328..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h
+++ /dev/null
@@ -1,174 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_LNE_TEST_RECEIVER_EXEC_KLQOYU_H_
-#define CIAO_LNE_TEST_RECEIVER_EXEC_KLQOYU_H_
-
-#include /**/ "ace/pre.h"
-
-#include "LNE_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_LNE_Test_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong> Atomic_ULong;
-
-  /**
-   * Provider Executor Implementation Class: info_listen_data_listener_exec_i
-   */
-
-  class info_listen_data_listener_exec_i
-    : public virtual ::LNE_Test::ListenNotEnabledTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_listen_data_listener_exec_i (
-      ::LNE_Test::CCM_Receiver_Context_ptr ctx,
-      Atomic_ULong &received_one_by_one,
-      Atomic_ULong &received_many_by_many);
-    virtual ~info_listen_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from LNE_Test::ListenNotEnabledTestConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::ListenNotEnabledTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::ListenNotEnabledTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::LNE_Test::CCM_Receiver_Context_var ciao_context_;
-    Atomic_ULong &received_one_by_one_;
-    Atomic_ULong &received_many_by_many_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_listen_status_exec_i
-   */
-
-  class info_listen_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_listen_status_exec_i (
-      ::LNE_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_listen_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::LNE_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::LNE_Test::ListenNotEnabledTestConnector::CCM_Listener_ptr
-    get_info_listen_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_listen_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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-
-    //@}
-
-  private:
-    ::LNE_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::LNE_Test::ListenNotEnabledTestConnector::CCM_Listener_var ciao_info_listen_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_listen_status_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Atomic_ULong received_one_by_one_;
-    Atomic_ULong received_many_by_many_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_LNE_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/.gitignore
deleted file mode 100644
index 0b9e96eacf9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/LNE_Test_SenderE.idl
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl
deleted file mode 100644
index 0c09fb7fdde..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_LISTEN_NOT_ENABLED_TEST_SENDER_IDL
-#define DDS_LISTEN_NOT_ENABLED_TEST_SENDER_IDL
-
-#include "Connector/LNE_Test_Connector.idl"
-
-module LNE_Test
-{
-  component Sender
-  {
-    port ListenNotEnabledTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    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
deleted file mode 100644
index 0511fba5491..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// 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, dds4ccm {
-  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, dds4ccm {
-  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_lem_stub {
-  after   += DDS_LNE_Test_Sender_lem_stub DDS_LNE_Test_Sender_stub \
-             DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_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
-  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_lem_stub, dds4ccm_skel {
-  after      += DDS_LNE_Test_Base_stub  DDS_LNE_Test_Sender_lem_stub \
-                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 \
-                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 {
-  }
-}
-
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
deleted file mode 100644
index 1d2bf03e4fd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,293 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "LNE_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_LNE_Test_Sender_Impl
-{
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  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 /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.get_started ();
-      }
-  }
-
-  /**
-   * WriteHandler
-   */
-
-  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)
-    : keys_ (5)
-      , iterations_ (10)
-  {
-    ACE_NEW_THROW_EX (this->rh_,
-                      WriteManyHandler (*this),
-                      ::CORBA::NO_MEMORY ());
-
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->rh_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  void
-  Sender_exec_i::write_many (void)
-  {
-    ListenNotEnabledTestSeq 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;
-          }
-      }
-
-    ::LNE_Test::ListenNotEnabledTestConnector::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-
-    try
-      {
-        ACE_Time_Value tv (1, 0);
-        ACE_OS::sleep (tv);
-        writer->write_many (write_many);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("write_many : written <%u> samples\n"),
-              write_many.length ()));
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_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::get_started (void)
-  {
-    try
-      {
-        this->start ();
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Unknown exception caught\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    this->reactor ()->notify (this->rh_);
-  }
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::LNE_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  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
deleted file mode 100644
index c734f167b6f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h
+++ /dev/null
@@ -1,168 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_LNE_TEST_SENDER_EXEC_QXP6HQ_H_
-#define CIAO_LNE_TEST_SENDER_EXEC_QXP6HQ_H_
-
-#include /**/ "ace/pre.h"
-
-#include "LNE_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_LNE_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * WriteHandler
-   */
-
-  class WriteManyHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteManyHandler (Sender_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void get_started (void);
-    void write_many (void);
-
-    //@}
-
-  private:
-    ::LNE_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    WriteManyHandler *rh_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start (void);
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_LNE_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/Plan.cdp
deleted file mode 100644
index 4a83501042c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/Plan.cdp
+++ /dev/null
@@ -1,371 +0,0 @@
-<!--  -->
-<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>LNE_Test_Depl_1</label>
-  <UUID>LNE_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_LNE_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_LNE_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="LNE_Test_ConnectorComponentImplementation">
-    <name>LNE_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <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>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LNE_Test_ListenNotEnabledTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LNE_Test_ListenNotEnabledTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LNE_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LNE_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_LNE_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_LNE_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="LNE_Test_ConnectorComponentInstance">
-    <name>LNE_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="LNE_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LNE_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="LNE_Test_ConnectorComponentInstance2">
-    <name>LNE_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="LNE_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LNE_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_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="LNE_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="LNE_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="LNE_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="LNE_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </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="LNE_Test_Connector_ExecArtifact">
-    <name>LNE_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_LNE_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="LNE_Test_Connector_SvntArtifact">
-    <name>LNE_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_LNE_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="LNE_Test_Connector_StubArtifact">
-    <name>LNE_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_LNE_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/ListenNotEnabled/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl
deleted file mode 100755
index c6321471979..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 10 seconds to allow task to complete\n";
-sleep (10);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/.gitignore
deleted file mode 100644
index e34f295b1bb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/LOBO_Test_Base.cxx
-/LOBO_Test_Base.h
-/LOBO_Test_BasePlugin.cxx
-/LOBO_Test_BasePlugin.h
-/LOBO_Test_BaseSupport.cxx
-/LOBO_Test_BaseSupport.h
-/LOBO_Test_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl
deleted file mode 100644
index 565b7e98142..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file LOBO_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef LISTEN_ONE_BY_ONE_TEST_BASE_IDL
-#define LISTEN_ONE_BY_ONE_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/LOBO_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/LOBO_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "ListenOneByOneTest"
-#pragma DCPS_DATA_KEY "ListenOneByOneTest key"
-
-struct ListenOneByOneTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<ListenOneByOneTest> ListenOneByOneTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc
deleted file mode 100644
index 8b3b8acbf22..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_LOBO_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_LOBO_Test_Base_stub
-  dynamicflags += LISTEN_ONE_BY_ONE_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=LISTEN_ONE_BY_ONE_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=LOBO_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    LOBO_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=LISTEN_ONE_BY_ONE_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    LOBO_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/.gitignore
deleted file mode 100644
index 406ee55c6bd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/LOBO_Test_ConnectorE.idl
-/LOBO_Test_Connector_conn.cpp
-/LOBO_Test_Connector_conn.h
-/LOBO_Test_Connector_conn_export.h
-/LOBO_Test_Connector_lem_stub_export.h
-/LOBO_Test_Connector_stub_export.h
-/LOBO_Test_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl
deleted file mode 100644
index 9f1928117a3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file LOBO_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef LISTEN_ONE_BY_ONE_TEST_CONNECTOR_IDL_
-#define LISTEN_ONE_BY_ONE_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/LOBO_Test_Base.idl"
-
-#pragma ciao lem "Connector/LOBO_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/LOBO_Test_BaseTypeSupport.idl"
-#endif
-
-module LOBO_Test
-{
-  module ::CCM_DDS::Typed
-    < ::ListenOneByOneTest, ::ListenOneByOneTestSeq>
-    ListenOneByOneTestConnector;
-};
-
-#endif /* LOBO_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
deleted file mode 100644
index 0bc3d164d54..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_LOBO_Test_Base -l .. -o ../lib -u DDS LOBO_Test_Connector"
-
-project(DDS_LOBO_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_LOBO_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=LISTEN_ONE_BY_ONE_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=LOBO_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=LISTEN_ONE_BY_ONE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=LOBO_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=LISTEN_ONE_BY_ONE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=LOBO_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=LISTEN_ONE_BY_ONE_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=LOBO_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    LOBO_Test_Connector.idl
-  }
-}
-
-project(DDS_LOBO_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_LOBO_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=LISTEN_ONE_BY_ONE_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=LOBO_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    LOBO_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_LOBO_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_LOBO_Test_Connector_lem_gen DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Base_stub
-  libs  += DDS_LOBO_Test_Base_stub DDS_LOBO_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_LOBO_Test_Connector_lem_stub
-  dynamicflags += LISTEN_ONE_BY_ONE_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LOBO_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    LOBO_Test_ConnectorEC.h
-    LOBO_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    LOBO_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_LOBO_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_LOBO_Test_Connector_idl_gen DDS_LOBO_Test_Base_stub
-  libs  += DDS_LOBO_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_LOBO_Test_Connector_stub
-  dynamicflags += LISTEN_ONE_BY_ONE_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LOBO_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    LOBO_Test_ConnectorC.h
-    LOBO_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    LOBO_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_LOBO_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Base_stub
-  sharedname = DDS_LOBO_Test_Connector_exec
-  libs += DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Base_stub DDS_LOBO_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += LISTEN_ONE_BY_ONE_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LOBO_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    LOBO_Test_Connector_conn.h
-    LOBO_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_LOBO_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Connector_exec DDS_LOBO_Test_Connector_stub
-  sharedname  = DDS_LOBO_Test_Connector_svnt
-  libs       += DDS_LOBO_Test_Connector_stub \
-                DDS_LOBO_Test_Connector_lem_stub  \
-                DDS_LOBO_Test_Base_stub \
-                DDS_LOBO_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += LISTEN_ONE_BY_ONE_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LOBO_Test_ConnectorS.cpp
-    LOBO_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    LOBO_Test_ConnectorS.h
-    LOBO_Test_Connector_svnt.h
-    LOBO_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/README b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/README
deleted file mode 100644
index ee5fd301c5e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/README
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-This test tests the listener.
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/.gitignore
deleted file mode 100644
index 20dd17a46af..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/LOBO_Test_ReceiverE.idl
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl
deleted file mode 100644
index 2944d3b6c0c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/LOBO_Test_Connector.idl"
-
-module LOBO_Test
-{
-  component Receiver
-  {
-    port ListenOneByOneTestConnector::DDS_Listen info_listen;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc
deleted file mode 100644
index d1d0bb8fc63..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(DDS_LOBO_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_LOBO_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 {
-    LOBO_Test_Receiver.idl
-  }
-}
-
-project(DDS_LOBO_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_LOBO_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 {
-    LOBO_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_LOBO_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_LOBO_Test_Receiver_lem_gen DDS_LOBO_Test_Receiver_stub  \
-           DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Base_stub
-  libs  +=  Receiver_stub DDS_LOBO_Test_Connector_stub \
-            DDS_LOBO_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LOBO_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    LOBO_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    LOBO_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_LOBO_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_LOBO_Test_Receiver_idl_gen  DDS_LOBO_Test_Connector_stub \
-           DDS_LOBO_Test_Base_stub DDS_LOBO_Test_Connector_lem_gen
-  libs  += DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LOBO_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    LOBO_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    LOBO_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_LOBO_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_LOBO_Test_Receiver_lem_stub DDS_LOBO_Test_Receiver_stub \
-             DDS_LOBO_Test_Base_stub DDS_LOBO_Test_Connector_stub \
-             DDS_LOBO_Test_Connector_lem_stub 
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_LOBO_Test_Base_stub \
-          DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LOBO_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    LOBO_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_LOBO_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_LOBO_Test_Receiver_lem_stub DDS_LOBO_Test_Base_stub \
-                  DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Connector_svnt \
-                  DDS_LOBO_Test_Receiver_exec DDS_LOBO_Test_Connector_lem_stub 
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_LOBO_Test_Base_stub \
-                DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Connector_svnt \
-                Receiver_exec DDS_LOBO_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LOBO_Test_ReceiverS.cpp
-    LOBO_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    LOBO_Test_ReceiverS.h
-    LOBO_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp
deleted file mode 100644
index ac725d4923d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,266 +0,0 @@
-// -*- C++ -*-
-#include "LOBO_Test_Receiver_exec.h"
-#include "ace/Log_Msg.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_LOBO_Test_Receiver_Impl
-{
-  //============================================================
-  // ListenOneByOneTest_Listener_exec_i
-  //============================================================
-  ListenOneByOneTest_Listener_exec_i::ListenOneByOneTest_Listener_exec_i (
-                                              Atomic_ULong &received_one_by_one,
-                                              Atomic_ULong &received_many_by_many,
-                                              ACE_Thread_ID &thread_id)
-    : received_one_by_one_ (received_one_by_one),
-      received_many_by_many_ (received_many_by_many),
-      thread_id_ (thread_id)
-  {
-  }
-
-  ListenOneByOneTest_Listener_exec_i::~ListenOneByOneTest_Listener_exec_i (void)
-  {
-  }
-
-  void
-  ListenOneByOneTest_Listener_exec_i::on_one_data (
-                                  const ListenOneByOneTest & an_instance,
-                                  const ::CCM_DDS::ReadInfo & info)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_ = t_id;
-
-    ACE_DEBUG ((LM_DEBUG, "ListenOneByOneTest_Listener_exec_i::on_one_data: "
-                            "key <%C> - iteration <%d>\n",
-                            an_instance.key.in (),
-                            an_instance.iteration));
-    if (info.instance_handle == ::DDS::HANDLE_NIL)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ListenOneByOneTest_Listener_exec_i::on_one_data: "
-                            "instance handle seems to be nil "
-                            "key <%C> - iteration <%d>\n",
-                            an_instance.key.in (),
-                            an_instance.iteration));
-      }
-    if (info.source_timestamp.sec == 0 &&
-        info.source_timestamp.nanosec == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ListenOneByOneTest_Listener_exec_i::on_one_data: "
-                            "source timestamp seems to be nil (nil) "
-                            "key <%C> - iteration <%d>\n",
-                            an_instance.key.in (),
-                            an_instance.iteration));
-      }
-    ++this->received_one_by_one_;
-  }
-
-  void
-  ListenOneByOneTest_Listener_exec_i::on_many_data (
-                                  const ListenOneByOneTestSeq & an_instance,
-                                  const ::CCM_DDS::ReadInfoSeq & /*info*/)
-  {
-    // Just count. Is checked on ccm_remove.
-    this->received_many_by_many_ += an_instance.length ();
-  }
-
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  Receiver_exec_i::Receiver_exec_i (void)
-    : received_one_by_one_ (0),
-      received_many_by_many_ (0),
-      thread_id_listener_ (0, 0),
-      iterations_ (10),
-      keys_ (5)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::start ()
-  {
-    ::CCM_DDS::DataListenerControl_var dlc =
-        this->context_->get_connection_info_listen_data_control ();
-    dlc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  ::LOBO_Test::ListenOneByOneTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_listen_data_listener (void)
-  {
-    return new ListenOneByOneTest_Listener_exec_i (
-                this->received_one_by_one_,
-                this->received_many_by_many_,
-                this->thread_id_listener_);
-  }
-
-  ::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 ::CCM_DDS::CCM_ConnectorStatusListener::_nil ();
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Receiver_exec_i::keys (::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::LOBO_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)
-  {
-    start ();
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    CORBA::ULong expected = this->keys_ * this->iterations_;
-    if (this->received_one_by_one_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ONE_BY_ONE: "
-                               "Didn't receive samples on one_by_one "
-                               "callback while mode is ONE_BY_ONE "
-                               "expected <%u> - received <%u>\n",
-                               expected,
-                               this->received_one_by_one_.value ()));
-      }
-    else if (expected != this->received_one_by_one_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ONE_BY_ONE: "
-                               "Didn't receive the expected "
-                               "number of samples on one_by_one "
-                               "callback while mode is ONE_BY_ONE "
-                               "expected <%u> - received <%u>\n",
-                               expected,
-                               this->received_one_by_one_.value ()));
-      }
-    if (this->received_many_by_many_.value () > 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ONE_BY_ONE: "
-                               "Received samples on many_by_many "
-                               "callback while mode is ONE_BY_ONE "
-                               "expected <0> - received <%u>\n",
-                               this->received_many_by_many_.value ()));
-      }
-    if (this->received_one_by_one_.value () > 0   &&
-        this->received_many_by_many_.value () == 0)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ONE_BY_ONE: "
-                               "Received only data on "
-                               "one_by_one callback. "
-                               "Test passed!\n"));
-      }
-    //get current thread
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_.to_string (list_buf);
-
-    if (this->thread_id_listener_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for ReaderListener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ONE_BY_ONE: "
-                              "Thread switch for ReaderListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                               "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-    }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ONE_BY_ONE: "
-                              "Thread switch for ReaderListener "
-                              "doesn't seem to work! "
-                               "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-    }
-    #else
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ONE_BY_ONE: ReaderListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "ONE_BY_ONE: ReaderListener: "
-                              "DDS seems to use its own thread for its callback: "
-                               "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-    }
-    #endif
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_LOBO_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/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h
deleted file mode 100644
index e171b512da7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_RECEIVER_EXEC_H_
-#define CIAO_RECEIVER_EXEC_H_
-
-#include "LOBO_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/OS_NS_Thread.h"
-
-
-
-#include <map>
-
-namespace CIAO_LOBO_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;
-
-  //============================================================
-  // ListenOneByOneTest_Listener_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export ListenOneByOneTest_Listener_exec_i
-    : public virtual ::LOBO_Test::ListenOneByOneTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ListenOneByOneTest_Listener_exec_i (
-                            Atomic_ULong &received_one_by_one,
-                            Atomic_ULong &received_many_by_many,
-                            ACE_Thread_ID &thread_id);
-    virtual ~ListenOneByOneTest_Listener_exec_i (void);
-
-    virtual void
-    on_one_data (
-      const ListenOneByOneTest & an_instance,
-      const ::CCM_DDS::ReadInfo & info);
-    virtual void
-    on_many_data (
-      const ListenOneByOneTestSeq & an_instance,
-      const ::CCM_DDS::ReadInfoSeq & info);
-  private:
-    Atomic_ULong &received_one_by_one_;
-    Atomic_ULong &received_many_by_many_;
-    ACE_Thread_ID &thread_id_;
-  };
-
-  //============================================================
-  // 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);
-
-    void start ();
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::LOBO_Test::ListenOneByOneTestConnector::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);
-
-    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:
-    ::LOBO_Test::CCM_Receiver_Context_var context_;
-
-    Atomic_ULong    received_one_by_one_;
-    Atomic_ULong    received_many_by_many_;
-    ACE_Thread_ID thread_id_listener_;
-
-    CORBA::UShort iterations_;
-    CORBA::UShort keys_;
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_LOBO_Test_Receiver_Impl (void);
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/.gitignore
deleted file mode 100644
index 630065578bc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/LOBO_Test_SenderE.idl
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl
deleted file mode 100644
index d399d7cc53b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_LISTEN_ONE_BY_ONE_TEST_SENDER_IDL
-#define DDS_LISTEN_ONE_BY_ONE_TEST_SENDER_IDL
-
-#include "Connector/LOBO_Test_Connector.idl"
-
-module LOBO_Test
-{
-  component Sender
-  {
-    port ListenOneByOneTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc
deleted file mode 100644
index 7fee73abf3b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_LOBO_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_LOBO_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_LOBO_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 {
-    LOBO_Test_Sender.idl
-  }
-}
-
-project(DDS_LOBO_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_LOBO_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 {
-    LOBO_Test_SenderE.idl
-  }
-}
-
-project(DDS_LOBO_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_LOBO_Test_Sender_lem_gen DDS_LOBO_Test_Sender_stub \
-           DDS_LOBO_Test_Base_stub
-  libs  += DDS_LOBO_Test_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LOBO_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    LOBO_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    LOBO_Test_SenderEC.inl
-  }
-}
-
-project(DDS_LOBO_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_LOBO_Test_Sender_idl_gen DDS_LOBO_Test_Base_stub \
-           DDS_LOBO_Test_Connector_stub
-  libs  += DDS_LOBO_Test_Base_stub DDS_LOBO_Test_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LOBO_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    LOBO_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    LOBO_Test_SenderC.inl
-  }
-}
-
-project(DDS_LOBO_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_LOBO_Test_Sender_lem_stub DDS_LOBO_Test_Sender_stub \
-             DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Connector_stub 
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub DDS_LOBO_Test_Base_stub \
-             DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Connector_stub 
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LOBO_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    LOBO_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_LOBO_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_LOBO_Test_Base_stub  DDS_LOBO_Test_Sender_lem_stub \
-                DDS_LOBO_Test_Connector_stub \
-                DDS_LOBO_Test_Connector_svnt DDS_LOBO_Test_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub DDS_LOBO_Test_Base_stub \
-                DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Connector_svnt \
-                DDS_LOBO_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    LOBO_Test_SenderS.cpp
-    LOBO_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    LOBO_Test_SenderS.h
-    LOBO_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp
deleted file mode 100644
index 63aee1fa2c2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,297 +0,0 @@
-// -*- C++ -*-
-#include "LOBO_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "ace/Guard_T.h"
-#include "ace/Log_Msg.h"
-#include "ace/Date_Time.h"
-
-namespace CIAO_LOBO_Test_Sender_Impl
-{
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  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 /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.get_started ();
-      }
-  }
-
-  //============================================================
-  // WriteManyHandler
-  //============================================================
-  WriteTicker::WriteTicker (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteTicker::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.write_one ();
-    return 0;
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (5)
-      , iterations_ (10)
-  {
-    this->ticker_ = new WriteTicker (*this);
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  void
-  Sender_exec_i::write_one (void)
-  {
-    if (this->last_key_ != this->samples_.end ())
-      {
-        try
-          {
-            ++this->last_key_->second->iteration;
-            ::LOBO_Test::ListenOneByOneTestConnector::Writer_var writer =
-              this->ciao_context_->get_connection_info_write_data ();
-            writer->write_one (this->last_key_->second, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, "Written key <%C> - <%u>\n",
-                          this->last_key_->first.c_str (),
-                          this->last_key_->second->iteration));
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                        ACE_TEXT ("while updating writer info for <%C>.\n"),
-                          this->last_key_->first.c_str ()));
-          }
-        ++this->last_key_;
-      }
-    else
-      {
-        // Onto the next iteration
-        this->last_key_ = this->samples_.begin ();
-        while (this->last_key_ != this->samples_.end ())
-          {
-            if (this->last_key_->second->iteration == this->iterations_)
-              {
-                // Next key
-                ++this->last_key_;
-              }
-            else
-              {
-                break;
-              }
-          }
-        if (this->last_key_ == this->samples_.end ())
-          {
-            this->reactor ()->cancel_timer (this->ticker_);
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    try
-      {
-        start ();
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::get_started: Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::get_started: Unknown exception caught\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        ListenOneByOneTest *new_key = new ListenOneByOneTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->iteration = 0;
-        this->samples_[key] = new_key;
-      }
-   this->last_key_ = this->samples_.begin ();
-   if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (5, 50000),
-                ACE_Time_Value (0, 50000)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  // Component attributes and port operations.
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::LOBO_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_LOBO_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/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h
deleted file mode 100644
index 310030d1ff8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h
+++ /dev/null
@@ -1,141 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_LOBO_TEST_SENDER_EXEC_QGSN5C_H_
-#define CIAO_LOBO_TEST_SENDER_EXEC_QGSN5C_H_
-
-#include /**/ "ace/pre.h"
-
-#include "LOBO_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_LOBO_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  //============================================================
-  // WriteTicker
-  //============================================================
-  class WriteTicker :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteTicker (Sender_exec_i &callback);
-    int handle_timeout (const ACE_Time_Value &, const void *);
-  private:
-    /// Maintains a handle that actually process the event
-    Sender_exec_i &callback_;
-  };
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);//@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined operations */
-    void get_started (void);
-    void write_one (void);
-    //@}
-
-  private:
-    ::LOBO_Test::CCM_Sender_Context_var ciao_context_;
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-
-    ACE_Reactor* reactor (void);
-    void start (void);
-
-    WriteTicker *ticker_;
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, ListenOneByOneTest_var> Writer_Table;
-    Writer_Table samples_;
-    Writer_Table::iterator last_key_;
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_LOBO_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/Plan.cdp
deleted file mode 100644
index 0273c9d561a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/Plan.cdp
+++ /dev/null
@@ -1,393 +0,0 @@
-<!--  -->
-<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>LOBO_Test_Depl_1</label>
-  <UUID>LOBO_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_LOBO_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_LOBO_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="LOBO_Test_ConnectorComponentImplementation">
-    <name>LOBO_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="LOBO_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="LOBO_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_LOBO_Test_ListenOneByOneTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LOBO_Test_ListenOneByOneTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LOBO_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LOBO_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_LOBO_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_LOBO_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" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="LOBO_Test_ConnectorComponentInstance">
-    <name>LOBO_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="LOBO_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LOBO_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="LOBO_Test_ConnectorComponentInstance2">
-    <name>LOBO_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="LOBO_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LOBO_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_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="LOBO_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="LOBO_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="LOBO_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="LOBO_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </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="LOBO_Test_Connector_ExecArtifact">
-    <name>LOBO_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_LOBO_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="LOBO_Test_Connector_SvntArtifact">
-    <name>LOBO_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_LOBO_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="LOBO_Test_Connector_StubArtifact">
-    <name>LOBO_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_LOBO_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/ListenOneByOne/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl
deleted file mode 100755
index d8b4eca445d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl
deleted file mode 100644
index ad271593b5c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file Event_MemLeakDetection_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef EVENT_MEMLEAKDETECTION_TEST_BASE_IDL
-#define EVENT_MEMLEAKDETECTION_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/Event_MemLeakDetection_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/Event_MemLeakDetection_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "Event_MemLeakDetectionTest"
-#pragma DCPS_DATA_KEY "Event_MemLeakDetectionTest key"
-
-struct Event_MemLeakDetectionTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<Event_MemLeakDetectionTest> Event_MemLeakDetectionTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.mpc
deleted file mode 100644
index e3ec1e97771..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_EMLDT_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_EMLDT_Base_stub
-  dynamicflags += EVENT_MEMLEAKDETECTION_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=EVENT_MEMLEAKDETECTION_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=Event_MemLeakDetection_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Event_MemLeakDetection_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=EVENT_MEMLEAKDETECTION_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Event_MemLeakDetection_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.idl
deleted file mode 100644
index c9e204f356b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file Event_MemLeakDetection_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef KEYED_TEST_CONNECTOR_IDL_
-#define KEYED_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Event_MemLeakDetection_Test_Base.idl"
-
-#pragma ciao lem "Connector/Event_MemLeakDetection_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Event_MemLeakDetection_Test_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::Event_MemLeakDetectionTest, ::Event_MemLeakDetectionTestSeq> Event_MemLeakDetectionConnector;
-
-#endif /* Event_MemLeakDetection_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc
deleted file mode 100644
index c3663a91361..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_EMLDT_Base -l .. -o ../lib -u DDS Event_MemLeakDetection_Test_Connector"
-
-project(DDS_EMLDT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_EMLDT_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Event_MemLeakDetection_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Event_MemLeakDetection_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Event_MemLeakDetection_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Event_MemLeakDetection_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Event_MemLeakDetection_Test_Connector.idl
-  }
-}
-
-project(DDS_EMLDT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_EMLDT_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Event_MemLeakDetection_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Event_MemLeakDetection_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_EMLDT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_EMLDT_Connector_lem_gen DDS_EMLDT_Connector_stub DDS_EMLDT_Base_stub
-  libs  += DDS_EMLDT_Base_stub DDS_EMLDT_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_EMLDT_Connector_lem_stub
-  dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_MemLeakDetection_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Event_MemLeakDetection_Test_ConnectorEC.h
-    Event_MemLeakDetection_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Event_MemLeakDetection_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_EMLDT_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_EMLDT_Connector_idl_gen DDS_EMLDT_Base_stub
-  libs  += DDS_EMLDT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_EMLDT_Connector_stub
-  dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_MemLeakDetection_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Event_MemLeakDetection_Test_ConnectorC.h
-    Event_MemLeakDetection_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Event_MemLeakDetection_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_EMLDT_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_EMLDT_Connector_lem_stub DDS_EMLDT_Connector_stub
-  sharedname = DDS_EMLDT_Connector_exec
-  libs += DDS_EMLDT_Connector_stub DDS_EMLDT_Connector_lem_stub DDS_EMLDT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_MemLeakDetection_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Event_MemLeakDetection_Test_Connector_conn.h
-    Event_MemLeakDetection_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_EMLDT_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_EMLDT_Connector_lem_stub DDS_EMLDT_Connector_exec DDS_EMLDT_Connector_stub
-  sharedname  = DDS_EMLDT_Connector_svnt
-  libs       += DDS_EMLDT_Connector_stub \
-                DDS_EMLDT_Connector_lem_stub  \
-                DDS_EMLDT_Base_stub \
-                DDS_EMLDT_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += EVENT_MEMLEAKDETECTION_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_MemLeakDetection_Test_ConnectorS.cpp
-    Event_MemLeakDetection_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Event_MemLeakDetection_Test_ConnectorS.h
-    Event_MemLeakDetection_Test_Connector_svnt.h
-    Event_MemLeakDetection_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.idl
deleted file mode 100644
index 452db0b4622..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Event_MemLeakDetection_Test_Connector.idl"
-
-module Event_MemLeakDetection_Test
-{
-  component Receiver
-  {
-    port Event_MemLeakDetectionConnector::DDS_Listen  info_listen;
-    port Event_MemLeakDetectionConnector::DDS_Get     info_get;
-    provides CCM_DDS::ConnectorStatusListener status_listener;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.mpc
deleted file mode 100644
index 3cc1aa2ad3a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_EMLDT_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_EMLDT_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.. -Gex
-
-  IDL_Files {
-    Event_MemLeakDetection_Test_Receiver.idl
-  }
-}
-
-project(DDS_EMLDT_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_EMLDT_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 {
-    Event_MemLeakDetection_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_EMLDT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_EMLDT_Receiver_lem_gen DDS_EMLDT_Receiver_stub  DDS_EMLDT_Connector_stub DDS_EMLDT_Base_stub
-  libs  +=  Receiver_stub DDS_EMLDT_Connector_stub DDS_EMLDT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_MemLeakDetection_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Event_MemLeakDetection_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Event_MemLeakDetection_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_EMLDT_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_EMLDT_Receiver_idl_gen  DDS_EMLDT_Connector_stub DDS_EMLDT_Base_stub DDS_EMLDT_Connector_lem_gen
-  libs  += DDS_EMLDT_Connector_stub DDS_EMLDT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_MemLeakDetection_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Event_MemLeakDetection_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Event_MemLeakDetection_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_EMLDT_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_EMLDT_Receiver_lem_stub DDS_EMLDT_Receiver_stub DDS_EMLDT_Base_stub DDS_EMLDT_Connector_stub DDS_EMLDT_Connector_lem_stub 
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_EMLDT_Base_stub DDS_EMLDT_Connector_stub DDS_EMLDT_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_MemLeakDetection_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Event_MemLeakDetection_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_EMLDT_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_EMLDT_Receiver_lem_stub DDS_EMLDT_Base_stub DDS_EMLDT_Connector_stub DDS_EMLDT_Connector_svnt DDS_EMLDT_Receiver_exec DDS_EMLDT_Connector_lem_stub 
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_EMLDT_Base_stub DDS_EMLDT_Connector_stub DDS_EMLDT_Connector_svnt Receiver_exec DDS_EMLDT_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_MemLeakDetection_Test_ReceiverS.cpp
-    Event_MemLeakDetection_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Event_MemLeakDetection_Test_ReceiverS.h
-    Event_MemLeakDetection_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.idl
deleted file mode 100644
index 1c63ca8799c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_EVENT_MEMLEAKDETECTION_TEST_SENDER_IDL
-#define DDS_EVENT_MEMLEAKDETECTION_TEST_SENDER_IDL
-
-#include "Connector/Event_MemLeakDetection_Test_Connector.idl"
-
-module Event_MemLeakDetection_Test
-{
-  component Sender
-  {
-    port Event_MemLeakDetectionConnector::DDS_Write info_write;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.mpc
deleted file mode 100644
index b3a68ef7736..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_EMLDT_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_EMLDT_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_EMLDT_Connector_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 .. -Gex
-
-  IDL_Files {
-    Event_MemLeakDetection_Test_Sender.idl
-  }
-}
-
-project(DDS_EMLDT_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_EMLDT_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 {
-    Event_MemLeakDetection_Test_SenderE.idl
-  }
-}
-
-project(DDS_EMLDT_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_EMLDT_Sender_lem_gen DDS_EMLDT_Sender_stub DDS_EMLDT_Base_stub
-  libs  += DDS_EMLDT_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_MemLeakDetection_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    Event_MemLeakDetection_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Event_MemLeakDetection_Test_SenderEC.inl
-  }
-}
-
-project(DDS_EMLDT_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_EMLDT_Sender_idl_gen DDS_EMLDT_Base_stub DDS_EMLDT_Connector_stub
-  libs  += DDS_EMLDT_Base_stub DDS_EMLDT_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_MemLeakDetection_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    Event_MemLeakDetection_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Event_MemLeakDetection_Test_SenderC.inl
-  }
-}
-
-project(DDS_EMLDT_Sender_exec) : ciao_executor, dds4ccm_base {
-  after   += DDS_EMLDT_Sender_lem_stub DDS_EMLDT_Sender_stub DDS_EMLDT_Connector_lem_stub DDS_EMLDT_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_EMLDT_Base_stub DDS_EMLDT_Connector_lem_stub DDS_EMLDT_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_MemLeakDetection_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Event_MemLeakDetection_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_EMLDT_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_EMLDT_Base_stub  DDS_EMLDT_Sender_lem_stub DDS_EMLDT_Connector_stub DDS_EMLDT_Connector_svnt  DDS_EMLDT_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_EMLDT_Base_stub DDS_EMLDT_Connector_stub DDS_EMLDT_Connector_svnt DDS_EMLDT_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Event_MemLeakDetection_Test_SenderS.cpp
-    Event_MemLeakDetection_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Event_MemLeakDetection_Test_SenderS.h
-    Event_MemLeakDetection_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/All.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/All.cdp
deleted file mode 100644
index e9cd40feb02..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/All.cdp
+++ /dev/null
@@ -1,549 +0,0 @@
-<!--  -->
-<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>Event_MemLeakDetection_Test_Depl_1</label>
-  <UUID>Event_MemLeakDetection_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_Event_MemLeakDetection_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_Event_MemLeakDetection_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="Event_MemLeakDetection_Test_ConnectorComponentImplementation">
-    <name>Event_MemLeakDetection_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Event_MemLeakDetection_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Event_MemLeakDetection_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_Event_MemLeakDetectionConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_MemLeakDetectionConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_MemLeakDetection_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_MemLeakDetection_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_Event_MemLeakDetection_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_Event_MemLeakDetection_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="Event_MemLeakDetection_Test_ConnectorComponentInstance">
-    <name>Event_MemLeakDetection_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_MemLeakDetection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Event_MemLeakDetection_Test_ConnectorComponentInstance2">
-    <name>Event_MemLeakDetection_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_MemLeakDetection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_rawlistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="Event_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_datacontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="Event_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_dds_reader</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_filter_config</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>getter_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>getter_fresh_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>getter_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>getter_dds_reader</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>getter_filter_config</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>status_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-     <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="Event_MemLeakDetection_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_dds_writer</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentInstance" />
-    </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="Event_MemLeakDetection_Test_Connector_ExecArtifact">
-    <name>Event_MemLeakDetection_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_EMLDT_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Event_MemLeakDetection_Test_Connector_SvntArtifact">
-    <name>Event_MemLeakDetection_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_EMLDT_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Event_MemLeakDetection_Test_Connector_StubArtifact">
-    <name>Event_MemLeakDetection_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_EMLDT_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/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Connector_only.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Connector_only.cdp
deleted file mode 100644
index 4256b05cf8e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Connector_only.cdp
+++ /dev/null
@@ -1,98 +0,0 @@
-<!--  -->
-<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>Event_MemLeakDetection_Test_Depl_1</label>
-  <UUID>Event_MemLeakDetection_Test_Depl_1</UUID>
-
-  <implementation xmi:id="Event_MemLeakDetection_Test_ConnectorComponentImplementation">
-    <name>Event_MemLeakDetection_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Event_MemLeakDetection_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Event_MemLeakDetection_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_Event_MemLeakDetectionConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_MemLeakDetectionConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_MemLeakDetection_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_MemLeakDetection_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="Event_MemLeakDetection_Test_ConnectorComponentInstance">
-    <name>Event_MemLeakDetection_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_MemLeakDetection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <artifact xmi:id="Event_MemLeakDetection_Test_Connector_ExecArtifact">
-    <name>Event_MemLeakDetection_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_EMLDT_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Event_MemLeakDetection_Test_Connector_SvntArtifact">
-    <name>Event_MemLeakDetection_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_EMLDT_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Event_MemLeakDetection_Test_Connector_StubArtifact">
-    <name>Event_MemLeakDetection_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_EMLDT_Connector_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Listen.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Listen.cdp
deleted file mode 100644
index 5b21c73b194..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Listen.cdp
+++ /dev/null
@@ -1,196 +0,0 @@
-<!--  -->
-<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>Event_MemLeakDetection_Test_Depl_1</label>
-  <UUID>Event_MemLeakDetection_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_Event_MemLeakDetection_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_Event_MemLeakDetection_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="Event_MemLeakDetection_Test_ConnectorComponentImplementation">
-    <name>Event_MemLeakDetection_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Event_MemLeakDetection_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Event_MemLeakDetection_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_Event_MemLeakDetectionConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_MemLeakDetectionConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_MemLeakDetection_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_MemLeakDetection_Test_Connector_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="Event_MemLeakDetection_Test_ConnectorComponentInstance">
-    <name>Event_MemLeakDetection_Test_ConnectorComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_MemLeakDetection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>listen_data_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="Event_MemLeakDetection_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Event_MemLeakDetection_Test_Connector_ExecArtifact">
-    <name>Event_MemLeakDetection_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_EMLDT_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Event_MemLeakDetection_Test_Connector_SvntArtifact">
-    <name>Event_MemLeakDetection_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_EMLDT_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Event_MemLeakDetection_Test_Connector_StubArtifact">
-    <name>Event_MemLeakDetection_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_EMLDT_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/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/One_Connection.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/One_Connection.cdp
deleted file mode 100644
index 02076f6c94b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/One_Connection.cdp
+++ /dev/null
@@ -1,194 +0,0 @@
-<!--  -->
-<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>Event_MemLeakDetection_Test_Depl_1</label>
-  <UUID>Event_MemLeakDetection_Test_Depl_1</UUID>
-
-  <implementation xmi:id="Event_MemLeakDetection_Test_ConnectorComponentImplementation">
-    <name>Event_MemLeakDetection_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Event_MemLeakDetection_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Event_MemLeakDetection_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_Event_MemLeakDetectionConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Event_MemLeakDetectionConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_MemLeakDetection_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_MemLeakDetection_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_Event_MemLeakDetection_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_Event_MemLeakDetection_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="Event_MemLeakDetection_Test_ConnectorComponentInstance">
-    <name>Event_MemLeakDetection_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Event_MemLeakDetection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Event_MemLeakDetection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>writer_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="Event_MemLeakDetection_Test_ConnectorComponentInstance" />
-    </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="Event_MemLeakDetection_Test_Connector_ExecArtifact">
-    <name>Event_MemLeakDetection_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_EMLDT_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Event_MemLeakDetection_Test_Connector_SvntArtifact">
-    <name>Event_MemLeakDetection_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_EMLDT_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Event_MemLeakDetection_Test_Connector_StubArtifact">
-    <name>Event_MemLeakDetection_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_EMLDT_Connector_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Receiver_only.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Receiver_only.cdp
deleted file mode 100644
index b6b83f64b6f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Receiver_only.cdp
+++ /dev/null
@@ -1,88 +0,0 @@
-<!--  -->
-<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>Event_MemLeakDetection_Test_Depl_1</label>
-  <UUID>Event_MemLeakDetection_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_Event_MemLeakDetection_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_Event_MemLeakDetection_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>
-
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-
-  <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/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Sender_only.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Sender_only.cdp
deleted file mode 100644
index 5989ffb91a7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/Sender_only.cdp
+++ /dev/null
@@ -1,87 +0,0 @@
-<!--  -->
-<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>Event_MemLeakDetection_Test_Depl_1</label>
-  <UUID>Event_MemLeakDetection_Test_Depl_1</UUID>
-
-  <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_Event_MemLeakDetection_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_Event_MemLeakDetection_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="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <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>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/run_test.pl
deleted file mode 100755
index 41c8906cbb8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/run_test.pl
+++ /dev/null
@@ -1,216 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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_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;
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   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";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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 node daemon\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        2 * $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;
-}
-
-if ($#ARGV == -1) {
-    opendir(DIR, ".");
-    @files = grep(/\.cdp$/,readdir(DIR));
-    closedir(DIR);
-}
-else {
-    @files = @ARGV;
-}
-
-create_targets ();
-init_ior_files ();
-
-foreach $file (@files) {
-    print "*********** Starting test for deployment $file ***********\n";
-
-    print STDERR "Starting Naming Service\n";
-
-    $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-    $NS->Spawn ();
-
-    if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                      2 * $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 daemons\n";
-        kill_open_processes ();
-        exit 1;
-    }
-
-    $daemons_running = 1;
-
-    # Invoke execution manager.
-    print "Invoking execution manager\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,
-                                    2 * $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";
-    $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                      "-x $file -k file://$ior_emfile");
-    $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ());
-
-    print "Sleeping 5 seconds to allow task to complete\n";
-    sleep (5);
-
-    print "Teardown the application\n";
-    $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                      "-k file://$ior_emfile -x $file -s");
-    $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ());
-    print "Executor finished.\n";
-
-    delete_ior_files ();
-    kill_open_processes ();
-}
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl
deleted file mode 100644
index eee91874471..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file State_MemLeakDetection_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef STATE_MEMLEAKDETECTION_TEST_BASE_IDL
-#define STATE_MEMLEAKDETECTION_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/State_MemLeakDetection_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/State_MemLeakDetection_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "State_MemLeakDetectionTest"
-#pragma DCPS_DATA_KEY "State_MemLeakDetectionTest key"
-
-struct State_MemLeakDetectionTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<State_MemLeakDetectionTest> State_MemLeakDetectionTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.mpc
deleted file mode 100644
index 860e3832f7d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_SMLDT_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_SMLDT_Base_stub
-  dynamicflags += STATE_MEMLEAKDETECTION_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=STATE_MEMLEAKDETECTION_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=State_MemLeakDetection_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    State_MemLeakDetection_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=STATE_MEMLEAKDETECTION_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    State_MemLeakDetection_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.idl
deleted file mode 100644
index 81046dbecf5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file State_MemLeakDetection_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef KEYED_TEST_CONNECTOR_IDL_
-#define KEYED_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/State_MemLeakDetection_Test_Base.idl"
-
-#pragma ciao lem "Connector/State_MemLeakDetection_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/State_MemLeakDetection_Test_BaseTypeSupport.idl"
-#endif
-
-module State_MemLeakDetection_Test
-{
-  module ::CCM_DDS::Typed < ::State_MemLeakDetectionTest, ::State_MemLeakDetectionTestSeq> State_MemLeakDetectionTestConnector;
-};
-
-#endif /* STATE_MEMLEAKDETECTION_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc
deleted file mode 100644
index 982b2e13c0a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SMLDT_Base -l .. -o ../lib -u DDS State_MemLeakDetection_Test_Connector"
-
-project(DDS_SMLDT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_SMLDT_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=STATE_MEMLEAKDETECTION_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=State_MemLeakDetection_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=STATE_MEMLEAKDETECTION_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=State_MemLeakDetection_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=STATE_MEMLEAKDETECTION_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=State_MemLeakDetection_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=STATE_MEMLEAKDETECTION_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=State_MemLeakDetection_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    State_MemLeakDetection_Test_Connector.idl
-  }
-}
-
-project(DDS_SMLDT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SMLDT_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=STATE_MEMLEAKDETECTION_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=State_MemLeakDetection_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    State_MemLeakDetection_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_SMLDT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SMLDT_Connector_lem_gen DDS_SMLDT_Connector_stub DDS_SMLDT_Base_stub
-  libs  += DDS_SMLDT_Base_stub DDS_SMLDT_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_SMLDT_Connector_lem_stub
-  dynamicflags += STATE_MEMLEAKDETECTION_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_MemLeakDetection_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    State_MemLeakDetection_Test_ConnectorEC.h
-    State_MemLeakDetection_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    State_MemLeakDetection_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_SMLDT_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SMLDT_Connector_idl_gen DDS_SMLDT_Base_stub
-  libs  += DDS_SMLDT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_SMLDT_Connector_stub
-  dynamicflags += STATE_MEMLEAKDETECTION_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_MemLeakDetection_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    State_MemLeakDetection_Test_ConnectorC.h
-    State_MemLeakDetection_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    State_MemLeakDetection_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_SMLDT_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SMLDT_Connector_lem_stub DDS_SMLDT_Connector_stub DDS_SMLDT_Base_stub
-  sharedname = DDS_SMLDT_Connector_exec
-  libs += DDS_SMLDT_Connector_stub DDS_SMLDT_Connector_lem_stub DDS_SMLDT_Base_stub DDS_SMLDT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += STATE_MEMLEAKDETECTION_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_MemLeakDetection_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    State_MemLeakDetection_Test_Connector_conn.h
-    State_MemLeakDetection_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SMLDT_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SMLDT_Connector_lem_stub DDS_SMLDT_Connector_exec DDS_SMLDT_Connector_stub
-  sharedname  = DDS_SMLDT_Connector_svnt
-  libs       += DDS_SMLDT_Connector_stub \
-                DDS_SMLDT_Connector_lem_stub  \
-                DDS_SMLDT_Base_stub \
-                DDS_SMLDT_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += STATE_MEMLEAKDETECTION_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_MemLeakDetection_Test_ConnectorS.cpp
-    State_MemLeakDetection_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    State_MemLeakDetection_Test_ConnectorS.h
-    State_MemLeakDetection_Test_Connector_svnt.h
-    State_MemLeakDetection_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.idl
deleted file mode 100644
index 21d432741b9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/State_MemLeakDetection_Test_Connector.idl"
-
-module State_MemLeakDetection_Test
-{
-  component Receiver
-  {
-    port State_MemLeakDetectionTestConnector::DDS_Read info_read;
-    port State_MemLeakDetectionTestConnector::DDS_Get info_get;
-    port State_MemLeakDetectionTestConnector::DDS_Listen info_listen;
-    port State_MemLeakDetectionTestConnector::DDS_StateListen info_statelisten;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.mpc
deleted file mode 100644
index e1c826c54f7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_SMLDT_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SMLDT_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.. -Gex
-
-  IDL_Files {
-    State_MemLeakDetection_Test_Receiver.idl
-  }
-}
-
-project(DDS_SMLDT_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_SMLDT_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 {
-    State_MemLeakDetection_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_SMLDT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_SMLDT_Receiver_lem_gen DDS_SMLDT_Receiver_stub  DDS_SMLDT_Connector_stub DDS_SMLDT_Base_stub
-  libs  +=  Receiver_stub DDS_SMLDT_Connector_stub DDS_SMLDT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_MemLeakDetection_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    State_MemLeakDetection_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    State_MemLeakDetection_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_SMLDT_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SMLDT_Receiver_idl_gen  DDS_SMLDT_Connector_stub DDS_SMLDT_Base_stub DDS_SMLDT_Connector_lem_gen
-  libs  += DDS_SMLDT_Connector_stub DDS_SMLDT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_MemLeakDetection_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    State_MemLeakDetection_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    State_MemLeakDetection_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_SMLDT_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_SMLDT_Receiver_lem_stub DDS_SMLDT_Receiver_stub DDS_SMLDT_Base_stub DDS_SMLDT_Connector_stub DDS_SMLDT_Connector_lem_stub 
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_SMLDT_Base_stub DDS_SMLDT_Connector_stub DDS_SMLDT_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_MemLeakDetection_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    State_MemLeakDetection_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SMLDT_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_SMLDT_Receiver_lem_stub DDS_SMLDT_Base_stub DDS_SMLDT_Connector_stub DDS_SMLDT_Connector_svnt DDS_SMLDT_Receiver_exec DDS_SMLDT_Connector_lem_stub 
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_SMLDT_Base_stub DDS_SMLDT_Connector_stub DDS_SMLDT_Connector_svnt Receiver_exec DDS_SMLDT_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_MemLeakDetection_Test_ReceiverS.cpp
-    State_MemLeakDetection_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    State_MemLeakDetection_Test_ReceiverS.h
-    State_MemLeakDetection_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.idl
deleted file mode 100644
index b0da02cc828..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_STATE_MEMLEAKDETECTION_TEST_SENDER_IDL
-#define DDS_STATE_MEMLEAKDETECTION_TEST_SENDER_IDL
-
-#include "Connector/State_MemLeakDetection_Test_Connector.idl"
-
-module State_MemLeakDetection_Test
-{
-  component Sender
-  {
-    port State_MemLeakDetectionTestConnector::DDS_Update info_update;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.mpc
deleted file mode 100644
index 5dfdcfd1e7b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SMLDT_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_SMLDT_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_SMLDT_Connector_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 .. -Gex
-
-  IDL_Files {
-    State_MemLeakDetection_Test_Sender.idl
-  }
-}
-
-project(DDS_SMLDT_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_SMLDT_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 {
-    State_MemLeakDetection_Test_SenderE.idl
-  }
-}
-
-project(DDS_SMLDT_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_SMLDT_Sender_lem_gen DDS_SMLDT_Sender_stub DDS_SMLDT_Base_stub
-  libs  += DDS_SMLDT_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_MemLeakDetection_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    State_MemLeakDetection_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    State_MemLeakDetection_Test_SenderEC.inl
-  }
-}
-
-project(DDS_SMLDT_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SMLDT_Sender_idl_gen DDS_SMLDT_Base_stub DDS_SMLDT_Connector_stub
-  libs  += DDS_SMLDT_Base_stub DDS_SMLDT_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_MemLeakDetection_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    State_MemLeakDetection_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    State_MemLeakDetection_Test_SenderC.inl
-  }
-}
-
-project(DDS_SMLDT_Sender_exec) : ciao_executor, dds4ccm_base {
-  after   += DDS_SMLDT_Sender_lem_stub DDS_SMLDT_Sender_stub DDS_SMLDT_Connector_lem_stub DDS_SMLDT_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_SMLDT_Base_stub DDS_SMLDT_Connector_lem_stub DDS_SMLDT_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_MemLeakDetection_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    State_MemLeakDetection_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SMLDT_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_SMLDT_Base_stub  DDS_SMLDT_Sender_lem_stub DDS_SMLDT_Connector_stub DDS_SMLDT_Connector_svnt  DDS_SMLDT_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_SMLDT_Base_stub DDS_SMLDT_Connector_stub DDS_SMLDT_Connector_svnt DDS_SMLDT_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_MemLeakDetection_Test_SenderS.cpp
-    State_MemLeakDetection_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    State_MemLeakDetection_Test_SenderS.h
-    State_MemLeakDetection_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/All.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/All.cdp
deleted file mode 100644
index d30bbd86d82..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/All.cdp
+++ /dev/null
@@ -1,721 +0,0 @@
-<!--  -->
-<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>State_MemLeakDetection_Test_Depl_1</label>
-  <UUID>State_MemLeakDetection_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_State_MemLeakDetection_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_State_MemLeakDetection_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="State_MemLeakDetection_Test_ConnectorComponentImplementation">
-    <name>State_MemLeakDetection_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="State_MemLeakDetection_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="State_MemLeakDetection_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_State_MemLeakDetection_Test_State_MemLeakDetectionTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_MemLeakDetection_Test_State_MemLeakDetectionTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_MemLeakDetection_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_MemLeakDetection_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_State_MemLeakDetection_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_State_MemLeakDetection_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="State_MemLeakDetection_Test_ConnectorComponentInstance">
-    <name>State_MemLeakDetection_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="State_MemLeakDetection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_MemLeakDetection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="State_MemLeakDetection_Test_ConnectorComponentInstance2">
-    <name>State_MemLeakDetection_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="State_MemLeakDetection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_MemLeakDetection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <!-- SENDER COMPONENT CONNECTIONS -->
-  <connection>
-    <name>update_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>update_dds_entity</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!-- RECEIVER COMPONENT CONNECTIONS -->
-  <!--   DDS_Get port -->
-  <connection>
-    <name>get_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>get_fresh_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>get_dds_entity_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>get_filter_config_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <!--   DDS_Get mirrorport -->
-  <connection>
-    <name>get_status_mirrorport</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <!--   DDS_Read port -->
-  <connection>
-    <name>read_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_read_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>read_dds_entity_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_read_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>read_filter_config_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_read_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <!--   DDS_Read mirrorport -->
-  <connection>
-    <name>read_status_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_read_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <!--   DDS_Listen port -->
-  <connection>
-    <name>listen_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>listen_data_control_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>listen_dds_entity_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>listen_filter_config_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <!--   DDS_Listen mirrorport -->
-  <connection>
-    <name>listen_data_listener_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>listen_status_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <!--   DDS_StateListen port -->
-  <connection>
-    <name>statelisten_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>statelisten_data_control_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>statelisten_dds_entity_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>statelisten_filter_config_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <!--   DDS_Listen mirrorport -->
-  <connection>
-    <name>statelisten_data_listener_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>statelisten_status_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance2" />
-    </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="State_MemLeakDetection_Test_Connector_ExecArtifact">
-    <name>State_MemLeakDetection_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_SMLDT_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="State_MemLeakDetection_Test_Connector_SvntArtifact">
-    <name>State_MemLeakDetection_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_SMLDT_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="State_MemLeakDetection_Test_Connector_StubArtifact">
-    <name>State_MemLeakDetection_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_SMLDT_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/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Connector_only.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Connector_only.cdp
deleted file mode 100644
index 8229bbea42c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Connector_only.cdp
+++ /dev/null
@@ -1,98 +0,0 @@
-<!--  -->
-<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>State_MemLeakDetection_Test_Depl_1</label>
-  <UUID>State_MemLeakDetection_Test_Depl_1</UUID>
-
-  <implementation xmi:id="State_MemLeakDetection_Test_ConnectorComponentImplementation">
-    <name>State_MemLeakDetection_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="State_MemLeakDetection_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="State_MemLeakDetection_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_State_MemLeakDetection_Test_State_MemLeakDetectionTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_MemLeakDetection_Test_State_MemLeakDetectionTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_MemLeakDetection_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_MemLeakDetection_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="State_MemLeakDetection_Test_ConnectorComponentInstance">
-    <name>State_MemLeakDetection_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="State_MemLeakDetection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_MemLeakDetection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <artifact xmi:id="State_MemLeakDetection_Test_Connector_ExecArtifact">
-    <name>State_MemLeakDetection_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_SMLDT_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="State_MemLeakDetection_Test_Connector_SvntArtifact">
-    <name>State_MemLeakDetection_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_SMLDT_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="State_MemLeakDetection_Test_Connector_StubArtifact">
-    <name>State_MemLeakDetection_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_SMLDT_Connector_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Listen.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Listen.cdp
deleted file mode 100644
index 4730cdeebc2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Listen.cdp
+++ /dev/null
@@ -1,197 +0,0 @@
-<!--  -->
-<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>State_MemLeakDetection_Test_Depl_1</label>
-  <UUID>State_MemLeakDetection_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_State_MemLeakDetection_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_State_MemLeakDetection_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="State_MemLeakDetection_Test_ConnectorComponentImplementation">
-    <name>State_MemLeakDetection_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="State_MemLeakDetection_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="State_MemLeakDetection_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_State_MemLeakDetection_Test_State_MemLeakDetectionTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_MemLeakDetection_Test_State_MemLeakDetectionTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_MemLeakDetection_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_MemLeakDetection_Test_Connector_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="State_MemLeakDetection_Test_ConnectorComponentInstance">
-    <name>State_MemLeakDetection_Test_ConnectorComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="State_MemLeakDetection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_MemLeakDetection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- RECEIVER COMPONENT CONNECTIONS -->
-  <!--   DDS_Listen port -->
-  <connection>
-    <name>listen_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="State_MemLeakDetection_Test_Connector_ExecArtifact">
-    <name>State_MemLeakDetection_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_SMLDT_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="State_MemLeakDetection_Test_Connector_SvntArtifact">
-    <name>State_MemLeakDetection_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_SMLDT_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="State_MemLeakDetection_Test_Connector_StubArtifact">
-    <name>State_MemLeakDetection_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_SMLDT_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/MemLeakDetection/State_MemLeakDetection_Test/descriptors/One_Connection.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/One_Connection.cdp
deleted file mode 100644
index b59e4f83a58..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/One_Connection.cdp
+++ /dev/null
@@ -1,196 +0,0 @@
-<!--  -->
-<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>State_MemLeakDetection_Test_Depl_1</label>
-  <UUID>State_MemLeakDetection_Test_Depl_1</UUID>
-
-  <implementation xmi:id="State_MemLeakDetection_Test_ConnectorComponentImplementation">
-    <name>State_MemLeakDetection_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="State_MemLeakDetection_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="State_MemLeakDetection_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_State_MemLeakDetection_Test_State_MemLeakDetectionTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_MemLeakDetection_Test_State_MemLeakDetectionTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_MemLeakDetection_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_MemLeakDetection_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_State_MemLeakDetection_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_State_MemLeakDetection_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="State_MemLeakDetection_Test_ConnectorComponentInstance">
-    <name>State_MemLeakDetection_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="State_MemLeakDetection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_MemLeakDetection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <!-- SENDER COMPONENT CONNECTIONS -->
-  <connection>
-    <name>update_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_MemLeakDetection_Test_ConnectorComponentInstance" />
-    </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="State_MemLeakDetection_Test_Connector_ExecArtifact">
-    <name>State_MemLeakDetection_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_SMLDT_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="State_MemLeakDetection_Test_Connector_SvntArtifact">
-    <name>State_MemLeakDetection_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_SMLDT_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="State_MemLeakDetection_Test_Connector_StubArtifact">
-    <name>State_MemLeakDetection_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_SMLDT_Connector_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Receiver_only.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Receiver_only.cdp
deleted file mode 100644
index 68a2babe7ad..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Receiver_only.cdp
+++ /dev/null
@@ -1,88 +0,0 @@
-<!--  -->
-<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>State_MemLeakDetection_Test_Depl_1</label>
-  <UUID>State_MemLeakDetection_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_State_MemLeakDetection_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_State_MemLeakDetection_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>
-
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-
-  <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/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Sender_only.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Sender_only.cdp
deleted file mode 100644
index ddbadbb155c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/Sender_only.cdp
+++ /dev/null
@@ -1,87 +0,0 @@
-<!--  -->
-<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>State_MemLeakDetection_Test_Depl_1</label>
-  <UUID>State_MemLeakDetection_Test_Depl_1</UUID>
-
-  <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_State_MemLeakDetection_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_State_MemLeakDetection_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="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <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>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/run_test.pl
deleted file mode 100755
index 41c8906cbb8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/run_test.pl
+++ /dev/null
@@ -1,216 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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_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;
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   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";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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 node daemon\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                        2 * $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;
-}
-
-if ($#ARGV == -1) {
-    opendir(DIR, ".");
-    @files = grep(/\.cdp$/,readdir(DIR));
-    closedir(DIR);
-}
-else {
-    @files = @ARGV;
-}
-
-create_targets ();
-init_ior_files ();
-
-foreach $file (@files) {
-    print "*********** Starting test for deployment $file ***********\n";
-
-    print STDERR "Starting Naming Service\n";
-
-    $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-    $NS->Spawn ();
-
-    if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                      2 * $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 daemons\n";
-        kill_open_processes ();
-        exit 1;
-    }
-
-    $daemons_running = 1;
-
-    # Invoke execution manager.
-    print "Invoking execution manager\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,
-                                    2 * $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";
-    $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                      "-x $file -k file://$ior_emfile");
-    $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ());
-
-    print "Sleeping 5 seconds to allow task to complete\n";
-    sleep (5);
-
-    print "Teardown the application\n";
-    $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                      "-k file://$ior_emfile -x $file -s");
-    $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ());
-    print "Executor finished.\n";
-
-    delete_ior_files ();
-    kill_open_processes ();
-}
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl
deleted file mode 100644
index de5a9830077..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file TypeRegistration_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef MLD_TYPE_REGISTRATION_TEST_BASE_IDL
-#define MLD_TYPE_REGISTRATION_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/TypeRegistration_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/TypeRegistration_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "MLDTypeRegistrationTest"
-#pragma DCPS_DATA_KEY "MLDTypeRegistrationTest key"
-
-struct MLDTypeRegistrationTest {
-  unsigned long key;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<MLDTypeRegistrationTest> MLDTypeRegistrationTestSeq;
-#endif
-
-#endif /* MLD_TYPE_REGISTRATION_TEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.mpc
deleted file mode 100644
index 745f93aafcf..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (TypeRegistration_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = TypeRegistration_Base_stub
-  dynamicflags += MLD_TYPE_REGISTRATION_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=MLD_TYPE_REGISTRATION_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=TypeRegistration_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    TypeRegistration_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=MLD_TYPE_REGISTRATION_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    TypeRegistration_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.idl
deleted file mode 100644
index 7bcc7fc0fb0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COMPONENT_IDL
-#define COMPONENT_IDL
-
-#include "Connector/TypeRegistration_Test_Connector.idl"
-
-module MLD_TypeRegistration_Test
-{
-  component CFTTestComponent
-  {
-    port MLDTypeRegistrationTestConn::DDS_Write   writer;
-    port MLDTypeRegistrationTestConn::DDS_Listen  listener;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc
deleted file mode 100644
index eb49c7a53e6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(TypeRegistration_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += TypeRegistration_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Component_stub_export.h \
-              -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Component_svnt_export.h \
-              -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Component_svnt_export.h \
-              -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Component_exec_export.h -I..
-
-  IDL_Files {
-    TypeRegistration_Test_Component.idl
-  }
-}
-
-project(TypeRegistration_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += TypeRegistration_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    TypeRegistration_Test_ComponentE.idl
-  }
-}
-
-project(TypeRegistration_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += TypeRegistration_Component_lem_gen TypeRegistration_Component_stub  \
-           TypeRegistration_Connector_stub TypeRegistration_Base_stub
-  libs  +=  Component_stub TypeRegistration_Connector_stub \
-            TypeRegistration_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_lem_stub
-  dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TypeRegistration_Test_ComponentEC.cpp
-  }
-
-  Header_Files {
-    TypeRegistration_Test_ComponentEC.h
-    Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    TypeRegistration_Test_ComponentEC.inl
-  }
-}
-
-project(TypeRegistration_Component_stub) : ccm_stub, dds4ccm_base {
-  after += TypeRegistration_Component_idl_gen  TypeRegistration_Connector_stub \
-           TypeRegistration_Base_stub TypeRegistration_Connector_lem_gen
-  libs  += TypeRegistration_Connector_stub TypeRegistration_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_stub
-  dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TypeRegistration_Test_ComponentC.cpp
-  }
-
-  Header_Files {
-    TypeRegistration_Test_ComponentC.h
-    Component_stub_export.h
-  }
-
-  Inline_Files {
-    TypeRegistration_Test_ComponentC.inl
-  }
-}
-
-project(TypeRegistration_Component_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += TypeRegistration_Component_lem_stub TypeRegistration_Component_stub \
-             TypeRegistration_Base_stub TypeRegistration_Connector_stub \
-             TypeRegistration_Connector_lem_stub
-  sharedname = Component_exec
-  libs += Component_stub Component_lem_stub TypeRegistration_Base_stub \
-          TypeRegistration_Connector_stub TypeRegistration_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TypeRegistration_Test_Component_exec.cpp
-  }
-
-  Header_Files {
-    TypeRegistration_Test_Component_exec.h
-    Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(TypeRegistration_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   TypeRegistration_Component_lem_stub TypeRegistration_Base_stub \
-                  TypeRegistration_Connector_stub TypeRegistration_Connector_svnt \
-                  TypeRegistration_Component_exec TypeRegistration_Connector_lem_stub
-  sharedname  = Component_svnt
-  libs       += Component_stub Component_lem_stub TypeRegistration_Base_stub \
-                TypeRegistration_Connector_stub TypeRegistration_Connector_svnt \
-                Component_exec TypeRegistration_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TypeRegistration_Test_ComponentS.cpp
-    TypeRegistration_Test_Component_svnt.cpp
-  }
-
-  Header_Files {
-    TypeRegistration_Test_ComponentS.h
-    TypeRegistration_Test_Component_svnt.h
-    Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.cpp
deleted file mode 100644
index 0e58496fb5f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.cpp
+++ /dev/null
@@ -1,289 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "TypeRegistration_Test_Component_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_MLD_TypeRegistration_Test_CFTTestComponent_Impl
-{
-  /**
-   * WriteTicker
-   */
-  WriteTicker::WriteTicker (CFTTestComponent_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteTicker::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.write_one ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: listener_data_listener_exec_i
-   */
-
-  listener_data_listener_exec_i::listener_data_listener_exec_i (
-        ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context_ptr ctx)
-    : ciao_context_ (
-        ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context::_duplicate (ctx))
-  {
-  }
-
-  listener_data_listener_exec_i::~listener_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::MLDTypeRegistrationTestConn::Listener
-
-  void
-  listener_data_listener_exec_i::on_one_data (const ::MLDTypeRegistrationTest & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ACE_DEBUG ((LM_DEBUG, "listener_data_listener_exec_i::on_one_data: "
-                            "key <%u>\n",
-                            datum.key));
-  }
-
-  void
-  listener_data_listener_exec_i::on_many_data (const ::MLDTypeRegistrationTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: listener_status_exec_i
-   */
-
-  listener_status_exec_i::listener_status_exec_i (
-        ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context_ptr ctx)
-    : ciao_context_ (
-        ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context::_duplicate (ctx))
-  {
-  }
-
-  listener_status_exec_i::~listener_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  listener_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  listener_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: CFTTestComponent_exec_i
-   */
-
-  CFTTestComponent_exec_i::CFTTestComponent_exec_i (void)
-    : ticker_(0)
-    , iterator(0)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      WriteTicker (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  CFTTestComponent_exec_i::~CFTTestComponent_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  CFTTestComponent_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  CFTTestComponent_exec_i::write_one (void)
-  {
-    MLDTypeRegistrationTest new_key;
-    new_key.key = ++this->iterator;
-
-    MLDTypeRegistrationTestConn::Writer_var writer =
-      this->ciao_context_->get_connection_writer_data ();
-    if (::CORBA::is_nil (writer.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "CFTTestComponent_exec_i::write_one - "
-                    "ERROR: Writer seems to be nil\n"));
-        return;
-      }
-    try
-      {
-        writer->write_one (new_key, ::DDS::HANDLE_NIL);
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, "CFTTestComponent_exec_i::write_one - "
-                    "ERROR: caught InternalError exception while writing <%d> to DDS.\n",
-                    this->iterator));
-      }
-    catch (const ::CORBA::Exception& )
-      {
-        ACE_ERROR ((LM_ERROR, "CFTTestComponent_exec_i::write_one - "
-                    "ERROR: caught CORBA exception while writing <%d> to DDS.\n",
-                    this->iterator));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::MLDTypeRegistrationTestConn::CCM_Listener_ptr
-  CFTTestComponent_exec_i::get_listener_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_listener_data_listener_.in ()))
-      {
-        listener_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          listener_data_listener_exec_i (
-            this->ciao_context_.in ()),
-            ::MLDTypeRegistrationTestConn::CCM_Listener::_nil ());
-
-          this->ciao_listener_data_listener_ = tmp;
-      }
-
-    return
-      ::MLDTypeRegistrationTestConn::CCM_Listener::_duplicate (
-        this->ciao_listener_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  CFTTestComponent_exec_i::get_listener_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_listener_status_.in ()))
-      {
-        listener_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          listener_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_listener_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_listener_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  CFTTestComponent_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  CFTTestComponent_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  CFTTestComponent_exec_i::ccm_activate (void)
-  {
-    if (this->reactor ()->schedule_timer (
-            this->ticker_,
-            0,
-            ACE_Time_Value (5, 50000),
-            ACE_Time_Value (1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-
-    ::CCM_DDS::DataListenerControl_var dlc =
-    this->ciao_context_->get_connection_listener_data_control();
-    dlc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  CFTTestComponent_exec_i::ccm_passivate (void)
-  {
-    this->reactor ()->cancel_timer(this->ticker_);
-  }
-
-  void
-  CFTTestComponent_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_MLD_TypeRegistration_Test_CFTTestComponent_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      CFTTestComponent_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.h
deleted file mode 100644
index e4790cb99e3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.h
+++ /dev/null
@@ -1,186 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_TYPEREGISTRATION_TEST_COMPONENT_EXEC_0FYVIW_H_
-#define CIAO_TYPEREGISTRATION_TEST_COMPONENT_EXEC_0FYVIW_H_
-
-#include /**/ "ace/pre.h"
-
-#include "TypeRegistration_Test_ComponentEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Component_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_MLD_TypeRegistration_Test_CFTTestComponent_Impl
-{
-  class CFTTestComponent_exec_i;
-
-  /**
-   * WriteTicker
-   */
-  class WriteTicker :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteTicker (CFTTestComponent_exec_i &callback);
-    int handle_timeout (const ACE_Time_Value &, const void *);
-  private:
-    /// Maintains a handle that actually process the event
-    CFTTestComponent_exec_i &callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: listener_data_listener_exec_i
-   */
-
-  class listener_data_listener_exec_i
-    : public virtual ::MLDTypeRegistrationTestConn::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    listener_data_listener_exec_i (
-      ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context_ptr ctx);
-    virtual ~listener_data_listener_exec_i (void);
-
-    /** @name Operations and attributes from MLDTypeRegistrationTestConn::Listener */
-    //@{
-
-    virtual
-    void on_one_data (const ::MLDTypeRegistrationTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::MLDTypeRegistrationTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: listener_status_exec_i
-   */
-
-  class listener_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    listener_status_exec_i (
-      ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context_ptr ctx);
-    virtual ~listener_status_exec_i (void);
-
-    /** @name Operations and attributes from CCM_DDS::PortStatusListener */
-    //@{
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: CFTTestComponent_exec_i
-   */
-
-  class CFTTestComponent_exec_i
-    : public virtual CFTTestComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    CFTTestComponent_exec_i (void);
-    virtual ~CFTTestComponent_exec_i (void);
-
-    /** @name Supported operations and attributes. */
-    //@{
-
-    //@}
-
-    /** @name Component attributes and port operations. */
-    //@{
-
-    virtual ::MLDTypeRegistrationTestConn::CCM_Listener_ptr
-    get_listener_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_listener_status (void);
-    //@}
-
-    /** @name 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);
-    //@}
-
-    /** @name User defined public operations. */
-    //@{
-    void write_one (void);
-    //@}
-
-  private:
-    ::MLD_TypeRegistration_Test::CCM_CFTTestComponent_Context_var ciao_context_;
-
-    /** @name Component attributes. */
-    //@{
-    ::MLDTypeRegistrationTestConn::CCM_Listener_var ciao_listener_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_listener_status_;
-    //@}
-
-    /** @name User defined members. */
-    //@{
-    WriteTicker     *ticker_;
-    ::CORBA::ULong  iterator;
-    //@}
-
-    /** @name User defined private operations. */
-    //@{
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_MLD_TypeRegistration_Test_CFTTestComponent_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl
deleted file mode 100644
index 6b6c822a884..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file TypeRegistration_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef MLD_TYPE_REGISTRATION_TEST_CONNECTOR_IDL_
-#define MLD_TYPE_REGISTRATION_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/TypeRegistration_Test_Base.idl"
-
-#pragma ciao lem "Connector/TypeRegistration_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/TypeRegistration_Test_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::MLDTypeRegistrationTest, ::MLDTypeRegistrationTestSeq> MLDTypeRegistrationTestConn;
-
-#endif /* MLD_TYPE_REGISTRATION_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc
deleted file mode 100644
index ba4a82920d7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p TypeRegistration_Base -l .. -o ../lib -u DDS TypeRegistration_Connector"
-
-project(TypeRegistration_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen TypeRegistration_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=MLD_TYPE_REGISTRATION_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=TypeRegistration_Connector_stub_export.h \
-              -Wb,skel_export_macro=MLD_TYPE_REGISTRATION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=TypeRegistration_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=MLD_TYPE_REGISTRATION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=TypeRegistration_Connector_svnt_export.h \
-              -Wb,conn_export_macro=MLD_TYPE_REGISTRATION_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=TypeRegistration_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    TypeRegistration_Test_Connector.idl
-  }
-}
-
-project(TypeRegistration_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += TypeRegistration_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=MLD_TYPE_REGISTRATION_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=TypeRegistration_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    TypeRegistration_Test_ConnectorE.idl
-  }
-}
-
-project(TypeRegistration_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += TypeRegistration_Connector_lem_gen TypeRegistration_Connector_stub TypeRegistration_Base_stub
-  libs  += TypeRegistration_Base_stub TypeRegistration_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = TypeRegistration_Connector_lem_stub
-  dynamicflags += MLD_TYPE_REGISTRATION_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TypeRegistration_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    TypeRegistration_Test_ConnectorEC.h
-    TypeRegistration_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    TypeRegistration_Test_ConnectorEC.inl
-  }
-}
-
-project(TypeRegistration_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += TypeRegistration_Connector_idl_gen TypeRegistration_Base_stub
-  libs  += TypeRegistration_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = TypeRegistration_Connector_stub
-  dynamicflags += MLD_TYPE_REGISTRATION_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TypeRegistration_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    TypeRegistration_Test_ConnectorC.h
-    TypeRegistration_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    TypeRegistration_Test_ConnectorC.inl
-  }
-}
-
-project(TypeRegistration_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += TypeRegistration_Connector_lem_stub TypeRegistration_Connector_stub TypeRegistration_Base_stub
-  sharedname = TypeRegistration_Connector_exec
-  libs += TypeRegistration_Connector_stub TypeRegistration_Connector_lem_stub TypeRegistration_Base_stub TypeRegistration_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += MLD_TYPE_REGISTRATION_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TypeRegistration_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    TypeRegistration_Test_Connector_conn.h
-    TypeRegistration_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(TypeRegistration_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += TypeRegistration_Connector_lem_stub TypeRegistration_Connector_exec TypeRegistration_Connector_stub
-  sharedname  = TypeRegistration_Connector_svnt
-  libs       += TypeRegistration_Connector_stub \
-                TypeRegistration_Connector_lem_stub  \
-                TypeRegistration_Base_stub \
-                TypeRegistration_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += MLD_TYPE_REGISTRATION_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TypeRegistration_Test_ConnectorS.cpp
-    TypeRegistration_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    TypeRegistration_Test_ConnectorS.h
-    TypeRegistration_Test_Connector_svnt.h
-    TypeRegistration_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/Plan.cdp
deleted file mode 100644
index 73f2782d197..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/Plan.cdp
+++ /dev/null
@@ -1,253 +0,0 @@
-<!--  -->
-<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>MLDTest_Depl</label>
-  <UUID>MLDTest_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_MLD_TypeRegistration_Test_CFTTestComponent_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_MLD_TypeRegistration_Test_CFTTestComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="MLD_TypeRegistration_Test_ConnectorImplementation">
-    <name>MLD_TypeRegistration_Test_ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="MLD_TypeRegistration_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="MLD_TypeRegistration_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_MLDTypeRegistrationTestConn_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_MLDTypeRegistrationTestConn_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TypeRegistration_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TypeRegistration_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-
-  <instance xmi:id="ComponentInstance">
-    <name>Component</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="MLD_TypeRegistration_Test_ConnectorInstance_Writer">
-    <name>MLD_TypeRegistration_Test_Connector_Writer</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="MLD_TypeRegistration_Test_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>MLDTypeRegistration_Writer</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="MLD_TypeRegistration_Test_ConnectorInstance_Listener">
-    <name>MLD_TypeRegistration_Test_Connector_Listener</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="MLD_TypeRegistration_Test_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>MLDTypeRegistration_Listener</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>listener_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>listener_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="MLD_TypeRegistration_Test_ConnectorInstance_Listener" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listener_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>listener_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="MLD_TypeRegistration_Test_ConnectorInstance_Listener" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>writer_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="MLD_TypeRegistration_Test_ConnectorInstance_Writer" />
-    </internalEndpoint>
-  </connection>
-
-
-  <artifact xmi:id="MLD_TypeRegistration_Test_Connector_ExecArtifact">
-    <name>TypeRegistration_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>TypeRegistration_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="MLD_TypeRegistration_Test_Connector_SvntArtifact">
-    <name>TypeRegistration_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>TypeRegistration_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="MLD_TypeRegistration_Test_Connector_StubArtifact">
-    <name>TypeRegistration_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>TypeRegistration_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/run_test.pl
deleted file mode 100755
index a7dfbd85bf6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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 = 1;
-@ports = ( 60001 );
-@iorbases = ( "Component.ior" );
-@iorfiles = 0;
-@nodenames = ( "ComponentNode" );
-
-# 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 20 seconds to allow task to complete\n";
-sleep (20);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl
deleted file mode 100644
index e88f8982ae7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * @file MultiTopic_Base.idl
- * @author
- */
-
-#ifndef MULTITOPIC_IDL
-#define MULTITOPIC_IDL
-
-#pragma ndds typesupport "Base/MultiTopic_BaseSupport.h"
-#pragma opendds typesupport "Base/MultiTopic_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "ShapeType"
-#pragma DCPS_DATA_KEY "ShapeType color"
-
-struct ShapeType {
-  string color; //@key
-  long x;
-  long y;
-  long shapesize;
-};
-#pragma keylist ShapeType color
-
-#pragma DCPS_DATA_TYPE "Attributes"
-#pragma DCPS_DATA_KEY "Attributes shape"
-#pragma DCPS_DATA_KEY "Attributes color"
-
-struct Attributes {
-  string shape; //@key
-  string color; //@key
-  float speed;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<ShapeType> ShapeTypeSeq;
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<Attributes> AttributesSeq;
-#endif
-
-#pragma keylist Attributes shape color
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.mpc
deleted file mode 100644
index 8ad8c86b97c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_MultiTopic_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_MultiTopic_Base_stub
-  dynamicflags += MULTITOPIC_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=MULTITOPIC_BASE_STUB_Export \
-              -Wb,stub_export_include=MultiTopic_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    MultiTopic_Base.idl
-  }
-
-  opendds_ts_flags += --export=MULTITOPIC_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    MultiTopic_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.idl
deleted file mode 100644
index 90493e79a63..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file MultiTopic_Connector.idl
- * @author
- */
-
-#ifndef MULTITOPIC_CONNECTOR_IDL_
-#define MULTITOPIC_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <Connector/ccm_dds_mt.idl>
-
-#include "Base/MultiTopic_Base.idl"
-
-#pragma ciao lem "Connector/MultiTopic_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/MultiTopic_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS_MT::Typed_MT < ::ShapeType, ::ShapeTypeSeq> Shapes;
-
-#endif /* MULTITOPIC_CONNECTOR_IDL_ */
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc
deleted file mode 100644
index 1453e0e781c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc
+++ /dev/null
@@ -1,156 +0,0 @@
-project (DDS_CCM_Example_MT_idl_gen) : taoidldefaults, anytypecode, dds4ccm {
-  custom_only = 1
-  after += DDS_MultiTopic_Base_stub
-  idlflags += -Wb,stub_export_macro=CCM_DDS_MT_STUB_Export \
-              -Wb,stub_export_include=ccm_dds_mt_stub_export.h \
-              -Wb,skel_export_macro=CCM_DDS_MT_SKEL_Export \
-              -Wb,skel_export_include=ccm_dds_mt_skel_export.h \
-              -SS -Scc -Sci -Gxhst \
-              -I $(CIAO_ROOT)/connectors/dds4ccm/idl
-
-  IDL_Files {
-    ccm_dds_mt.idl
-  }
-}
-
-project(DDS_MultiTopic_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_CCM_Example_MT_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=MULTITOPIC_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=MultiTopic_Connector_stub_export.h \
-              -Wb,skel_export_macro=MULTITOPIC_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=MultiTopic_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=MULTITOPIC_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=MultiTopic_Connector_svnt_export.h \
-              -Wb,conn_export_macro=MULTITOPIC_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=MultiTopic_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    MultiTopic_Connector.idl
-  }
-
-}
-
-project(DDS_MultiTopic_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_MultiTopic_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=MULTITOPIC_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=MultiTopic_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    MultiTopic_ConnectorE.idl
-  }
-}
-
-project(DDS_MultiTopic_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_MultiTopic_Connector_lem_gen DDS_MultiTopic_Connector_stub DDS_MultiTopic_Base_stub
-  libs  += DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_MultiTopic_Connector_lem_stub
-  dynamicflags += MULTITOPIC_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultiTopic_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    MultiTopic_ConnectorEC.h
-    MultiTopic_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    MultiTopic_ConnectorEC.inl
-  }
-}
-
-project(DDS_MultiTopic_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_MultiTopic_Connector_idl_gen DDS_MultiTopic_Base_stub
-  libs  += DDS_MultiTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_MultiTopic_Connector_stub
-  dynamicflags += MULTITOPIC_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultiTopic_ConnectorC.cpp
-  }
-
-  Header_Files {
-    MultiTopic_ConnectorC.h
-    MultiTopic_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    MultiTopic_ConnectorC.inl
-  }
-}
-
-project(DDS_MultiTopic_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_MultiTopic_Connector_lem_stub DDS_MultiTopic_Connector_stub
-  sharedname = DDS_MultiTopic_Connector_exec
-  libs += DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_lem_stub DDS_MultiTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += MULTITOPIC_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultiTopic_Connector_conn.cpp
-  }
-
-  Header_Files {
-    MultiTopic_Connector_conn.h
-    MultiTopic_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_MultiTopic_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_MultiTopic_Connector_lem_stub DDS_MultiTopic_Connector_exec DDS_MultiTopic_Connector_stub
-  sharedname  = DDS_MultiTopic_Connector_svnt
-  libs       += DDS_MultiTopic_Connector_stub \
-                DDS_MultiTopic_Connector_lem_stub  \
-                DDS_MultiTopic_Base_stub \
-                DDS_MultiTopic_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += MULTITOPIC_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultiTopic_ConnectorS.cpp
-    MultiTopic_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    MultiTopic_ConnectorS.h
-    MultiTopic_Connector_svnt.h
-    MultiTopic_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp
deleted file mode 100644
index e62a9213235..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp
+++ /dev/null
@@ -1,653 +0,0 @@
-#include "connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h"
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::DDS_MT_Event_Connector_T (void)
-  : reactor_ (0)
-{
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::supplier_sq_traits::data_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_sq_data (void)
-{
-  ACE_TRACE ("DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_sq_data");
-
-  typename CCM_TYPE::supplier_sq_traits::data_type::_var_type dw =
-    this->sq_supplier_.get_data ();
-  return CCM_TYPE::supplier_sq_traits::data_type::_duplicate (dw.in ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::supplier_sq_traits::dds_entity_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_sq_dds_entity (void)
-{
-
-  return CCM_TYPE::supplier_sq_traits::dds_entity_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::pull_consumer_sq_traits::fresh_data_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_sq_fresh_data (void)
-{
-  typename CCM_TYPE::pull_consumer_sq_traits::fresh_data_type::_var_type fresh_data =
-    this->pull_consumer_sq_.get_fresh_data ();
-  return CCM_TYPE::pull_consumer_sq_traits::fresh_data_type::_duplicate (
-                                                              fresh_data.in ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::pull_consumer_sq_traits::data_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_sq_data (void)
-{
-
-  return CCM_TYPE::pull_consumer_sq_traits::data_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::pull_consumer_sq_traits::dds_entity_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_sq_dds_entity (void)
-{
-
-  return CCM_TYPE::pull_consumer_sq_traits::dds_entity_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::QueryFilter*
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_sq_filter (void)
-{
-  return 0;
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_sq_filter (const ::CCM_DDS::QueryFilter&)
-{
-
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::CCM_ContentFilterSetting_ptr
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_sq_filter_config(void)
-{
-
-  return ::CCM_DDS::CCM_ContentFilterSetting::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::CCM_ContentFilterSetting*
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_sq_filter_config(void)
-{
-  return ::CCM_DDS::CCM_ContentFilterSetting::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::QueryFilter *
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_sq_filter (void)
-{
-  return 0;
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_sq_filter (const ::CCM_DDS::QueryFilter &)
-{
-
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::push_consumer_sq_traits::data_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_sq_data (void)
-{
-
-  return CCM_TYPE::push_consumer_sq_traits::data_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::push_consumer_sq_traits::data_control_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_sq_data_control (void)
-{
-
-  return CCM_TYPE::push_consumer_sq_traits::data_control_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::push_consumer_sq_traits::dds_entity_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_sq_dds_entity (void)
-{
-
-  return CCM_TYPE::push_consumer_sq_traits::dds_entity_type::_nil ();
-}
-
-//TRIANGEL
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::supplier_tr_traits::data_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_tr_data (void)
-{
-  ACE_TRACE ("DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_tr_data");
-
-  typename CCM_TYPE::supplier_sq_traits::data_type::_var_type dw =
-    this->tr_supplier_.get_data ();
-  return CCM_TYPE::supplier_sq_traits::data_type::_duplicate (dw.in ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::supplier_tr_traits::dds_entity_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_tr_dds_entity (void)
-{
-
-  return CCM_TYPE::supplier_tr_traits::dds_entity_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::pull_consumer_tr_traits::fresh_data_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_tr_fresh_data (void)
-{
-  typename CCM_TYPE::pull_consumer_tr_traits::fresh_data_type::_var_type fresh_data =
-    this->pull_consumer_tr_.get_fresh_data ();
-
-  return CCM_TYPE::pull_consumer_tr_traits::fresh_data_type::_duplicate (
-                                                              fresh_data.in ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::pull_consumer_tr_traits::data_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_tr_data (void)
-{
-
-  return CCM_TYPE::pull_consumer_tr_traits::data_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::pull_consumer_tr_traits::dds_entity_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_tr_dds_entity (void)
-{
-
-  return CCM_TYPE::pull_consumer_tr_traits::dds_entity_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::QueryFilter*
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_tr_filter (void)
-{
-
-  return 0;
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_tr_filter (const ::CCM_DDS::QueryFilter&)
-{
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::CCM_ContentFilterSetting*
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_tr_filter_config(void)
-{
-  return ::CCM_DDS::CCM_ContentFilterSetting::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::CCM_ContentFilterSetting*
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_tr_filter_config(void)
-{
-  return ::CCM_DDS::CCM_ContentFilterSetting::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::QueryFilter *
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_tr_filter (void)
-{
-  return 0;
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_tr_filter (
-  const ::CCM_DDS::QueryFilter &)
-{
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::push_consumer_tr_traits::data_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_tr_data (void)
-{
-  return CCM_TYPE::push_consumer_tr_traits::data_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::push_consumer_tr_traits::data_control_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_tr_data_control (void)
-{
-
-  return CCM_TYPE::push_consumer_tr_traits::data_control_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::push_consumer_tr_traits::dds_entity_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_tr_dds_entity (void)
-{
-
-  return CCM_TYPE::push_consumer_tr_traits::dds_entity_type::_nil ();
-}
-
-//CIRCLE
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::supplier_cl_traits::data_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_cl_data (void)
-{
-  ACE_TRACE ("DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_cl_data");
-  typename CCM_TYPE::supplier_sq_traits::data_type::_var_type dw =
-    this->cl_supplier_.get_data ();
-  return CCM_TYPE::supplier_sq_traits::data_type::_duplicate (dw.in ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::supplier_cl_traits::dds_entity_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_cl_dds_entity (void)
-{
-
-  return CCM_TYPE::supplier_cl_traits::dds_entity_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::pull_consumer_cl_traits::fresh_data_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_cl_fresh_data (void)
-{
-  return CCM_TYPE::pull_consumer_cl_traits::fresh_data_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::pull_consumer_cl_traits::data_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_cl_data (void)
-{
-
-  return CCM_TYPE::pull_consumer_cl_traits::data_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::pull_consumer_cl_traits::dds_entity_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_cl_dds_entity (void)
-{
-
-  return CCM_TYPE::pull_consumer_cl_traits::dds_entity_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::QueryFilter*
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_cl_filter (void)
-{
-
-  return 0;
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_cl_filter (const ::CCM_DDS::QueryFilter&)
-{
-
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::CCM_ContentFilterSetting*
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_cl_filter_config(void)
-{
-
-  return ::CCM_DDS::CCM_ContentFilterSetting::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::CCM_ContentFilterSetting*
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_cl_filter_config(void)
-{
-
-  return ::CCM_DDS::CCM_ContentFilterSetting::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-::CCM_DDS::QueryFilter *
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_cl_filter (void)
-{
-  return 0;
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_cl_filter (const ::CCM_DDS::QueryFilter &)
-{
-
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::push_consumer_cl_traits::data_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_cl_data (void)
-{
-  return CCM_TYPE::push_consumer_cl_traits::data_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::push_consumer_cl_traits::data_control_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_cl_data_control (void)
-{
-  typename CCM_TYPE::push_consumer_cl_traits::data_control_type::_var_type dlc =
-    this->push_consumer_cl_.get_data_control ();
-  return CCM_TYPE::push_consumer_cl_traits::data_control_type::_duplicate (dlc.in ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-typename CCM_TYPE::push_consumer_cl_traits::dds_entity_type::_ptr_type
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_cl_dds_entity (void)
-{
-  return CCM_TYPE::push_consumer_cl_traits::dds_entity_type::_nil ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-char *
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name_sq (void)
-{
-  return CORBA::string_dup (this->topic_name_sq_.in ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name_sq (
-  const char * topic_name_sq)
-{
-  this->topic_name_sq_ = topic_name_sq;
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-char *
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name_tr (void)
-{
-  return CORBA::string_dup (this->topic_name_tr_.in ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name_tr (
-  const char * topic_name_tr)
-{
-  this->topic_name_tr_ = topic_name_tr;
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-char *
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name_cl (void)
-{
-  return CORBA::string_dup (this->topic_name_cl_.in ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name_cl (
-  const char * topic_name_cl)
-{
-  this->topic_name_cl_ = topic_name_cl;
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::create_topics (
-  const char * typesupport_name)
-{
-   this->init_topic (this->domain_participant_.in (),
-                     this->topic_sq_.inout (),
-                     this->topic_name_sq_.in (),
-                     typesupport_name);
-   if (::CORBA::is_nil (this->topic_sq_.in ()))
-     {
-       ACE_ERROR ((LM_ERROR, "DDS_MT_Event_Connector_T::create_topics - "
-                  "Error creating topic for Square\n"));
-       throw ::CORBA::INTERNAL ();
-     }
-   this->init_topic (this->domain_participant_.in (),
-                     this->topic_tr_.inout (),
-                     this->topic_name_tr_.in (),
-                     typesupport_name);
-   if (::CORBA::is_nil (this->topic_tr_.in ()))
-     {
-       ACE_ERROR ((LM_ERROR, "DDS_MT_Event_Connector_T::create_topics - "
-                  "Error creating topic for Triangle\n"));
-       throw ::CORBA::INTERNAL ();
-     }
-   this->init_topic (this->domain_participant_.in (),
-                     this->topic_cl_.inout (),
-                     this->topic_name_cl_.in (),
-                     typesupport_name);
-   if (::CORBA::is_nil (this->topic_cl_.in ()))
-     {
-       ACE_ERROR ((LM_ERROR, "DDS_MT_Event_Connector_T::create_topics - "
-                  "Error creating topic for Circle\n"));
-       throw ::CORBA::INTERNAL ();
-     }
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::configuration_complete (void)
-{
-  // Init default domain (Base_Connector)
-  this->init_domain (this->domain_participant_.inout ());
-
-  // Init type (TopicBase_Connector)
-  ::CORBA::String_var typesupport_name;
-#if (CIAO_DDS4CCM_NDDS==1)
-  typesupport_name = ::CORBA::string_dup (DDS_TYPE::type_support::get_type_name ());
-#elif (CIAO_DDS4CCM_OPENDDS==1)
-  typename DDS_TYPE::type_support type;
-  typesupport_name = type.get_type_name ();
-#endif
-  this->register_type (this->domain_participant_.in (),
-                       typesupport_name.in ());
-
-  // Create the topics needed (this class)
-  this->create_topics (typesupport_name);
-
-  // Init the subscriber and publisher (TopicBase_Connector)
-  this->init_subscriber (this->domain_participant_.in (),
-                         this->subscriber_.inout ());
-  this->init_publisher (this->domain_participant_.in (),
-                        this->publisher_.inout ());
-
-  this->sq_supplier_.configuration_complete (
-                                      this->topic_sq_.in (),
-                                      this->publisher_.in (),
-                                      this->qos_profile_,
-                                      this->qos_xml_);
-  this->tr_supplier_.configuration_complete (
-                                      this->topic_tr_.in (),
-                                      this->publisher_.in (),
-                                      this->qos_profile_,
-                                      this->qos_xml_);
-  this->cl_supplier_.configuration_complete (
-                                      this->topic_cl_.in (),
-                                      this->publisher_.in (),
-                                      this->qos_profile_,
-                                      this->qos_xml_);
-  this->pull_consumer_sq_.configuration_complete (
-                                      this->topic_sq_.in (),
-                                      this->subscriber_.in (),
-                                      this->qos_profile_,
-                                      this->qos_xml_);
-  this->pull_consumer_tr_.configuration_complete (
-                                      this->topic_tr_.in (),
-                                      this->subscriber_.in (),
-                                      this->qos_profile_,
-                                      this->qos_xml_);
-  this->push_consumer_cl_.configuration_complete (
-                                      this->topic_cl_.in (),
-                                      this->subscriber_.in (),
-                                      this->qos_profile_,
-                                      this->qos_xml_);
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::activate_topics (void)
-{
-  this->activate_topic (this->reactor_,
-                        this->topic_sq_.in (),
-                        this->topiclistener_sq_.inout ());
-  this->activate_topic (this->reactor_,
-                        this->topic_tr_.in (),
-                        this->topiclistener_tr_.inout ());
-  this->activate_topic (this->reactor_,
-                        this->topic_cl_.in (),
-                        this->topiclistener_cl_.inout ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_activate (void)
-{
-  this->activate_topics ();
-  this->activate_subscriber (this->reactor_,
-                             this->subscriber_.in (),
-                             this->subscriber_listener_.inout ());
-  this->activate_publisher (this->reactor_,
-                            this->publisher_.in (),
-                            this->publisher_listener_.inout ());
-
-  this->sq_supplier_.activate ();
-  this->tr_supplier_.activate ();
-  this->cl_supplier_.activate ();
-
-  ::CCM_DDS::PortStatusListener_var pull_consumer_sq_psl =
-    this->context_->get_connection_pull_consumer_sq_status ();
-  this->pull_consumer_sq_.activate (pull_consumer_sq_psl.in (),
-                                    this->reactor_);
-
-  ::CCM_DDS::PortStatusListener_var pull_consumer_tr_psl =
-    this->context_->get_connection_pull_consumer_tr_status ();
-  this->pull_consumer_tr_.activate (pull_consumer_tr_psl.in (),
-                                    this->reactor_);
-
-  ::CCM_DDS::PortStatusListener_var push_consumer_cl_psl =
-    this->context_->get_connection_push_consumer_cl_status ();
-
-  this->dl_ = this->context_->get_connection_push_consumer_cl_data_listener ();
-  this->push_consumer_cl_.activate (this->dl_.in (),
-                                    push_consumer_cl_psl.in (),
-                                    this->reactor_);
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::passivate_topics (void)
-{
-  ::DDS::TopicListener_var topic_listener = this->topiclistener_sq_._retn ();
-  if (!::CORBA::is_nil (topic_listener.in ()))
-    {
-      this->passivate_topic (this->topic_sq_.in (),
-                             topic_listener.in ());
-    }
-  topic_listener = this->topiclistener_tr_._retn ();
-  if (!::CORBA::is_nil (topic_listener.in ()))
-    {
-      this->passivate_topic (this->topic_tr_.in (),
-                             topic_listener.in ());
-    }
-  topic_listener = this->topiclistener_cl_._retn ();
-  if (!::CORBA::is_nil (topic_listener.in ()))
-    {
-      this->passivate_topic (this->topic_cl_.in (),
-                             topic_listener.in ());
-    }
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_passivate (void)
-{
-  this->sq_supplier_.passivate ();
-  this->tr_supplier_.passivate ();
-  this->cl_supplier_.passivate ();
-
-  this->pull_consumer_sq_.passivate ();
-  this->pull_consumer_tr_.passivate ();
-
-  this->push_consumer_cl_.passivate ();
-
-  this->passivate_topics ();
-
-  ::DDS::SubscriberListener_var subscriber_listener =
-    this->subscriber_listener_._retn ();
-  if (!::CORBA::is_nil (subscriber_listener.in ()))
-    {
-      this->passivate_subscriber (this->subscriber_.in (),
-                                  subscriber_listener.in ());
-    }
-  ::DDS::PublisherListener_var publisher_listener =
-    this->publisher_listener_._retn ();
-  if (!::CORBA::is_nil (publisher_listener.in ()))
-    {
-      this->passivate_publisher (this->publisher_.in (),
-                                 publisher_listener.in ());
-    }
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::remove_topics (void)
-{
-  this->remove_topic (this->domain_participant_.in (),
-                      this->topic_sq_.inout ());
-  this->remove_topic (this->domain_participant_.in (),
-                      this->topic_tr_.inout ());
-  this->remove_topic (this->domain_participant_.in (),
-                      this->topic_cl_.inout ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-void
-DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove (void)
-{
-  this->sq_supplier_.remove (this->publisher_.in ());
-  this->tr_supplier_.remove (this->publisher_.in ());
-  this->cl_supplier_.remove (this->publisher_.in ());
-
-  this->pull_consumer_sq_.remove (this->subscriber_.in ());
-  this->pull_consumer_tr_.remove (this->subscriber_.in ());
-  this->push_consumer_cl_.remove (this->subscriber_.in ());
-
-  this->remove_topics ();
-
-  /**
-    *
-    * In order to close down in a thread safe and memory leak free manner, one
-    * should first declare a temporary _var variable and assign this one with the
-    * class member, using _retn (). This'll free all references to the class member
-    * so one's sure that the only one left is the temporary _var variable. This
-    * one should be used in calls to the 'remove_xxx' methods.
-  **/
-  ::DDS::Publisher_var publisher = this->publisher_._retn ();
-  if (!::CORBA::is_nil (publisher.in ()))
-    {
-      this->remove_publisher (this->domain_participant_.in (),
-                              publisher.in ());
-    }
-  ::DDS::Subscriber_var subscriber = this->subscriber_._retn ();
-  if (!::CORBA::is_nil (subscriber.in ()))
-    {
-      this->remove_subscriber (this->domain_participant_.in (),
-                               subscriber.in ());
-    }
-
-  ::CORBA::String_var typesupport_name;
-#if (CIAO_DDS4CCM_NDDS==1)
-  typesupport_name = ::CORBA::string_dup (DDS_TYPE::type_support::get_type_name ());
-#elif (CIAO_DDS4CCM_OPENDDS==1)
-  typename DDS_TYPE::type_support type;
-  typesupport_name = type.get_type_name ();
-#endif
-  this->unregister_type (this->domain_participant_.in (),
-                         typesupport_name.in ());
-
-  ::DDS::DomainParticipant_var dp = this->domain_participant_._retn ();
-  if (!::CORBA::is_nil (dp.in ()))
-    {
-      this->remove_domain (dp.in ());
-    }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h
deleted file mode 100644
index 81486213f69..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h
+++ /dev/null
@@ -1,287 +0,0 @@
-#ifndef DDS_MT_CONNECTOR_T_H_
-#define DDS_MT_CONNECTOR_T_H_
-
-#include "connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h"
-#include "connectors/dds4ccm/impl/DDS_Write_T.h"
-#include "connectors/dds4ccm/impl/DDS_Get_T.h"
-#include "connectors/dds4ccm/impl/DDS_Listen_T.h"
-#include "connectors/dds4ccm/impl/DataListenerControl_T.h"
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-class DDS_MT_Event_Connector_T
-  : public virtual DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>
-{
-
-typedef DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE> TopicBaseConnector;
-
-public:
-  DDS_MT_Event_Connector_T (void);
-
-  /**
-    * Square connector
-    **/
-  virtual
-  typename CCM_TYPE::supplier_sq_traits::data_type::_ptr_type
-  get_supplier_sq_data (void);
-
-  virtual
-  typename CCM_TYPE::supplier_sq_traits::dds_entity_type::_ptr_type
-  get_supplier_sq_dds_entity (void);
-
-  virtual
-  typename CCM_TYPE::pull_consumer_sq_traits::fresh_data_type::_ptr_type
-  get_pull_consumer_sq_fresh_data (void);
-
-  virtual
-  typename CCM_TYPE::pull_consumer_sq_traits::data_type::_ptr_type
-  get_pull_consumer_sq_data (void);
-
-  virtual
-  typename CCM_TYPE::pull_consumer_sq_traits::dds_entity_type::_ptr_type
-  get_pull_consumer_sq_dds_entity (void);
-
-  virtual
-  CCM_DDS::QueryFilter*
-  pull_consumer_sq_filter (void);
-
-  virtual
-  void
-  pull_consumer_sq_filter (const CCM_DDS::QueryFilter&);
-
-  virtual
-  ::CCM_DDS::CCM_ContentFilterSetting_ptr
-  get_pull_consumer_sq_filter_config(void);
-
-  virtual
-  CCM_DDS::CCM_ContentFilterSetting*
-  get_push_consumer_sq_filter_config(void);
-
-  virtual
-  CCM_DDS::QueryFilter *
-  push_consumer_sq_filter (void);
-
-  virtual
-  void
-  push_consumer_sq_filter (const ::CCM_DDS::QueryFilter &);
-
-  virtual
-  typename CCM_TYPE::push_consumer_sq_traits::data_type::_ptr_type
-  get_push_consumer_sq_data (void);
-
-  virtual
-  typename CCM_TYPE::push_consumer_sq_traits::data_control_type::_ptr_type
-  get_push_consumer_sq_data_control (void);
-
-  virtual
-  typename CCM_TYPE::push_consumer_sq_traits::dds_entity_type::_ptr_type
-  get_push_consumer_sq_dds_entity (void);
-
-  /**
-    * Triangle connector
-    **/
-  virtual
-  typename CCM_TYPE::supplier_tr_traits::data_type::_ptr_type
-  get_supplier_tr_data (void);
-
-  virtual
-  typename CCM_TYPE::supplier_tr_traits::dds_entity_type::_ptr_type
-  get_supplier_tr_dds_entity (void);
-
-  virtual
-  typename CCM_TYPE::pull_consumer_tr_traits::fresh_data_type::_ptr_type
-  get_pull_consumer_tr_fresh_data (void);
-
-  virtual
-  typename CCM_TYPE::pull_consumer_tr_traits::data_type::_ptr_type
-  get_pull_consumer_tr_data (void);
-
-  virtual
-  typename CCM_TYPE::pull_consumer_tr_traits::dds_entity_type::_ptr_type
-  get_pull_consumer_tr_dds_entity (void);
-
-  virtual
-  CCM_DDS::QueryFilter*
-  pull_consumer_tr_filter (void);
-
-  virtual
-  void
-  pull_consumer_tr_filter (const CCM_DDS::QueryFilter&);
-
-  virtual
-  CCM_DDS::CCM_ContentFilterSetting*
-  get_pull_consumer_tr_filter_config(void);
-
-  virtual
-  CCM_DDS::CCM_ContentFilterSetting*
-  get_push_consumer_tr_filter_config(void);
-
-  virtual
-  CCM_DDS::QueryFilter *
-  push_consumer_tr_filter (void);
-
-  virtual
-  void
-  push_consumer_tr_filter (const ::CCM_DDS::QueryFilter &);
-
-  virtual
-  typename CCM_TYPE::push_consumer_tr_traits::data_type::_ptr_type
-  get_push_consumer_tr_data (void);
-
-  virtual
-  typename CCM_TYPE::push_consumer_tr_traits::data_control_type::_ptr_type
-  get_push_consumer_tr_data_control (void);
-
-  virtual
-  typename CCM_TYPE::push_consumer_tr_traits::dds_entity_type::_ptr_type
-  get_push_consumer_tr_dds_entity (void);
-
-  /**
-    * Circle connector
-    **/
-  virtual
-  typename CCM_TYPE::supplier_cl_traits::data_type::_ptr_type
-  get_supplier_cl_data (void);
-
-  virtual
-  typename CCM_TYPE::supplier_cl_traits::dds_entity_type::_ptr_type
-  get_supplier_cl_dds_entity (void);
-
-  virtual
-  typename CCM_TYPE::pull_consumer_cl_traits::fresh_data_type::_ptr_type
-  get_pull_consumer_cl_fresh_data (void);
-
-  virtual
-  typename CCM_TYPE::pull_consumer_cl_traits::data_type::_ptr_type
-  get_pull_consumer_cl_data (void);
-
-  virtual
-  typename CCM_TYPE::pull_consumer_cl_traits::dds_entity_type::_ptr_type
-  get_pull_consumer_cl_dds_entity (void);
-
-  virtual
-  CCM_DDS::QueryFilter*
-  pull_consumer_cl_filter (void);
-
-  virtual
-  void
-  pull_consumer_cl_filter (const CCM_DDS::QueryFilter&);
-
-  virtual
-  CCM_DDS::CCM_ContentFilterSetting*
-  get_pull_consumer_cl_filter_config(void);
-
-  virtual
-  CCM_DDS::CCM_ContentFilterSetting*
-  get_push_consumer_cl_filter_config(void);
-
-  virtual
-  CCM_DDS::QueryFilter *
-  push_consumer_cl_filter (void);
-
-  virtual
-  void
-  push_consumer_cl_filter (const ::CCM_DDS::QueryFilter &);
-
-  virtual
-  typename CCM_TYPE::push_consumer_cl_traits::data_type::_ptr_type
-  get_push_consumer_cl_data (void);
-
-  virtual
-  typename CCM_TYPE::push_consumer_cl_traits::data_control_type::_ptr_type
-  get_push_consumer_cl_data_control (void);
-
-  virtual
-  typename CCM_TYPE::push_consumer_cl_traits::dds_entity_type::_ptr_type
-  get_push_consumer_cl_dds_entity (void);
-
-  /**
-    * Topic names.
-    **/
-  virtual char * topic_name_sq (void);
-  virtual void topic_name_sq (const char * topic_name_sq);
-  virtual char * topic_name_tr (void);
-  virtual void topic_name_tr (const char * topic_name_tr);
-  virtual char * topic_name_cl (void);
-  virtual void topic_name_cl (const char * topic_name_cl);
-
-  /**
-    * Deployment methods.
-    **/
-  virtual void configuration_complete (void);
-  virtual void ccm_remove (void);
-  virtual void ccm_activate (void);
-  virtual void ccm_passivate (void);
-
-private:
-  DDS_Write_T <
-      typename CCM_TYPE::supplier_sq_traits,
-      typename DDS_TYPE::typed_writer_type,
-      typename DDS_TYPE::value_type,
-      SEQ_TYPE>
-    sq_supplier_;
-
-  DDS_Write_T <
-      typename CCM_TYPE::supplier_tr_traits,
-      typename DDS_TYPE::typed_writer_type,
-      typename DDS_TYPE::value_type,
-      SEQ_TYPE>
-    tr_supplier_;
-
-  DDS_Write_T <
-      typename CCM_TYPE::supplier_cl_traits,
-      typename DDS_TYPE::typed_writer_type,
-      typename DDS_TYPE::value_type,
-      SEQ_TYPE>
-    cl_supplier_;
-
-  DDS_Get_T <
-      typename CCM_TYPE::pull_consumer_sq_traits,
-      typename DDS_TYPE::typed_reader_type,
-      typename DDS_TYPE::value_type,
-      SEQ_TYPE,
-      FIXED>
-    pull_consumer_sq_;
-
-  DDS_Get_T <
-      typename CCM_TYPE::pull_consumer_tr_traits,
-      typename DDS_TYPE::typed_reader_type,
-      typename DDS_TYPE::value_type,
-      SEQ_TYPE,
-      FIXED>
-    pull_consumer_tr_;
-
-  DDS_Listen_T<
-      typename CCM_TYPE::push_consumer_cl_traits,
-      typename DDS_TYPE::typed_reader_type,
-      typename DDS_TYPE::value_type,
-      SEQ_TYPE,
-      CIAO::DDS4CCM::DDS4CCM_TAKE>
-    push_consumer_cl_;
-
-  /// Connection to the receiver implementation
-  typename CCM_TYPE::push_consumer_cl_traits::data_listener_type::_var_type dl_;
-
-  CORBA::String_var topic_name_sq_;
-  CORBA::String_var topic_name_tr_;
-  CORBA::String_var topic_name_cl_;
-
-  ::DDS::Topic_var topic_sq_;
-  ::DDS::Topic_var topic_tr_;
-  ::DDS::Topic_var topic_cl_;
-
-  ::DDS::TopicListener_var topiclistener_sq_;
-  ::DDS::TopicListener_var topiclistener_tr_;
-  ::DDS::TopicListener_var topiclistener_cl_;
-
-  ACE_Reactor * reactor_;
-
-  void create_topics (const char * typesupport_name);
-
-  void activate_topics (void);
-  void passivate_topics (void);
-  void remove_topics (void);
-};
-
-#include "MultiTopic_Connector_T.cpp"
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl
deleted file mode 100644
index 321861eff88..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef CCM_DDS_MT_IDL
-#define CCM_DDS_MT_IDL
-
-#include <Components.idl>
-
-#include "connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl"
-#include "connectors/dds4ccm/idl/dds4ccm_StateListenerControl.idl"
-#include "connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl"
-#include "connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl"
-
-#pragma dds4ccm impl "MultiTopic_Connector_T.h"
-
-#include <ccm_dds.idl>
-
-/**
- * @namespace CCM_DDS_MT
- *
- * Module containing all @ref MT related entities. Non-typed constructs are
- * directly defined in this module, while typed constructs are in a templated
- * sub-module.
- */
-module CCM_DDS_MT
-{
-  module Typed_MT<typename T, sequence<T> TSeq>
-    {
-      alias CCM_DDS::Typed<T, TSeq> DDS_Typed;
-      typedef DDS_Typed::DataReader DataReader;
-      typedef DDS_Typed::DataWriter DataWriter;
-
-      // DDS MT Connector
-      // ------------------
-      connector DDS_MT_Event : CCM_DDS::DDS_Base {
-        mirrorport DDS_Typed::DDS_Write  supplier_sq;
-        mirrorport DDS_Typed::DDS_Get    pull_consumer_sq;
-        mirrorport DDS_Typed::DDS_Listen push_consumer_sq;
-        mirrorport DDS_Typed::DDS_Write  supplier_tr;
-        mirrorport DDS_Typed::DDS_Get    pull_consumer_tr;
-        mirrorport DDS_Typed::DDS_Listen push_consumer_tr;
-        mirrorport DDS_Typed::DDS_Write  supplier_cl;
-        mirrorport DDS_Typed::DDS_Get    pull_consumer_cl;
-        mirrorport DDS_Typed::DDS_Listen push_consumer_cl;
-
-        attribute string topic_name_sq;
-        attribute string topic_name_tr;
-        attribute string topic_name_cl;
-      };
-   };
-};
-
-#endif // CCM_DDS_MT_IDL
-
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.idl
deleted file mode 100644
index 69c0b85ea58..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/MultiTopic_Connector.idl"
-
-module Shapes
-{
-  component Receiver
-  {
-    port DDS_Typed::DDS_Get info_get_sq;
-    port DDS_Typed::DDS_Get info_get_tr;
-    port DDS_Typed::DDS_Listen info_out_cl;
-
-    attribute unsigned long rate;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.mpc
deleted file mode 100644
index 4119c175422..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.mpc
+++ /dev/null
@@ -1,137 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -u DDS -b dds4ccm_base Receiver"
-
-project(DDS_MultiTopic_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_MultiTopic_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 {
-    MultiTopic_Receiver.idl
-  }
-}
-
-project(DDS_MultiTopic_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_MultiTopic_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 {
-    MultiTopic_ReceiverE.idl
-  }
-}
-
-project(DDS_MultiTopic_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_MultiTopic_Receiver_lem_gen DDS_MultiTopic_Receiver_stub  DDS_MultiTopic_Connector_stub DDS_MultiTopic_Base_stub
-  libs  +=  Receiver_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultiTopic_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    MultiTopic_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    MultiTopic_ReceiverEC.inl
-  }
-}
-
-project(DDS_MultiTopic_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_MultiTopic_Receiver_idl_gen  DDS_MultiTopic_Connector_stub DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_lem_gen
-  libs  += DDS_MultiTopic_Connector_stub DDS_MultiTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultiTopic_ReceiverC.cpp
-  }
-
-  Header_Files {
-    MultiTopic_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    MultiTopic_ReceiverC.inl
-  }
-}
-
-project(DDS_MultiTopic_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_MultiTopic_Receiver_lem_stub DDS_MultiTopic_Receiver_stub DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_lem_stub 
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultiTopic_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    MultiTopic_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_MultiTopic_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_MultiTopic_Receiver_lem_stub DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_svnt DDS_MultiTopic_Receiver_exec DDS_MultiTopic_Connector_lem_stub 
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_svnt Receiver_exec DDS_MultiTopic_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultiTopic_ReceiverS.cpp
-    MultiTopic_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    MultiTopic_ReceiverS.h
-    MultiTopic_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp
deleted file mode 100644
index 57932fba639..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp
+++ /dev/null
@@ -1,396 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "MultiTopic_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/OS_NS_time.h"
-#include "ace/Reactor.h"
-#include "dds4ccm/impl/TimeUtilities.h"
-
-#define TIME_OUT_SEC 1
-
-namespace CIAO_Shapes_Receiver_Impl
-{
-
-  //============================================================
-  // read_action_Generator
-  //============================================================
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &,
-                                         const void *)
-  {
-    this->pulse_callback_.get_one ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-  */
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::Shapes::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Shapes::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::Shapes::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::ShapeType & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<CIRCLE Listener> : ")
-            ACE_TEXT ("received CIRCLE for <%C> at %u:%u:%u\n"),
-            datum.color.in (),
-            datum.x,
-            datum.y,
-            datum.shapesize));
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::ShapeTypeSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : ticker_ (0),
-      rate_ (0)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      read_action_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-
-  void
-  Receiver_exec_i::get_one (void)
-  {
-    ShapeType_var shape_info;
-    ::CCM_DDS::ReadInfo_var readinfo;
-
-    try
-      {
-        ::Shapes::DDS_Typed::Getter_var getter_sq =
-          this-> ciao_context_->get_connection_info_get_sq_fresh_data ();
-        if (!::CORBA::is_nil (getter_sq.in ()))
-          {
-            if (getter_sq->get_one (shape_info.out (), readinfo.out ()))
-              {
-                ACE_Time_Value time;
-                time <<= readinfo->source_timestamp;
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<GET_ONE - SQUARE> ReadInfo -> ")
-                                      ACE_TEXT ("date = %#T\n"), &time));
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<GET_ONE - SQUARE> : ")
-                                      ACE_TEXT ("received shape_info for <%C> at %u:%u:%u\n"),
-                                      shape_info->color.in (),
-                                      shape_info->x,
-                                      shape_info->y,
-                                      shape_info->shapesize));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<GET_ONE - SQUARE> No data available for <%C>\n"),
-                         shape_info->color.in ()));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_one - "
-                      "ERROR: Getter for <SQUARE> seems to be nil\n"));
-          }
-
-        ::Shapes::DDS_Typed::Getter_var getter_tr =
-          this-> ciao_context_->get_connection_info_get_tr_fresh_data ();
-        if (!::CORBA::is_nil (getter_tr.in ()))
-          {
-            if (getter_tr->get_one (shape_info.out (), readinfo.out ()))
-              {
-                ACE_Time_Value time;
-                time <<= readinfo->source_timestamp;
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<GET_ONE - TRIANGLE> ReadInfo -> ")
-                                      ACE_TEXT ("date = %#T\n"), &time));
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<GET_ONE - TRIANGLE> : ")
-                                      ACE_TEXT ("received shape_info for <%C> at %u:%u:%u\n"),
-                                      shape_info->color.in (),
-                                      shape_info->x,
-                                      shape_info->y,
-                                      shape_info->shapesize));
-              }
-            else
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<GET_ONE - TRIANGLE> : No data available for <%C>\n"),
-                            shape_info->color.in ()));
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_one - "
-                      "ERROR: Getter for TRIANGLE seems to be nil\n"));
-          }
-        //Circle is retrieved by the listener functionality
-      }
-    catch(const CCM_DDS::NonExistent& )
-       {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ShapeType_Read_One: no shape_info receieved\n")));
-       }
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Receiver_exec_i::start (void)
-  {
-    // calculate the interval time
-    long const usec = 1000000 / this->rate_;
-
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (1, usec),
-                ACE_Time_Value (2*TIME_OUT_SEC, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Receiver_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    delete this->ticker_;
-  }
-  // Component attributes and port operations.
-
-  ::Shapes::DDS_Typed::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_sq_data_listener (void)
-  {
-    return ::Shapes::DDS_Typed::CCM_Listener::_nil ();
-  }
-
-  ::Shapes::DDS_Typed::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_tr_data_listener (void)
-  {
-    return ::Shapes::DDS_Typed::CCM_Listener::_nil ();
-  }
-
-  ::Shapes::DDS_Typed::CCM_Listener_ptr
-   Receiver_exec_i::get_info_out_cl_data_listener (void)
-   {
-     if ( ::CORBA::is_nil (this->ciao_info_out_cl_data_listener_.in ()))
-       {
-         info_out_data_listener_exec_i *tmp = 0;
-         ACE_NEW_RETURN (
-           tmp,
-           info_out_data_listener_exec_i (
-             this->ciao_context_.in ()),
-             ::Shapes::DDS_Typed::CCM_Listener::_nil ());
-
-           this->ciao_info_out_cl_data_listener_ = tmp;
-       }
-
-     return
-       ::Shapes::DDS_Typed::CCM_Listener::_duplicate (
-         this->ciao_info_out_cl_data_listener_.in ());
-   }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_sq_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_tr_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_cl_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_get_sq_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_get_tr_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_get_cl_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CORBA::ULong
-  Receiver_exec_i::rate (void)
-  {
-    return this->rate_;
-  }
-
-  void
-  Receiver_exec_i::rate (
-    const ::CORBA::ULong rate)
-  {
-    this->rate_ = rate;
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Shapes::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::DataListenerControl_var lc_cl =
-    this->ciao_context_->get_connection_info_out_cl_data_control ();
-    if (::CORBA::is_nil (lc_cl.in ()))
-      {
-        ACE_ERROR ((LM_INFO,
-            ACE_TEXT ("Error:  Listener control receptacle cl is null!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-    lc_cl->mode (::CCM_DDS::ONE_BY_ONE);
-
-    ::DDS::Duration_t to;
-    to.sec = TIME_OUT_SEC;
-    to.nanosec = 0;
-
-    ::Shapes::DDS_Typed::Getter_var getter_sq =
-      this-> ciao_context_->get_connection_info_get_sq_fresh_data ();
-    if (CORBA::is_nil (getter_sq.in ()))
-      {
-        ACE_ERROR ((LM_INFO,
-            ACE_TEXT ("Error: Getter of SQUARE seems to be nil!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-    getter_sq->time_out (to);
-
-    ::Shapes::DDS_Typed::Getter_var getter_tr =
-      this-> ciao_context_->get_connection_info_get_tr_fresh_data ();
-    if (CORBA::is_nil (getter_tr.in ()))
-      {
-        ACE_ERROR ((LM_INFO,
-            ACE_TEXT ("Error: Getter of TRIANGLE seems to be nil!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-    getter_tr->time_out (to);
-    this->start ();
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    this->stop();
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" RECEIVER_EXEC_Export  ::Components::EnterpriseComponent_ptr
-  create_Shape_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/MultiTopic/Receiver/MultiTopic_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h
deleted file mode 100644
index d6da1384e16..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h
+++ /dev/null
@@ -1,195 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_MULTITOPIC_RECEIVER_EXEC_BDTSSY_H_
-#define CIAO_MULTITOPIC_RECEIVER_EXEC_BDTSSY_H_
-
-
-#include "MultiTopic_ReceiverEC.h"
-
-#include /**/ "Receiver_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_Shapes_Receiver_Impl
-{
-  class Receiver_exec_i;
-   /**
-   * @class reader activity generator
-   *
-   * @brief an active object used by Receiver to perform a periodical read action
-   *
-   */
-   class read_action_Generator
-     : public ACE_Event_Handler
-   {
-   public:
-     read_action_Generator (Receiver_exec_i &callback);
-
-     ~read_action_Generator ();
-
-     virtual int handle_timeout (const ACE_Time_Value &tv,
-                                 const void *arg);
-
-   private:
-     Receiver_exec_i &pulse_callback_;
-
-   };
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class RECEIVER_EXEC_Export info_out_data_listener_exec_i
-    : public virtual ::Shapes::DDS_Typed::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::Shapes::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from Shapes::Listener. */
-
-    virtual
-    void on_one_data (const ::ShapeType & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::ShapeTypeSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::Shapes::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: 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 and port operations. */
-
-    virtual ::Shapes::DDS_Typed::CCM_Listener_ptr
-    get_info_out_sq_data_listener (void);
-
-    virtual ::Shapes::DDS_Typed::CCM_Listener_ptr
-    get_info_out_tr_data_listener (void);
-
-    virtual ::Shapes::DDS_Typed::CCM_Listener_ptr
-    get_info_out_cl_data_listener (void);
-
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_sq_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_tr_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_cl_status (void);
-
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_sq_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_tr_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_cl_status (void);
-
-
-    virtual ::CORBA::ULong rate (void);
-
-    virtual void rate (::CORBA::ULong rate);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    virtual void get_one (void);
-    virtual void start (void);
-    virtual void stop (void);
-
-    //@}
-
-  private:
-    ::Shapes::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::Shapes::DDS_Typed::CCM_Listener_var ciao_info_out_cl_data_listener_;
-
-     read_action_Generator * ticker_;
-
-    ::CORBA::ULong rate_;
-    //@}
-
-    //@{
-    /** User defined members. */
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shape_Receiver_Impl (void);
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.idl
deleted file mode 100644
index a406582c556..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef DDS_MULTITOPIC_SENDER_IDL
-#define DDS_MULTITOPIC_SENDER_IDL
-
-#include "Connector/MultiTopic_Connector.idl"
-
-module Shapes
-{
-  component Sender
-  {
-    port DDS_Typed::DDS_Write info_write_sq;
-    port DDS_Typed::DDS_Write info_write_tr;
-    port DDS_Typed::DDS_Write info_write_cl;
-
-    attribute unsigned long rate;
-    attribute unsigned short max_x;
-    attribute unsigned short max_y;
-    attribute unsigned short max_size;
-    attribute boolean resize_shape;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc
deleted file mode 100644
index 8b4677dde14..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_MultiTopic_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_MultiTopic_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_MultiTopic_Connector_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 {
-    MultiTopic_Sender.idl
-  }
-}
-
-project(DDS_MultiTopic_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_MultiTopic_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 {
-    MultiTopic_SenderE.idl
-  }
-}
-
-project(DDS_MultiTopic_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_MultiTopic_Sender_lem_gen DDS_MultiTopic_Sender_stub DDS_MultiTopic_Base_stub
-  libs  += Sender_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultiTopic_SenderEC.cpp
-  }
-
-  Header_Files {
-    MultiTopic_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    MultiTopic_SenderEC.inl
-  }
-}
-
-project(DDS_MultiTopic_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_MultiTopic_Sender_idl_gen DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub
-  libs  += DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultiTopic_SenderC.cpp
-  }
-
-  Header_Files {
-    MultiTopic_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    MultiTopic_SenderC.inl
-  }
-}
-
-project(DDS_MultiTopic_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_MultiTopic_Sender_lem_stub DDS_MultiTopic_Sender_stub DDS_MultiTopic_Connector_lem_stub DDS_MultiTopic_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_lem_stub
-  libpaths += ../lib
-  includes += .. ../Connector
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultiTopic_Sender_exec.cpp
-  }
-
-  Header_Files {
-    MultiTopic_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_MultiTopic_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_MultiTopic_Base_stub  DDS_MultiTopic_Sender_lem_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_svnt  DDS_MultiTopic_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_svnt DDS_MultiTopic_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultiTopic_SenderS.cpp
-    MultiTopic_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    MultiTopic_SenderS.h
-    MultiTopic_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp
deleted file mode 100644
index f8239046c6b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp
+++ /dev/null
@@ -1,350 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "MultiTopic_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_Shapes_Sender_Impl
-{
-  //============================================================
-  // pulse_Generator
-  //============================================================
-  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  pulse_Generator::~pulse_Generator ()
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-
-   /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-  Sender_exec_i::Sender_exec_i (void)
-    : rate_ (0),
-      max_x_ (0),
-      max_y_ (0),
-      max_size_ (0),
-      resize_shape_ (false),
-      TypeOfShape (SHAPE_TYPE_SQUARE)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-    ACE_NEW_THROW_EX (this->square_,
-                      ShapeType,
-                      ::CORBA::NO_MEMORY ());
-    ACE_NEW_THROW_EX (this->triangle_,
-                      ShapeType,
-                      ::CORBA::NO_MEMORY ());
-    ACE_NEW_THROW_EX (this->circle_,
-                      ShapeType,
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-    delete this->square_;
-    delete this->triangle_;
-    delete this->circle_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::tick ()
-    {
-      try
-        {
-          ::Shapes::DDS_Typed::Writer_var writer;
-          if (this->TypeOfShape == SHAPE_TYPE_SQUARE)
-            {
-              writer = this->ciao_context_->get_connection_info_write_sq_data ();
-            }
-          else if (this->TypeOfShape == SHAPE_TYPE_TRIANGLE)
-            {
-              writer = this->ciao_context_->get_connection_info_write_tr_data ();
-            }
-          else if (this->TypeOfShape == SHAPE_TYPE_CIRCLE)
-            {
-              writer = this->ciao_context_->get_connection_info_write_cl_data ();
-            }
-          if (::CORBA::is_nil (writer.in ()))
-            {
-              ACE_ERROR ((LM_ERROR, "Sender_exec_i::tick () - "
-                        "ERROR: Unable to get connection to writer\n"));
-              return;
-            }
-
-         if (this->TypeOfShape == SHAPE_TYPE_SQUARE)
-          {
-            this->TypeOfShape = SHAPE_TYPE_TRIANGLE;
-            writer->write_one (*square_, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("UPDATED Shape_info Square for <%C> %u:%u:%u\n"),
-                this->square_->color.in (),
-                this->square_->x,
-                this->square_->y,
-                this->square_->shapesize));
-          }
-        else if (this->TypeOfShape == SHAPE_TYPE_TRIANGLE)
-          {
-            this->TypeOfShape = SHAPE_TYPE_CIRCLE;
-            writer->write_one (*triangle_, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("UPDATED Shape_info Triangle for <%C> %u:%u:%u\n"),
-                this->triangle_->color.in (),
-                this->triangle_->x,
-                this->triangle_->y,
-                this->triangle_->shapesize));
-          }
-        else if (this->TypeOfShape == SHAPE_TYPE_CIRCLE)
-          {
-            this->TypeOfShape = SHAPE_TYPE_SQUARE;
-            writer->write_one (*circle_, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("UPDATED Shape_info Circle for <%C> %u:%u:%u\n"),
-                this->circle_->color.in (),
-                this->circle_->x,
-                this->circle_->y,
-                this->circle_->shapesize));
-           }
-        }
-      catch (const CCM_DDS::NonExistent& )
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("Shape_info for <%C> not updated: <%C> didn't exist.\n"),
-                      this->square_->color.in (), this->square_->color.in ()));
-        }
-      catch (const CCM_DDS::InternalError& )
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("Internal Error while updating Shape_info for <%C>.\n"),
-                      this->square_->color.in ()));
-        }
-    }
-
-  // Component attributes and port operations.
-
-  ::CORBA::ULong
-  Sender_exec_i::rate (void)
-  {
-    return this->rate_;
-  }
-
-  void
-  Sender_exec_i::rate (
-    const ::CORBA::ULong rate)
-  {
-    this->rate_ = rate;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::max_x (void)
-  {
-    return this->max_x_;
-  }
-
-  void
-  Sender_exec_i::max_x (
-    const ::CORBA::UShort max_x)
-  {
-    this->max_x_ = max_x;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::max_y (void)
-  {
-    return this->max_y_;
-  }
-
-  void
-  Sender_exec_i::max_y (
-    const ::CORBA::UShort max_y)
-  {
-    this->max_y_ = max_y;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::max_size (void)
-  {
-    return this->max_size_;
-  }
-
-  void
-  Sender_exec_i::max_size (
-    const ::CORBA::UShort max_size)
-  {
-    this->max_size_ = max_size;
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::resize_shape (void)
-  {
-    return this->resize_shape_;
-  }
-
-  void
-  Sender_exec_i::resize_shape (
-    const ::CORBA::Boolean resize_shape)
-  {
-    this->resize_shape_ = resize_shape;
-  }
-
-
-  void
-  Sender_exec_i::start (void)
-  {
-    // calculate the interval time
-    long const usec = 1000000 / this->rate_;
-
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (0, usec),
-                ACE_Time_Value (0, usec)) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                             ACE_TEXT ("Error scheduling timer")));
-    }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    try
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-        delete this->ticker_;
-        delete this->square_;
-        delete this->triangle_;
-        delete this->circle_;
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::stop - "
-                  "ERROR: unexpected exception caught while shutting down.\n"));
-      }
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Shapes::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    this->square_->x = ACE_OS::rand () % this->max_x_;
-    this->square_->y = ACE_OS::rand () % this->max_y_;
-    this->square_->shapesize = max_size_;
-    this->square_->color = CORBA::string_dup("GREEN");
-
-    this->triangle_->x = ACE_OS::rand () % this->max_x_;
-    this->triangle_->y = ACE_OS::rand () % this->max_y_;
-    this->triangle_->shapesize = max_size_;
-    this->triangle_->color = CORBA::string_dup("YELLOW");
-
-    this->circle_->x = ACE_OS::rand () % this->max_x_;
-    this->circle_->y = ACE_OS::rand () % this->max_y_;
-    this->circle_->shapesize = max_size_;
-    this->circle_->color = CORBA::string_dup("BLUE");
-
-    this->start ();
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-     this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C"  ::Components::EnterpriseComponent_ptr
-  create_Shape_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/MultiTopic/Sender/MultiTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.h
deleted file mode 100644
index 62cf9fa7d06..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.h
+++ /dev/null
@@ -1,160 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_MULTITOPIC_SENDER_EXEC_DNHPAQ_H_
-#define CIAO_MULTITOPIC_SENDER_EXEC_DNHPAQ_H_
-
-
-#include "MultiTopic_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_Shapes_Sender_Impl
-{
-  class Sender_exec_i;
-  //============================================================
-  // pulse_Generator
-  //============================================================
-  class pulse_Generator : public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-
-    virtual ~pulse_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                   const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class  SENDER_EXEC_Export Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-    enum TYPE_OF_SHAPE {
-      SHAPE_TYPE_SQUARE,
-      SHAPE_TYPE_TRIANGLE,
-      SHAPE_TYPE_CIRCLE
-    };
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::ULong rate (void);
-
-    virtual void rate (::CORBA::ULong rate);
-
-    virtual ::CORBA::UShort max_x (void);
-
-    virtual void max_x (::CORBA::UShort max_x);
-
-    virtual ::CORBA::UShort max_y (void);
-
-    virtual void max_y (::CORBA::UShort max_y);
-
-    virtual ::CORBA::UShort max_size (void);
-
-    virtual void max_size (::CORBA::UShort max_size);
-
-    virtual ::CORBA::Boolean resize_shape (void);
-
-    virtual void resize_shape (::CORBA::Boolean resize_shape);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void tick ();
-    void start ();
-    void stop ();
-    //@}
-
-  private:
-    ::Shapes::CCM_Sender_Context_var ciao_context_;
-
-    ShapeType* square_;
-    ShapeType* triangle_;
-    ShapeType* circle_;
-    pulse_Generator * ticker_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::ULong rate_;
-
-    ::CORBA::UShort max_x_;
-
-    ::CORBA::UShort max_y_;
-
-    ::CORBA::UShort max_size_;
-
-    ::CORBA::Boolean resize_shape_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    TYPE_OF_SHAPE TypeOfShape;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shape_Sender_Impl (void);
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/MultiTopic/descriptors/Plan.cdp
deleted file mode 100644
index 780be477216..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/descriptors/Plan.cdp
+++ /dev/null
@@ -1,526 +0,0 @@
-<!--  -->
-<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>Shapes_Depl_1</label>
-  <UUID>Shapes_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_Shape_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_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="Shapes_ConnectorComponentImplementation">
-    <name>Shapes_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Shapes_Connector_ExecArtifact" />
-    <artifact xmi:idref="Shapes_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_Shapes_DDS_MT_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_DDS_MT_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shapes_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_Shape_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Shapes_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" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Shapes_ConnectorSenderInstance">
-    <name>Shapes_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name_sq</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name_tr</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Triangle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name_cl</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Circle</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Shapes_ConnectorReceiverInstance">
-    <name>Shapes_ConnectorReceiverInstance</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Shapes_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name_sq</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Square</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name_tr</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Triangle</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name_cl</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Circle</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>1</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_x</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>225</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_y</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>250</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>max_size</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>25</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>resize_shape</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- SENDER SENDER SENDER SENDER SENDER -->
-
-  <!-- SQUARE -->
-  <connection>
-    <name>writer_sq_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_sq_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_sq_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ConnectorSenderInstance" />
-    </internalEndpoint>
-  </connection>
-  <!-- TRIANGLE -->
-  <connection>
-    <name>writer_tr_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_tr_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_tr_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ConnectorSenderInstance" />
-    </internalEndpoint>
-  </connection>
-  <!-- CIRCLE -->
-  <connection>
-    <name>writer_cl_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_cl_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_cl_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ConnectorSenderInstance" />
-    </internalEndpoint>
-  </connection>
-
-
-  <!-- RECEIVER RECEIVER RECEIVER RECEIVER RECEIVER -->
-
-  <!-- SQUARE: (Getter only) -->
-  <connection>
-    <name>info_get_sq_fresh_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_sq_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_sq_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ConnectorReceiverInstance" />
-    </internalEndpoint>
-  </connection>
-  <!-- TRIANGLE (Getter only) -->
-  <connection>
-    <name>info_get_tr_fresh_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_tr_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_tr_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ConnectorReceiverInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!-- CIRCLE (Listener only) -->
-  <connection>
-    <name>_listenercontrol_cl</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_cl_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_cl_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Shapes_ConnectorReceiverInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listener_cl</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_cl_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_cl_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Shapes_ConnectorReceiverInstance" />
-    </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="Shapes_Connector_ExecArtifact">
-    <name>Shapes_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_MultiTopic_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_SvntArtifact">
-    <name>Shapes_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_MultiTopic_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Shapes_Connector_StubArtifact">
-    <name>Shapes_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_MultiTopic_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/MultiTopic/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/MultiTopic/descriptors/run_test.pl
deleted file mode 100755
index 10f73a3be9f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 60 seconds to allow task to complete\n";
-sleep (60);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl
deleted file mode 100644
index cd0486eba27..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * @file MultipleTemp_Base.idl
- * @author Marijke Hengstmengel
- */
-
-#ifndef MULTIPLE_TEMP_BASE_IDL
-#define MULTIPLE_TEMP_BASE_IDL
-
-#pragma ndds typesupport "Base/MultipleTemp_BaseSupport.h"
-#pragma opendds typesupport "Base/MultipleTemp_BaseSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TestTopicOne"
-#pragma DCPS_DATA_KEY "TestTopicOne keyOne"
-#pragma DCPS_DATA_TYPE "TestTopicTwo"
-#pragma DCPS_DATA_KEY "TestTopicTwo keyTwo"
-
-
-struct TestTopicOne {
-  string keyOne; //@key
-  long x;
-};
-
-struct TestTopicTwo {
-  string keyTwo; //@key
-  long y;
-  long z;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopicOne> TestTopicOneSeq;
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopicTwo> TestTopicTwoSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.mpc b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.mpc
deleted file mode 100644
index 0b0e2cc5639..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.mpc
+++ /dev/null
@@ -1,25 +0,0 @@
-project (DDS_MultipleTemp_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  requires += dummy_label
-  sharedname = DDS_MultipleTemp_Base_stub
-  dynamicflags += MULTIPLE_TEMP_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=MULTIPLE_TEMP_BASE_STUB_Export \
-              -Wb,stub_export_include=MultipleTemp_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    MultipleTemp_Base.idl
-  }
-
-  opendds_ts_flags += --export=MULTIPLE_TEMP_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    MultipleTemp_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl
deleted file mode 100644
index 4ce01c01aaa..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @file MultipleTemp_Connector.idl
- * @author Marijke Hengstmengel
- */
-
-#ifndef MULTIPLE_TEMP_CONNECTOR_IDL_
-#define MULTIPLE_TEMP_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <Connector/ccm_dds_mlt.idl>
-
-#include "Base/MultipleTemp_Base.idl"
-
-#pragma ciao lem "Connector/MultipleTemp_ConnectorE.idl"
-
-module MultipleTemp
-{
-  module ::CCM_DDS::Duplex_Typed < ::TestTopicOne, ::TestTopicOneSeq, ::TestTopicTwo, ::TestTopicTwoSeq> MultipleTempConnector;
-};
-
-#endif /* MULTIPLE_TEMP_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc
deleted file mode 100644
index 06b2767a604..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc
+++ /dev/null
@@ -1,166 +0,0 @@
-project (DDS_MLT_idl_gen) : taoidldefaults, anytypecode, dds4ccm {
-  requires += dummy_label
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=CCM_DDS_MLT_STUB_Export \
-              -Wb,stub_export_include=ccm_dds_mlt_stub_export.h \
-              -Wb,skel_export_macro=CCM_DDS_MLT_SKEL_Export \
-              -Wb,skel_export_include=ccm_dds_mlt_skel_export.h \
-              -SS -Scc -Sci -Gxhst \
-              -I $(CIAO_ROOT)/connectors/dds4ccm/idl
-
-  IDL_Files {
-    ccm_dds_mlt.idl
-  }
-}
-
-project(DDS_MT_TEMP_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  requires += dummy_label
-  after += DDS4CCM_idl_gen DDS_MLT_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=MULTIPLE_TEMP_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=MultipleTemp_Connector_stub_export.h \
-              -Wb,skel_export_macro=MULTIPLE_TEMP_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=MultipleTemp_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=MULTIPLE_TEMP_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=MultipleTemp_Connector_svnt_export.h \
-              -Wb,conn_export_macro=MULTIPLE_TEMP_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=MultipleTemp_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    MultipleTemp_Connector.idl
-  }
-}
-
-project(DDS_MT_TEMP_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  requires += dummy_label
-  custom_only = 1
-  after += DDS_MT_TEMP_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=MULTIPLE_TEMP_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=MultipleTemp_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    MultipleTemp_ConnectorE.idl
-  }
-}
-
-project(DDS_MT_TEMP_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  requires += dummy_label
-  after += DDS_MT_TEMP_Connector_lem_gen DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Base_stub
-  libs  += DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_MT_TEMP_Connector_lem_stub
-  dynamicflags += MULTIPLE_TEMP_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultipleTemp_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    MultipleTemp_ConnectorEC.h
-    MultipleTemp_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    MultipleTemp_ConnectorEC.inl
-  }
-}
-
-project(DDS_MultipleTemp_Connector_stub) : ccm_stub, dds4ccm_base {
-  requires += dummy_label
-  after += DDS_MT_TEMP_Connector_idl_gen DDS_MultipleTemp_Base_stub
-  libs  += DDS_MultipleTemp_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_MultipleTemp_Connector_stub
-  dynamicflags += MULTIPLE_TEMP_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultipleTemp_ConnectorC.cpp
-  }
-
-  Header_Files {
-    MultipleTemp_ConnectorC.h
-    MultipleTemp_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    MultipleTemp_ConnectorC.inl
-  }
-}
-
-project(DDS_MultipleTemp_Connector_exec) : ciao_executor, dds4ccm_impl {
-  requires += dummy_label
-  after   += DDS_MT_TEMP_Connector_lem_stub DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Base_stub
-  sharedname = DDS_MultipleTemp_Connector_exec
-  libs += DDS_MultipleTemp_Connector_stub DDS_MT_TEMP_Connector_lem_stub DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += MULTIPLE_TEMP_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Template_Files{
-    MultipleTemp_Connector_T.cpp
-  }
-
-  Source_Files {
-    MultipleTemp_Connector_conn.cpp
-  }
-
-  Header_Files {
-    MultipleTemp_Connector_conn.h
-    MultipleTemp_Connector_conn_export.h
-    MultipleTemp_Connector_T.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_MT_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  requires += dummy_label
-  after      += DDS_MT_TEMP_Connector_lem_stub DDS_MultipleTemp_Connector_exec DDS_MultipleTemp_Connector_stub
-  sharedname  = DDS_MultipleTemp_Connector_svnt
-  libs       += DDS_MultipleTemp_Connector_stub \
-                DDS_MT_TEMP_Connector_lem_stub  \
-                DDS_MultipleTemp_Base_stub \
-                DDS_MultipleTemp_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += MULTIPLE_TEMP_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultipleTemp_ConnectorS.cpp
-    MultipleTemp_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    MultipleTemp_ConnectorS.h
-    MultipleTemp_Connector_svnt.h
-    MultipleTemp_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp
deleted file mode 100644
index 4b4f467b572..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp
+++ /dev/null
@@ -1,517 +0,0 @@
-#include "connectors/dds4ccm/impl/DDS_Base_Connector_T.h"
-#include "ace/Reactor.h"
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::FooConnector_Connector_T(void)
-  : push_consumer_t_ (),
-    push_consumer_y_ (),
-    reactor_ (0)
-{
-}
-
-
-/**
-  * Type registration both topics
- **/
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-void
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::register_type (
-  ::DDS::DomainParticipant_ptr participant,
-  const char * /*typesupport_name*/)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::register_type");
-
-  ::DDS::ReturnCode_t retcode_t = ::DDS::RETCODE_OK;
-  ::DDS::ReturnCode_t retcode_y = ::DDS::RETCODE_OK;
-#if (CIAO_DDS4CCM_NDDS==1)
-  ::CIAO::NDDS::DDS_DomainParticipant_i *part =
-    dynamic_cast< CIAO::NDDS::DDS_DomainParticipant_i * > (participant);
-  if (!part)
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-          "DDS_MultipleTemp_FooConnector_T::register_type - "
-          "Unable to cast the DomainParticipant proxy to its internal "
-          "representation.\n"));
-      throw ::CORBA::INTERNAL ();
-    }
-
-  typedef ::CIAO::NDDS::DDS_TypeFactory_T <DDS_TYPE_T, SEQ_TYPE_T> dds_type_factory_t;
-  typedef ::CIAO::NDDS::DDS_TypeFactory_T <DDS_TYPE_Y, SEQ_TYPE_Y> dds_type_factory_y;
-
-  ::CIAO::NDDS::DDS_TypeFactory_i * factory_t = 0;
-  ::CIAO::NDDS::DDS_TypeFactory_i * factory_y = 0;
-
-  const char* typesupport_name_t = DDS_TYPE_T::type_support::get_type_name ();
-  const char* typesupport_name_y = DDS_TYPE_Y::type_support::get_type_name ();
-
-
-  ACE_NEW_THROW_EX (factory_t,
-                    dds_type_factory_t (),
-                    ::CORBA::NO_MEMORY ());
-  ::CIAO::NDDS::DDS_TypeSupport_i::register_type (typesupport_name_t,
-                                                  factory_t, participant);
-
-  ACE_NEW_THROW_EX (factory_y,
-                      dds_type_factory_y (),
-                      ::CORBA::NO_MEMORY ());
-
-  ::CIAO::NDDS::DDS_TypeSupport_i::register_type (typesupport_name_y,
-                                                  factory_y, participant);
-
-  retcode_t = DDS_TYPE_T::type_support::register_type(
-    part->get_rti_entity (), typesupport_name_t);
-
-  retcode_y = DDS_TYPE_Y::type_support::register_type(
-      part->get_rti_entity (), typesupport_name_y);
-
-#endif
-  if ((retcode_t != ::DDS::RETCODE_OK)  && (retcode_y != ::DDS::RETCODE_OK))
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-          "DDS_MultipleTemp_FooConnector_T::register_type - "
-          "Error registering type T <%C> and type Y <%C>\n",
-          ::CIAO::DDS4CCM::translate_retcode (retcode_t),::CIAO::DDS4CCM::translate_retcode (retcode_y)));
-      throw ::CCM_DDS::InternalError (retcode_t, 0);
-    }
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-void
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::unregister_type (
-  ::DDS::DomainParticipant_ptr participant,
-  const char * typesupport_name)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::unregister_type");
-#if (CIAO_DDS4CCM_NDDS==1)
-  ::CIAO::NDDS::DDS_TypeFactory_i * factory =
-    ::CIAO::NDDS::DDS_TypeSupport_i::unregister_type (typesupport_name, participant);
-  delete factory;
-#else
-  ACE_UNUSED_ARG (participant);
-  ACE_UNUSED_ARG (typesupport_name);
-#endif
-
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-char *
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::topic_name_t (void)
-{
-  return CORBA::string_dup (this->topic_name_t_.in ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-void
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::topic_name_t (
-  const char * topic_name_t)
-{
-  this->topic_name_t_ = topic_name_t;
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-::CCM_DDS::CCM_ContentFilterSetting *
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_t_filter_config(void)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_t_filter_config");
-  this->push_consumer_t_.set_component (this);
-  return this->push_consumer_t_.get_filter_config ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-::CCM_DDS::QueryFilter *
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::push_consumer_t_filter (void)
-{
-  return this->push_consumer_t_.filter ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-void
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::push_consumer_t_filter (
-  const ::CCM_DDS::QueryFilter &filter)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::push_consumer_t_filter");
-  this->push_consumer_t_.filter (filter);
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-typename CCM_TYPE::push_consumer_t_traits::data_type::_ptr_type
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_t_data (void)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_t_data");
-  this->push_consumer_t_.set_component (this);
-  return this->push_consumer_t_.get_data ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-typename CCM_TYPE::push_consumer_t_traits::data_control_type::_ptr_type
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_t_data_control (void)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_t_data_control");
-  this->push_consumer_t_.set_component (this);
-  return this->push_consumer_t_.get_data_control ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-typename CCM_TYPE::push_consumer_t_traits::dds_entity_type::_ptr_type
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_t_dds_entity (void)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_t_dds_entity");
-  this->push_consumer_t_.set_component (this);
-  return this->push_consumer_t_.get_dds_entity ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-typename CCM_TYPE::observable_t_traits::data_type::_ptr_type
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_observable_t_data (void)
-{
-//  return CCM_TYPE::observable_t_traits::data_type::_nil();
-  this->observable_t_.set_component (this);
-  return this->observable_t_.get_data ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-typename CCM_TYPE::observable_t_traits::dds_entity_type::_ptr_type
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_observable_t_dds_entity (void)
-{
-  this->observable_t_.set_component (this);
-  return this->observable_t_.get_dds_entity ();
-}
-
-// Y
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-char *
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::topic_name_y (void)
-{
-  return CORBA::string_dup (this->topic_name_y_.in ());
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-void
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::topic_name_y (
-  const char * topic_name_y)
-{
-  this->topic_name_y_ = topic_name_y;
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-::CCM_DDS::CCM_ContentFilterSetting*
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_y_filter_config(void)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_y_filter_config");
-  this->push_consumer_y_.set_component (this);
-  return this->push_consumer_y_.get_filter_config ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-::CCM_DDS::QueryFilter *
- FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::push_consumer_y_filter (void)
-{
-  return this->push_consumer_y_.filter ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-void
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::push_consumer_y_filter (
-  const ::CCM_DDS::QueryFilter &filter)
-{
-  this->push_consumer_y_.filter (filter);
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-typename CCM_TYPE::push_consumer_y_traits::data_type::_ptr_type
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_y_data (void)
-{
-  this->push_consumer_y_.set_component (this);
-  return this->push_consumer_y_.get_data ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-typename CCM_TYPE::push_consumer_y_traits::data_control_type::_ptr_type
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_y_data_control (void)
-{
-  this->push_consumer_y_.set_component (this);
-  return this->push_consumer_y_.get_data_control ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-typename CCM_TYPE::push_consumer_y_traits::dds_entity_type::_ptr_type
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_y_dds_entity (void)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_y_dds_entity");
-  this->push_consumer_y_.set_component (this);
-  return this->push_consumer_y_.get_dds_entity ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-typename CCM_TYPE::observable_y_traits::data_type::_ptr_type
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_observable_y_data (void)
-{
-  this->observable_y_.set_component (this);
-  return this->observable_y_.get_data ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-typename CCM_TYPE::observable_y_traits::dds_entity_type::_ptr_type
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_observable_y_dds_entity (void)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::get_observable_y_dds_entity");
-  this->observable_y_.set_component (this);
-  return this->observable_y_.get_dds_entity ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-void
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::configuration_complete (void)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::configuration_complete");
-  // Init default domain in Base_Connector
-  BaseConnector::configuration_complete ();
-
-  if (::CORBA::is_nil (this->domain_participant_.in ()))
-    {
-      ACE_ERROR ((LM_ERROR, "FooConnector_Connector_T::configuration complete init_domain - "
-                   "Error domain_participant\n"));
-       throw ::CORBA::INTERNAL ();
-    }
-
-  // Second argument can be removed if register_type is changed in (Topic)Base_Connector_T
-  this->register_type (this->domain_participant_.in (),
-                       "dummy_name");
-
-  const char* typesupport_name_t = DDS_TYPE_T::type_support::get_type_name ();
-  const char* typesupport_name_y = DDS_TYPE_Y::type_support::get_type_name ();
-
-  // Create the topics needed
-  this->init_topic (this->domain_participant_.in (),
-                       this->topic_t_.inout () ,
-                       this->topic_name_t_.in (),
-                       typesupport_name_t);
-
-  if (::CORBA::is_nil (this->topic_t_.in ()))
-     {
-       ACE_ERROR ((LM_ERROR, "FooConnector_Connector_T*** configuration complete init_topic - "
-                  "Error creating topic for t\n"));
-       throw ::CORBA::INTERNAL ();
-     }
-
-  this->init_topic (this->domain_participant_.in (),
-                         this->topic_y_.inout () ,
-                         this->topic_name_y_.in (),
-                         typesupport_name_y);
-
-  if (::CORBA::is_nil (this->topic_y_.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "FooConnector_Connector_T*** configuration complete init_topic - "
-                   "Error creating topic for y\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-
-  // Init the subscriber and publisher
-  this->init_subscriber (this->domain_participant_.in (),
-                         this->subscriber_t_.inout ());
-  this->init_publisher (this->domain_participant_.in (),
-                        this->publisher_t_.inout ());
-  this->init_subscriber (this->domain_participant_.in (),
-                         this->subscriber_y_.inout ());
-  this->init_publisher (this->domain_participant_.in (),
-                      this->publisher_y_.inout ());
-
-  this->observable_t_.configuration_complete (
-          this->topic_t_.in (),
-          this->publisher_t_.in (),
-          this->qos_profile_);
-  this->observable_y_.configuration_complete (
-           this->topic_y_.in (),
-           this->publisher_y_.in (),
-           this->qos_profile_);
-
-  this->dl_t_ = this->context_->get_connection_push_consumer_t_data_listener ();
-  this->dl_y_ = this->context_->get_connection_push_consumer_y_data_listener ();
-
-  this->push_consumer_t_psl =
-     this->context_->get_connection_push_consumer_t_status ();
-
-  this->push_consumer_y_psl =
-     this->context_->get_connection_push_consumer_y_status ();
-
-
-  this->push_consumer_t_.configuration_complete (
-                                      this->topic_t_.in (),
-                                      this->subscriber_t_.in (),
-                                      this->qos_profile_);
-  this->push_consumer_y_.configuration_complete (
-                                       this->topic_y_.in (),
-                                       this->subscriber_y_.in (),
-                                       this->qos_profile_);
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-void
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::ccm_activate (void)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::ccm_activate");
-  BaseConnector::ccm_activate ();
-  ACE_Reactor* reactor = 0;
-
-  this->activate_subscriber (reactor,
-                             this->subscriber_t_.in (),
-                             this->subscriber_t_listener_.inout ());
-  this->activate_publisher (reactor,
-                            this->publisher_t_.in (),
-                            this->publisher_t_listener_.inout ());
-
-  this->activate_topic ( reactor,
-                         this->topic_t_.in (),
-                         this->topiclistener_t_.inout ());
-  this->activate_topic (reactor,
-                        this->topic_y_.in (),
-                        this->topiclistener_y_.inout ());
-
-  this->push_consumer_t_.activate (this->dl_t_.in (),
-                                    push_consumer_t_psl.in (),
-                                    this->reactor_);
-
-  this->push_consumer_y_.activate (this->dl_y_.in (),
-                                          push_consumer_y_psl.in (),
-                                          this->reactor_);
-  this->observable_t_.activate ();
-  this->observable_y_.activate ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-void
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::ccm_passivate (void)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::ccm_passivate");
-
-  if (ACE_OS::strlen (this->topic_name_t_) != 0)
-    {
-      this->observable_t_.passivate ();
-      this->push_consumer_t_.passivate ();
-    }
-  if (ACE_OS::strlen (this->topic_name_y_) != 0)
-    {
-      this->observable_y_.passivate ();
-      this->push_consumer_y_.passivate ();
-    }
-
-  ::DDS::TopicListener_var topiclistener_t =
-     this->topiclistener_t_._retn ();
-   if (! CORBA::is_nil (topiclistener_t.in ()))
-     {
-       this->passivate_topic (this->topic_t_.in (),
-                              topiclistener_t.in ());
-     }
-
-   ::DDS::TopicListener_var topiclistener_y =
-       this->topiclistener_y_._retn ();
-   if (! CORBA::is_nil (topiclistener_y.in ()))
-     {
-       this->passivate_topic (this->topic_y_.in (),
-                              topiclistener_y.in ());
-     }
-
-  ::DDS::SubscriberListener_var subscriber_t_listener =
-    this->subscriber_t_listener_._retn ();
-  if (!::CORBA::is_nil (subscriber_t_listener.in ()))
-    {
-      this->passivate_subscriber (this->subscriber_t_.in (),
-                                    subscriber_t_listener.in ());
-    }
-
-  ::DDS::PublisherListener_var publisher_t_listener =
-    this->publisher_t_listener_._retn ();
-  if (!::CORBA::is_nil (publisher_t_listener.in ()))
-    {
-      this->passivate_publisher (this->publisher_t_.in (),
-                                   publisher_t_listener.in ());
-    }
-
-  ::DDS::SubscriberListener_var subscriber_y_listener =
-      this->subscriber_y_listener_._retn ();
-  if (!::CORBA::is_nil (subscriber_y_listener.in ()))
-    {
-      this->passivate_subscriber (this->subscriber_y_.in (),
-                                    subscriber_y_listener.in ());
-    }
-
-  ::DDS::PublisherListener_var publisher_y_listener =
-      this->publisher_y_listener_._retn ();
-  if (!::CORBA::is_nil (publisher_y_listener.in ()))
-    {
-      this->passivate_publisher (this->publisher_y_.in (),
-                                   publisher_y_listener.in ());
-    }
-
-  BaseConnector::ccm_passivate ();
-}
-
-template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y>
-void
-FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::ccm_remove (void)
-{
-  DDS4CCM_TRACE ("FooConnector_Connector_T::ccm_remove");
-
-  if (ACE_OS::strlen (this->topic_name_t_) != 0)
-    {
-      this->observable_t_.remove (this->publisher_t_.in ());
-      this->push_consumer_t_.remove (this->subscriber_t_.in ());
-
-    }
-
-  if (ACE_OS::strlen (this->topic_name_y_) != 0)
-    {
-      this->observable_y_.remove (this->publisher_y_.in ());
-      this->push_consumer_y_.remove (this->subscriber_y_.in ());
-    }
-
-  ::DDS::Topic_var topic_t = this->topic_t_._retn ();
-  if (! CORBA::is_nil (topic_t.in ()))
-    {
-      this->remove_topic (this->domain_participant_.in (),
-                          topic_t.in ());
-    }
-
-  ::DDS::Topic_var topic_y = this->topic_y_._retn ();
-  if (! CORBA::is_nil (topic_y.in ()))
-    {
-      this->remove_topic (this->domain_participant_.in (),
-                          topic_y.in ());
-    }
-
-  const char* typesupport_name_t = DDS_TYPE_T::type_support::get_type_name ();
-  this->unregister_type (this->domain_participant_.in (),
-                        typesupport_name_t);
-  const char* typesupport_name_y = DDS_TYPE_Y::type_support::get_type_name ();
-  this->unregister_type (this->domain_participant_.in (),
-                        typesupport_name_y);
-
-  ::DDS::Publisher_var publisher_t = this->publisher_t_._retn ();
-  if (!::CORBA::is_nil (publisher_t.in ()))
-    {
-      this->remove_publisher (this->domain_participant_.in (),
-                              publisher_t.in ());
-    }
-
-  ::DDS::Subscriber_var subscriber_t = this->subscriber_t_._retn ();
-  if (!::CORBA::is_nil (subscriber_t.in ()))
-    {
-       this->remove_subscriber (this->domain_participant_.in (),
-                                   subscriber_t.in ());
-    }
-
-  ::DDS::Publisher_var publisher_y = this->publisher_y_._retn ();
-  if (!::CORBA::is_nil (publisher_y.in ()))
-    {
-      this->remove_publisher (this->domain_participant_.in (),
-                                 publisher_y.in ());
-    }
-  ::DDS::Subscriber_var subscriber_y = this->subscriber_y_._retn ();
-  if (!::CORBA::is_nil (subscriber_y.in ()))
-    {
-      this->remove_subscriber (this->domain_participant_.in (),
-                                  subscriber_y.in ());
-    }
-
-  BaseConnector::ccm_remove ();
- }
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h
deleted file mode 100644
index 140f5aab79d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h
+++ /dev/null
@@ -1,193 +0,0 @@
-#ifndef DDS_MLT_CONNECTOR_T_H_
-#define DDS_MLT_CONNECTOR_T_H_
-
-#include "connectors/dds4ccm/impl/DDS_Base_Connector_T.h"
-#include "connectors/dds4ccm/impl/DDS_Write_T.h"
-#include "connectors/dds4ccm/impl/DDS_Get_T.h"
-#include "connectors/dds4ccm/impl/DDS_Listen_T.h"
-#include "connectors/dds4ccm/impl/DDS_Update_T.h"
-#include "connectors/dds4ccm/impl/DataListenerControl_T.h"
-
-template <typename CCM_TYPE,
-          typename DDS_TYPE_T, bool FIXED_T,
-          typename SEQ_TYPE_T,
-          typename DDS_TYPE_Y, bool FIXED_Y,
-          typename SEQ_TYPE_Y>
-class FooConnector_Connector_T
-  : public virtual DDS_Base_Connector_T<CCM_TYPE>
-{
-
-  typedef DDS_Base_Connector_T<CCM_TYPE> BaseConnector;
-
-public:
-  FooConnector_Connector_T (void);
-
-  virtual
-  void
-  register_type (
-  ::DDS::DomainParticipant_ptr participant,
-  const char * typesupport_name);
-
-  virtual
-  void
-  unregister_type (
-  ::DDS::DomainParticipant_ptr participant,
-  const char * typesupport_name);
-
-  /**
-   * T type connector
-   **/
-  // DDS_Listen operations
-  virtual
-  CCM_DDS::CCM_ContentFilterSetting*
-  get_push_consumer_t_filter_config(void);
-
-  virtual
-  CCM_DDS::QueryFilter *
-  push_consumer_t_filter (void);
-
-  virtual
-  void
-  push_consumer_t_filter (const ::CCM_DDS::QueryFilter &);
-
-  virtual
-  typename CCM_TYPE::push_consumer_t_traits::data_type::_ptr_type
-  get_push_consumer_t_data (void);
-
-  virtual
-  typename CCM_TYPE::push_consumer_t_traits::data_control_type::_ptr_type
-  get_push_consumer_t_data_control (void);
-
-  virtual
-  typename CCM_TYPE::push_consumer_t_traits::dds_entity_type::_ptr_type
-  get_push_consumer_t_dds_entity (void);
-
-  // DDS_Update operations
-  virtual
-  typename CCM_TYPE::observable_t_traits::data_type::_ptr_type
-  get_observable_t_data (void);
-
-  virtual
-  typename CCM_TYPE::observable_t_traits::dds_entity_type::_ptr_type
-  get_observable_t_dds_entity (void);
-
-
-
-  /**
-    * Y type connector
-   **/
-  // DDS_Listen operations
-  virtual
-  CCM_DDS::CCM_ContentFilterSetting*
-  get_push_consumer_y_filter_config(void);
-
-  virtual
-  CCM_DDS::QueryFilter *
-  push_consumer_y_filter (void);
-
-  virtual
-  void
-  push_consumer_y_filter (const ::CCM_DDS::QueryFilter &);
-
-  virtual
-  typename CCM_TYPE::push_consumer_y_traits::data_type::_ptr_type
-  get_push_consumer_y_data (void);
-
-  virtual
-  typename CCM_TYPE::push_consumer_y_traits::data_control_type::_ptr_type
-  get_push_consumer_y_data_control (void);
-
-  virtual
-  typename CCM_TYPE::push_consumer_y_traits::dds_entity_type::_ptr_type
-  get_push_consumer_y_dds_entity (void);
-
-  // DDS_Update operations
-  virtual
-  typename CCM_TYPE::observable_y_traits::data_type::_ptr_type
-  get_observable_y_data (void);
-
-  virtual
-  typename CCM_TYPE::observable_y_traits::dds_entity_type::_ptr_type
-  get_observable_y_dds_entity (void);
-
-
-
-  /**
-    * Topic names.
-    **/
-  virtual char * topic_name_t (void);
-  virtual void topic_name_t (const char * topic_name_t);
-  virtual char * topic_name_y (void);
-  virtual void topic_name_y (const char * topic_name_y);
-
-  /**
-    * Deployment methods.
-    **/
-  virtual void configuration_complete (void);
-  virtual void ccm_remove (void);
-  virtual void ccm_activate (void);
-  virtual void ccm_passivate (void);
-
-private:
-  DDS_Listen_T<
-      typename CCM_TYPE::push_consumer_t_traits,
-      typename DDS_TYPE_T::typed_reader_type,
-      typename DDS_TYPE_T::value_type,
-      SEQ_TYPE_T>
-    push_consumer_t_;
-  DDS_Listen_T<
-      typename CCM_TYPE::push_consumer_y_traits,
-      typename DDS_TYPE_Y::typed_reader_type,
-      typename DDS_TYPE_Y::value_type,
-      SEQ_TYPE_Y>
-    push_consumer_y_;
-
-  DDS_Update_T<
-      typename CCM_TYPE::observable_t_traits,
-      typename DDS_TYPE_T::typed_writer_type,
-      typename DDS_TYPE_T::value_type,
-      SEQ_TYPE_T>
-    observable_t_;
-
-  DDS_Update_T<
-      typename CCM_TYPE::observable_y_traits,
-      typename DDS_TYPE_Y::typed_writer_type,
-      typename DDS_TYPE_Y::value_type,
-      SEQ_TYPE_Y>
-    observable_y_;
-
-  //connection to the receiver implementation
-  typename CCM_TYPE::push_consumer_t_traits::data_listener_type::_var_type dl_t_;
-  typename CCM_TYPE::push_consumer_y_traits::data_listener_type::_var_type dl_y_;
-
-  ::CCM_DDS::PortStatusListener_var push_consumer_t_psl;
-  ::CCM_DDS::PortStatusListener_var push_consumer_y_psl;
-
-  ::DDS::Publisher_var publisher_t_;
-  ::DDS::PublisherListener_var publisher_t_listener_;
-  ::DDS::Subscriber_var subscriber_t_;
-  ::DDS::SubscriberListener_var subscriber_t_listener_;
-
-  ::DDS::Publisher_var publisher_y_;
-  ::DDS::PublisherListener_var publisher_y_listener_;
-  ::DDS::Subscriber_var subscriber_y_;
-  ::DDS::SubscriberListener_var subscriber_y_listener_;
-
-  CORBA::String_var topic_name_t_;
-  CORBA::String_var topic_name_y_;
-
-  ::DDS::Topic_var topic_t_;
-  ::DDS::Topic_var topic_y_;
-
-  ::DDS::TopicListener_var topiclistener_t_;
-  ::DDS::TopicListener_var topiclistener_y_;
-
-  ACE_Reactor * reactor_;
-
-  void create_topics (const char * typesupport_name);
-
-};
-
-#include "MultipleTemp_Connector_T.cpp"
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/ccm_dds_mlt.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/ccm_dds_mlt.idl
deleted file mode 100644
index 9a3df82c7f0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/ccm_dds_mlt.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef CCM_DDS_MLT_IDL
-#define CCM_DDS_MLT_IDL
-
-#include <Components.idl>
-
-#pragma dds4ccm impl "MultipleTemp_Connector_T.h"
-
-#include <ccm_dds.idl>
-
-module CCM_DDS
-{
-  module Duplex_Typed <typename T, sequence<T> TSeq, typename Y,  sequence <Y> YSeq> {
-    alias Typed <T, TSeq> T_Typed;
-    alias Typed <Y, YSeq> Y_Typed;
-
-    connector FooConnector : CCM_DDS::DDS_Base
-    {
-      mirrorport T_Typed::DDS_Listen push_consumer_t;
-      mirrorport Y_Typed::DDS_Listen push_consumer_y;
-      mirrorport T_Typed::DDS_Update observable_t;
-      mirrorport Y_Typed::DDS_Update observable_y;
-
-      attribute string topic_name_t;
-      attribute string topic_name_y;
-
-    };
-  };
-};
-
-#endif // CCM_DDS_MLT_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.idl
deleted file mode 100644
index 6b259d3b560..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/MultipleTemp_Connector.idl"
-
-module MultipleTemp
-{
-  component Receiver
-  {
-    port MultipleTempConnector::T_Typed::DDS_Listen info_one_out;
-    port MultipleTempConnector::Y_Typed::DDS_Listen info_two_out;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc
deleted file mode 100644
index e7d436114cc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc
+++ /dev/null
@@ -1,141 +0,0 @@
-project(DDS_MultipleTemp_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  requires += dummy_label
-  custom_only = 1
-  after += DDS_MT_TEMP_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 {
-    MultipleTemp_Receiver.idl
-  }
-}
-
-project(DDS_MultipleTemp_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  requires += dummy_label
-  after += DDS_MultipleTemp_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 {
-    MultipleTemp_ReceiverE.idl
-  }
-}
-
-project(DDS_MT_TEMP_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  requires += dummy_label
-  after += DDS_MultipleTemp_Receiver_lem_gen DDS_MultipleTemp_Receiver_stub  DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Base_stub
-  libs  +=  Receiver_stub DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultipleTemp_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    MultipleTemp_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    MultipleTemp_ReceiverEC.inl
-  }
-}
-
-project(DDS_MultipleTemp_Receiver_stub) : ccm_stub, dds4ccm_base {
-  requires += dummy_label
-  after += DDS_MultipleTemp_Receiver_idl_gen  DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Base_stub DDS_MT_TEMP_Connector_lem_gen
-  libs  += DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultipleTemp_ReceiverC.cpp
-  }
-
-  Header_Files {
-    MultipleTemp_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    MultipleTemp_ReceiverC.inl
-  }
-}
-
-project(DDS_MultipleTemp_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  requires += dummy_label
-  after   += DDS_MT_TEMP_Receiver_lem_stub DDS_MultipleTemp_Receiver_stub DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub DDS_MT_TEMP_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub DDS_MT_TEMP_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultipleTemp_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    MultipleTemp_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_MultipleTemp_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  requires += dummy_label
-  after      +=   DDS_MT_TEMP_Receiver_lem_stub DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Connector_svnt DDS_MultipleTemp_Receiver_exec DDS_MT_TEMP_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Connector_svnt Receiver_exec DDS_MT_TEMP_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultipleTemp_ReceiverS.cpp
-    MultipleTemp_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    MultipleTemp_ReceiverS.h
-    MultipleTemp_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp
deleted file mode 100644
index 0f6ccb4596c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp
+++ /dev/null
@@ -1,250 +0,0 @@
-// -*- C++ -*-
-// Test for MULTIPLE_TEMPLATES
-
-#include "MultipleTemp_Receiver_exec.h"
-#include "ace/Log_Msg.h"
-
-#include "ace/OS_NS_time.h"
-#include "dds4ccm/impl/Utils.h"
-#include "dds4ccm/impl/TimeUtilities.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_MultipleTemp_Receiver_Impl
-{
-  CORBA::UShort received_one= 0;
-  CORBA::UShort received_two= 0;
-
-  //============================================================
-  // ListenOne_Listener_exec_i Listener to topic One
-  //============================================================
-  ListenOne_Listener_exec_i::ListenOne_Listener_exec_i (
-      ::MultipleTemp::CCM_Receiver_Context_ptr ctx)
-  : ciao_context_ (
-      ::MultipleTemp::CCM_Receiver_Context::_duplicate (ctx))
-
-  {
-  }
-
-  ListenOne_Listener_exec_i::~ListenOne_Listener_exec_i (void)
-  {
-  }
-
-  void
-  ListenOne_Listener_exec_i::on_one_data (
-                                  const TestTopicOne & an_instance,
-                                  const ::CCM_DDS::ReadInfo & info)
-  {
-    ACE_DEBUG ((LM_DEBUG, "ListenOne_Listener_exec_i::on_one_data: "
-                            "key <%C> - x <%d>\n",
-                            an_instance.keyOne.in (),
-                            an_instance.x));
-    if ( info.instance_handle == ::DDS::HANDLE_NIL)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ListenOne_Listener_exec_i::on_one_data: "
-                            "instance handle seems to be invalid "
-                            "key <%C> - x <%d>\n",
-                            an_instance.keyOne.in (),
-                            an_instance.x));
-      }
-    if (info.source_timestamp.sec == 0 &&
-        info.source_timestamp.nanosec == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ListenOne_Listener_exec_i::on_one_data: "
-                            "source timestamp seems to be invalid (nil) "
-                            "key <%C> - x <%d>\n",
-                            an_instance.keyOne.in (),
-                            an_instance.x));
-      }
-    ++received_one;
-  }
-
-  void
-  ListenOne_Listener_exec_i::on_many_data (
-                                  const TestTopicOneSeq & ,
-                                  const ::CCM_DDS::ReadInfoSeq & )
-  {
-  }
-  //============================================================
-  // ListenTwo_Listener_exec_i Listener to topic Two
-  //============================================================
-  ListenTwo_Listener_exec_i::ListenTwo_Listener_exec_i (
-      ::MultipleTemp::CCM_Receiver_Context_ptr ctx)
-  : ciao_context_ (
-      ::MultipleTemp::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  ListenTwo_Listener_exec_i::~ListenTwo_Listener_exec_i (void)
-  {
-  }
-
-  void
-  ListenTwo_Listener_exec_i::on_one_data (
-                                  const TestTopicTwo & an_instance,
-                                  const ::CCM_DDS::ReadInfo & info)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ListenTwo_Listener_exec_i::on_one_data: "
-                              "key <%C> - y <%d>\n",
-                              an_instance.keyTwo.in (),
-                              an_instance.y));
-      if (::DDS::HANDLE_NIL == info.instance_handle)
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR: ListenTwo_Listener_exec_i::on_one_data: "
-                              "instance handle seems to be invalid "
-                              "key <%C> - y <%d>\n",
-                              an_instance.keyTwo.in (),
-                              an_instance.y));
-        }
-      if (info.source_timestamp.sec == 0 &&
-          info.source_timestamp.nanosec == 0)
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR: ListenTwo_Listener_exec_i::on_one_data: "
-                              "source timestamp seems to be invalid (nil) "
-                              "key <%C> - iteration <%d>\n",
-                              an_instance.keyTwo.in (),
-                              an_instance.y));
-        }
-    ++received_two;
-  }
-
-  void
-  ListenTwo_Listener_exec_i::on_many_data (
-                                  const TestTopicTwoSeq & ,
-                                  const ::CCM_DDS::ReadInfoSeq & )
-  {
-  }
-
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  Receiver_exec_i::Receiver_exec_i (void)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-   // Port operations.
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_one_out_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-   Receiver_exec_i::get_info_two_out_status (void)
-   {
-     return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-   }
-
-  ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener_ptr
-  Receiver_exec_i::get_info_one_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_one_data_listener_.in ()))
-       {
-         ListenOne_Listener_exec_i *tmp = 0;
-         ACE_NEW_RETURN (
-           tmp,
-           ListenOne_Listener_exec_i (
-             this->ciao_context_.in ()),
-             ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener::_nil ());
-           this->ciao_info_out_one_data_listener_ = tmp;
-       }
-
-     return
-         ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener::_duplicate (
-         this->ciao_info_out_one_data_listener_.in ());
-   }
-
-  ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener_ptr
-   Receiver_exec_i::get_info_two_out_data_listener (void)
-   {
-    if ( ::CORBA::is_nil (this->ciao_info_out_two_data_listener_.in ()))
-        {
-          ListenTwo_Listener_exec_i *tmp = 0;
-          ACE_NEW_RETURN (
-            tmp,
-            ListenTwo_Listener_exec_i (
-              this->ciao_context_.in ()),
-              ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener::_nil ());
-            this->ciao_info_out_two_data_listener_ = tmp;
-        }
-
-      return
-          ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener::_duplicate (
-          this->ciao_info_out_two_data_listener_.in ());
-   }
-
-  // Operations from Components::SessionComponent.
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::MultipleTemp::CCM_Receiver_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::DataListenerControl_var dlc_one =
-        this->ciao_context_->get_connection_info_one_out_data_control ();
-    ::CCM_DDS::DataListenerControl_var dlc_two =
-        this->ciao_context_->get_connection_info_two_out_data_control ();
-    dlc_one->mode (::CCM_DDS::ONE_BY_ONE);
-    dlc_two->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (received_one != 8)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver: "
-                               "Received wrong number of topic one: "
-                               "received <%C> - expected <8>\n",
-                               received_one));
-       }
-    if (received_two != 8)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver: "
-                               "Received wrong number of topic two: "
-                               "received <%C> - expected <8>\n",
-                               received_two));
-       }
-    if ((received_two == 8) && (received_one == 8))
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK: Receiver: "
-                               "Received received expected topics.\n"));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_MultipleTemp_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/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h
deleted file mode 100644
index f49ef8e3df1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h
+++ /dev/null
@@ -1,111 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_RECEIVER_EXEC_H_
-#define CIAO_RECEIVER_EXEC_H_
-
-#include "MultipleTemp_ReceiverEC.h"
-
-#include /**/ "Receiver_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-
-namespace CIAO_MultipleTemp_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  //============================================================
-  // ListenOneByOneTest_Listener_exec_i one
-  //============================================================
-  class RECEIVER_EXEC_Export ListenOne_Listener_exec_i
-  : public virtual ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ListenOne_Listener_exec_i (
-        ::MultipleTemp::CCM_Receiver_Context_ptr ctx);
-
-    virtual ~ListenOne_Listener_exec_i (void);
-
-    virtual void
-    on_one_data (
-      const TestTopicOne& an_instance,
-      const ::CCM_DDS::ReadInfo & info);
-    virtual void
-    on_many_data (
-      const TestTopicOneSeq & an_instance,
-      const ::CCM_DDS::ReadInfoSeq & info);
-  private:
-    ::MultipleTemp::CCM_Receiver_Context_var ciao_context_;
-  };
-  //============================================================
-  // ListenOneByOneTest_Listener_exec_i two
-  //============================================================
-  class RECEIVER_EXEC_Export ListenTwo_Listener_exec_i
-  : public virtual ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ListenTwo_Listener_exec_i (
-        ::MultipleTemp::CCM_Receiver_Context_ptr ctx);
-
-    virtual ~ListenTwo_Listener_exec_i (void);
-
-    virtual void
-    on_one_data (
-      const TestTopicTwo& an_instance,
-      const ::CCM_DDS::ReadInfo & info);
-    virtual void
-      on_many_data (
-        const TestTopicTwoSeq & an_instance,
-        const ::CCM_DDS::ReadInfoSeq & info);
-  private:
-    ::MultipleTemp::CCM_Receiver_Context_var ciao_context_;
-  };
-  //============================================================
-  // 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);
-
-    // Port operations.
-    virtual ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener_ptr
-    get_info_one_out_data_listener (void);
-    virtual ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener_ptr
-    get_info_two_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_one_out_status (void);
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_two_out_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:
-    ::MultipleTemp::CCM_Receiver_Context_var ciao_context_;
-    ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener_var ciao_info_out_one_data_listener_;
-    ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener_var ciao_info_out_two_data_listener_;
-   };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_MultipleTemp_Receiver_Impl (void);
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl
deleted file mode 100644
index 8d9bc7ac108..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_MULTIPLE_TEMP_SENDER_IDL
-#define DDS_MULTIPLE_TEMP_SENDER_IDL
-
-#include "Connector/MultipleTemp_Connector.idl"
-
-module MultipleTemp
-{
-  component Sender
-  {
-    port MultipleTempConnector::T_Typed::DDS_Update test_topic_one_update;
-    port MultipleTempConnector::Y_Typed::DDS_Update test_topic_two_update;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc
deleted file mode 100644
index 2fad9a0818e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-project(DDS_MultipleTemp_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  requires += dummy_label
-  after += DDS_MT_TEMP_Connector_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 {
-    MultipleTemp_Sender.idl
-  }
-}
-
-project(DDS_MultipleTemp_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  requires += dummy_label
-  after += DDS_MultipleTemp_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 {
-    MultipleTemp_SenderE.idl
-  }
-}
-
-project(DDS_MultipleTemp_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  requires += dummy_label
-  after += DDS_MultipleTemp_Sender_lem_gen DDS_MultipleTemp_Sender_stub DDS_MultipleTemp_Base_stub
-  libs  += DDS_MultipleTemp_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultipleTemp_SenderEC.cpp
-  }
-
-  Header_Files {
-    MultipleTemp_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    MultipleTemp_SenderEC.inl
-  }
-}
-
-project(DDS_MultipleTemp_Sender_stub) : ccm_stub, dds4ccm_base {
-  requires += dummy_label
-  after += DDS_MultipleTemp_Sender_idl_gen DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub
-  libs  += DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultipleTemp_SenderC.cpp
-  }
-
-  Header_Files {
-    MultipleTemp_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    MultipleTemp_SenderC.inl
-  }
-}
-
-project(DDS_MultipleTemp_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  requires += dummy_label
-  after   += DDS_MultipleTemp_Sender_lem_stub DDS_MultipleTemp_Sender_stub DDS_MT_TEMP_Connector_lem_stub DDS_MultipleTemp_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_MultipleTemp_Base_stub DDS_MT_TEMP_Connector_lem_stub  DDS_MultipleTemp_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultipleTemp_Sender_exec.cpp
-  }
-
-  Header_Files {
-    MultipleTemp_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_MultipleTemp_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  requires += dummy_label
-  after      += DDS_MultipleTemp_Base_stub  DDS_MultipleTemp_Sender_lem_stub DDS_MultipleTemp_Connector_stub DDS_MultipleTemp_Connector_svnt DDS_MT_TEMP_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_MultipleTemp_Base_stub DDS_MultipleTemp_Connector_stub  DDS_MultipleTemp_Connector_svnt DDS_MT_TEMP_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    MultipleTemp_SenderS.cpp
-    MultipleTemp_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    MultipleTemp_SenderS.h
-    MultipleTemp_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp
deleted file mode 100644
index 5df1ea1c79c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp
+++ /dev/null
@@ -1,373 +0,0 @@
-// -*- C++ -*-
-//Test Multiple templates connector
-#include "MultipleTemp_Sender_exec.h"
-#include "ace/Guard_T.h"
-#include "ace/Log_Msg.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_MultipleTemp_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;
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-  Sender_exec_i::Sender_exec_i (void)
-  : test_nr_(UPDATE_CREATE),
-    test_ok_(true)
-  {
-    this->ticker_ = new pulse_Generator (*this);
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-  // Supported operations and attributes.
-  CORBA::Boolean
-  Sender_exec_i::create_one_topic()
-  {
-    CORBA::Boolean result = true;
-    TestTopicOne i = this->topic_one_seq_one_[0];
-    TestTopicTwo u = this->topic_two_seq_one_[0];
-  try
-    {
-      if ( ::CORBA::is_nil (this->updater_one_) ||
-           ::CORBA::is_nil (this->updater_two_))
-        {
-           ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: updater_ is nil")));
-           result= false;
-         }
-      else
-        {
-          this->updater_one_->create_one(i);
-          this->updater_two_->create_one(u);
-          ACE_DEBUG ((LM_DEBUG,
-                       ACE_TEXT ("MultipleTemp: create_one for both topics ")
-                       ACE_TEXT ("<%C> and <%C>\n"),
-                       i.keyOne.in(), u.keyTwo.in()));
-        }
-    }
-    catch(const CCM_DDS::AlreadyCreated &)
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unexpected exception: ")
-                            ACE_TEXT ("AlreadyCreated with test updater")
-                            ACE_TEXT (" create_one <%C> or <%C>.\n"),
-                            i.keyOne.in(), u.keyTwo.in()));
-      result= false;
-    }
-    catch (const CCM_DDS::InternalError& )
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while create_one.\n")));
-      result = false;;
-    }
-    return result;
-  }
-
-
-  CORBA::Boolean
-  Sender_exec_i::update_one_topic()
-  {
-    //update already created instance with handle nil
-    CORBA::Boolean result = true;
-    TestTopicOne i = this->topic_one_seq_one_[0];
-    TestTopicTwo u = this->topic_two_seq_one_[0];
-
-    try
-    {
-      this->updater_one_->update_one(i, DDS::HANDLE_NIL);
-      this->updater_two_->update_one(u, DDS::HANDLE_NIL);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("MultipleTemp: update_one with already")
-                  ACE_TEXT (" existing instance with DDS::HANDLE_NIL,")
-                  ACE_TEXT (" key <%C> and key <%C>\n"),
-                  i.keyOne.in(), u.keyTwo.in()));
-    }
-    catch(const CCM_DDS::NonExistent &)
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unexpected exception: ")
-                            ACE_TEXT ("NonExistent with test updater ")
-                            ACE_TEXT ("update_one.\n")));
-      result = false;
-    }
-    catch (const CCM_DDS::InternalError& )
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while update_one.\n")));
-      result = false;
-    }
-    return result;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::create_many_topics()
-  {
-    //create many with no exception
-    CORBA::Boolean result = false;
-    try
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("create_many both topics : <%u> samples\n"),
-                  this->topic_one_seq_many_.length ()));
-      this->updater_one_->create_many (this->topic_one_seq_many_);
-      this->updater_two_->create_many (this->topic_two_seq_many_);
-
-      result = true;
-    }
-    catch(const CCM_DDS::NonExistent& )
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("ERROR Unexpected exception:")
-                  ACE_TEXT (" NonExistent with test updater create_many\n")));
-    }
-    catch (const CCM_DDS::InternalError& ex)
-    {
-       ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error in updater:")
-                   ACE_TEXT (" create_many: index <%d> - retval <%d>\n"),
-                   ex.index, ex.error_code));
-
-    }
-    return result;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::update_many_topics()
-  {
-    CORBA::Boolean result = false;
-    try
-    {
-      this->updater_one_->update_many (this->topic_one_seq_many_);
-      this->updater_two_->update_many (this->topic_two_seq_many_);
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("update_many : written <%u> samples\n"),
-                 this->topic_one_seq_many_.length ()));
-      result = true;
-    }
-    catch(const CCM_DDS::NonExistent& )
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("Unexpected exception: NonExistent ")
-                  ACE_TEXT ("with test updater update_many.\n")));
-      result = false;
-    }
-    catch (const CCM_DDS::InternalError& ex)
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                   ACE_TEXT ("with update_many: index <%d> - retval <%d>\n"),
-                   ex.index, ex.error_code));
-      result = false;
-    }
-    return result;
-  }
-
-  void
-  Sender_exec_i::add_instances_of_topic ()
-  {
-    //make 4 sequences of instances as testdata
-    CORBA::UShort total = 3;
-    this->topic_one_seq_one_.length (total);
-    //sequence for tests with .._one
-    for (int i = 1; i < (total + 1); i++)
-      {
-        char key[9];
-        TestTopicOne new_key;
-        ACE_OS::sprintf (key, "keyONE_%d", i);
-        new_key.keyOne = CORBA::string_dup(key);
-        new_key.x = i;
-        this->topic_one_seq_one_[i-1] = new_key;
-      }
-    //sequence for tests with .._many
-    this->topic_one_seq_many_.length (total);
-    for (int i = 1; i < (total + 1); i++)
-      {
-        char key[10];
-        TestTopicOne new_key;
-        ACE_OS::sprintf (key, "manyOne_%d", i);
-        new_key.keyOne = CORBA::string_dup(key);
-        new_key.x = i;
-        this->topic_one_seq_many_[i-1] = new_key;
-      }
-    this->topic_two_seq_one_.length (total);
-    //sequence for tests with .._one
-    for (int i = 1; i < (total + 1); i++)
-      {
-        char key[9];
-        TestTopicTwo new_key;
-        ACE_OS::sprintf (key, "keyTWO_%d", i);
-        new_key.keyTwo = CORBA::string_dup(key);
-        new_key.y = i;
-        new_key.z = i;
-        this->topic_two_seq_one_[i-1] = new_key;
-      }
-     //sequence for tests with .._many
-    this->topic_two_seq_many_.length (total);
-    for (int i = 1; i < (total + 1); i++)
-      {
-        char key[10];
-        TestTopicTwo new_key;
-        ACE_OS::sprintf (key, "manyTwo_%d", i);
-        new_key.keyTwo = CORBA::string_dup(key);
-        new_key.y = i;
-        new_key.z = i;
-        this->topic_two_seq_many_[i-1] = new_key;
-      }
-  }
-
-  void
-  Sender_exec_i::tick ()
-  {
-    if(this->test_ok_.value())
-    {
-      switch (this->test_nr_)
-      {
-        case UPDATE_CREATE:
-          this->test_ok_ = this->create_one_topic();
-          if(this->test_ok_.value())
-            {
-              this->test_nr_ = UPDATE_ONE;
-            }
-          else
-            {
-              this->test_nr_ = END_TEST;
-            }
-          break;
-        case UPDATE_ONE:
-          this->test_ok_ = this->update_one_topic();
-          this->test_nr_ = CREATE_MANY;
-          break;
-        case CREATE_MANY:
-          this->test_ok_ = this->create_many_topics();
-          if(this->test_ok_.value())
-            {
-              this->test_nr_ = UPDATE_MANY;
-            }
-          else
-            {
-              this->test_nr_ = END_TEST;
-            }
-          this->test_nr_ = UPDATE_MANY;
-          break;
-        case UPDATE_MANY:
-          this->test_ok_ = this->update_many_topics();
-          this->test_nr_ = END_TEST;
-          break;
-        default:
-          break;
-      }
-    }
-  }
-  void
-  Sender_exec_i::start (void)
-  {
-    long sec = 3L;
-    long const usec = 0L;
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (sec, usec),
-                ACE_Time_Value (sec, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                               ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-    delete this->ticker_;
-  }
-
-  void
-  Sender_exec_i::set_session_context (
-      ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ = ::MultipleTemp::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-   }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    this->updater_one_  =
-        this->context_->get_connection_test_topic_one_update_data ();
-    this->updater_two_  =
-        this->context_->get_connection_test_topic_two_update_data ();
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    this->add_instances_of_topic ();
-    this->start ();
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    if(!this->test_ok_.value())
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("ERROR: Error in MultipleTemp in Sender")));
-      }
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_MultipleTemp_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/MultipleTemp/Sender/MultipleTemp_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.h
deleted file mode 100644
index 7158bbe145e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.h
+++ /dev/null
@@ -1,83 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_SENDER_EXEC_H_
-#define CIAO_SENDER_EXEC_H_
-
-#include "MultipleTemp_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_MultipleTemp_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Sender_exec_i;
-
-  enum MULTIPLE_TEMP_TEST {
-    UPDATE_CREATE,
-    UPDATE_ONE,
-    CREATE_MANY,
-    UPDATE_MANY,
-    END_TEST
-  };
-
-  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_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (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 tick (void);
-
-  private:
-    ACE_Reactor* reactor (void);
-    void start (void);
-    void stop (void);
-    void add_instances_of_topic (void);
-    CORBA::Boolean create_one_topic(void);
-    CORBA::Boolean update_one_topic(void);
-    CORBA::Boolean create_many_topics(void);
-    CORBA::Boolean update_many_topics(void);
-
-    pulse_Generator * ticker_;
-    ::MultipleTemp::CCM_Sender_Context_var context_;
-    ::MultipleTemp::MultipleTempConnector::T_Typed::Updater_var updater_one_;
-    ::MultipleTemp::MultipleTempConnector::Y_Typed::Updater_var updater_two_;
-
-    MULTIPLE_TEMP_TEST test_nr_;
-    Atomic_Boolean test_ok_;
-    TestTopicOneSeq topic_one_seq_one_;
-    TestTopicOneSeq topic_one_seq_many_;
-    TestTopicTwoSeq topic_two_seq_one_;
-    TestTopicTwoSeq topic_two_seq_many_;
-
- };
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_MultipleTemp_Sender_Impl (void);
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/MultipleTemp/descriptors/Plan.cdp
deleted file mode 100644
index 49bff6b4ba0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/descriptors/Plan.cdp
+++ /dev/null
@@ -1,489 +0,0 @@
-<!--  -->
-<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>MultipleTemp_Depl_1</label>
-  <UUID>MultipleTemp_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_MultipleTemp_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_MultipleTemp_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="MultipleTemp_ConnectorComponentImplementation">
-    <name>MultipleTemp_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="MultipleTemp_Connector_ExecArtifact" />
-    <artifact xmi:idref="MultipleTemp_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_MultipleTemp_MultipleTempConnector_FooConnector_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_MultipleTemp_MultipleTempConnector_FooConnector_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_MultipleTemp_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_MultipleTemp_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_MultipleTemp_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_MultipleTemp_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="MultipleTemp_ConnectorComponentInstance">
-    <name>MultipleTemp_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="MultipleTemp_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name_t</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestOne</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name_y</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestTwo</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="MultipleTemp_ConnectorComponentInstance2">
-    <name>MultipleTemp_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="MultipleTemp_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name_t</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestOne</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name_y</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestTwo</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>_listenercontrol_one</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_one_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_t_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="MultipleTemp_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_statelistener_one</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_one_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_t_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="MultipleTemp_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <!--connection>
-    <name>_portstatuslistener_one</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_one_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_t_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="MultipleTemp_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection-->
-  <connection>
-    <name>info_one_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_one_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_t_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="MultipleTemp_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>updater_one_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_one_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_t_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="MultipleTemp_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>_listenercontrol_two</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_two_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_y_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="MultipleTemp_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_statelistener_two</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_two_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_y_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="MultipleTemp_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <!--connection>
-    <name>_portstatuslistener_two</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_two_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_y_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="MultipleTemp_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection-->
-
-  <connection>
-    <name>info_two_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_two_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_y_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="MultipleTemp_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>updater_two_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_two_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_y_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="MultipleTemp_ConnectorComponentInstance" />
-    </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="MultipleTemp_Connector_ExecArtifact">
-    <name>DDS_MultipleTemp_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_MultipleTemp_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="MultipleTemp_Connector_SvntArtifact">
-    <name>DDS_MultipleTemp_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_MultipleTemp_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="MultipleTemp_Connector_StubArtifact">
-    <name>MultipleTemp_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_MultipleTemp_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/MultipleTemp/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/descriptors/run_test.pl
deleted file mode 100755
index 638d55cd247..00000000000
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/.gitignore b/CIAO/connectors/dds4ccm/tests/NoModule/.gitignore
deleted file mode 100644
index d8421a46f0e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NoModule/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-/NoModule.cxx
-/NoModule.h
-/NoModulePlugin.cxx
-/NoModulePlugin.h
-/NoModuleSupport.cxx
-/NoModuleSupport.h
-/NoModule_Common_stub_export.h
-/NoModule_ConnectorE.idl
-/NoModule_Connector_conn.cpp
-/NoModule_Connector_conn.h
-/NoModule_Connector_conn_export.h
-/NoModule_Connector_lem_stub_export.h
-/NoModule_Connector_stub_export.h
-/NoModule_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.idl b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.idl
deleted file mode 100644
index bbd7f4e74d7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef NOMODULE_IDL
-#define NOMODULE_IDL
-
-#pragma ndds typesupport "NoModuleSupport.h"
-#pragma opendds typesupport "NoModuleTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "NoModuleType"
-#pragma DCPS_DATA_KEY "NoModuleType value"
-
-struct NoModuleType {
-  string value; //@key
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<NoModuleType> NoModuleTypeSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.mpc b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.mpc
deleted file mode 100644
index 0c26ca42da4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.mpc
+++ /dev/null
@@ -1,22 +0,0 @@
-project (NoModule_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = NoModule_stub
-  dynamicflags += NOMODULE_COMMON_STUB_BUILD_DLL
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=NOMODULE_COMMON_STUB_Export \
-              -Wb,stub_export_include=NoModule_Common_stub_export.h 
-
-  IDL_Files {
-    idlflags += -Gxhst
-    NoModule.idl
-  }
-
-  opendds_ts_flags += --export=NOMODULE_COMMON_STUB_Export
-
-  DDSGenerator_Files {
-    NoModule.idl
-  }
-
-  Source_Files {
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl
deleted file mode 100644
index 1826d617ae5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef NOMODULE_CONNECTOR_IDL
-#define NOMODULE_CONNECTOR_IDL
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "NoModule.idl"
-
-#pragma ciao lem "NoModule_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "NoModuleTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::NoModuleType, ::NoModuleTypeSeq> NoModuleTypeConnector;
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc
deleted file mode 100644
index 445ed545e45..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc
+++ /dev/null
@@ -1,130 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -b dds4ccm_base NoModule_Connector"
-
-project(NoModule_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  custom_only = 1
-  after += NoModule_stub
-  idlflags += -Wb,stub_export_macro=NOMODULE_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=NoModule_Connector_stub_export.h \
-              -Wb,skel_export_macro=NOMODULE_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=NoModule_Connector_svnt_export.h \
-              -Wb,conn_export_macro=NOMODULE_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=NoModule_Connector_conn_export.h \
-              -Gxhex -Gxhsk -Gxhst
-  IDL_Files {
-    NoModule_Connector.idl
-  }
-}
-
-project(NoModule_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += NoModule_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=NOMODULE_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=NoModule_Connector_lem_stub_export.h \
-              -SS -Gxhst
-
-  IDL_Files {
-    NoModule_ConnectorE.idl
-  }
-}
-
-project(NoModule_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub  {
-  after += NoModule_Connector_lem_gen NoModule_Connector_stub
-  libs  +=  NoModule_Connector_stub
-
-
-  sharedname = NoModule_Connector_lem_stub
-  dynamicflags += NOMODULE_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    NoModule_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    NoModule_ConnectorEC.h
-    NoModule_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    NoModule_ConnectorEC.inl
-  }
-}
-
-project(NoModule_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += NoModule_Connector_idl_gen NoModule_stub
-  libs  += NoModule_stub
-
-
-  sharedname = NoModule_Connector_stub
-  dynamicflags += NOMODULE_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    NoModule_ConnectorC.cpp
-  }
-
-  Header_Files {
-    NoModule_ConnectorC.h
-    NoModule_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    NoModule_ConnectorC.inl
-  }
-}
-
-project(NoModule_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += NoModule_Connector_lem_stub NoModule_Connector_stub
-  sharedname = NoModule_Connector_exec
-  libs += NoModule_Connector_stub NoModule_Connector_lem_stub NoModule_stub
-
-  dynamicflags += NOMODULE_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    NoModule_Connector_conn.cpp
-  }
-
-  Header_Files {
-    NoModule_Connector_conn.h
-    NoModule_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(NoModule_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += NoModule_Connector_lem_stub
-  sharedname  = NoModule_Connector_svnt
-  libs       += NoModule_Connector_stub NoModule_Connector_lem_stub  NoModule_stub
-
-
-  dynamicflags += NOMODULE_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    NoModule_ConnectorS.cpp
-    NoModule_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    NoModule_ConnectorS.h
-    NoModule_Connector_svnt.h
-    NoModule_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/.gitignore b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl
deleted file mode 100644
index be43e622d8f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file NonChangeable_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef NONCHANGEABLE_BASE_IDL
-#define NONCHANGEABLE_BASE_IDL
-
-#pragma ndds typesupport "Base/NonChangeable_BaseSupport.h"
-#pragma opendds typesupport "Base/NonChangeable_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "NonChangeableTest"
-
-struct NonChangeableTest {
-  string key;
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<NonChangeableTest> NonChangeableTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc
deleted file mode 100644
index 02f3162309f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_NonChangeableBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_NonChangeableBase_stub
-  dynamicflags += NONCHANGEABLE_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=NONCHANGEABLE_BASE_STUB_Export \
-              -Wb,stub_export_include=NonChangeable_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    NonChangeable_Base.idl
-  }
-
-  opendds_ts_flags += --export=NONCHANGEABLE_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    NonChangeable_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.idl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.idl
deleted file mode 100644
index 56afbc8213c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @file NonChangeable_Component.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COMPONENT_IDL
-#define COMPONENT_IDL
-
-#include "Connector/NonChangeable_Connector.idl"
-
-module NonChangeable
-{
-  component NonChangeableComponent
-  {
-    port NonChangeableTestConnector::DDS_Get info_get;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc
deleted file mode 100644
index b9aa5408dfe..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(NonChangeable_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_NonChangeableConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Component_stub_export.h \
-              -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Component_svnt_export.h \
-              -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Component_svnt_export.h \
-              -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Component_exec_export.h -I..
-
-  IDL_Files {
-    NonChangeable_Component.idl
-  }
-}
-
-project(NonChangeable_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += NonChangeable_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    NonChangeable_ComponentE.idl
-  }
-}
-
-project(NonChangeable_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += NonChangeable_Component_lem_gen NonChangeable_Component_stub  \
-           DDS_NonChangeableConnector_stub DDS_NonChangeableBase_stub
-  libs  +=  Component_stub DDS_NonChangeableConnector_stub \
-            DDS_NonChangeableBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_lem_stub
-  dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    NonChangeable_ComponentEC.cpp
-  }
-
-  Header_Files {
-    NonChangeable_ComponentEC.h
-    Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    NonChangeable_ComponentEC.inl
-  }
-}
-
-project(NonChangeable_Component_stub) : ccm_stub, dds4ccm_base {
-  after += NonChangeable_Component_idl_gen  DDS_NonChangeableConnector_stub \
-           DDS_NonChangeableBase_stub DDS_NonChangeableConnector_lem_gen
-  libs  += DDS_NonChangeableConnector_stub DDS_NonChangeableBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_stub
-  dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    NonChangeable_ComponentC.cpp
-  }
-
-  Header_Files {
-    NonChangeable_ComponentC.h
-    Component_stub_export.h
-  }
-
-  Inline_Files {
-    NonChangeable_ComponentC.inl
-  }
-}
-
-project(NonChangeable_Component_exec) : ciao_executor, dds4ccm_impl {
-  after   += NonChangeable_Component_lem_stub NonChangeable_Component_stub \
-             DDS_NonChangeableBase_stub DDS_NonChangeableConnector_stub \
-             DDS_NonChangeableConnector_lem_stub 
-  sharedname = Component_exec
-  libs += Component_stub Component_lem_stub DDS_NonChangeableBase_stub \
-          DDS_NonChangeableConnector_stub DDS_NonChangeableConnector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    NonChangeable_Component_exec.cpp
-  }
-
-  Header_Files {
-    NonChangeable_Component_exec.h
-    Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(NonChangeable_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   NonChangeable_Component_lem_stub DDS_NonChangeableBase_stub \
-                  DDS_NonChangeableConnector_stub DDS_NonChangeableConnector_svnt \
-                  NonChangeable_Component_exec DDS_NonChangeableConnector_lem_stub 
-  sharedname  = Component_svnt
-  libs       += Component_stub Component_lem_stub DDS_NonChangeableBase_stub \
-                DDS_NonChangeableConnector_stub DDS_NonChangeableConnector_svnt \
-                Component_exec DDS_NonChangeableConnector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    NonChangeable_ComponentS.cpp
-    NonChangeable_Component_svnt.cpp
-  }
-
-  Header_Files {
-    NonChangeable_ComponentS.h
-    NonChangeable_Component_svnt.h
-    Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp
deleted file mode 100644
index f9f8da29692..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-// -*- C++ -*-
-#include "NonChangeable_Component_exec.h"
-
-#include "dds4ccm/impl/Utils.h"
-
-#define DOMAIN_ID_IN_DP 56
-#define TOPIC_NAME_IN_DP "NonChangeable"
-
-#define DW_MAX_BLOCKING_TIME_SEC 11
-#define DW_MAX_BLOCKING_TIME_NSEC 200
-
-namespace CIAO_NonChangeable_NonChangeableComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  Component_exec_i::Component_exec_i (void)
-  {
-  }
-
-  Component_exec_i::~Component_exec_i (void)
-  {
-  }
-
-  bool
-  Component_exec_i::test_topic_name (
-    ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn)
-  {
-    try
-      {
-        conn->topic_name ("nonchangeable_test");
-        ACE_DEBUG ((LM_DEBUG, "NonChangeable_Connector_exec_impl_i::test_topic_name - "
-                              "Able to reset topic name without an exception.\n"));
-        return true;
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_topic_name - "
-                              "ERROR: Unable to reset topic name.\n"));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_topic_name - "
-                              "ERROR: Caught unexpected exception.\n"));
-      }
-    return false;
-  }
-
-  bool
-  Component_exec_i::test_key_fields (
-    ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn)
-  {
-    try
-      {
-        ::DDS::StringSeq fields;
-        fields.length (2);
-        fields[0] = CORBA::string_dup ("field_0");
-        fields[1] = CORBA::string_dup ("field_1");
-        conn->key_fields (fields);
-        ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_domain_id - "
-                              "ERROR: Able to set key fields without "
-                              "an exception.\n"));
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_DEBUG ((LM_DEBUG, "NonChangeable_Connector_exec_impl_i::test_key_fields - "
-                              "Caught expected exception.\n"));
-        return true;
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_key_fields - "
-                              "ERROR: Caught unexpected exception.\n"));
-        return false;
-      }
-    return false;
-  }
-
-  bool
-  Component_exec_i::test_domain_id (
-    ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn)
-  {
-    try
-      {
-        conn->domain_id (64);
-        ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_domain_id - "
-                              "ERROR: Able to set domain ID without "
-                              "an exception.\n"));
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_DEBUG ((LM_DEBUG, "NonChangeable_Connector_exec_impl_i::test_domain_id - "
-                              "Caught expected exception.\n"));
-        return true;
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_domain_id - "
-                              "ERROR: Caught unexpected exception.\n"));
-        return false;
-      }
-    return false;
-  }
-
-  bool
-  Component_exec_i::test_qos_profile (
-    ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn)
-  {
-    try
-      {
-        conn->qos_profile ("nonchangeable_profile");
-        ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_qos_profile - "
-                              "ERROR: Able to set QoS profile without "
-                              "an exception.\n"));
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_DEBUG ((LM_DEBUG, "NonChangeable_Connector_exec_impl_i::test_qos_profile - "
-                              "Caught expected exception.\n"));
-        return true;
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_qos_profile - "
-                              "ERROR: Caught unexpected exception.\n"));
-        return false;
-      }
-    return false;
-  }
-
-  bool
-  Component_exec_i::test_filter (
-    ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn)
-  {
-    try
-      {
-        ::CCM_DDS::QueryFilter filter;
-        filter.expression = ::CORBA::string_dup ("na");
-        conn->pull_consumer_filter (filter);
-        ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_filter - "
-                              "ERROR: Able to set filter without "
-                              "an exception.\n"));
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_DEBUG ((LM_DEBUG, "NonChangeable_Connector_exec_impl_i::test_filter - "
-                              "Caught expected exception.\n"));
-        return true;
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "NonChangeable_Connector_exec_impl_i::test_filter - "
-                              "ERROR: Caught unexpected exception.\n"));
-        return false;
-      }
-    return false;
-  }
-
-  // Operations from Components::SessionComponent.
-  CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_info_get_status (void)
-  {
-    return CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  void
-  Component_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::NonChangeable::CCM_NonChangeableComponent_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Component_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_activate (void)
-  {
-    ::NonChangeable::NonChangeableTestConnector::Reader_var reader =
-      this->context_->get_connection_info_get_data ();
-    if (::CORBA::is_nil (reader.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Component_exec_i::ccm_activate - "
-                              "Unable to get reader interface\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-    ::CORBA::Object_var cmp = reader->_get_component ();
-    if (::CORBA::is_nil (cmp.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Component_exec_i::ccm_activate - "
-                              "Unable to get component interface\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-    ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_var conn =
-      ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event::_narrow (cmp.in ());
-    if (::CORBA::is_nil (conn.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Component_exec_i::ccm_activate - "
-                              "Unable to narrow connector interface\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-
-    if (this->test_topic_name (conn.in ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "Set topic_name test passed.\n"));
-      }
-    if (this->test_key_fields (conn.in ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "Set key_fields test passed.\n"));
-      }
-    if (this->test_domain_id (conn.in ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "Set domain_id test passed.\n"));
-      }
-    if (this->test_qos_profile (conn.in ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "Set qos_profile test passed.\n"));
-      }
-    if (this->test_filter (conn.in ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "Set qos_profile test passed.\n"));
-      }
-  }
-
-  void
-  Component_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_NonChangeable_Component_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Component_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.h b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.h
deleted file mode 100644
index bce33e2e3b4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COMPONENT_EXEC_H_
-#define CIAO_COMPONENT_EXEC_H_
-
-#include "NonChangeable_ComponentEC.h"
-
-#include /**/ "Component_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_NonChangeable_NonChangeableComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  class COMPONENT_EXEC_Export Component_exec_i
-    : public virtual NonChangeableComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Component_exec_i (void);
-    virtual ~Component_exec_i (void);
-
-    // Operations from Components::SessionComponent.
-    CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_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);
-
-  private:
-    ::NonChangeable::CCM_NonChangeableComponent_Context_var context_;
-
-    bool
-    test_key_fields (
-      ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn);
-
-    bool
-    test_attributes (
-      ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn);
-
-    bool
-    test_qos_profile (
-      ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn);
-
-    bool
-    test_topic_name (
-      ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn);
-
-    bool
-    test_domain_id (
-      ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn);
-
-    bool
-    test_filter (
-      ::NonChangeable::NonChangeableTestConnector::CCM_DDS_Event_ptr conn);
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_NonChangeable_Component_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl
deleted file mode 100644
index a848e17fe87..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file NonChangeable_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef NONCHANGABLE_CONNECTOR_IDL_
-#define NONCHANGABLE_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/NonChangeable_Base.idl"
-
-#pragma ciao lem "Connector/NonChangeable_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/NonChangeable_BaseTypeSupport.idl"
-#endif
-
-module NonChangeable
-{
-  module ::CCM_DDS::Typed
-    < ::NonChangeableTest, ::NonChangeableTestSeq>
-    NonChangeableTestConnector;
-};
-
-#endif /* NonChangeable_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
deleted file mode 100644
index c2e73a35ca1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_NonChangeableBase -l .. -o ../lib -u DDS NonChangeable_Connector"
-
-project(DDS_NonChangeableConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_NonChangeableBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=NONCHANGABLE_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=NonChangeable_Connector_stub_export.h \
-              -Wb,skel_export_macro=NONCHANGABLE_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=NonChangeable_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=NONCHANGABLE_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=NonChangeable_Connector_svnt_export.h \
-              -Wb,conn_export_macro=NONCHANGABLE_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=NonChangeable_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    NonChangeable_Connector.idl
-  }
-}
-
-project(DDS_NonChangeableConnector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_NonChangeableConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=NONCHANGABLE_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=NonChangeable_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    NonChangeable_ConnectorE.idl
-  }
-}
-
-project(DDS_NonChangeableConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_NonChangeableConnector_lem_gen DDS_NonChangeableConnector_stub DDS_NonChangeableBase_stub
-  libs  += DDS_NonChangeableBase_stub DDS_NonChangeableConnector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_NonChangeableConnector_lem_stub
-  dynamicflags += NONCHANGABLE_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    NonChangeable_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    NonChangeable_ConnectorEC.h
-    NonChangeable_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    NonChangeable_ConnectorEC.inl
-  }
-}
-
-project(DDS_NonChangeableConnector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_NonChangeableConnector_idl_gen DDS_NonChangeableBase_stub
-  libs  += DDS_NonChangeableBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_NonChangeableConnector_stub
-  dynamicflags += NONCHANGABLE_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    NonChangeable_ConnectorC.cpp
-  }
-
-  Header_Files {
-    NonChangeable_ConnectorC.h
-    NonChangeable_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    NonChangeable_ConnectorC.inl
-  }
-}
-
-project(DDS_NonChangeableConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_NonChangeableConnector_lem_stub DDS_NonChangeableConnector_stub DDS_NonChangeableBase_stub
-  sharedname = DDS_NonChangeableConnector_exec
-  libs += DDS_NonChangeableConnector_stub DDS_NonChangeableConnector_lem_stub DDS_NonChangeableBase_stub DDS_NonChangeableBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += NONCHANGABLE_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    NonChangeable_Connector_conn.cpp
-  }
-
-  Header_Files {
-    NonChangeable_Connector_conn.h
-    NonChangeable_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_NonChangeableConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_NonChangeableConnector_lem_stub DDS_NonChangeableConnector_exec DDS_NonChangeableConnector_stub
-  sharedname  = DDS_NonChangeableConnector_svnt
-  libs       += DDS_NonChangeableConnector_stub \
-                DDS_NonChangeableConnector_lem_stub  \
-                DDS_NonChangeableBase_stub \
-                DDS_NonChangeableConnector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += NONCHANGABLE_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    NonChangeable_ConnectorS.cpp
-    NonChangeable_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    NonChangeable_ConnectorS.h
-    NonChangeable_Connector_svnt.h
-    NonChangeable_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/README b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/README
deleted file mode 100644
index 15c5a62a44f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/README
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-This test tests whether the connection attributes
-can be set once the configuration is complete.
-This shouldn't be allowed and therefore a
-NonChangeable exception must be thrown.
-
-The following attributes are tested:
-  * key_fields
-  * domain_id
-  * qos_profile
-  * topic_name
-
-An error is reported for every attribute where
-no NonChangeable exception was catched.
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/Plan.cdp
deleted file mode 100644
index cd45205b5b5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/Plan.cdp
+++ /dev/null
@@ -1,198 +0,0 @@
-<!--  -->
-<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>NonChangeableAttribute_Depl_1</label>
-  <UUID>NonChangeableAttribute_Depl_1</UUID>
-
-  <implementation xmi:id="NonChangeableComponentImplementation">
-    <name>NonChangeableComponentmplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_NonChangeable_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_NonChangeable_NonChangeableComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="NonChangeableConnectorImplementation">
-    <name>NonChangeableConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="NonChangeableConnector_ExecArtifact" />
-    <artifact xmi:idref="NonChangeableConnector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_NonChangeable_NonChangeableTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_NonChangeable_NonChangeableTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>NonChangeableConnector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>NonChangeableConnector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="NonChangeableComponentInstance">
-    <name>NonChangeableComponentInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="NonChangeableComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="NonChangeableConnectorInstance">
-    <name>NonChangeableConnectorInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="NonChangeableConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>NonChangeable</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_get_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="NonChangeableComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="NonChangeableConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="NonChangeableConnector_ExecArtifact">
-    <name>NonChangeableConnector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_NonChangeableConnector_exec</location>
-  </artifact>
-  <artifact xmi:id="NonChangeableConnector_SvntArtifact">
-    <name>NonChangeableConnector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_NonChangeableConnector_svnt</location>
-  </artifact>
-  <artifact xmi:id="NonChangeableConnector_StubArtifact">
-    <name>NonChangeableConnector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_NonChangeableConnector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl
deleted file mode 100755
index 445ce8b9d56..00000000000
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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 = 1;
-@ports = ( 60001);
-@iorbases = ( "NodeApp1.ior" );
-@iorfiles = 0;
-@nodenames = ( "ComponentNode");
-
-# 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 5 seconds to allow task to complete\n";
-sleep (5);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/.gitignore b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl
deleted file mode 100644
index c67d2b6caba..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * @file OIT_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef ON_INCONSISTENT_TOPIC_TEST_BASE_IDL
-#define ON_INCONSISTENT_TOPIC_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/OIT_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/OIT_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "OIT_Receiver_Topic"
-#pragma DCPS_DATA_KEY "OIT_Receiver_Topic symbol"
-
-struct OIT_Receiver_Topic {
-  string symbol; //@key
-  long x;
-  long y;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<OIT_Receiver_Topic> OIT_Receiver_TopicSeq;
-#endif
-
-#pragma DCPS_DATA_TYPE "OIT_Sender_Topic"
-#pragma DCPS_DATA_KEY "OIT_Sender_Topic symbol"
-
-struct OIT_Sender_Topic {
-  string symbol; //@key
-  long x;
-  short y;
-  long z;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<OIT_Sender_Topic> OIT_Sender_TopicSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.mpc
deleted file mode 100644
index 0b13c2744f6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (OIT_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = OIT_Test_Base_stub
-  dynamicflags += ON_INCONSISTENT_TOPIC_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=ON_INCONSISTENT_TOPIC_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=OIT_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    OIT_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=ON_INCONSISTENT_TOPIC_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    OIT_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/.gitignore
deleted file mode 100644
index 70b981aaaec..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/OIT_Test_ReceiverE.idl
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.idl
deleted file mode 100644
index 8c1ab7b70f2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "ReceiverConnector/OIT_Receiver_Connector.idl"
-
-module OIT_Test
-{
-  component Receiver
-  {
-    port OIT_Receiver_TopicConnector::DDS_Listen info_out;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc
deleted file mode 100644
index 2d0d4f3ed85..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(OIT_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += OIT_Receiver_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 {
-    OIT_Test_Receiver.idl
-  }
-}
-
-project(OIT_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += OIT_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 {
-    OIT_Test_ReceiverE.idl
-  }
-}
-
-project(OIT_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += OIT_Test_Receiver_lem_gen OIT_Test_Receiver_stub  \
-           OIT_Receiver_Connector_stub OIT_Test_Base_stub
-  libs  +=  Receiver_stub OIT_Receiver_Connector_stub \
-            OIT_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    OIT_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    OIT_Test_ReceiverEC.inl
-  }
-}
-
-project(OIT_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += OIT_Test_Receiver_idl_gen  OIT_Receiver_Connector_stub \
-           OIT_Test_Base_stub OIT_Receiver_Connector_lem_gen
-  libs  += OIT_Receiver_Connector_stub OIT_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    OIT_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    OIT_Test_ReceiverC.inl
-  }
-}
-
-project(OIT_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += OIT_Test_Receiver_lem_stub OIT_Test_Receiver_stub \
-             OIT_Test_Base_stub OIT_Receiver_Connector_stub \
-             OIT_Receiver_Connector_lem_stub 
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub OIT_Test_Base_stub \
-          OIT_Receiver_Connector_stub OIT_Receiver_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    OIT_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(OIT_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   OIT_Test_Receiver_lem_stub OIT_Test_Base_stub \
-                  OIT_Receiver_Connector_stub OIT_Receiver_Connector_svnt \
-                  OIT_Test_Receiver_exec OIT_Receiver_Connector_lem_stub 
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub OIT_Test_Base_stub \
-                OIT_Receiver_Connector_stub OIT_Receiver_Connector_svnt \
-                Receiver_exec OIT_Receiver_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Test_ReceiverS.cpp
-    OIT_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    OIT_Test_ReceiverS.h
-    OIT_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp
deleted file mode 100644
index 2484942d900..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-// -*- C++ -*-
-#include "OIT_Test_Receiver_exec.h"
-
-#include "ace/Log_Msg.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_OIT_Test_Receiver_Impl
-{
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &inconsistent,
-                                                                  ACE_Thread_ID &thread_id)
-    : inconsistent_ (inconsistent),
-      thread_id_ (thread_id)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
-    ::DDS::Topic_ptr /* the_topic */,
-    const DDS::InconsistentTopicStatus & /* status */)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_ = t_id;
-    this->inconsistent_ = true;
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected(
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind  /*status_kind*/)
-  {
-  }
-
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  Receiver_exec_i::Receiver_exec_i (void)
-    : inconsistent_ (false),
-      thread_id_listener_ (0, 0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-
-  // Port operations.
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Receiver_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (this->inconsistent_,
-                                               this->thread_id_listener_);
-  }
-
-  ::OIT_Test::OIT_Receiver_TopicConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    return ::OIT_Test::OIT_Receiver_TopicConnector::CCM_Listener::_nil ();
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ = ::OIT_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)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (!this->inconsistent_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: did not receive the expected ")
-                              ACE_TEXT ("error 'on_inconsistent_topic'\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Received the expected ")
-                              ACE_TEXT ("'on_inconsistent_topic'\n")));
-      }
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_.to_string(list_buf);
-
-    if (this->thread_id_listener_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread ID for ConnectorStatusListener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: "
-                              "Thread switch for ConnectorStatusListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread switch for ConnectorStatusListener "
-                              "doesn't seem to work! "
-                             "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: ConnectorStatusListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                             "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: ConnectorStatusListener: "
-                              "DDS seems to use its own thread for its callback: "
-                             "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #endif
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_OIT_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/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.h
deleted file mode 100644
index dcc1b2c12d9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.h
+++ /dev/null
@@ -1,102 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_RECEIVER_EXEC_H_
-#define CIAO_RECEIVER_EXEC_H_
-
-#include "OIT_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"
-
-namespace CIAO_OIT_Test_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  //============================================================
-  // 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_Boolean &,
-                                    ACE_Thread_ID &);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (
-        ::DDS::Entity_ptr the_entity,
-        ::DDS::StatusKind  status_kind);
-    private:
-    Atomic_Boolean &inconsistent_;
-    ACE_Thread_ID &thread_id_;
-  };
-
-  //============================================================
-  // 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::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::OIT_Test::OIT_Receiver_TopicConnector::CCM_Listener_ptr
-    get_info_out_data_listener (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:
-    ::OIT_Test::CCM_Receiver_Context_var context_;
-
-    Atomic_Boolean inconsistent_;
-    ACE_Thread_ID thread_id_listener_;
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_OIT_Test_Receiver_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/.gitignore b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/.gitignore
deleted file mode 100644
index 241d5a1d74e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/OIT_Receiver_ConnectorE.idl
-/OIT_Receiver_Connector_conn.cpp
-/OIT_Receiver_Connector_conn.h
-/OIT_Receiver_Connector_conn_export.h
-/OIT_Receiver_Connector_lem_stub_export.h
-/OIT_Receiver_Connector_stub_export.h
-/OIT_Receiver_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl
deleted file mode 100644
index e326c3f6bb0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @file OIT_Receiver_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef ON_INCONSISTENT_TOPIC_TEST_RECEIVER_CONNECTOR_IDL_
-#define ON_INCONSISTENT_TOPIC_TEST_RECEIVER_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/OIT_Test_Base.idl"
-
-#pragma ciao lem "ReceiverConnector/OIT_Receiver_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/OIT_Test_BaseTypeSupport.idl"
-#endif
-
-module OIT_Test
-{
-  module ::CCM_DDS::Typed < ::OIT_Receiver_Topic, ::OIT_Receiver_TopicSeq>
-    OIT_Receiver_TopicConnector;
-};
-
-#endif /* ON_INCONSISTENT_TOPIC_TEST_RECEIVER_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc
deleted file mode 100644
index 092a37dcd4c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p OIT_Test_Base -l .. -o ../lib -u DDS OIT_Receiver_Connector"
-
-project(OIT_Receiver_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen OIT_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=OIT_Receiver_Connector_stub_export.h \
-              -Wb,skel_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=OIT_Receiver_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=OIT_Receiver_Connector_svnt_export.h \
-              -Wb,conn_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=OIT_Receiver_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    OIT_Receiver_Connector.idl
-  }
-}
-
-project(OIT_Receiver_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += OIT_Receiver_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=OIT_Receiver_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    OIT_Receiver_ConnectorE.idl
-  }
-}
-
-project(OIT_Receiver_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += OIT_Receiver_Connector_lem_gen OIT_Receiver_Connector_stub OIT_Test_Base_stub
-  libs  += OIT_Test_Base_stub OIT_Receiver_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = OIT_Receiver_Connector_lem_stub
-  dynamicflags += ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Receiver_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    OIT_Receiver_ConnectorEC.h
-    OIT_Receiver_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    OIT_Receiver_ConnectorEC.inl
-  }
-}
-
-project(OIT_Receiver_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += OIT_Receiver_Connector_idl_gen OIT_Test_Base_stub
-  libs  += OIT_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = OIT_Receiver_Connector_stub
-  dynamicflags += ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Receiver_ConnectorC.cpp
-  }
-
-  Header_Files {
-    OIT_Receiver_ConnectorC.h
-    OIT_Receiver_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    OIT_Receiver_ConnectorC.inl
-  }
-}
-
-project(OIT_Receiver_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += OIT_Receiver_Connector_lem_stub OIT_Receiver_Connector_stub OIT_Test_Base_stub
-  sharedname = OIT_Receiver_Connector_exec
-  libs += OIT_Receiver_Connector_stub OIT_Receiver_Connector_lem_stub OIT_Test_Base_stub OIT_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Receiver_Connector_conn.cpp
-  }
-
-  Header_Files {
-    OIT_Receiver_Connector_conn.h
-    OIT_Receiver_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(OIT_Receiver_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += OIT_Receiver_Connector_lem_stub OIT_Receiver_Connector_exec OIT_Receiver_Connector_stub
-  sharedname  = OIT_Receiver_Connector_svnt
-  libs       += OIT_Receiver_Connector_stub \
-                OIT_Receiver_Connector_lem_stub  \
-                OIT_Test_Base_stub \
-                OIT_Receiver_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Receiver_ConnectorS.cpp
-    OIT_Receiver_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    OIT_Receiver_ConnectorS.h
-    OIT_Receiver_Connector_svnt.h
-    OIT_Receiver_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/.gitignore
deleted file mode 100644
index 49adbc26bc2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/OIT_Test_SenderE.idl
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl
deleted file mode 100644
index afcd1df6db4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef ON_INCONSISTENT_TOPIC_TEST_SENDER_IDL
-#define ON_INCONSISTENT_TOPIC_TEST_SENDER_IDL
-
-#include "SenderConnector/OIT_Sender_Connector.idl"
-
-module OIT_Test
-{
-  component Sender
-  {
-    port OIT_Sender_TopicConnector::DDS_Write topic_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc
deleted file mode 100644
index fb5578f9df6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p OIT_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(OIT_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += OIT_Sender_Connector_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 {
-    OIT_Test_Sender.idl
-  }
-}
-
-project(OIT_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += OIT_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 {
-    OIT_Test_SenderE.idl
-  }
-}
-
-project(OIT_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += OIT_Test_Sender_lem_gen OIT_Test_Sender_stub \
-           OIT_Test_Base_stub
-  libs  += OIT_Test_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    OIT_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    OIT_Test_SenderEC.inl
-  }
-}
-
-project(OIT_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += OIT_Test_Sender_idl_gen OIT_Test_Base_stub \
-           OIT_Sender_Connector_stub
-  libs  += OIT_Test_Base_stub OIT_Sender_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    OIT_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    OIT_Test_SenderC.inl
-  }
-}
-
-project(OIT_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += OIT_Test_Sender_lem_stub OIT_Test_Sender_stub \
-             OIT_Sender_Connector_lem_stub OIT_Sender_Connector_stub 
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub OIT_Test_Base_stub \
-             OIT_Sender_Connector_lem_stub OIT_Sender_Connector_stub 
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    OIT_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(OIT_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += OIT_Test_Base_stub  OIT_Test_Sender_lem_stub \
-                OIT_Sender_Connector_stub \
-                OIT_Sender_Connector_svnt OIT_Sender_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub OIT_Test_Base_stub \
-                OIT_Sender_Connector_stub OIT_Sender_Connector_svnt \
-                OIT_Sender_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Test_SenderS.cpp
-    OIT_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    OIT_Test_SenderS.h
-    OIT_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp
deleted file mode 100644
index e7c710051a8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-// -*- C++ -*-
-#include "OIT_Test_Sender_exec.h"
-
-#include "ace/Log_Msg.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_OIT_Test_Sender_Impl
-{
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-                                             Atomic_Boolean &inconsistent,
-                                             ACE_Thread_ID &thread_id)
-    : inconsistent_ (inconsistent),
-      thread_id_ (thread_id)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-     ::DDS::Topic_ptr /*the_topic*/,
-     const DDS::InconsistentTopicStatus & /*status*/)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_ = t_id;
-    this->inconsistent_ = true;
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status (
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind  /*status_kind*/)
-  {
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-  Sender_exec_i::Sender_exec_i (void)
-    : inconsistent_ (false),
-      thread_id_listener_ (0, 0)
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (this->inconsistent_,
-                                               this->thread_id_listener_);
-  }
-
-  void
-  Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ = ::OIT_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)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    if (this->inconsistent_.value ())
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ")
-                              ACE_TEXT ("'on_inconsistent_topic'\n")));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: did not receive the expected ")
-                              ACE_TEXT ("error 'on_inconsistent_topic'\n")));
-      }
-
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_.to_string(list_buf);
-
-    if (this->thread_id_listener_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread ID for ConnectorStatusListener not set!\n"));
-      }
-
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: "
-                              "Thread switch for ConnectorStatusListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                             "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread switch for ConnectorStatusListener "
-                              "doesn't seem to work! "
-                             "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: ConnectorStatusListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                             "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: ConnectorStatusListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    #endif
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_OIT_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/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.h
deleted file mode 100644
index b580b33a4bc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_SENDER_EXEC_H_
-#define CIAO_SENDER_EXEC_H_
-
-
-#include "OIT_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_OIT_Test_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean &,
-                                    ACE_Thread_ID &);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind  status_kind);
-  private:
-    Atomic_Boolean &inconsistent_;
-    ACE_Thread_ID &thread_id_;
-  };
-
-  //============================================================
-  // Sender_exec_i
-  //============================================================
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    virtual CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-  private:
-    ::OIT_Test::CCM_Sender_Context_var context_;
-
-    Atomic_Boolean inconsistent_;
-    ACE_Thread_ID thread_id_listener_;
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_OIT_Test_Sender_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/.gitignore b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/.gitignore
deleted file mode 100644
index b16bcc4261d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/OIT_Sender_ConnectorE.idl
-/OIT_Sender_Connector_conn.cpp
-/OIT_Sender_Connector_conn.h
-/OIT_Sender_Connector_conn_export.h
-/OIT_Sender_Connector_lem_stub_export.h
-/OIT_Sender_Connector_stub_export.h
-/OIT_Sender_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl
deleted file mode 100644
index a8e1bd58cbf..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-
-/**
- * @file OIT_Sender_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef ON_INCONSISTENT_TOPIC_TEST_SENDER_CONNECTOR_IDL_
-#define ON_INCONSISTENT_TOPIC_TEST_SENDER_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-#include "Base/OIT_Test_Base.idl"
-
-#pragma ciao lem "SenderConnector/OIT_Sender_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/OIT_Test_BaseTypeSupport.idl"
-#endif
-
-module OIT_Test
-{
-  module ::CCM_DDS::Typed < ::OIT_Sender_Topic, ::OIT_Sender_TopicSeq>
-    OIT_Sender_TopicConnector;
-};
-
-#endif /* ON_INCONSISTENT_TOPIC_TEST_SENDER_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc
deleted file mode 100644
index 199cdb2ec8a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p OIT_Test_Base -l .. -o ../lib -u DDS OIT_Sender_Connector"
-
-project(OIT_Sender_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen OIT_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=OIT_Sender_Connector_stub_export.h \
-              -Wb,skel_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=OIT_Sender_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=OIT_Sender_Connector_svnt_export.h \
-              -Wb,conn_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=OIT_Sender_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    OIT_Sender_Connector.idl
-  }
-}
-
-project(OIT_Sender_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += OIT_Sender_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=OIT_Sender_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    OIT_Sender_ConnectorE.idl
-  }
-}
-
-project(OIT_Sender_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += OIT_Sender_Connector_lem_gen OIT_Sender_Connector_stub OIT_Test_Base_stub
-  libs  += OIT_Test_Base_stub OIT_Sender_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = OIT_Sender_Connector_lem_stub
-  dynamicflags += ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Sender_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    OIT_Sender_ConnectorEC.h
-    OIT_Sender_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    OIT_Sender_ConnectorEC.inl
-  }
-}
-
-project(OIT_Sender_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += OIT_Sender_Connector_idl_gen OIT_Test_Base_stub
-  libs  += OIT_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = OIT_Sender_Connector_stub
-  dynamicflags += ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Sender_ConnectorC.cpp
-  }
-
-  Header_Files {
-    OIT_Sender_ConnectorC.h
-    OIT_Sender_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    OIT_Sender_ConnectorC.inl
-  }
-}
-
-project(OIT_Sender_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += OIT_Sender_Connector_lem_stub OIT_Sender_Connector_stub OIT_Test_Base_stub
-  sharedname = OIT_Sender_Connector_exec
-  libs += OIT_Sender_Connector_stub OIT_Sender_Connector_lem_stub OIT_Test_Base_stub OIT_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Sender_Connector_conn.cpp
-  }
-
-  Header_Files {
-    OIT_Sender_Connector_conn.h
-    OIT_Sender_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(OIT_Sender_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += OIT_Sender_Connector_lem_stub OIT_Sender_Connector_exec OIT_Sender_Connector_stub
-  sharedname  = OIT_Sender_Connector_svnt
-  libs       += OIT_Sender_Connector_stub \
-                OIT_Sender_Connector_lem_stub  \
-                OIT_Test_Base_stub \
-                OIT_Sender_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OIT_Sender_ConnectorS.cpp
-    OIT_Sender_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    OIT_Sender_ConnectorS.h
-    OIT_Sender_Connector_svnt.h
-    OIT_Sender_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/Plan.cdp
deleted file mode 100644
index ddc1025aa90..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/Plan.cdp
+++ /dev/null
@@ -1,403 +0,0 @@
-<!--  -->
-<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>On_Inconsistent_Topic_Depl</label>
-  <UUID>On_Inconsistent_Topic_Depl</UUID>
-
-  <implementation xmi:id="ReceiverImplementation">
-    <name>ReceiverImplementation</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_OIT_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_OIT_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="Sender_ConnectorImplementation">
-    <name>Sender_ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_Connector_ExecArtifact" />
-    <artifact xmi:idref="Sender_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_OIT_Test_OIT_Sender_TopicConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_OIT_Test_OIT_Sender_TopicConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Receiver_ConnectorImplementation">
-    <name>Receiver_ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_Connector_ExecArtifact" />
-    <artifact xmi:idref="Receiver_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_OIT_Test_OIT_Receiver_TopicConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_OIT_Test_OIT_Receiver_TopicConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="SenderImplementation">
-    <name>SenderImplementation</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_OIT_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_OIT_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="ReceiverInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverImplementation" />
-  </instance>
-
-  <instance xmi:id="Receiver_ConnectorInstance">
-    <name>Receiver_ConnectorComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Receiver_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestOIT</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <instance xmi:id="SenderInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderImplementation" />
-  </instance>
-
-  <instance xmi:id="Sender_ConnectorInstance">
-    <name>Sender_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Sender_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestOIT</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_out_reader</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Receiver_ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_out_connector_status_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Receiver_ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>topic_write_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>topic_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Sender_ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>test_sec_topic_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Sender_ConnectorInstance" />
-    </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_Connector_ExecArtifact">
-    <name>Sender_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>OIT_Sender_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_Connector_SvntArtifact">
-    <name>Sender_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>OIT_Sender_Connector_svnt</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_Connector_ExecArtifact">
-    <name>Receiver_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>OIT_Receiver_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_Connector_SvntArtifact">
-    <name>Receiver_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>OIT_Receiver_Connector_svnt</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl
deleted file mode 100755
index 8de796937cb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl
+++ /dev/null
@@ -1,244 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 10 seconds to allow task to complete\n";
-sleep (10);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/.gitignore b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/.gitignore
deleted file mode 100644
index db0a52d9a85..00000000000
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-/OFM_Connector.cxx
-/OFM_Connector.h
-/OFM_ConnectorE.idl
-/OFM_ConnectorPlugin.cxx
-/OFM_ConnectorPlugin.h
-/OFM_ConnectorSupport.cxx
-/OFM_ConnectorSupport.h
-/OFM_Connector_conn.cpp
-/OFM_Connector_conn.h
-/OFM_Connector_conn_export.h
-/OFM_Connector_lem_stub_export.h
-/OFM_Connector_stub_export.h
-/OFM_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl
deleted file mode 100644
index fe3f5c1236f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef OFM_BASE_IDL
-#define OFM_BASE_IDL
-
-#pragma ndds typesupport "OFM_BaseSupport.h"
-#pragma opendds typesupport "OFM_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "Topic1"
-#pragma DCPS_DATA_KEY "Topic1 key_value_topic1"
-
-struct Topic1 {
-  string key_value_topic1; //@key
-  long long_value;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<Topic1> Topic1Seq;
-#endif
-
-#pragma DCPS_DATA_TYPE "Topic2"
-#pragma DCPS_DATA_KEY "Topic2 key_value_topic2"
-
-struct Topic2 {
-  string key_value_topic2; //@key
-  float float_value;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<Topic2> Topic2Seq;
-#endif
-
-#pragma DCPS_DATA_TYPE "Topic3"
-#pragma DCPS_DATA_KEY "Topic3 key_value_topic3"
-
-struct Topic3 {
-  string key_value_topic3; //@key
-  short short_value;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<Topic3> Topic3Seq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl
deleted file mode 100644
index 1554b27a1aa..00000000000
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef OFM_CONNECTOR_IDL
-#define OFM_CONNECTOR_IDL
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "OFM_Base.idl"
-
-#pragma ciao lem "OFM_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "OFM_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::Topic1, ::Topic1Seq> Topic1Connector;
-module ::CCM_DDS::Typed < ::Topic2, ::Topic2Seq> Topic2Connector;
-module ::CCM_DDS::Typed < ::Topic3, ::Topic3Seq> Topic3Connector;
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc
deleted file mode 100644
index a61728181f5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc
+++ /dev/null
@@ -1,147 +0,0 @@
-project (OFM_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = OFM_Base_stub
-  dynamicflags += OFM_CONNECTOR_BASE_STUB_BUILD_DLL
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=OFM_CONNECTOR_BASE_STUB_Export \
-              -Wb,stub_export_include=OFM_Connector_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    OFM_Base.idl
-  }
-
-  opendds_ts_flags += --export=OFM_CONNECTOR_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    OFM_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
-
-project(OFM_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  custom_only = 1
-  after += OFM_Base_stub
-  idlflags += -Wb,stub_export_macro=OFM_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=OFM_Connector_stub_export.h \
-              -Wb,skel_export_macro=OFM_CONNECTOR_SKEL_Export \
-              -Wb,skel_export_include=OFM_Connector_skel_export.h \
-              -Wb,conn_export_macro=OFM_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=OFM_Connector_conn_export.h \
-              -Wb,svnt_export_macro=OFM_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=OFM_Connector_svnt_export.h
-
-  IDL_Files {
-    OFM_Connector.idl
-  }
-}
-
-project(OFM_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += OFM_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=OFM_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=OFM_Connector_lem_stub_export.h \
-              -SS -Gxhst
-
-  IDL_Files {
-    OFM_ConnectorE.idl
-  }
-}
-
-project(OFM_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub  {
-  after    += OFM_Connector_lem_gen OFM_Connector_stub OFM_Base_stub
-  libs     += OFM_Connector_stub OFM_Base_stub
-
-  sharedname = OFM_Connector_lem_stub
-  dynamicflags += OFM_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OFM_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    OFM_ConnectorEC.h
-    OFM_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    OFM_ConnectorEC.inl
-  }
-}
-
-project(OFM_Connector_stub) : ccm_stub, dds4ccm_base, dds4ccm_ts_default {
-  after    += OFM_Connector_idl_gen OFM_Base_stub
-  sharedname = OFM_Connector_stub
-  dynamicflags += OFM_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OFM_ConnectorC.cpp
-  }
-
-  Header_Files {
-    OFM_ConnectorC.h
-    OFM_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    OFM_ConnectorC.inl
-  }
-}
-
-project(OFM_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after += OFM_Connector_lem_stub OFM_Connector_stub OFM_Base_stub
-  libs  += OFM_Connector_stub OFM_Connector_lem_stub OFM_Base_stub
-  sharedname = OFM_Connector_exec
-
-  dynamicflags += OFM_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OFM_Connector_conn.cpp
-  }
-
-  Header_Files {
-    OFM_Connector_conn.h
-    OFM_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(OFM_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after += OFM_Connector_lem_stub
-  libs  += OFM_Connector_stub OFM_Connector_lem_stub OFM_Base_stub
-  sharedname  = OFM_Connector_svnt
-
-  dynamicflags += OFM_CONNECTOR_SVNT_BUILD_DLL OFM_CONNECTOR_SKEL_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OFM_ConnectorS.cpp
-    OFM_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    OFM_ConnectorS.h
-    OFM_Connector_svnt.h
-    OFM_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/.gitignore b/CIAO/connectors/dds4ccm/tests/OneFile/Single/.gitignore
deleted file mode 100644
index b4b90bfc61a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Single/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-/OneFile_Connector.cxx
-/OneFile_Connector.h
-/OneFile_ConnectorE.idl
-/OneFile_ConnectorPlugin.cxx
-/OneFile_ConnectorPlugin.h
-/OneFile_ConnectorSupport.cxx
-/OneFile_ConnectorSupport.h
-/OneFile_Connector_conn.cpp
-/OneFile_Connector_conn.h
-/OneFile_Connector_conn_export.h
-/OneFile_Connector_lem_stub_export.h
-/OneFile_Connector_stub_export.h
-/OneFile_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl
deleted file mode 100644
index afbaa15e6ce..00000000000
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file OneFile_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef ONEFILE_BASE_IDL_
-#define ONEFILE_BASE_IDL_
-
-#pragma ndds typesupport "OneFile_BaseSupport.h"
-#pragma opendds typesupport "OneFile_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "OneFileTopic"
-#pragma DCPS_DATA_KEY "OneFileTopic hello"
-
-struct OneFileTopic {
-  string hello; //@key
-  long iteration;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<OneFileTopic> OneFileTopicSeq;
-#endif
-
-#endif /* ONEFILE_BASE_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl
deleted file mode 100644
index 9ec4b65b603..00000000000
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file OneFile_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef ONEFILE_CONNECTOR_IDL_
-#define ONEFILE_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "OneFile_Base.idl"
-
-#pragma ciao lem "OneFile_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "OneFile_BaseTypeSupport.idl"
-#endif
-
-module OneFile_Connector
-{
-  module ::CCM_DDS::Typed < OneFileTopic, OneFileTopicSeq> OneFileConnector;
-};
-
-module ::CCM_DDS::Typed < OneFileTopic, OneFileTopicSeq> OneFileConnector;
-
-#endif /* ONEFILE_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc
deleted file mode 100644
index c459b45c687..00000000000
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc
+++ /dev/null
@@ -1,148 +0,0 @@
-project (OneFile_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = OneFile_Base_stub
-  dynamicflags += ONEFILE_CONNECTOR_BASE_STUB_BUILD_DLL
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=ONEFILE_CONNECTOR_BASE_STUB_Export \
-              -Wb,stub_export_include=ONEFILE_Connector_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    OneFile_Base.idl
-  }
-
-  opendds_ts_flags += --export=ONEFILE_CONNECTOR_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    OneFile_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
-project(OneFile_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  custom_only = 1
-  after += OneFile_Base_stub
-  idlflags += -Wb,stub_export_macro=ONEFILE_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=OneFile_Connector_stub_export.h \
-              -Wb,skel_export_macro=ONEFILE_CONNECTOR_SKEL_Export \
-              -Wb,skel_export_include=OneFile_Connector_skel_export.h \
-              -Wb,conn_export_macro=ONEFILE_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=OneFile_Connector_conn_export.h \
-              -Wb,skel_export_macro=ONEFILE_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=OneFile_Connector_svnt_export.h
-
-  IDL_Files {
-    OneFile_Connector.idl
-  }
-}
-
-project(OneFile_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  after    += OneFile_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=ONEFILE_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=OneFile_Connector_lem_stub_export.h \
-              -SS -Gxhst
-
-  IDL_Files {
-    OneFile_ConnectorE.idl
-  }
-}
-
-project(OneFile_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub  {
-  after    += OneFile_Connector_lem_gen OneFile_Connector_stub OneFile_Base_stub
-  libs     += OneFile_Connector_stub OneFile_Base_stub
-
-  sharedname = OneFile_Connector_lem_stub
-  dynamicflags += ONEFILE_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OneFile_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    OneFile_ConnectorEC.h
-    OneFile_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    OneFile_ConnectorEC.inl
-  }
-}
-
-project(OneFile_Connector_stub) : ccm_stub, dds4ccm_base, dds4ccm_ts_default {
-  after    += OneFile_Connector_idl_gen OneFile_Base_stub
-  sharedname = OneFile_Connector_stub
-  dynamicflags += ONEFILE_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OneFile_ConnectorC.cpp
-  }
-
-  Header_Files {
-    OneFile_ConnectorC.h
-    OneFile_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    OneFile_ConnectorC.inl
-  }
-}
-
-project(OneFile_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after    += OneFile_Connector_lem_stub OneFile_Connector_stub OneFile_Base_stub
-  libs     += OneFile_Connector_stub OneFile_Connector_lem_stub OneFile_Base_stub
-  sharedname = OneFile_Connector_exec
-
-  dynamicflags += ONEFILE_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OneFile_Connector_conn.cpp
-  }
-
-  Header_Files {
-    OneFile_Connector_conn.h
-    OneFile_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(OneFile_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += OneFile_Connector_lem_stub
-  sharedname  = OneFile_Connector_svnt
-  libs       += OneFile_Connector_stub OneFile_Connector_lem_stub OneFile_Base_stub
-
-  dynamicflags += ONEFILE_CONNECTOR_SVNT_BUILD_DLL ONEFILE_CONNECTOR_SKEL_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    OneFile_ConnectorS.cpp
-    OneFile_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    OneFile_ConnectorS.h
-    OneFile_Connector_svnt.h
-    OneFile_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/.gitignore b/CIAO/connectors/dds4ccm/tests/PSAT/.gitignore
deleted file mode 100644
index 4142f2e29ed..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSAT/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-/ccm_dds_psat.cxx
-/ccm_dds_psat.h
-/ccm_dds_psatE.idl
-/ccm_dds_psatPlugin.cxx
-/ccm_dds_psatPlugin.h
-/ccm_dds_psatSupport.cxx
-/ccm_dds_psatSupport.h
-/ccm_dds_psat_conn.cpp
-/ccm_dds_psat_conn.h
-/ccm_dds_psat_conn_export.h
-/ccm_dds_psat_lem_stub_export.h
-/ccm_dds_psat_stub_export.h
-/ccm_dds_psat_svnt_export.h
-/lib
-/psat_connE.idl
-/psat_conn_conn.h
-/psat_type.cxx
-/psat_type.h
-/psat_typePlugin.cxx
-/psat_typePlugin.h
-/psat_typeSupport.cxx
-/psat_typeSupport.h
-/psat_type_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h b/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h
deleted file mode 100644
index 0f1bcc115dd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h
+++ /dev/null
@@ -1,95 +0,0 @@
-#ifndef DDS_PSAT_CONNECTOR_T
-#define DDS_PSAT_CONNECTOR_T
-
-#include "connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h"
-
-template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE>
-class DDS_PSAT_Event_Connector_T
-  : public virtual DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>
-{
-  virtual
-  typename CCM_TYPE::supplier_traits::data_type::_ptr_type
-  get_supplier_data (void)
-  {
-    return CCM_TYPE::supplier_traits::data_type::_nil ();
-  }
-
-  virtual
-  typename CCM_TYPE::supplier_traits::dds_entity_type::_ptr_type
-  get_supplier_dds_entity (void)
-  {
-    return CCM_TYPE::supplier_traits::dds_entity_type::_nil ();
-  }
-
-  virtual
-  typename CCM_TYPE::consumer_traits::data_type::_ptr_type
-  get_consumer_data (void)
-  {
-    return CCM_TYPE::consumer_traits::data_type::_nil ();
-  }
-
-  virtual
-  typename CCM_TYPE::consumer_traits::data_control_type::_ptr_type
-  get_consumer_data_control (void)
-  {
-    return CCM_TYPE::consumer_traits::data_control_type::_nil ();
-  }
-
-  virtual
-  typename CCM_TYPE::consumer_traits::dds_entity_type::_ptr_type
-  get_consumer_dds_entity (void)
-  {
-    return CCM_TYPE::consumer_traits::dds_entity_type::_nil ();
-  }
-
-  virtual
-  typename CCM_TYPE::consumer_traits::buffer_control_type::_ptr_type
-  get_consumer_buffer_control (void)
-  {
-    return CCM_TYPE::consumer_traits::buffer_control_type::_nil ();
-  }
-
-  virtual
-  ::CCM_DDS_PSAT::SharedMemoryConfig *
-  shared_memory_config (void)
-  {
-    return 0;
-  }
-
-  virtual
-  void
-  shared_memory_config (
-    const ::CCM_DDS_PSAT::SharedMemoryConfig & /*shared_memory_config */)
-  {
-  }
-
-  virtual
-  ::CCM_DDS_PSAT::BufferPoolConfig
-  attach_buffer_config (void)
-  {
-    return ::CCM_DDS_PSAT::BufferPoolConfig ();
-  }
-
-  virtual
-  void
-  attach_buffer_config (
-    const ::CCM_DDS_PSAT::BufferPoolConfig & /* attach_buffer_config */)
-  {
-  }
-
-  virtual
-  ::CCM_DDS_PSAT::TransportConfig *
-  transports_config (void)
-  {
-    return 0;
-  }
-
-  virtual
-  void
-  transports_config (
-    const ::CCM_DDS_PSAT::TransportConfig & /* transports_config */)
-  {
-  }
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/PSAT_Connector.idl b/CIAO/connectors/dds4ccm/tests/PSAT/PSAT_Connector.idl
deleted file mode 100644
index 92d41cef253..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSAT/PSAT_Connector.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @file PSAT_Connector.idl
- */
-
-#ifndef PSAT_CONNECTOR_USER_IDL
-#define PSAT_CONNECTOR_USER_IDL
-
-#include  <Components.idl>
-
-#include "ccm_dds_psat.idl"
-#include "psat_type.idl"
-
-#pragma ciao lem "PSAT_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "psat_typeTypeSupport.idl"
-#endif
-
-module ::CCM_DDS_PSAT::Typed_PSAT < ::TestTopic, ::TestTopicSeq> TestTopicMod;
-
-#endif /* PSAT_CONNECTOR_USER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl
deleted file mode 100644
index df0e7d7ff28..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl
+++ /dev/null
@@ -1,248 +0,0 @@
-#ifndef CCM_DDS_PSAT_IDL
-#define CCM_DDS_PSAT_IDL
-
-#pragma dds4ccm impl "DDS_PSAT_Connector_T.h"
-
-#if defined (__TAO_IDL)
-#include <ccm_dds.idl>
-#endif
-
-/**
- * @namespace CCM_DDS_PSAT
- *
- * Module containing all @ref PSAT related entities. Non-typed constructs are
- * directly defined in this module, while typed constructs are in a templated
- * sub-module.
- */
-module CCM_DDS_PSAT
-{
-   // ---------------------------
-   // Enums, structs and Typedefs
-   // ---------------------------
-
-   const long FIXED_STRING_SIZE = 50;
-
-   typedef char FixedString[FIXED_STRING_SIZE];
-
-   typedef sequence<string> StrSeq;
-
-   enum EndianType
-   {
-      PSAT_AD_LITTLE_ENDIAN,
-      PSAT_AD_BIG_ENDIAN
-   };
-
-   struct DataShape
-   {
-      long long num_blocks;
-
-      long long block_length;
-
-      long long stride;
-   };
-
-   struct SubscriberSideInfo
-   {
-      long long transferred_length;
-
-      long long sample_incomplete_deadline_usec;
-
-      boolean   deliver_sample;
-
-      long long            destination_offset;
-   };
-
-   struct ConnectorPrivateInfo
-   {
-      FixedString publisher_connector_id;
-
-      long long   internal_buffer_id;
-
-   };
-
-   struct PSAT_Header
-   {
-      long long            sample_start_address;
-
-      long long            ad_buffer_id;
-
-      long long            source_offset;
-
-      DataShape            psat_view;
-
-      EndianType           source_endian;
-
-      boolean              sample_complete;
-
-      SubscriberSideInfo   subscriber_side_info;
-
-      ConnectorPrivateInfo connector_only_info;
-   };
-
-   struct BasicUDM
-   {
-      PSAT_Header psatHeader;
-   };
-
-   struct AsynchErrorInfo
-   {
-      string get_rid_of_this; // TEMPORARY FIELD SO THE STRUCT COMPILES
-   };
-
-   struct SharedMemoryConfig
-   {
-      string    name;
-
-      long long size;
-
-      long long alignment;
-   };
-
-   struct BufferPoolConfig
-   {
-      long long buffer_start_offset;
-
-      long long num_buffers;
-
-      long long buffer_size;
-   };
-
-  struct TransportConfig
-   {
-      StrSeq  allowed_interfaces;
-
-      StrSeq  denied_interfaces;
-
-      StrSeq  transport_preference;
-   };
-
-   // ----------
-   // Exceptions
-   // ----------
-
-   exception SharedMemoryInitError
-   {
-      string explanation;
-   };
-
-   exception InvalidConnectorAttributes
-   {
-      string explanation;
-   };
-
-   exception NoAvailableAD_Buffer
-   {
-      string explanation;
-   };
-
-   exception InvalidAD_BufferState
-   {
-      string explanation;
-   };
-
-   exception InvalidUDM
-   {
-      string explanation;
-   };
-
-   exception UnsucessfulFlush
-   {
-      string explanation;
-   };
-
-   module Typed_PSAT<typename T, sequence<T> TSeq>
-   {
-      alias CCM_DDS::Typed<T, TSeq> DDS_Typed;
-      typedef DDS_Typed::DataReader DataReader;
-      typedef DDS_Typed::DataWriter DataWriter;
-
-      local interface PSAT_BufferControl
-      {
-         void release_buffer(in T datum)
-               raises(InvalidAD_BufferState, InvalidUDM);
-
-         void flush() raises(UnsucessfulFlush);
-      };
-
-      local interface PSAT_Writer : PSAT_BufferControl
-      {
-         void create_data(out T datum)
-               raises(CCM_DDS::InternalError, NoAvailableAD_Buffer);
-
-         void create_data_override(out T datum)
-               raises(CCM_DDS::InternalError);
-
-         void create_data_w_existing(in T existing_datum, out T datum)
-               raises(CCM_DDS::InternalError, InvalidAD_BufferState);
-
-         void notify_on_buffer_available(in long long timeoutUsec);
-
-         void write_one(in T datum)
-               raises(CCM_DDS::InternalError, InvalidUDM);
-      };
-
-      local interface PSAT_WriterStatusListener
-      {
-         void on_buffer_available();
-
-         void on_buffer_wait_timeout();
-      };
-
-      local interface PSAT_Interceptor
-      {
-         void on_metadata_intercept(inout T datum);
-      };
-
-      local interface PSAT_ReaderStatusListener : CCM_DDS::PortStatusListener
-      {
-         void on_copy_unsupported(in T datum, in AsynchErrorInfo info);
-         void on_data_corruption(in T datum, in AsynchErrorInfo info);
-         void on_incomplete_transfer(in T datum, in AsynchErrorInfo info);
-         void on_invalid_UDM(in T datum, in AsynchErrorInfo info);
-      };
-
-      // --------------
-      // DDS PSAT Ports
-      // --------------
-
-      porttype DDS_PSAT_Write
-      {
-         uses     PSAT_Writer               data;
-         uses     DDS::DataWriter           dds_entity;
-         provides PSAT_WriterStatusListener status;
-      };
-
-      porttype DDS_PSAT_Listen
-      {
-         uses     DDS_Typed::Reader            data;
-         provides DDS_Typed::Listener          data_listener;
-         uses     CCM_DDS::DataListenerControl data_control;
-         provides PSAT_ReaderStatusListener    status;
-         uses     DDS::DataReader              dds_entity;
-         provides PSAT_Interceptor             interceptor;
-         uses     PSAT_BufferControl           buffer_control;
-      };
-
-      // ------------------
-      // DDS PSAT Connector
-      // ------------------
-
-      connector DDS_PSAT_Event : CCM_DDS::DDS_TopicBase
-      {
-         mirrorport DDS_PSAT_Write       supplier;
-         mirrorport DDS_PSAT_Listen      consumer;
-
-         attribute  SharedMemoryConfig   shared_memory_config
-               setraises(CCM_DDS::NonChangeable);
-
-         attribute  BufferPoolConfig     attach_buffer_config
-               setraises(CCM_DDS::NonChangeable);
-
-         attribute  TransportConfig      transports_config
-               setraises(CCM_DDS::NonChangeable);
-      };
-   };
-};
-
-#endif // CCM_DDS_PSAT_IDL
-
diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc
deleted file mode 100644
index 90be1668a36..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc
+++ /dev/null
@@ -1,204 +0,0 @@
-project (DDS_CCM_Example_PSAT_type_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_CCM_Example_PSAT_type_stub
-  dynamicflags += PSAT_TYPE_STUB_BUILD_DLL
-  libout = lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=PSAT_TYPE_STUB_Export \
-              -Wb,stub_export_include=psat_type_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    psat_type.idl
-  }
-
-  opendds_ts_flags += --export=PSAT_TYPE_STUB_Export
-
-  DDSGenerator_Files {
-    psat_type.idl
-  }
-
-  Source_Files {
-  }
-}
-
-project (DDS_CCM_Example_PSAT_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default, dds4ccm, dds4ccm_stub, ccm_stub {
-  sharedname = DDS_CCM_Example_PSAT_stub
-  dynamicflags += CCM_DDS_PSAT_STUB_BUILD_DLL
-  libout = lib
-
-  idlflags += -SS \
-              -Wb,stub_export_macro=CCM_DDS_PSAT_STUB_Export \
-              -Wb,stub_export_include=ccm_dds_psat_stub_export.h \
-              -Wb,skel_export_macro=CCM_DDS_PSAT_SKEL_Export \
-              -Wb,skel_export_include=ccm_dds_psat_skel_export.h \
-              -I $(CIAO_ROOT)/connectors/dds4ccm/idl
-
-  IDL_Files {
-    idlflags += -Gxhst -Gxhsk
-    ccm_dds_psat.idl
-  }
-
-  opendds_ts_flags += --export=CCM_DDS_PSAT_STUB_Export -I $(CIAO_ROOT)/connectors/dds4ccm/idl
-  ndds_ts_flags += -I $(CIAO_ROOT)/connectors/dds4ccm/idl
-
-  DDSGenerator_Files {
-    ccm_dds_psat.idl
-  }
-
-  Source_Files {
-  }
-}
-
-
-project(PSAT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_CCM_Example_PSAT_type_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=PSAT_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=PSAT_Connector_stub_export.h \
-              -Wb,skel_export_macro=PSAT_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=PSAT_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=PSAT_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=PSAT_Connector_svnt_export.h \
-              -Wb,conn_export_macro=PSAT_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=PSAT_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    PSAT_Connector.idl
-  }
-}
-
-project(PSAT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += PSAT_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=PSAT_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=PSAT_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    PSAT_ConnectorE.idl
-  }
-}
-
-project(PSAT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after  += PSAT_Connector_lem_gen \
-            DDS_PSAT_Connector_stub \
-            DDS_CCM_Example_PSAT_stub
-  libs   += DDS_CCM_Example_PSAT_stub \
-            DDS_PSAT_Connector_stub
-  libpaths += lib
-  libout = lib
-  includes += ..
-  sharedname = PSAT_Connector_lem_stub
-  dynamicflags += PSAT_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSAT_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    PSAT_ConnectorEC.h
-    PSAT_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    PSAT_ConnectorEC.inl
-  }
-}
-
-project(DDS_PSAT_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += PSAT_Connector_idl_gen DDS_CCM_Example_PSAT_stub DDS_CCM_Example_PSAT_type_stub
-  libs  += DDS_CCM_Example_PSAT_stub
-  libpaths += lib
-  libout = lib
-  includes += ..
-  sharedname = DDS_PSAT_Connector_stub
-  dynamicflags += PSAT_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSAT_ConnectorC.cpp
-  }
-
-  Header_Files {
-    PSAT_ConnectorC.h
-    PSAT_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    PSAT_ConnectorC.inl
-  }
-}
-
-project(DDS_PSAT_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after    += DDS_CCM_Example_PSAT_type_stub \
-              PSAT_Connector_lem_stub \
-              DDS_PSAT_Connector_stub
-  sharedname = DDS_PSAT_Connector_exec
-  libs += DDS_CCM_Example_PSAT_type_stub \
-          DDS_PSAT_Connector_stub \
-          PSAT_Connector_lem_stub \
-          DDS_CCM_Example_PSAT_stub
-  libpaths += lib
-  libout = lib
-  includes += ..
-  dynamicflags += PSAT_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSAT_Connector_conn.cpp
-  }
-
-  Header_Files {
-    DDS_PSAT_Connector_T.h
-    PSAT_Connector_conn.h
-    PSAT_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_PSAT_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += PSAT_Connector_lem_stub \
-                DDS_PSAT_Connector_exec \
-                DDS_PSAT_Connector_skel
-  sharedname  = DDS_PSAT_Connector_svnt
-  libs       += DDS_PSAT_Connector_stub \
-                PSAT_Connector_lem_stub  \
-                DDS_CCM_Example_PSAT_stub \
-                DDS_PSAT_Connector_exec
-  libpaths += lib
-  libout = lib
-  includes += ..
-  dynamicflags += PSAT_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSAT_ConnectorS.cpp
-    PSAT_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    PSAT_ConnectorS.h
-    PSAT_Connector_svnt.h
-    PSAT_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/psat_type.idl b/CIAO/connectors/dds4ccm/tests/PSAT/psat_type.idl
deleted file mode 100644
index 49ff5697c10..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSAT/psat_type.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file   psat_type.idl
- */
-
-#ifndef PSAT_TYPE_IDL
-#define PSAT_TYPE_IDL
-
-#pragma ndds typesupport "psat_typeSupport.h"
-#pragma opendds typesupport "psat_typeTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TestTopic"
-#pragma DCPS_DATA_KEY "TestTopic key"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopic> TestTopicSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/.gitignore b/CIAO/connectors/dds4ccm/tests/PSLDeadline/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/.gitignore
deleted file mode 100644
index 2d9b539ddab..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/PSL_DeadlineTest_Base.cxx
-/PSL_DeadlineTest_Base.h
-/PSL_DeadlineTest_BasePlugin.cxx
-/PSL_DeadlineTest_BasePlugin.h
-/PSL_DeadlineTest_BaseSupport.cxx
-/PSL_DeadlineTest_BaseSupport.h
-/PSL_DeadlineTest_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl
deleted file mode 100644
index 7ea3138441f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file   PSL_DeadlineTest_Base.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef PSL_DEADLINETEST_BASE_IDL
-#define PSL_DEADLINETEST_BASE_IDL
-
-#pragma ndds typesupport "Base/PSL_DeadlineTest_BaseSupport.h"
-#pragma opendds typesupport "Base/PSL_DeadlineTest_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TestTopic"
-#pragma DCPS_DATA_KEY "TestTopic key"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopic> TestTopicSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc
deleted file mode 100644
index 66e0b1762cb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_PSL_DeadlineTest_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_PSL_DeadlineTest_Base_stub
-  dynamicflags += PSL_DEADLINETEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=PSL_DEADLINETEST_BASE_STUB_Export \
-              -Wb,stub_export_include=PSL_DeadlineTest_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    PSL_DeadlineTest_Base.idl
-  }
-
-  opendds_ts_flags += --export=PSL_DEADLINETEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    PSL_DeadlineTest_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/.gitignore
deleted file mode 100644
index 4a97096073c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/PSL_DeadlineTest_ConnectorE.idl
-/PSL_DeadlineTest_Connector_conn.cpp
-/PSL_DeadlineTest_Connector_conn.h
-/PSL_DeadlineTest_Connector_conn_export.h
-/PSL_DeadlineTest_Connector_lem_stub_export.h
-/PSL_DeadlineTest_Connector_stub_export.h
-/PSL_DeadlineTest_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl
deleted file mode 100644
index 6f3117be92e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file PSL_DeadlineTest_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef PSL_DeadlineTest_CONNECTOR_IDL_
-#define PSL_DeadlineTest_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/PSL_DeadlineTest_Base.idl"
-
-#pragma ciao lem "Connector/PSL_DeadlineTest_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/PSL_DeadlineTest_BaseTypeSupport.idl"
-#endif
-
-module PSL_DeadlineTest
-{
-  module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> PSLDeadlineConnector;
-};
-
-#endif /* PSL_DeadlineTest_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
deleted file mode 100644
index 60489f913ca..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_PSL_DeadlineTest_Base -l .. -o ../lib -u DDS PSL_DeadlineTest_Connector"
-
-project(DDS_PSL_DT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_PSL_DeadlineTest_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=PSL_DEADLINETEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=PSL_DeadlineTest_Connector_stub_export.h \
-              -Wb,skel_export_macro=PSL_DEADLINETEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=PSL_DeadlineTest_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=PSL_DEADLINETEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=PSL_DeadlineTest_Connector_svnt_export.h \
-              -Wb,conn_export_macro=PSL_DEADLINETEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=PSL_DeadlineTest_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    PSL_DeadlineTest_Connector.idl
-  }
-}
-
-project(DDS_PSL_DT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_PSL_DT_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=PSL_DEADLINETEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=PSL_DeadlineTest_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    PSL_DeadlineTest_ConnectorE.idl
-  }
-}
-
-project(DDS_PSL_DT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_PSL_DT_Connector_lem_gen DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Base_stub
-  libs  += DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_PSL_DT_Connector_lem_stub
-  dynamicflags += PSL_DEADLINETEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_DeadlineTest_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    PSL_DeadlineTest_ConnectorEC.h
-    PSL_DeadlineTest_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    PSL_DeadlineTest_ConnectorEC.inl
-  }
-}
-
-project(DDS_PSL_DeadlineTest_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_PSL_DT_Connector_idl_gen DDS_PSL_DeadlineTest_Base_stub
-  libs  += DDS_PSL_DeadlineTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_PSL_DeadlineTest_Connector_stub
-  dynamicflags += PSL_DEADLINETEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_DeadlineTest_ConnectorC.cpp
-  }
-
-  Header_Files {
-    PSL_DeadlineTest_ConnectorC.h
-    PSL_DeadlineTest_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    PSL_DeadlineTest_ConnectorC.inl
-  }
-}
-
-project(DDS_PSL_DeadlineTest_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Base_stub
-  sharedname = DDS_PSL_DeadlineTest_Connector_exec
-  libs += DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += PSL_DEADLINETEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_DeadlineTest_Connector_conn.cpp
-  }
-
-  Header_Files {
-    PSL_DeadlineTest_Connector_conn.h
-    PSL_DeadlineTest_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_PSL_DeadlineTest_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Connector_exec DDS_PSL_DeadlineTest_Connector_stub
-  sharedname  = DDS_PSL_DeadlineTest_Connector_svnt
-  libs       += DDS_PSL_DeadlineTest_Connector_stub \
-                DDS_PSL_DT_Connector_lem_stub  \
-                DDS_PSL_DeadlineTest_Base_stub \
-                DDS_PSL_DeadlineTest_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += PSL_DEADLINETEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_DeadlineTest_ConnectorS.cpp
-    PSL_DeadlineTest_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    PSL_DeadlineTest_ConnectorS.h
-    PSL_DeadlineTest_Connector_svnt.h
-    PSL_DeadlineTest_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/.gitignore
deleted file mode 100644
index dc6edf4befa..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/PSL_DeadlineTest_ReceiverE.idl
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl
deleted file mode 100644
index 28afda4aea3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/PSL_DeadlineTest_Connector.idl"
-
-module PSL_DeadlineTest
-{
-  component Receiver
-  {
-    port PSLDeadlineConnector::DDS_Get info_get;
-    port PSLDeadlineConnector::DDS_Listen info_out;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc
deleted file mode 100644
index d69a0858a80..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_PSL_DeadlineTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_PSL_DT_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 {
-    PSL_DeadlineTest_Receiver.idl
-  }
-}
-
-project(DDS_PSL_DeadlineTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_PSL_DeadlineTest_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 {
-    PSL_DeadlineTest_ReceiverE.idl
-  }
-}
-
-project(DDS_PSL_DT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_PSL_DeadlineTest_Receiver_lem_gen DDS_PSL_DeadlineTest_Receiver_stub  DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Base_stub
-  libs  +=  Receiver_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_DeadlineTest_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    PSL_DeadlineTest_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    PSL_DeadlineTest_ReceiverEC.inl
-  }
-}
-
-project(DDS_PSL_DeadlineTest_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_PSL_DeadlineTest_Receiver_idl_gen  DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DT_Connector_lem_gen
-  libs  += DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_DeadlineTest_ReceiverC.cpp
-  }
-
-  Header_Files {
-    PSL_DeadlineTest_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    PSL_DeadlineTest_ReceiverC.inl
-  }
-}
-
-project(DDS_PSL_DeadlineTest_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_PSL_DT_Receiver_lem_stub DDS_PSL_DeadlineTest_Receiver_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DT_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DT_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_DeadlineTest_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    PSL_DeadlineTest_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_PSL_DeadlineTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_PSL_DT_Receiver_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Connector_svnt DDS_PSL_DeadlineTest_Receiver_exec DDS_PSL_DT_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Connector_svnt Receiver_exec DDS_PSL_DT_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_DeadlineTest_ReceiverS.cpp
-    PSL_DeadlineTest_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    PSL_DeadlineTest_ReceiverS.h
-    PSL_DeadlineTest_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp
deleted file mode 100644
index d0e8cc74f2d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp
+++ /dev/null
@@ -1,504 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "PSL_DeadlineTest_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#include "dds4ccm/impl/TimeUtilities.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_PSL_DeadlineTest_Receiver_Impl
-{
-
-  /**
-   * Read action Generator
-   */
-
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->pulse_callback_.read_all();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_get_status_exec_i
-   */
-
-  info_get_status_exec_i::info_get_status_exec_i (
-        ::PSL_DeadlineTest::CCM_Receiver_Context_ptr ctx,
-        Atomic_Short &deadline_port_get,
-        ACE_Thread_ID &thread_id_get)
-    : ciao_context_ (
-        ::PSL_DeadlineTest::CCM_Receiver_Context::_duplicate (ctx))
-      , deadline_port_get_ (deadline_port_get)
-      , thread_id_get_ (thread_id_get)
-  {
-  }
-
-  info_get_status_exec_i::~info_get_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_get_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-  const ::DDS::RequestedDeadlineMissedStatus & status)
-  {
-    if (! ::CORBA::is_nil (the_reader) && status.total_count != 0)
-      {
-        ACE_DEBUG ((LM_DEBUG, "info_get_status_exec_i::on_requested_deadline_missed - "
-                    "on_requested_deadline_missed received in PSL of the Getter\n"));
-        ++this->deadline_port_get_;
-        ACE_Thread_ID t_id;
-        this->thread_id_get_ = t_id;
-      }
-  }
-
-  void
-  info_get_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::PSL_DeadlineTest::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::PSL_DeadlineTest::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::PSL_DeadlineTest::PSLDeadlineConnector::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::TestTopic & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("info_out_data_listener_exec_i::on_one_data - ")
-              ACE_TEXT ("ERROR: received test_topic_info for <%C> at %u\n"),
-              datum.key.in (),
-              datum.x));
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::TestTopicSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::PSL_DeadlineTest::CCM_Receiver_Context_ptr ctx,
-        Atomic_Short &deadline_port_listener,
-        ACE_Thread_ID &thread_id_listener)
-    : ciao_context_ (
-        ::PSL_DeadlineTest::CCM_Receiver_Context::_duplicate (ctx))
-      , deadline_port_listener_ (deadline_port_listener)
-      , thread_id_listener_ (thread_id_listener)
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-  const ::DDS::RequestedDeadlineMissedStatus & status)
-  {
-    if (! ::CORBA::is_nil (the_reader) && status.total_count != 0)
-      {
-        ACE_DEBUG ((LM_DEBUG, "info_get_status_exec_i::on_requested_deadline_missed - "
-                    "on_requested_deadline_missed received in PSL of the Listener\n"));
-        ++this->deadline_port_listener_;
-        ACE_Thread_ID t_id;
-        this->thread_id_listener_ = t_id;
-      }
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : deadline_port_listener_ (0)
-      , deadline_port_get_ (0)
-      , thread_id_listener_listener_ (0, 0)
-      , thread_id_listener_get_ (0, 0)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      read_action_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Receiver_exec_i::read_all (void)
-  {
-    ::PSL_DeadlineTest::PSLDeadlineConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data();
-    if (::CORBA::is_nil (reader.in ()))
-      {
-        return;
-      }
-    TestTopicSeq TestTopic_infos;
-    ::CCM_DDS::ReadInfoSeq readinfoseq;
-    try
-      {
-        reader->read_all(TestTopic_infos, readinfoseq);
-        for(CORBA::ULong i = 0; i < readinfoseq.length(); ++i)
-          {
-            ACE_Time_Value tv;
-            tv <<= readinfoseq[i].source_timestamp;
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ")
-                                  ACE_TEXT ("-> UTC date =%#T ")
-                                  ACE_TEXT ("for sample %C:%u\n"),
-                                  &tv,
-                                  TestTopic_infos[i].key.in (),
-                                  TestTopic_infos[i].x));
-          }
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("internal error or no data\n")));
-      }
-  }
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_get_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_get_status_.in ()))
-      {
-        info_get_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_get_status_exec_i (
-            this->ciao_context_.in (),
-            this->deadline_port_get_,
-            this->thread_id_listener_get_),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_get_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_get_status_.in ());
-  }
-
-  ::PSL_DeadlineTest::PSLDeadlineConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in ()),
-            ::PSL_DeadlineTest::PSLDeadlineConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::PSL_DeadlineTest::PSLDeadlineConnector::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in (),
-            this->deadline_port_listener_,
-            this->thread_id_listener_listener_),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::PSL_DeadlineTest::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::DataListenerControl_var lc =
-      this->ciao_context_->get_connection_info_out_data_control ();
-
-    if (::CORBA::is_nil (lc.in ()))
-      {
-        ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-    lc->mode (::CCM_DDS::NOT_ENABLED);
-
-    // calculate the interval time
-    if (this->reactor ()->schedule_timer (this->ticker_,
-                                          0,
-                                          ACE_Time_Value(2, 0),
-                                          ACE_Time_Value(1, 300000)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-     if (this->deadline_port_get_.value () == 0)
-      {
-
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
-                               ACE_TEXT (" error 'on_requested_deadline_missed' on PortStatusListener Get in Receiver\n")
-                    ));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Have received the expected ")
-                              ACE_TEXT ("'on_requested_deadline_missed' %d times in PortStatusListener Get in Receiver\n"),
-                              this->deadline_port_get_.value ()
-                    ));
-      }
-     if (this->deadline_port_listener_.value () == 0)
-      {
-
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
-                               ACE_TEXT (" error 'on_requested_deadline_missed' on PortStatusListener Listener in Receiver\n")
-                    ));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Have received the expected ")
-                              ACE_TEXT ("'on_requested_deadline_missed' %d times in PortStatusListener Listener in Receiver\n"),
-                              this->deadline_port_listener_.value ()
-                    ));
-      }
-        //get current thread
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf_1 [65];
-    this->thread_id_listener_get_.to_string (list_buf_1);
-    //check thread switch for listener 1
-    if (this->thread_id_listener_get_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for PortStatusListener Get not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_get_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK : "
-                              "Thread switch for PortStatusListener Get seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_1,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread switch for PortStatusListener Get "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_1,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_get_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: PortStatusListener Get: "
-                              "DDS seems to use a CCM thread for its callback: "
-                               "listener <%C> - component <%C>\n",
-                              list_buf_1,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK : PortStatusListener Get: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_1,
-                              ccm_buf));
-      }
-    #endif
-
-    //check thread switch for listener 2
-   char list_buf_2 [65];
-   this->thread_id_listener_listener_.to_string (list_buf_2);
-   if (this->thread_id_listener_listener_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for PortStatusListener Listener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK : "
-                              "Thread switch for PortStatusListener Listener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_2,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread switch for PortStatusListener Listener "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_2,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: PortStatusListener Listener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                               "listener <%C> - component <%C>\n",
-                              list_buf_2,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK : PortStatusListener Listener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_2,
-                              ccm_buf));
-      }
-    #endif
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_PSL_DeadlineTest_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/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h
deleted file mode 100644
index 28003e60820..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h
+++ /dev/null
@@ -1,240 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_PSL_DEADLINETEST_RECEIVER_EXEC_W7G6VT_H_
-#define CIAO_PSL_DEADLINETEST_RECEIVER_EXEC_W7G6VT_H_
-
-#include /**/ "ace/pre.h"
-
-#include "PSL_DeadlineTest_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_PSL_DeadlineTest_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Short > Atomic_Short;
-
-  class Receiver_exec_i;
-  /**
-   * Read action generator
-   */
-
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-
-  private:
-    Receiver_exec_i &pulse_callback_;
-
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_get_status_exec_i
-   */
-
-  class info_get_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_get_status_exec_i (
-      ::PSL_DeadlineTest::CCM_Receiver_Context_ptr ctx,
-      Atomic_Short &deadline_port_get,
-      ACE_Thread_ID &thread_id_get);
-    virtual ~info_get_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::PSL_DeadlineTest::CCM_Receiver_Context_var ciao_context_;
-    Atomic_Short &deadline_port_get_;
-    ACE_Thread_ID &thread_id_get_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::PSL_DeadlineTest::PSLDeadlineConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::PSL_DeadlineTest::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from PSL_DeadlineTest::PSLDeadlineConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::TestTopicSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::PSL_DeadlineTest::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::PSL_DeadlineTest::CCM_Receiver_Context_ptr ctx,
-      Atomic_Short &deadline_port_listener,
-      ACE_Thread_ID &thread_id_listener);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::PSL_DeadlineTest::CCM_Receiver_Context_var ciao_context_;
-    Atomic_Short &deadline_port_listener_;
-    ACE_Thread_ID &thread_id_listener_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_status (void);
-
-    virtual ::PSL_DeadlineTest::PSLDeadlineConnector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void read_all(void);
-
-    //@}
-
-  private:
-    ::PSL_DeadlineTest::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_get_status_;
-    ::PSL_DeadlineTest::PSLDeadlineConnector::CCM_Listener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    read_action_Generator * ticker_;
-
-    Atomic_Short deadline_port_listener_;
-    Atomic_Short deadline_port_get_;
-    ACE_Thread_ID thread_id_listener_listener_;
-    ACE_Thread_ID thread_id_listener_get_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_PSL_DeadlineTest_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/.gitignore
deleted file mode 100644
index c687f2550a7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/PSL_DeadlineTest_SenderE.idl
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl
deleted file mode 100644
index 0d5dc07f572..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_PSL_DEADLINETEST_SENDER_IDL
-#define DDS_PSL_DEADLINETEST_SENDER_IDL
-
-#include "Connector/PSL_DeadlineTest_Connector.idl"
-
-module PSL_DeadlineTest
-{
-  component Sender
-  {
-     port PSLDeadlineConnector::DDS_Write test_topic_write;
-     provides CCM_DDS::ConnectorStatusListener test_topic_connector_status;
-
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc
deleted file mode 100644
index 6a4e5555900..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_PSL_DeadlineTest_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_PSL_DeadlineTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_PSL_DT_Connector_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 {
-    PSL_DeadlineTest_Sender.idl
-  }
-}
-
-project(DDS_PSL_DeadlineTest_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_PSL_DeadlineTest_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 {
-    PSL_DeadlineTest_SenderE.idl
-  }
-}
-
-project(DDS_PSL_DeadlineTest_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_PSL_DeadlineTest_Sender_lem_gen DDS_PSL_DeadlineTest_Sender_stub DDS_PSL_DeadlineTest_Base_stub
-  libs  += DDS_PSL_DeadlineTest_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_DeadlineTest_SenderEC.cpp
-  }
-
-  Header_Files {
-    PSL_DeadlineTest_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    PSL_DeadlineTest_SenderEC.inl
-  }
-}
-
-project(DDS_PSL_DeadlineTest_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_PSL_DeadlineTest_Sender_idl_gen DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub
-  libs  += DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_DeadlineTest_SenderC.cpp
-  }
-
-  Header_Files {
-    PSL_DeadlineTest_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    PSL_DeadlineTest_SenderC.inl
-  }
-}
-
-project(DDS_PSL_DeadlineTest_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_PSL_DeadlineTest_Sender_lem_stub DDS_PSL_DeadlineTest_Sender_stub DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DT_Connector_lem_stub  DDS_PSL_DeadlineTest_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_DeadlineTest_Sender_exec.cpp
-  }
-
-  Header_Files {
-    PSL_DeadlineTest_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_PSL_DeadlineTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_PSL_DeadlineTest_Base_stub  DDS_PSL_DeadlineTest_Sender_lem_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Connector_svnt DDS_PSL_DT_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub  DDS_PSL_DeadlineTest_Connector_svnt DDS_PSL_DT_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_DeadlineTest_SenderS.cpp
-    PSL_DeadlineTest_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    PSL_DeadlineTest_SenderS.h
-    PSL_DeadlineTest_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp
deleted file mode 100644
index fc1f81ade1f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp
+++ /dev/null
@@ -1,292 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "PSL_DeadlineTest_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_PSL_DeadlineTest_Sender_Impl
-{
-
-  /**
-   * Write action generator
-   */
-
-  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: test_topic_connector_status_exec_i
-   */
-
-  test_topic_connector_status_exec_i::test_topic_connector_status_exec_i (
-        ::PSL_DeadlineTest::CCM_Sender_Context_ptr ctx)
-    : ciao_context_ (
-        ::PSL_DeadlineTest::CCM_Sender_Context::_duplicate (ctx))
-  {
-  }
-
-  test_topic_connector_status_exec_i::~test_topic_connector_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-
-  void
-  test_topic_connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */,
-  const ::DDS::InconsistentTopicStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  test_topic_connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  test_topic_connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleRejectedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  test_topic_connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  test_topic_connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  test_topic_connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr /* the_entity */,
-  ::DDS::StatusKind /* status_kind */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::tick ()
-  {
-    ::PSL_DeadlineTest::PSLDeadlineConnector::Writer_var writer =
-      this->ciao_context_->get_connection_test_topic_write_data ();
-
-    for (PSL_DLTest_Table::iterator i = this->_ktests_.begin ();
-         i != this->_ktests_.end ();
-         ++i)
-      {
-         try
-          {
-            if (! ::CORBA::is_nil (writer.in ()))
-              {
-                writer->write_one(i->second,::DDS::HANDLE_NIL);
-                i->second->x++;
-              }
-          }
-         catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating topic for <%C>.\n"),
-                    i->first.c_str ()));
-          }
-       }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    // deadline period in QoS is set to two so the reader expects data every
-    // two seconds. Setting the interval to somewhat more than two seconds,
-    // the reader should (almost) always receive an on_requested_deadline_missed
-    // callback from DDS.
-    long sec = 2L;
-    long const usec = 100000L;
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (sec, usec),
-                ACE_Time_Value (sec, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                             ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-  }
-
-  void
-  Sender_exec_i::add_instance_of_topic (const char * key, int x)
-  {
-    TestTopic *new_key = new TestTopic;
-    new_key->key = CORBA::string_dup(key);
-    new_key->x = x;
-    this->_ktests_[key] = new_key;
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_test_topic_connector_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_test_topic_connector_status_.in ()))
-      {
-        test_topic_connector_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          test_topic_connector_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_ConnectorStatusListener::_nil ());
-
-          this->ciao_test_topic_connector_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate (
-        this->ciao_test_topic_connector_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::PSL_DeadlineTest::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    //add 2 different instances of topic
-    this->add_instance_of_topic ("ONE", 1);
-    this->add_instance_of_topic ("ONE", 2);
-    this->add_instance_of_topic ("ONE", 3);
-    this->add_instance_of_topic ("ONE", 4);
-    this->add_instance_of_topic ("ONE", 5);
-    this->add_instance_of_topic ("TWO", 1);
-    this->add_instance_of_topic ("TWO", 2);
-    this->add_instance_of_topic ("TWO", 3);
-    this->add_instance_of_topic ("TWO", 4);
-    this->add_instance_of_topic ("TWO", 5);
-    this->start ();
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_PSL_DeadlineTest_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/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h
deleted file mode 100644
index 7ad27c5579e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h
+++ /dev/null
@@ -1,185 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_PSL_DEADLINETEST_SENDER_EXEC_RFOSRO_H_
-#define CIAO_PSL_DEADLINETEST_SENDER_EXEC_RFOSRO_H_
-
-#include /**/ "ace/pre.h"
-
-#include "PSL_DeadlineTest_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_PSL_DeadlineTest_Sender_Impl
-{
-
- typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Sender_exec_i;
-
-  /**
-   * Write action generator
-   */
-
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: test_topic_connector_status_exec_i
-   */
-
-  class test_topic_connector_status_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    test_topic_connector_status_exec_i (
-      ::PSL_DeadlineTest::CCM_Sender_Context_ptr ctx);
-    virtual ~test_topic_connector_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-    const ::DDS::InconsistentTopicStatus & status);
-
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedIncompatibleQosStatus & status);
-
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleRejectedStatus & status);
-
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedDeadlineMissedStatus & status);
-
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedIncompatibleQosStatus & status);
-
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind status_kind);
-    //@}
-
-  private:
-    ::PSL_DeadlineTest::CCM_Sender_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_test_topic_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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-   void tick (void);
-
-    //@}
-
-  private:
-    ::PSL_DeadlineTest::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_test_topic_connector_status_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    pulse_Generator * ticker_;
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, TestTopic_var> PSL_DLTest_Table;
-    PSL_DLTest_Table _ktests_;
-
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start (void);
-    void stop (void);
-
-    void add_instance_of_topic (const char *, int x );
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_PSL_DeadlineTest_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Deadline_Library.xml b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Deadline_Library.xml
deleted file mode 100644
index 3f0b16fb65f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Deadline_Library.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-  <qos_profile name="DeadlineProfile">
-     <datawriter_qos>
-          <reliability>
-               <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-               <max_blocking_time>
-                    <sec>1</sec>
-                    <nanosec>0</nanosec>
-               </max_blocking_time>
-         </reliability>
-          <durability>
-               <kind>TRANSIENT_DURABILITY_QOS</kind>
-          </durability>
-          <history>
-               <kind>KEEP_ALL_HISTORY_QOS</kind>
-               <depth>2</depth>
-          </history>
-          <deadline>
-               <period>
-                    <sec>2</sec>
-                    <nanosec>0</nanosec>
-               </period>
-          </deadline>
-     </datawriter_qos>
-    <datareader_qos>
-          <reliability>
-               <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-          </reliability>
-          <history>
-               <kind>KEEP_ALL_HISTORY_QOS</kind>
-               <depth>1</depth>
-          </history>
-          <durability>
-                 <kind>TRANSIENT_DURABILITY_QOS</kind>
-          </durability>
-          <time_based_filter>
-               <minimum_separation>
-                    <sec>1</sec>
-                    <nanosec>50000000</nanosec>
-               </minimum_separation>
-          </time_based_filter>
-          <deadline>
-               <period>
-                    <sec>2</sec>
-                    <nanosec>0</nanosec>
-               </period>
-          </deadline>
-     </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp
deleted file mode 100644
index 516e0b44275..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp
+++ /dev/null
@@ -1,431 +0,0 @@
-<!--  -->
-<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>PSL_DeadlineTest_Depl_1</label>
-  <UUID>PSL_DeadlineTest_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_PSL_DeadlineTest_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PSL_DeadlineTest_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="PSL_DeadlineTest_ConnectorComponentImplementation">
-    <name>PSL_DeadlineTest_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="PSL_DeadlineTest_Connector_ExecArtifact" />
-    <artifact xmi:idref="PSL_DeadlineTest_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_PSL_DeadlineTest_PSLDeadlineConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PSL_DeadlineTest_PSLDeadlineConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PSL_DeadlineTest_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PSL_DeadlineTest_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_PSL_DeadlineTest_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PSL_DeadlineTest_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="PSL_DeadlineTest_ConnectorComponentInstance">
-    <name>PSL_DeadlineTest_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="PSL_DeadlineTest_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-    <name>qos_profile</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>Deadline_Library#DeadlineProfile</string>
-      </value>
-    </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="PSL_DeadlineTest_ConnectorComponentInstance2">
-    <name>PSL_DeadlineTest_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="PSL_DeadlineTest_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Deadline_Library#DeadlineProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_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="PSL_DeadlineTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="PSL_DeadlineTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistener2</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="PSL_DeadlineTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_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="PSL_DeadlineTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="PSL_DeadlineTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>test_topic_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="PSL_DeadlineTest_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_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="PSL_DeadlineTest_ConnectorComponentInstance" />
-    </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="PSL_DeadlineTest_Connector_ExecArtifact">
-    <name>PSL_DeadlineTest_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_PSL_DeadlineTest_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="PSL_DeadlineTest_Connector_SvntArtifact">
-    <name>PSL_DeadlineTest_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_PSL_DeadlineTest_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="PSL_DeadlineTest_Connector_StubArtifact">
-    <name>PSL_DeadlineTest_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_PSL_DeadlineTest_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/PSLDeadline/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 116879bcf87..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="Deadline_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="DeadlineProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>1</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-          <depth>2</depth>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-        <deadline>
-          <period>
-            <sec>2</sec>
-            <nanosec>0</nanosec>
-          </period>
-        </deadline>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-          <depth>1</depth>
-        </history>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <time_based_filter>
-          <minimum_separation>
-            <sec>1</sec>
-            <nanosec>50000000</nanosec>
-          </minimum_separation>
-        </time_based_filter>
-        <deadline>
-          <period>
-            <sec>2</sec>
-            <nanosec>0</nanosec>
-          </period>
-        </deadline>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl
deleted file mode 100755
index 3318cb486e1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 20 seconds to allow task to complete\n";
-sleep (20);
-
-# 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 -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/.gitignore b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/.gitignore
deleted file mode 100644
index 944232d98a4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/PSL_SampleLost_Base.cxx
-/PSL_SampleLost_Base.h
-/PSL_SampleLost_BasePlugin.cxx
-/PSL_SampleLost_BasePlugin.h
-/PSL_SampleLost_BaseSupport.cxx
-/PSL_SampleLost_BaseSupport.h
-/PSL_SampleLost_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl
deleted file mode 100644
index 9ba9ea7c56b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file   PSL_SampleLost_Base.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef PSL_SAMPLELOST_BASE_IDL
-#define PSL_SAMPLELOST_BASE_IDL
-
-#pragma ndds typesupport "Base/PSL_SampleLost_BaseSupport.h"
-#pragma opendds typesupport "Base/PSL_SampleLost_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TestTopic"
-#pragma DCPS_DATA_KEY "TestTopic key"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopic> TestTopicSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc
deleted file mode 100644
index 7fc4f39128e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_PSL_SampleLost_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_PSL_SampleLost_Base_stub
-  dynamicflags += PSL_SAMPLELOST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=PSL_SAMPLELOST_BASE_STUB_Export \
-              -Wb,stub_export_include=PSL_SampleLost_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    PSL_SampleLost_Base.idl
-  }
-
-  opendds_ts_flags += --export=PSL_SAMPLELOST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    PSL_SampleLost_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl
deleted file mode 100644
index b79b3fa1266..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file PSL_SampleLost_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef PSL_SampleLost_CONNECTOR_IDL_
-#define PSL_SampleLost_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/PSL_SampleLost_Base.idl"
-
-#pragma ciao lem "Connector/PSL_SampleLost_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/PSL_SampleLost_BaseTypeSupport.idl"
-#endif
-
-module PSL_SampleLost
-{
-  module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> PSL_SampleLostConnector;
-};
-
-#endif /* PSL_SampleLost_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
deleted file mode 100644
index 1f208fcca53..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_PSL_SampleLost_Base -l .. -o ../lib -u DDS PSL_SampleLost_Connector"
-
-project(DDS_PSL_SL_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_PSL_SampleLost_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=PSL_SAMPLELOST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=PSL_SampleLost_Connector_stub_export.h \
-              -Wb,skel_export_macro=PSL_SAMPLELOST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=PSL_SampleLost_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=PSL_SAMPLELOST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=PSL_SampleLost_Connector_svnt_export.h \
-              -Wb,conn_export_macro=PSL_SAMPLELOST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=PSL_SampleLost_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    PSL_SampleLost_Connector.idl
-  }
-}
-
-project(DDS_PSL_SL_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_PSL_SL_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=PSL_SAMPLELOST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=PSL_SampleLost_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    PSL_SampleLost_ConnectorE.idl
-  }
-}
-
-project(DDS_PSL_SL_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_PSL_SL_Connector_lem_gen DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Base_stub
-  libs  += DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_PSL_SL_Connector_lem_stub
-  dynamicflags += PSL_SAMPLELOST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_SampleLost_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    PSL_SampleLost_ConnectorEC.h
-    PSL_SampleLost_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    PSL_SampleLost_ConnectorEC.inl
-  }
-}
-
-project(DDS_PSL_SampleLost_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_PSL_SL_Connector_idl_gen DDS_PSL_SampleLost_Base_stub
-  libs  += DDS_PSL_SampleLost_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_PSL_SampleLost_Connector_stub
-  dynamicflags += PSL_SAMPLELOST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_SampleLost_ConnectorC.cpp
-  }
-
-  Header_Files {
-    PSL_SampleLost_ConnectorC.h
-    PSL_SampleLost_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    PSL_SampleLost_ConnectorC.inl
-  }
-}
-
-project(DDS_PSL_SampleLost_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Base_stub
-  sharedname = DDS_PSL_SampleLost_Connector_exec
-  libs += DDS_PSL_SampleLost_Connector_stub DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += PSL_SAMPLELOST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_SampleLost_Connector_conn.cpp
-  }
-
-  Header_Files {
-    PSL_SampleLost_Connector_conn.h
-    PSL_SampleLost_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_PSL_SampleLost_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Connector_exec DDS_PSL_SampleLost_Connector_stub
-  sharedname  = DDS_PSL_SampleLost_Connector_svnt
-  libs       += DDS_PSL_SampleLost_Connector_stub \
-                DDS_PSL_SL_Connector_lem_stub  \
-                DDS_PSL_SampleLost_Base_stub \
-                DDS_PSL_SampleLost_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += PSL_SAMPLELOST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_SampleLost_ConnectorS.cpp
-    PSL_SampleLost_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    PSL_SampleLost_ConnectorS.h
-    PSL_SampleLost_Connector_svnt.h
-    PSL_SampleLost_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.idl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.idl
deleted file mode 100644
index 9d22dcc4c64..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/PSL_SampleLost_Connector.idl"
-
-module PSL_SampleLost
-{
-  component Receiver
-  {
-    port PSL_SampleLostConnector::DDS_Get info_get;
-    port PSL_SampleLostConnector::DDS_Listen info_out;
-   };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc
deleted file mode 100644
index 1b65cc914fe..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_PSL_SampleLost_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_PSL_SL_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 {
-    PSL_SampleLost_Receiver.idl
-  }
-}
-
-project(DDS_PSL_SampleLost_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_PSL_SampleLost_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 {
-    PSL_SampleLost_ReceiverE.idl
-  }
-}
-
-project(DDS_PSL_SL_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_PSL_SampleLost_Receiver_lem_gen DDS_PSL_SampleLost_Receiver_stub  DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Base_stub
-  libs  +=  Receiver_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_SampleLost_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    PSL_SampleLost_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    PSL_SampleLost_ReceiverEC.inl
-  }
-}
-
-project(DDS_PSL_SampleLost_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_PSL_SampleLost_Receiver_idl_gen  DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SL_Connector_lem_gen
-  libs  += DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_SampleLost_ReceiverC.cpp
-  }
-
-  Header_Files {
-    PSL_SampleLost_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    PSL_SampleLost_ReceiverC.inl
-  }
-}
-
-project(DDS_PSL_SampleLost_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_PSL_SL_Receiver_lem_stub DDS_PSL_SampleLost_Receiver_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SL_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SL_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_SampleLost_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    PSL_SampleLost_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_PSL_SampleLost_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_PSL_SL_Receiver_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Connector_svnt DDS_PSL_SampleLost_Receiver_exec DDS_PSL_SL_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Connector_svnt Receiver_exec DDS_PSL_SL_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_SampleLost_ReceiverS.cpp
-    PSL_SampleLost_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    PSL_SampleLost_ReceiverS.h
-    PSL_SampleLost_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp
deleted file mode 100644
index 73738cea795..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp
+++ /dev/null
@@ -1,506 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "PSL_SampleLost_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "dds4ccm/impl/TimeUtilities.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_PSL_SampleLost_Receiver_Impl
-{
-  /**
-   * Read action generator
-   */
-
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->pulse_callback_.read_all();
-    return 0;
-  }
-
-
-  /**
-   * Facet Executor Implementation Class: info_get_status_exec_i
-   */
-
-  info_get_status_exec_i::info_get_status_exec_i (
-        ::PSL_SampleLost::CCM_Receiver_Context_ptr ctx,
-        Atomic_Boolean &sample_port_get,
-        ACE_Thread_ID &thread_id_listener_get)
-    : ciao_context_ (
-        ::PSL_SampleLost::CCM_Receiver_Context::_duplicate (ctx))
-      , sample_port_get_ (sample_port_get)
-      , thread_id_listener_get_ (thread_id_listener_get)
-  {
-  }
-
-  info_get_status_exec_i::~info_get_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_get_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_get_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & status)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_listener_get_ = t_id;
-
-    if (status.total_count > 0)
-      {
-        this->sample_port_get_ = true;
-      }
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::PSL_SampleLost::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::PSL_SampleLost::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::PSL_SampleLost::PSL_SampleLostConnector::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::TestTopic & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("TestTopic_RawListener: ")
-            ACE_TEXT ("ERROR: received test_topic_info for <%C> at %u\n"),
-            datum.key.in (),
-            datum.x));
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::TestTopicSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::PSL_SampleLost::CCM_Receiver_Context_ptr ctx,
-        Atomic_Boolean &sample_port_listener,
-        ACE_Thread_ID &thread_id_listener_listener)
-    : ciao_context_ (
-        ::PSL_SampleLost::CCM_Receiver_Context::_duplicate (ctx))
-      , sample_port_listener_ (sample_port_listener)
-      , thread_id_listener_listener_ (thread_id_listener_listener)
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & status)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_listener_listener_ = t_id;
-
-    if (status.total_count > 0)
-      {
-        this->sample_port_listener_ = true;
-      }
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : sample_port_get_ (false)
-      , sample_port_listener_ (false)
-      , thread_id_listener_get_ (0, 0)
-      , thread_id_listener_listener_ (0, 0)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      read_action_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Receiver_exec_i::read_all (void)
-  {
-    ::PSL_SampleLost::PSL_SampleLostConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data ();
-
-    if (!::CORBA::is_nil (reader.in ()))
-      {
-        TestTopicSeq TestTopic_infos;
-        ::CCM_DDS::ReadInfoSeq readinfoseq;
-        try
-          {
-            reader->read_all(TestTopic_infos, readinfoseq);
-            for(CORBA::ULong i = 0; i < readinfoseq.length(); ++i)
-              {
-                ACE_Time_Value tv;
-                tv <<= readinfoseq[i].source_timestamp;
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ")
-                                      ACE_TEXT ("-> UTC date =%#T\n"),
-                                      &tv));
-              }
-            for(CORBA::ULong i = 0; i < TestTopic_infos.length(); ++i)
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL keyed test info : ")
-                      ACE_TEXT ("Number <%d> : received TestTopic_info for <%C> at %u\n"),
-                    i,
-                    TestTopic_infos[i].key.in (),
-                    TestTopic_infos[i].x));
-              }
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("internal error or no data\n")));
-          }
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_get_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_get_status_.in ()))
-      {
-        info_get_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_get_status_exec_i (
-            this->ciao_context_.in (),
-            this->sample_port_get_,
-            this->thread_id_listener_get_),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_get_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_get_status_.in ());
-  }
-
-  ::PSL_SampleLost::PSL_SampleLostConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in ()),
-            ::PSL_SampleLost::PSL_SampleLostConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::PSL_SampleLost::PSL_SampleLostConnector::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in (),
-            this->sample_port_listener_,
-            this->thread_id_listener_listener_),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::PSL_SampleLost::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::DataListenerControl_var lc =
-    this->ciao_context_->get_connection_info_out_data_control ();
-
-    if (::CORBA::is_nil (lc.in ()))
-      {
-        ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-    lc->mode (::CCM_DDS::NOT_ENABLED);
-
-    // calculate the interval time
-    long const usec = 100000;
-    if (this->reactor ()->schedule_timer (this->ticker_,
-                                          0,
-                                          ACE_Time_Value(3, usec),
-                                          ACE_Time_Value(3, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-     if(!this->sample_port_get_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
-                         ACE_TEXT ("error 'on_sample_lost' on DDS_Listen port in Receiver\n")
-              ));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Have received the expected ")
-                               ACE_TEXT ("'on_sample_lost' in on DDS_Listen port Receiver\n")
-                    ));
-      }
-    if (!this->sample_port_listener_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
-                         ACE_TEXT ("error 'on_sample_lost' on DDS_Get port in Receiver\n")
-              ));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Have received the expected ")
-                               ACE_TEXT ("'on_sample_lost' in on DDS_GET port Receiver\n")
-                    ));
-      }
-             //get current thread
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf_1 [65];
-    this->thread_id_listener_get_.to_string (list_buf_1);
-
-    //check thread switch for listener 1
-    if (this->thread_id_listener_get_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for PortStatusListener Get not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_get_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK : "
-                              "Thread switch for PortStatusListener Get seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                               "listener <%C> - component <%C>\n",
-                              list_buf_1,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread switch for PortStatusListener Get "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_1,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_get_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: PortStatusListener Get: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_1,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK : PortStatusListener Get: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_1,
-                              ccm_buf));
-      }
-    #endif
-
-    //check thread switch for listener 2
-    char list_buf_2 [65];
-   this->thread_id_listener_listener_.to_string (list_buf_2);
-   if (this->thread_id_listener_listener_.id () == 0)
-     {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for PortStatusListener Listener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK : "
-                              "Thread switch for PortStatusListener Listener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_2,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread switch for PortStatusListener Listener "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_2,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: PortStatusListener Listener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_2,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK : PortStatusListener Listener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_2,
-                              ccm_buf));
-      }
-    #endif
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_PSL_SampleLost_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/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h
deleted file mode 100644
index a70f89dfc7f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h
+++ /dev/null
@@ -1,241 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_PSL_SAMPLELOST_RECEIVER_EXEC_G6JDCF_H_
-#define CIAO_PSL_SAMPLELOST_RECEIVER_EXEC_G6JDCF_H_
-
-#include /**/ "ace/pre.h"
-
-#include "PSL_SampleLost_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_PSL_SampleLost_Receiver_Impl
-{
-
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean> Atomic_Boolean;
-
-  class Receiver_exec_i;
-
-  /**
-   * Read action generator
-   */
-
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-
-  private:
-    Receiver_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_get_status_exec_i
-   */
-
-  class info_get_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_get_status_exec_i (
-      ::PSL_SampleLost::CCM_Receiver_Context_ptr ctx,
-      Atomic_Boolean &sample_port_get,
-      ACE_Thread_ID &thread_id_listener_get);
-    virtual ~info_get_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::PSL_SampleLost::CCM_Receiver_Context_var ciao_context_;
-    Atomic_Boolean &sample_port_get_;
-    ACE_Thread_ID &thread_id_listener_get_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::PSL_SampleLost::PSL_SampleLostConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::PSL_SampleLost::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from PSL_SampleLost::PSL_SampleLostConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::TestTopicSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::PSL_SampleLost::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::PSL_SampleLost::CCM_Receiver_Context_ptr ctx,
-      Atomic_Boolean &sample_port_listener,
-      ACE_Thread_ID &thread_id_listener_listener);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::PSL_SampleLost::CCM_Receiver_Context_var ciao_context_;
-    Atomic_Boolean &sample_port_listener_;
-    ACE_Thread_ID &thread_id_listener_listener_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_status (void);
-
-    virtual ::PSL_SampleLost::PSL_SampleLostConnector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void read_all (void);
-
-    //@}
-
-  private:
-    ::PSL_SampleLost::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_get_status_;
-    ::PSL_SampleLost::PSL_SampleLostConnector::CCM_Listener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    read_action_Generator * ticker_;
-
-    Atomic_Boolean sample_port_get_;
-    Atomic_Boolean sample_port_listener_;
-    ACE_Thread_ID thread_id_listener_get_;
-    ACE_Thread_ID thread_id_listener_listener_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_PSL_SampleLost_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl
deleted file mode 100644
index ca82d0a9095..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_PSL_SAMPLELOST_SENDER_IDL
-#define DDS_PSL_SAMPLELOST_SENDER_IDL
-
-#include "Connector/PSL_SampleLost_Connector.idl"
-
-module PSL_SampleLost
-{
-  component Sender
-  {
-    port PSL_SampleLostConnector::DDS_Write test_topic_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc
deleted file mode 100644
index 3df0cd46900..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_PSL_SampleLost_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_PSL_SampleLost_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_PSL_SL_Connector_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 {
-    PSL_SampleLost_Sender.idl
-  }
-}
-
-project(DDS_PSL_SampleLost_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_PSL_SampleLost_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 {
-    PSL_SampleLost_SenderE.idl
-  }
-}
-
-project(DDS_PSL_SampleLost_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_PSL_SampleLost_Sender_lem_gen DDS_PSL_SampleLost_Sender_stub DDS_PSL_SampleLost_Base_stub
-  libs  += DDS_PSL_SampleLost_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_SampleLost_SenderEC.cpp
-  }
-
-  Header_Files {
-    PSL_SampleLost_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    PSL_SampleLost_SenderEC.inl
-  }
-}
-
-project(DDS_PSL_SampleLost_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_PSL_SampleLost_Sender_idl_gen DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub
-  libs  += DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_SampleLost_SenderC.cpp
-  }
-
-  Header_Files {
-    PSL_SampleLost_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    PSL_SampleLost_SenderC.inl
-  }
-}
-
-project(DDS_PSL_SampleLost_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_PSL_SampleLost_Sender_lem_stub DDS_PSL_SampleLost_Sender_stub DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SL_Connector_lem_stub  DDS_PSL_SampleLost_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_SampleLost_Sender_exec.cpp
-  }
-
-  Header_Files {
-    PSL_SampleLost_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_PSL_SampleLost_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_PSL_SampleLost_Base_stub  DDS_PSL_SampleLost_Sender_lem_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Connector_svnt DDS_PSL_SL_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub  DDS_PSL_SampleLost_Connector_svnt DDS_PSL_SL_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PSL_SampleLost_SenderS.cpp
-    PSL_SampleLost_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    PSL_SampleLost_SenderS.h
-    PSL_SampleLost_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp
deleted file mode 100644
index f974995a892..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp
+++ /dev/null
@@ -1,270 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "PSL_SampleLost_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_PSL_SampleLost_Sender_Impl
-{
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Sender_exec_i &callback)
-    : callback_ (callback)
-    , started_(false)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (!this->started_ && status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        this->started_ = true;
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-        this->callback_.get_started ();
-      }
-  }
-
-  /**
-   * Write action generator
-   */
-
-  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  void
-  Sender_exec_i::tick ()
-  {
-    ::PSL_SampleLost::PSL_SampleLostConnector::Writer_var writer =
-      this->ciao_context_->get_connection_test_topic_write_data ();
-
-    for (PSL_DLTest_Table::iterator i = this->_ktests_.begin ();
-         i != this->_ktests_.end ();
-         ++i)
-      {
-         try
-          {
-            if (! ::CORBA::is_nil (writer.in ()) )
-              {
-                writer->write_one(i->second,::DDS::HANDLE_NIL);
-                i->second->x++;
-              }
-          }
-         catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating topic for <%C>.\n"),
-                    i->first.c_str ()));
-          }
-       }
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    //add 2 different instances of topic
-    this->add_instance_of_topic ("ONE",1);
-    this->add_instance_of_topic ("TWO",2);
-    this->start ();
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    long sec = 1L;
-    long const usec = 0L;
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (sec, usec),
-                ACE_Time_Value (sec, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                             ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-  }
-
-  void
-  Sender_exec_i::add_instance_of_topic (const char * key, int x)
-  {
-    TestTopic *new_key = new TestTopic;
-    new_key->key = CORBA::string_dup(key);
-    new_key->x = x;
-    this->_ktests_[key] = new_key;
-  }
-
-
-  // Component attributes and port operations.
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::PSL_SampleLost::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_PSL_SampleLost_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/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h
deleted file mode 100644
index a5a5601e815..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h
+++ /dev/null
@@ -1,173 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_PSL_SAMPLELOST_SENDER_EXEC_S5YOJH_H_
-#define CIAO_PSL_SAMPLELOST_SENDER_EXEC_S5YOJH_H_
-
-#include /**/ "ace/pre.h"
-
-#include "PSL_SampleLost_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_PSL_SampleLost_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Sender_exec_i;
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-    bool started_;
-  };
-
-
-  /**
-   * Write action Generator
-   */
-
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void tick (void);
-    void get_started (void);
-
-    //@}
-
-  private:
-    ::PSL_SampleLost::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    //@}
-
-    //@{
-    /** User defined members. */
-    pulse_Generator * ticker_;
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, TestTopic_var> PSL_DLTest_Table;
-    PSL_DLTest_Table _ktests_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start (void);
-    void stop (void);
-
-    void add_instance_of_topic (const char *, int x );
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_PSL_SampleLost_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/HelloTest_Library.xml b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/HelloTest_Library.xml
deleted file mode 100644
index d5ffa603e00..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/HelloTest_Library.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-  <qos_profile name="HelloProfile">
-     <datawriter_qos>
-          <reliability>
-               <kind>RELIABLE_RELIABILITY_QOS</kind>
-               <max_blocking_time>
-                    <sec>2</sec>
-                    <nanosec>0</nanosec>
-               </max_blocking_time>
-         </reliability>
-          <durability>
-               <kind>TRANSIENT_DURABILITY_QOS</kind>
-          </durability>
-          <durability_service>
-               <history_kind>KEEP_LAST_HISTORY_QOS</history_kind>
-               <history_depth>10</history_depth>
-               <max_samples>10</max_samples>
-               <max_instances>2</max_instances>
-               <max_samples_per_instance>10</max_samples_per_instance>
-          </durability_service>
-          <deadline>
-               <period>
-                    <sec>3</sec>
-                    <nanosec>0</nanosec>
-               </period>
-          </deadline>
-     </datawriter_qos>
-    <datareader_qos>
-          <reliability>
-               <kind>RELIABLE_RELIABILITY_QOS</kind>
-          </reliability>
-          <history>
-               <kind>KEEP_LAST_HISTORY_QOS</kind>
-               <depth>10</depth>
-          </history>
-          <resource_limits>
-               <initial_samples>1</initial_samples>
-               <initial_instances>1</initial_instances>
-               <max_samples>10</max_samples>
-               <max_instances>1</max_instances>
-               <max_samples_per_instance>10</max_samples_per_instance>
-          </resource_limits>
-          <durability>
-                 <kind>TRANSIENT_DURABILITY_QOS</kind>
-          </durability>
-          <deadline>
-               <period>
-                    <sec>3</sec>
-                    <nanosec>0</nanosec>
-               </period>
-          </deadline>
-     </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/Plan.cdp
deleted file mode 100644
index 63be232a68b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/Plan.cdp
+++ /dev/null
@@ -1,430 +0,0 @@
-<!--  -->
-<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>PSL_SampleLost_Depl_1</label>
-  <UUID>PSL_SampleLost_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_PSL_SampleLost_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PSL_SampleLost_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="PSL_SampleLost_ConnectorComponentImplementation">
-    <name>PSL_SampleLost_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="PSL_SampleLost_Connector_ExecArtifact" />
-    <artifact xmi:idref="PSL_SampleLost_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_PSL_SampleLost_PSL_SampleLostConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PSL_SampleLost_PSL_SampleLostConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PSL_SampleLost_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PSL_SampleLost_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_PSL_SampleLost_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PSL_SampleLost_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="PSL_SampleLost_ConnectorComponentInstance">
-    <name>PSL_SampleLost_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="PSL_SampleLost_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-    <name>qos_profile</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>HelloTest_Library#HelloProfile</string>
-      </value>
-    </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="PSL_SampleLost_ConnectorComponentInstance2">
-    <name>PSL_SampleLost_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="PSL_SampleLost_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#HelloProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_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="PSL_SampleLost_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="PSL_SampleLost_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistener2</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="PSL_SampleLost_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_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="PSL_SampleLost_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="PSL_SampleLost_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_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="PSL_SampleLost_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_connection_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="PSL_SampleLost_ConnectorComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </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="PSL_SampleLost_Connector_ExecArtifact">
-    <name>PSL_SampleLost_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_PSL_SampleLost_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="PSL_SampleLost_Connector_SvntArtifact">
-    <name>PSL_SampleLost_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_PSL_SampleLost_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="PSL_SampleLost_Connector_StubArtifact">
-    <name>PSL_SampleLost_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_PSL_SampleLost_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/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 9a3741f6c28..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="HelloTest_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="HelloProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>2</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <durability_service>
-          <history_kind>KEEP_LAST_HISTORY_QOS</history_kind>
-          <history_depth>10</history_depth>
-          <max_samples>10</max_samples>
-          <max_samples_per_instance>10</max_samples_per_instance>
-          <max_instances>2</max_instances>
-        </durability_service>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-        <deadline>
-          <period>
-            <sec>3</sec>
-            <nanosec>0</nanosec>
-          </period>
-        </deadline>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>10</depth>
-        </history>
-        <resource_limits>
-          <initial_samples>1</initial_samples>
-          <initial_instances>1</initial_instances>
-          <max_samples>10</max_samples>
-          <max_instances>1</max_instances>
-          <max_samples_per_instance>10</max_samples_per_instance>
-        </resource_limits>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <deadline>
-          <period>
-            <sec>3</sec>
-            <nanosec>0</nanosec>
-          </period>
-        </deadline>
-        </datareader_qos>
-
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl
deleted file mode 100755
index c5b1964e047..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.cpp
deleted file mode 100644
index 81b50b7a3e6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "deadline_qos_test.h"
-
-#include "duration.h"
-
-DeadlinePolicyTest::DeadlinePolicyTest ()
-{
-}
-
-bool
-DeadlinePolicyTest::check (const ::DDS_DeadlineQosPolicy & dds_qos,
-                           const ::DDS::DeadlineQosPolicy & qos)
-{
-  return Duration::check (dds_qos.period, qos.period);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.h
deleted file mode 100644
index b2dd688bb25..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef DEADLINE_QOS_TEST_H_
-#define DEADLINE_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/DeadlineQosPolicy.h"
-
-class DeadlinePolicyTest
-{
-public:
-  DeadlinePolicyTest ();
-
-  static bool check (const ::DDS_DeadlineQosPolicy & dds_qos,
-                     const ::DDS::DeadlineQosPolicy & qos);
-};
-
-#endif /* DEADLINE_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.cpp
deleted file mode 100644
index cbc982daa7e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "dest_order_qos_test.h"
-
-DestinationOrderPolicyTest::DestinationOrderPolicyTest ()
-{
-}
-
-bool
-DestinationOrderPolicyTest::check (const ::DDS_DestinationOrderQosPolicy & dds_qos,
-                                   const ::DDS::DestinationOrderQosPolicy & qos)
-{
-  return dds_qos.kind == static_cast <DDS_DestinationOrderQosPolicyKind> (qos.kind);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.h
deleted file mode 100644
index 941a0fcbf81..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef DEST_ORDER_QOS_TEST_H_
-#define DEST_ORDER_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/DestinationOrderQosPolicy.h"
-
-class DestinationOrderPolicyTest
-{
-public:
-  DestinationOrderPolicyTest ();
-
-  static bool check (const ::DDS_DestinationOrderQosPolicy & dds_qos,
-                     const ::DDS::DestinationOrderQosPolicy & qos);
-};
-
-#endif /* DEST_ORDER_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.cpp
deleted file mode 100644
index 4c05f843c35..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "dp_factory_qos_test.h"
-
-#include "entity_factory_qos_test.h"
-
-DomainParticipantFactoryPolicyTest::DomainParticipantFactoryPolicyTest ()
-{
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h
deleted file mode 100644
index ee6daf56d75..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef DP_FACTORY_QOS_TEST_H_
-#define DP_FACTORY_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/DomainParticipantFactoryQos.h"
-
-class DomainParticipantFactoryPolicyTest
-{
-public:
-  DomainParticipantFactoryPolicyTest ();
-
-};
-
-#endif /* DP_FACTORY_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.cpp
deleted file mode 100644
index 649fef081ca..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "dp_qos_test.h"
-
-#include "entity_factory_qos_test.h"
-#include "user_data_qos_test.h"
-
-DomainParticipantPolicyTest::DomainParticipantPolicyTest ()
-{
-}
-
-int
-DomainParticipantPolicyTest::run ()
-{
-  int ret = 0;
-  try
-    {
-      ::DDS::DomainParticipantQos policy;
-      DDS_DomainParticipantQos dds_policy_org, dds_policy;
-
-      dds_policy_org = DDS_PARTICIPANT_QOS_DEFAULT;
-
-      policy <<= dds_policy_org;
-      dds_policy <<= policy;
-
-      if (!EntityFactoryPolicyTest::check (dds_policy.entity_factory, policy.entity_factory))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DOMAIN PARTICIPANT : "
-                                "Error in EntityFactoryQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!UserDataPolicyTest::check (dds_policy.user_data, policy.user_data))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DOMAIN PARTICIPANT : "
-                                "Error in UserDataQosPolicy.\n"));
-          ++ret;
-        }
-    }
-  catch (...)
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR DOMAIN PARTICIPANT: Unexpected exception caught."));
-      return -1;
-    }
-  return ret;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.h
deleted file mode 100644
index e18a64c6481..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef DOMAINPARTICIPANT_QOS_TEST_H_
-#define DOMAINPARTICIPANT_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/DomainParticipantQos.h"
-
-class DomainParticipantPolicyTest
-{
-public:
-  DomainParticipantPolicyTest ();
-
-  int run ();
-};
-
-#endif /* DOMAINPARTICIPANT_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.cpp
deleted file mode 100644
index 3b18c29614b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-#include "dr_qos_test.h"
-
-#include "dur_qos_test.h"
-#include "deadline_qos_test.h"
-#include "lat_budget_qos_test.h"
-#include "liveliness_qos_test.h"
-#include "reliability_qos_test.h"
-#include "dest_order_qos_test.h"
-#include "hist_qos_test.h"
-#include "resource_limits_qos_test.h"
-#include "user_data_qos_test.h"
-#include "ownership_qos_test.h"
-#include "tbf_qos_test.h"
-#include "rd_lifecycle_qos_test.h"
-#include "typeconsistencyenforcement_qos_test.h"
-
-DatareaderPolicyTest::DatareaderPolicyTest ()
-{
-}
-
-int
-DatareaderPolicyTest::run ()
-{
-  int ret = 0;
-  try
-    {
-      ::DDS::DataReaderQos policy;
-      DDS_DataReaderQos dds_policy_org, dds_policy;
-
-      dds_policy_org = DDS_DATAREADER_QOS_DEFAULT;
-
-      policy <<= dds_policy_org;
-      dds_policy <<= policy;
-
-      if (!DurabilityPolicyTest::check (dds_policy.durability,
-                                        policy.durability))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : "
-                                "Error in DurabilityQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!DeadlinePolicyTest::check (dds_policy.deadline,
-                                      policy.deadline))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : "
-                                "Error in DeadlineQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!LatencyBudgetPolicyTest::check (dds_policy.latency_budget,
-                                           policy.latency_budget))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : "
-                                "Error in LatencyBudgetQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!LivelinessPolicyTest::check (dds_policy.liveliness,
-                                        policy.liveliness))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : "
-                                "Error in LivelinessQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!ReliabilityPolicyTest::check (dds_policy.reliability,
-                                         policy.reliability))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : "
-                                "Error in ReliabilityQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!DestinationOrderPolicyTest::check (dds_policy.destination_order,
-                                             policy.destination_order))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : "
-                                "Error in DestinationOrderQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!HistoryPolicyTest::check (dds_policy.history,
-                                     policy.history))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : "
-                                "Error in HistoryQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!ResourceLimitsPolicyTest::check (dds_policy.resource_limits,
-                                     policy.resource_limits))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : "
-                                "Error in ResourceLimitsQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!UserDataPolicyTest::check (dds_policy.user_data, policy.user_data))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : "
-                                "Error in UserDataQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!OwnershipPolicyTest::check (dds_policy.ownership,
-                                       policy.ownership))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : "
-                                "Error in OwnershipQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!TimeBasedFilterPolicyTest::check (dds_policy.time_based_filter,
-                                             policy.time_based_filter))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : "
-                                "Error in TimeBasedFilterQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!ReaderDataLifecyclePolicyTest::check (dds_policy.reader_data_lifecycle,
-                                                 policy.reader_data_lifecycle))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : "
-                                "Error in ReaderDataLifecycleQosPolicy.\n"));
-          ++ret;
-        }
-
-#if defined (RTI_DDS_VERSION_MAJOR) && (RTI_DDS_VERSION_MAJOR >= 5)
-      if (!TypeConsistencyEnforcementPolicyPolicyTest::check (dds_policy.type_consistency,
-                                                 policy.type_consistency))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : "
-                                "Error in TypeConsistencyEnforcementQosPolicy.\n"));
-          ++ret;
-        }
-#endif
-    }
-  catch (...)
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR DATAREADER: Unexpected exception caught."));
-      return -1;
-    }
-  return ret;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.h
deleted file mode 100644
index 2c3cd0e8c60..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef DATAREADER_QOS_TEST_H_
-#define DATAREADER_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/DataReaderQos.h"
-
-class DatareaderPolicyTest
-{
-public:
-  DatareaderPolicyTest ();
-
-  int run ();
-};
-
-#endif /* DATAREADER_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.cpp
deleted file mode 100644
index c764b6dccbf..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "dur_qos_test.h"
-
-DurabilityPolicyTest::DurabilityPolicyTest ()
-{
-}
-
-
-bool
-DurabilityPolicyTest::check (const ::DDS_DurabilityQosPolicy & dds_qos,
-                             const ::DDS::DurabilityQosPolicy & qos)
-{
-  return dds_qos.kind == static_cast <DDS_DurabilityQosPolicyKind> (qos.kind);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.h
deleted file mode 100644
index 07d6aa9b9b2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef DURABILITY_QOS_TEST_H_
-#define DURABILITY_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/DurabilityQosPolicy.h"
-
-class DurabilityPolicyTest
-{
-public:
-  DurabilityPolicyTest ();
-
-  static bool check (const ::DDS_DurabilityQosPolicy & dds_qos,
-                     const ::DDS::DurabilityQosPolicy & qos);
-};
-
-#endif /* DURABILITY_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.cpp
deleted file mode 100644
index 04e21f02bc3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "dur_service_qos_test.h"
-
-DurabilityServicePolicyTest::DurabilityServicePolicyTest ()
-{
-}
-
-bool
-DurabilityServicePolicyTest::check (const ::DDS_DurabilityServiceQosPolicy & dds_qos,
-                                    const ::DDS::DurabilityServiceQosPolicy & qos)
-{
-  return dds_qos.service_cleanup_delay.sec == qos.service_cleanup_delay.sec &&
-         dds_qos.history_kind == static_cast <DDS_HistoryQosPolicyKind> (qos.history_kind) &&
-         dds_qos.history_depth == qos.history_depth &&
-         dds_qos.max_samples == qos.max_samples &&
-         dds_qos.max_instances == qos.max_instances &&
-         dds_qos.max_samples_per_instance == qos.max_samples_per_instance;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.h
deleted file mode 100644
index 5fde21bca60..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef DURABILITY_SERVICE_QOS_TEST_H_
-#define DURABILITY_SERVICE_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/DurabilityServiceQosPolicy.h"
-
-class DurabilityServicePolicyTest
-{
-public:
-  DurabilityServicePolicyTest ();
-
-  static bool check (const ::DDS_DurabilityServiceQosPolicy & dds_qos,
-                     const ::DDS::DurabilityServiceQosPolicy & qos);
-};
-
-#endif /* DURABILITY_SERVICE_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/duration.cpp b/CIAO/connectors/dds4ccm/tests/Policies/duration.cpp
deleted file mode 100644
index a7d652b93c7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/duration.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "duration.h"
-
-Duration::Duration ()
-{
-}
-
-
-bool
-Duration::check (const ::DDS_Duration_t & dds_dur,
-                 const ::DDS::Duration_t & dur)
-{
-  return dds_dur.sec == dur.sec &&
-         dds_dur.nanosec == dur.nanosec;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/duration.h b/CIAO/connectors/dds4ccm/tests/Policies/duration.h
deleted file mode 100644
index abf2962c1a2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/duration.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef DURATION_H_
-#define DURATION_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/Duration_t.h"
-
-class Duration
-{
-public:
-  Duration ();
-
-  static bool check (const ::DDS_Duration_t & dds_dur,
-                     const ::DDS::Duration_t & dur);
-};
-
-#endif /* DURATION_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.cpp
deleted file mode 100644
index f3b05feb0b3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-#include "dw_qos_test.h"
-
-#include "dur_qos_test.h"
-#include "dur_service_qos_test.h"
-#include "deadline_qos_test.h"
-#include "lat_budget_qos_test.h"
-#include "liveliness_qos_test.h"
-#include "reliability_qos_test.h"
-#include "dest_order_qos_test.h"
-#include "hist_qos_test.h"
-#include "resource_limits_qos_test.h"
-#include "transport_prio_qos_test.h"
-#include "lifespan_qos_test.h"
-#include "user_data_qos_test.h"
-#include "ownership_qos_test.h"
-#include "ownership_strength_qos_test.h"
-#include "wr_lifecycle_qos_test.h"
-
-DatawriterPolicyTest::DatawriterPolicyTest ()
-{
-}
-
-int
-DatawriterPolicyTest::run ()
-{
-  int ret = 0;
-  try
-    {
-      ::DDS::DataWriterQos policy;
-      DDS_DataWriterQos dds_policy_org, dds_policy;
-
-      dds_policy_org = DDS_DATAWRITER_QOS_DEFAULT;
-
-      policy <<= dds_policy_org;
-      dds_policy <<= policy;
-
-      if (!DurabilityPolicyTest::check (dds_policy.durability,
-                                        policy.durability))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in DurabilityQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!DurabilityServicePolicyTest::check (dds_policy.durability_service,
-                                               policy.durability_service))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in DurabilityServiceQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!DeadlinePolicyTest::check (dds_policy.deadline,
-                                      policy.deadline))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in DeadlineQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!LatencyBudgetPolicyTest::check (dds_policy.latency_budget,
-                                           policy.latency_budget))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in LatencyBudgetQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!LivelinessPolicyTest::check (dds_policy.liveliness,
-                                        policy.liveliness))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in LivelinessQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!ReliabilityPolicyTest::check (dds_policy.reliability,
-                                         policy.reliability))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in ReliabilityQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!DestinationOrderPolicyTest::check (dds_policy.destination_order,
-                                             policy.destination_order))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in DestinationOrderQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!HistoryPolicyTest::check (dds_policy.history,
-                                     policy.history))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in HistoryQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!ResourceLimitsPolicyTest::check (dds_policy.resource_limits,
-                                     policy.resource_limits))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in ResourceLimitsQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!TransportPriorityPolicyTest::check (dds_policy.transport_priority,
-                                              policy.transport_priority))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in TransportPriorityQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!LifespanPolicyTest::check (dds_policy.lifespan,
-                                      policy.lifespan))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in LifespanQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!UserDataPolicyTest::check (dds_policy.user_data, policy.user_data))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in UserDataQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!OwnershipPolicyTest::check (dds_policy.ownership,
-                                       policy.ownership))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in OwnershipQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!OwnershipStrengthPolicyTest::check (dds_policy.ownership_strength,
-                                       policy.ownership_strength))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in OwnershipStrengthQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!WriterDataLifecyclePolicyTest::check (dds_policy.writer_data_lifecycle,
-                                                 policy.writer_data_lifecycle))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : "
-                                "Error in WriterDataLifecycleQosPolicy.\n"));
-          ++ret;
-        }
-    }
-  catch (...)
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER: Unexpected exception caught."));
-      return -1;
-    }
-  return ret;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.h
deleted file mode 100644
index 3e85b37d06c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef DATAWRITER_QOS_TEST_H_
-#define DATAWRITER_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/DataWriterQos.h"
-
-class DatawriterPolicyTest
-{
-public:
-  DatawriterPolicyTest ();
-
-  int run ();
-};
-
-#endif /* DATAWRITER_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.cpp
deleted file mode 100644
index c5fecf7a4a8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "entity_factory_qos_test.h"
-
-EntityFactoryPolicyTest::EntityFactoryPolicyTest ()
-{
-}
-
-bool
-EntityFactoryPolicyTest::check (const ::DDS_EntityFactoryQosPolicy & dds_qos,
-                                const ::DDS::EntityFactoryQosPolicy & qos)
-{
-  return dds_qos.autoenable_created_entities ==
-         static_cast <DDS_Boolean> (qos.autoenable_created_entities);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.h
deleted file mode 100644
index 30b4aaaa7f9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef ENTITY_FACTORY_QOS_TEST_H_
-#define ENTITY_FACTORY_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/EntityFactoryQosPolicy.h"
-
-class EntityFactoryPolicyTest
-{
-public:
-  EntityFactoryPolicyTest ();
-
-  static bool check (const ::DDS_EntityFactoryQosPolicy & dds_qos,
-                     const ::DDS::EntityFactoryQosPolicy & qos);
-};
-
-#endif /* ENTITY_FACTORY_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.cpp
deleted file mode 100644
index 3e2120c601d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "group_data_qos_test.h"
-
-#include "octet_seq.h"
-
-GroupDataPolicyTest::GroupDataPolicyTest ()
-{
-}
-
-bool
-GroupDataPolicyTest::check (const ::DDS_GroupDataQosPolicy & dds_qos,
-                            const ::DDS::GroupDataQosPolicy & qos)
-{
-  return OctetSequence::check (dds_qos.value,
-                               qos.value,
-                               "GroupDataPolicyTest");
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.h
deleted file mode 100644
index 2aa822bf935..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef GROUP_DATA_QOS_TEST_H_
-#define GROUP_DATA_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/GroupDataQosPolicy.h"
-
-class GroupDataPolicyTest
-{
-public:
-  GroupDataPolicyTest ();
-
-  static bool check (const ::DDS_GroupDataQosPolicy & dds_qos,
-                     const ::DDS::GroupDataQosPolicy & qos);
-};
-
-#endif /* GROUP_DATA_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.cpp
deleted file mode 100644
index d769ec1bc7d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "hist_qos_test.h"
-
-HistoryPolicyTest::HistoryPolicyTest ()
-{
-}
-
-bool
-HistoryPolicyTest::check (const ::DDS_HistoryQosPolicy & dds_qos,
-                          const ::DDS::HistoryQosPolicy & qos)
-{
-
-  return dds_qos.kind == static_cast <DDS_HistoryQosPolicyKind> (qos.kind) &&
-         dds_qos.depth == qos.depth;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.h
deleted file mode 100644
index 5776a879e7e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef HISTORY_QOS_TEST_H_
-#define HISTORY_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/HistoryQosPolicy.h"
-
-class HistoryPolicyTest
-{
-public:
-  HistoryPolicyTest ();
-
-  static bool check (const ::DDS_HistoryQosPolicy & dds_qos,
-                     const ::DDS::HistoryQosPolicy & qos);
-};
-
-#endif /* HISTORY_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.cpp
deleted file mode 100644
index 26a7527d447..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "lat_budget_qos_test.h"
-
-#include "duration.h"
-
-LatencyBudgetPolicyTest::LatencyBudgetPolicyTest ()
-{
-}
-
-bool
-LatencyBudgetPolicyTest::check (const ::DDS_LatencyBudgetQosPolicy & dds_qos,
-                                const ::DDS::LatencyBudgetQosPolicy & qos)
-{
-  return Duration::check (dds_qos.duration, qos.duration);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h
deleted file mode 100644
index 968011fc581..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef LATENCY_BUDGET_QOS_TEST_H_
-#define LATENCY_BUDGET_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/LatencyBudgetQosPolicy.h"
-
-class LatencyBudgetPolicyTest
-{
-public:
-  LatencyBudgetPolicyTest ();
-
-  static bool check (const ::DDS_LatencyBudgetQosPolicy & dds_qos,
-                     const ::DDS::LatencyBudgetQosPolicy & qos);
-};
-
-#endif /* LATENCY_BUDGET_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.cpp
deleted file mode 100644
index fa1be610bd3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "lifespan_qos_test.h"
-
-#include "duration.h"
-
-LifespanPolicyTest::LifespanPolicyTest ()
-{
-}
-
-bool
-LifespanPolicyTest::check (const ::DDS_LifespanQosPolicy & dds_qos,
-                           const ::DDS::LifespanQosPolicy & qos)
-{
-  return Duration::check (dds_qos.duration, qos.duration);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.h
deleted file mode 100644
index 0977e58ccdc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef LIFESPAN_QOS_TEST_H_
-#define LIFESPAN_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/LifespanQosPolicy.h"
-
-class LifespanPolicyTest
-{
-public:
-  LifespanPolicyTest ();
-
-  static bool check (const ::DDS_LifespanQosPolicy & dds_qos,
-                     const ::DDS::LifespanQosPolicy & qos);
-};
-
-#endif /* LIFESPAN_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.cpp
deleted file mode 100644
index 0064c309716..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "liveliness_qos_test.h"
-
-#include "duration.h"
-
-LivelinessPolicyTest::LivelinessPolicyTest ()
-{
-}
-
-bool
-LivelinessPolicyTest::check (const ::DDS_LivelinessQosPolicy & dds_qos,
-                             const ::DDS::LivelinessQosPolicy & qos)
-{
-  return dds_qos.kind == static_cast <DDS_LivelinessQosPolicyKind> (qos.kind) &&
-         Duration::check (dds_qos.lease_duration, qos.lease_duration);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.h
deleted file mode 100644
index 7fea05b6670..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef LIVELINESS_QOS_TEST_H_
-#define LIVELINESS_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/LivelinessQosPolicy.h"
-
-class LivelinessPolicyTest
-{
-public:
-  LivelinessPolicyTest ();
-
-  static bool check (const ::DDS_LivelinessQosPolicy & dds_qos,
-                     const ::DDS::LivelinessQosPolicy & qos);
-};
-
-#endif /* LIVELINESS_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/main.cpp b/CIAO/connectors/dds4ccm/tests/Policies/main.cpp
deleted file mode 100644
index e5072f852f8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/main.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-#include "ace/OS_main.h"
-#include "ace/Log_Msg.h"
-
-#include "pub_qos_test.h"
-#include "sub_qos_test.h"
-#include "dw_qos_test.h"
-#include "dr_qos_test.h"
-#include "tp_qos_test.h"
-#include "dp_qos_test.h"
-#include "states_test.h"
-#include "string_seq.h"
-
-int handle_result (const int & result,
-                   const char * test)
-{
-  int ret = 0;
-  if (result == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR POLICIES : "
-                            "Exception caught while testing "
-                            "%C QoS\n",
-                            test));
-    }
-  else if (result > 0)
-    {
-      ret = result;
-      ACE_ERROR ((LM_ERROR, "ERROR POLICIES : "
-                            "<%d> errors found while testing "
-                            "%C QoS\n",
-                            result, test));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "%C QoS test passed!\n",
-                             test));
-    }
-  return ret;
-}
-
-bool
-test_string_seq ()
-{
-  DDS::StringSeq foo (2);
-  foo.length (2);
-  foo[0] = CORBA::string_dup ("bar");
-  foo[1] = CORBA::string_dup ("foo");
-  DDS_StringSeq rti_foo;
-  rti_foo <<= foo;
-  DDS::StringSeq tao_foo;
-  tao_foo <<= rti_foo;
-  return StringSequence::check (rti_foo, tao_foo, "StringSeq");
-}
-
-int
-ACE_TMAIN (int , ACE_TCHAR **)
-{
-  PublisherPolicyTest publisher;
-  SubscriberPolicyTest subscriber;
-  DatawriterPolicyTest datawriter;
-  DatareaderPolicyTest datareader;
-  TopicPolicyTest topic;
-  StatesTest states;
-  DomainParticipantPolicyTest domainparticipant;
-
-  int ret = 0;
-  int test = 0;
-  try
-    {
-      test = publisher.run ();
-      ret += handle_result (test, "Publisher");
-      test = subscriber.run ();
-      ret += handle_result (test, "Subscriber");
-      test = datawriter.run ();
-      ret += handle_result (test, "Datawriter");
-      test = datareader.run ();
-      ret += handle_result (test, "DataReader");
-      test = topic.run ();
-      ret += handle_result (test, "Topic");
-      test = domainparticipant.run ();
-      ret += handle_result (test, "DomainParticipant");
-      test = states.run ();
-      ret += handle_result (test, "States");
-      ret += test_string_seq ();
-    }
-  catch (...)
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR: Unexpected exception caught."));
-      return -1;
-    }
-  return 0;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.cpp b/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.cpp
deleted file mode 100644
index a3399da99d1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "octet_seq.h"
-
-OctetSequence::OctetSequence ()
-{
-}
-
-bool
-OctetSequence::check (const ::DDS_OctetSeq & dds_seq,
-                      const ::DDS::OctetSeq & seq,
-                      const char * test)
-{
-  if (static_cast < ::CORBA::ULong> (dds_seq.length ()) !=
-      seq.length ())
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR %C : "
-                            "Length group_data is not equal to original length.\n",
-                            test));
-      return false;
-    }
-
-  for (::DDS_Long i = 0; i < dds_seq.length (); ++i)
-    {
-      if (seq[i] != dds_seq[i])
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR %C : "
-                            "Item %d of group_data is not equal to original.\n",
-                            test, i));
-          return false;
-        }
-    }
-  return true;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h b/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h
deleted file mode 100644
index f17bf8e0aab..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef OCTET_SEQ_H_
-#define OCTET_SEQ_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/OctetSeq.h"
-
-class OctetSequence
-{
-public:
-  OctetSequence ();
-
-  static bool check (const ::DDS_OctetSeq & dds_seq,
-                     const ::DDS::OctetSeq & seq,
-                     const char * test);
-};
-
-#endif /* OCTET_SEQ_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.cpp
deleted file mode 100644
index eb36fc8dfca..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "ownership_qos_test.h"
-
-OwnershipPolicyTest::OwnershipPolicyTest ()
-{
-}
-
-bool
-OwnershipPolicyTest::check (const ::DDS_OwnershipQosPolicy & dds_qos,
-                            const ::DDS::OwnershipQosPolicy & qos)
-{
-  return dds_qos.kind ==
-         static_cast <DDS_OwnershipQosPolicyKind> (qos.kind);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.h
deleted file mode 100644
index f1deb5aa63f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef OWNERSHIP_QOS_TEST_H_
-#define OWNERSHIP_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/OwnershipQosPolicy.h"
-
-class OwnershipPolicyTest
-{
-public:
-  OwnershipPolicyTest ();
-
-  static bool check (const ::DDS_OwnershipQosPolicy & dds_qos,
-                     const ::DDS::OwnershipQosPolicy & qos);
-};
-
-#endif /* OWNERSHIP_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.cpp
deleted file mode 100644
index a4e43c33972..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "ownership_strength_qos_test.h"
-
-OwnershipStrengthPolicyTest::OwnershipStrengthPolicyTest ()
-{
-}
-
-bool
-OwnershipStrengthPolicyTest::check (const ::DDS_OwnershipStrengthQosPolicy & dds_qos,
-                                    const ::DDS::OwnershipStrengthQosPolicy & qos)
-{
-  return dds_qos.value == qos.value;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h
deleted file mode 100644
index fe46ea19f39..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef OWNERSHIP_STRENGTH_QOS_TEST_H_
-#define OWNERSHIP_STRENGTH_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/OwnershipStrengthQosPolicy.h"
-
-class OwnershipStrengthPolicyTest
-{
-public:
-  OwnershipStrengthPolicyTest ();
-
-  static bool check (const ::DDS_OwnershipStrengthQosPolicy & dds_qos,
-                     const ::DDS::OwnershipStrengthQosPolicy & qos);
-};
-
-#endif /* OWNERSHIP_STRENGTH_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.cpp
deleted file mode 100644
index f092096fc6c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "partition_qos_test.h"
-
-PartitionPolicyTest::PartitionPolicyTest ()
-{
-}
-
-bool
-PartitionPolicyTest::check (const ::DDS_PartitionQosPolicy & dds_qos,
-                            const ::DDS::PartitionQosPolicy & qos)
-{
-  if (static_cast <CORBA::ULong> (dds_qos.name.length ()) !=
-      qos.name.length ())
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR PartitionPolicyTest : "
-                            "Length name sequence is not equal "
-                            "to original length.\n"));
-      return false;
-    }
-  for (DDS_Long i = 0; i < dds_qos.name.length (); ++i)
-    {
-      if (ACE_OS::strcmp (dds_qos.name[i], qos.name[i]) != 0)
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR PartitionPolicyTest : "
-                            "Item %d of name sequence is not equal "
-                            "to original.\n",
-                            i));
-          return false;
-        }
-    }
-  return true;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.h
deleted file mode 100644
index 329348a6d72..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef PARTITION_QOS_TEST_H_
-#define PARTITION_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/PartitionQosPolicy.h"
-
-class PartitionPolicyTest
-{
-public:
-  PartitionPolicyTest ();
-
-  static bool check (const ::DDS_PartitionQosPolicy & dds_qos,
-                     const ::DDS::PartitionQosPolicy & qos);
-};
-
-#endif /* PARTITION_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/policies.mpc b/CIAO/connectors/dds4ccm/tests/Policies/policies.mpc
deleted file mode 100644
index 88a5ac62309..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/policies.mpc
+++ /dev/null
@@ -1,47 +0,0 @@
-project(DDS_Policies_Test) : taoexe, typecode, dds4ccm_base {
-  includes += $(CIAO_ROOT)
-  exename = policies_test
-  requires += dds4ccm_ndds
-
-  Source_Files {
-    deadline_qos_test.cpp
-    dest_order_qos_test.cpp
-    dp_factory_qos_test.cpp
-    dp_qos_test.cpp
-    dr_qos_test.cpp
-    dur_qos_test.cpp
-    dur_service_qos_test.cpp
-    dw_qos_test.cpp
-    entity_factory_qos_test.cpp
-    group_data_qos_test.cpp
-    hist_qos_test.cpp
-    lat_budget_qos_test.cpp
-    lifespan_qos_test.cpp
-    liveliness_qos_test.cpp
-    main.cpp
-    ownership_qos_test.cpp
-    partition_qos_test.cpp
-    presentation_qos_test.cpp
-    pub_qos_test.cpp
-    reliability_qos_test.cpp
-    resource_limits_qos_test.cpp
-    sub_qos_test.cpp
-    tp_data_qos_test.cpp
-    tp_qos_test.cpp
-    transport_prio_qos_test.cpp
-    user_data_qos_test.cpp
-    rd_lifecycle_qos_test.cpp
-    tbf_qos_test.cpp
-    typeconsistencyenforcement_qos_test.cpp
-    ownership_strength_qos_test.cpp
-    wr_lifecycle_qos_test.cpp
-    duration.cpp
-    octet_seq.cpp
-    string_seq.cpp
-    states_test.cpp
-  }
-
-  Header_Files {
-    *.h
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.cpp
deleted file mode 100644
index 661fe7a0421..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "presentation_qos_test.h"
-
-PresentationPolicyTest::PresentationPolicyTest ()
-{
-}
-
-bool
-PresentationPolicyTest::check (const ::DDS_PresentationQosPolicy & dds_qos,
-                               const ::DDS::PresentationQosPolicy & qos)
-{
-  return dds_qos.access_scope ==
-              static_cast <DDS_PresentationQosPolicyAccessScopeKind>(qos.access_scope) &&
-         dds_qos.coherent_access ==
-              static_cast <DDS_Boolean> (qos.coherent_access) &&
-         dds_qos.ordered_access ==
-              static_cast <DDS_Boolean> (qos.ordered_access);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.h
deleted file mode 100644
index 6acfd5da5b2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef PRESENTATION_QOS_TEST_H_
-#define PRESENTATION_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/PresentationQosPolicy.h"
-
-class PresentationPolicyTest
-{
-public:
-  PresentationPolicyTest ();
-
-  static bool check (const ::DDS_PresentationQosPolicy & dds_qos,
-                     const ::DDS::PresentationQosPolicy & qos);
-};
-
-#endif /* PRESENTATION_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.cpp
deleted file mode 100644
index 8fe67e4728a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "pub_qos_test.h"
-#include "group_data_qos_test.h"
-#include "entity_factory_qos_test.h"
-#include "presentation_qos_test.h"
-#include "partition_qos_test.h"
-
-PublisherPolicyTest::PublisherPolicyTest ()
-{
-}
-
-int
-PublisherPolicyTest::run ()
-{
-  int ret = 0;
-  try
-    {
-      ::DDS::PublisherQos policy;
-      DDS_PublisherQos dds_policy_org, dds_policy;
-
-      dds_policy_org = DDS_PUBLISHER_QOS_DEFAULT;
-
-      policy <<= dds_policy_org;
-      dds_policy <<= policy;
-
-      if (!PresentationPolicyTest::check (dds_policy.presentation, policy.presentation))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR PUBLISHER : "
-                                "Error in PresentationQosPolicy.\n"));
-          ++ret;
-        }
-      if (!PartitionPolicyTest::check (dds_policy.partition, policy.partition))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR PUBLISHER : "
-                                "Error in PartitionQosPolicy.\n"));
-          ++ret;
-        }
-      if (!GroupDataPolicyTest::check (dds_policy.group_data, policy.group_data))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR PUBLISHER : "
-                                "Error in GroupDataQosPolicy.\n"));
-          ++ret;
-        }
-      if (!EntityFactoryPolicyTest::check (dds_policy.entity_factory, policy.entity_factory))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR PUBLISHER : "
-                                "Error in EntityFactoryQosPolicy.\n"));
-          ++ret;
-        }
-    }
-  catch (...)
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR PUBLISHER: Unexpected exception caught."));
-      return -1;
-    }
-  return ret;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.h
deleted file mode 100644
index 069c63f051a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef PUBLISHER_QOS_TEST_H_
-#define PUBLISHER_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/PublisherQos.h"
-
-class PublisherPolicyTest
-{
-public:
-  PublisherPolicyTest ();
-
-  int run ();
-};
-
-#endif /* PUBLISHER_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.cpp
deleted file mode 100644
index ae419b62f8e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "rd_lifecycle_qos_test.h"
-
-#include "duration.h"
-
-ReaderDataLifecyclePolicyTest::ReaderDataLifecyclePolicyTest ()
-{
-}
-
-bool
-ReaderDataLifecyclePolicyTest::check (const ::DDS_ReaderDataLifecycleQosPolicy & dds_qos,
-                                      const ::DDS::ReaderDataLifecycleQosPolicy & qos)
-{
-  return Duration::check (dds_qos.autopurge_nowriter_samples_delay,
-                          qos.autopurge_nowriter_samples_delay)     &&
-         Duration::check (dds_qos.autopurge_disposed_samples_delay,
-                          qos.autopurge_disposed_samples_delay);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h
deleted file mode 100644
index 6eff701402b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef READER_DATA_LIFECYCLE_QOS_TEST_H_
-#define READER_DATA_LIFECYCLE_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/ReaderDataLifecycleQosPolicy.h"
-
-class ReaderDataLifecyclePolicyTest
-{
-public:
-  ReaderDataLifecyclePolicyTest ();
-
-  static bool check (const ::DDS_ReaderDataLifecycleQosPolicy & dds_qos,
-                     const ::DDS::ReaderDataLifecycleQosPolicy & qos);
-};
-
-#endif /* READER_DATA_LIFECYCLE_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.cpp
deleted file mode 100644
index 9d006a10d68..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "reliability_qos_test.h"
-
-#include "duration.h"
-
-ReliabilityPolicyTest::ReliabilityPolicyTest ()
-{
-}
-
-bool
-ReliabilityPolicyTest::check (const ::DDS_ReliabilityQosPolicy & dds_qos,
-                              const ::DDS::ReliabilityQosPolicy & qos)
-{
-  return dds_qos.kind == static_cast <DDS_ReliabilityQosPolicyKind> (qos.kind) &&
-         Duration::check (dds_qos.max_blocking_time, qos.max_blocking_time);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.h
deleted file mode 100644
index 45887016444..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef RELIABILITY_QOS_TEST_H_
-#define RELIABILITY_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/ReliabilityQosPolicy.h"
-
-class ReliabilityPolicyTest
-{
-public:
-  ReliabilityPolicyTest ();
-
-  static bool check (const ::DDS_ReliabilityQosPolicy & dds_qos,
-                     const ::DDS::ReliabilityQosPolicy & qos);
-};
-
-#endif /* RELIABILITY_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.cpp
deleted file mode 100644
index 60cbdf49797..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "resource_limits_qos_test.h"
-
-ResourceLimitsPolicyTest::ResourceLimitsPolicyTest ()
-{
-}
-
-
-bool
-ResourceLimitsPolicyTest::check (const ::DDS_ResourceLimitsQosPolicy & dds_qos,
-                                 const ::DDS::ResourceLimitsQosPolicy & qos)
-{
-  return dds_qos.max_samples == qos.max_samples &&
-         dds_qos.max_instances == qos.max_instances &&
-         dds_qos.max_samples_per_instance == qos.max_samples_per_instance;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h
deleted file mode 100644
index 51d1bf84240..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef RESOURCE_LIMITS_QOS_TEST_H_
-#define RESOURCE_LIMITS_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/ResourceLimitsQosPolicy.h"
-
-class ResourceLimitsPolicyTest
-{
-public:
-  ResourceLimitsPolicyTest ();
-
-  static bool check (const ::DDS_ResourceLimitsQosPolicy & dds_qos,
-                     const ::DDS::ResourceLimitsQosPolicy & qos);
-};
-
-#endif /* RESOURCE_LIMITS_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/run_test.pl b/CIAO/connectors/dds4ccm/tests/Policies/run_test.pl
deleted file mode 100755
index 6b2a3cbf722..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/run_test.pl
+++ /dev/null
@@ -1,27 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::TestTarget;
-
-my $program = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
-
-$PROG = $program->CreateProcess ("policies_test", "");
-$program_status = $PROG->SpawnWaitKill ($program->ProcessStartWaitInterval());
-
-if ($program_status != 0) {
-    print STDERR "ERROR: policies_test returned $program_status\n";
-    exit 1;
-}
-
-$exit_status = $PROG->WaitKill ($program->ProcessStopWaitInterval());
-
-if ($exit_status != 0) {
-    print STDERR "ERROR: policies_test returned $server_status\n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/states_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/states_test.cpp
deleted file mode 100644
index 7232d3cfc1f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/states_test.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-#include "states_test.h"
-
-StatesTest::StatesTest()
-{
-
-}
-
-int
-StatesTest::run ()
-{
-  int ret = 0;
-  try
-    {
-      // SAMPLE STATES
-      if (DDS_READ_SAMPLE_STATE != ::DDS::READ_SAMPLE_STATE)
-        {
-          ACE_ERROR ((LM_ERROR, "StatesTest::run - "
-                                "ERROR : READ_SAMPLE_STATE states seem "
-                                "unequal: DDS4CCM <%u> - RTI <%u>\n",
-                                DDS_READ_SAMPLE_STATE,
-                                ::DDS::READ_SAMPLE_STATE));
-          ++ret;
-        }
-      if (DDS_NOT_READ_SAMPLE_STATE != ::DDS::NOT_READ_SAMPLE_STATE)
-        {
-          ACE_ERROR ((LM_ERROR, "StatesTest::run - "
-                                "ERROR : NOT_READ_SAMPLE_STATE states seem "
-                                "unequal: DDS4CCM <%u> - RTI <%u>\n",
-                                DDS_NOT_READ_SAMPLE_STATE,
-                                ::DDS::NOT_READ_SAMPLE_STATE));
-          ++ret;
-        }
-      if (DDS_ANY_SAMPLE_STATE != ::DDS::ANY_SAMPLE_STATE)
-        {
-          ACE_ERROR ((LM_ERROR, "StatesTest::run - "
-                                "ERROR : ANY_SAMPLE_STATE states seem "
-                                "unequal: DDS4CCM <%u> - RTI <%u>\n",
-                                DDS_ANY_SAMPLE_STATE,
-                                ::DDS::ANY_SAMPLE_STATE));
-          ++ret;
-        }
-      // VIEW STATES
-      if (DDS_NEW_VIEW_STATE != ::DDS::NEW_VIEW_STATE)
-        {
-          ACE_ERROR ((LM_ERROR, "StatesTest::run - "
-                                "ERROR : NEW_VIEW_STATE states seem "
-                                "unequal: DDS4CCM <%u> - RTI <%u>\n",
-                                DDS_NEW_VIEW_STATE,
-                                ::DDS::NEW_VIEW_STATE));
-          ++ret;
-        }
-      if (DDS_NOT_NEW_VIEW_STATE != ::DDS::NOT_NEW_VIEW_STATE)
-        {
-          ACE_ERROR ((LM_ERROR, "StatesTest::run - "
-                                "ERROR : NOT_NEW_VIEW_STATE states seem "
-                                "unequal: DDS4CCM <%u> - RTI <%u>\n",
-                                DDS_NOT_NEW_VIEW_STATE,
-                                ::DDS::NOT_NEW_VIEW_STATE));
-          ++ret;
-        }
-      if (DDS_ANY_VIEW_STATE != ::DDS::ANY_VIEW_STATE)
-        {
-          ACE_ERROR ((LM_ERROR, "StatesTest::run - "
-                                "ERROR : ANY_VIEW_STATE states seem "
-                                "unequal: DDS4CCM <%u> - RTI <%u>\n",
-                                DDS_ANY_VIEW_STATE,
-                                ::DDS::ANY_VIEW_STATE));
-          ++ret;
-        }
-      // VIEW STATES
-      if (DDS_ALIVE_INSTANCE_STATE != ::DDS::ALIVE_INSTANCE_STATE)
-        {
-          ACE_ERROR ((LM_ERROR, "StatesTest::run - "
-                                "ERROR : ALIVE_INSTANCE_STATE states seem "
-                                "unequal: DDS4CCM <%u> - RTI <%u>\n",
-                                DDS_ALIVE_INSTANCE_STATE,
-                                ::DDS::ALIVE_INSTANCE_STATE));
-          ++ret;
-        }
-      if (DDS_NOT_ALIVE_DISPOSED_INSTANCE_STATE !=
-          ::DDS::NOT_ALIVE_DISPOSED_INSTANCE_STATE)
-        {
-          ACE_ERROR ((LM_ERROR, "StatesTest::run - "
-                                "ERROR : NOT_ALIVE_DISPOSED_INSTANCE_STATE states seem "
-                                "unequal: DDS4CCM <%u> - RTI <%u>\n",
-                                DDS_NOT_ALIVE_DISPOSED_INSTANCE_STATE,
-                                ::DDS::NOT_ALIVE_DISPOSED_INSTANCE_STATE));
-          ++ret;
-        }
-      if (DDS_NOT_ALIVE_NO_WRITERS_INSTANCE_STATE !=
-          ::DDS::NOT_ALIVE_NO_WRITERS_INSTANCE_STATE)
-        {
-          ACE_ERROR ((LM_ERROR, "StatesTest::run - "
-                                "ERROR : NOT_ALIVE_NO_WRITERS_INSTANCE_STATE "
-                                "states seem "
-                                "unequal: DDS4CCM <%u> - RTI <%u>\n",
-                                DDS_NOT_ALIVE_NO_WRITERS_INSTANCE_STATE,
-                                ::DDS::NOT_ALIVE_NO_WRITERS_INSTANCE_STATE));
-          ++ret;
-        }
-      if (DDS_ANY_INSTANCE_STATE !=
-          ::DDS::ANY_INSTANCE_STATE)
-        {
-          ACE_ERROR ((LM_ERROR, "StatesTest::run - "
-                                "ERROR : ANY_INSTANCE_STATE "
-                                "states seem "
-                                "unequal: DDS4CCM <%u> - RTI <%u>\n",
-                                DDS_ANY_INSTANCE_STATE,
-                                ::DDS::ANY_INSTANCE_STATE));
-          ++ret;
-        }
-      if (DDS_NOT_ALIVE_INSTANCE_STATE !=
-          ::DDS::NOT_ALIVE_INSTANCE_STATE)
-        {
-          ACE_ERROR ((LM_ERROR, "StatesTest::run - "
-                                "ERROR : NOT_ALIVE_INSTANCE_STATE "
-                                "states seem "
-                                "unequal: DDS4CCM <%u> - RTI <%u>\n",
-                                DDS_NOT_ALIVE_INSTANCE_STATE,
-                                ::DDS::NOT_ALIVE_INSTANCE_STATE));
-          ++ret;
-        }
-    }
-  catch (...)
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR STATES: Unexpected exception caught."));
-      return -1;
-    }
-  return ret;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/states_test.h b/CIAO/connectors/dds4ccm/tests/Policies/states_test.h
deleted file mode 100644
index 1e9b3324248..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/states_test.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef STATES_TEST_H_
-#define STATES_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-
-class StatesTest
-{
-public:
-  StatesTest ();
-
-  int run ();
-};
-
-#endif /* STATES_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/string_seq.cpp b/CIAO/connectors/dds4ccm/tests/Policies/string_seq.cpp
deleted file mode 100644
index 78aeaad0098..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/string_seq.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "string_seq.h"
-
-StringSequence::StringSequence ()
-{
-}
-
-bool
-StringSequence::check (const ::DDS_StringSeq & dds_seq,
-                      const ::DDS::StringSeq & seq,
-                      const char * test)
-{
-  if (static_cast < ::CORBA::ULong> (dds_seq.length ()) !=
-      seq.length ())
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR %C : "
-                            "Length group_data is not equal to original length.\n",
-                            test));
-      return false;
-    }
-
-  for (::DDS_Long i = 0; i < dds_seq.length (); ++i)
-    {
-      if (ACE_OS::strcmp (seq[i], dds_seq[i]) != 0)
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR %C : "
-                            "Item %d of group_data is not equal to original <%C>:<%C>.\n",
-                            test, i, seq[i].in (), dds_seq[i]));
-          return false;
-        }
-    }
-  return true;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/string_seq.h b/CIAO/connectors/dds4ccm/tests/Policies/string_seq.h
deleted file mode 100644
index 17d7e9419a2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/string_seq.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef STRING_SEQ_H_
-#define STRING_SEQ_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/StringSeq.h"
-
-class StringSequence
-{
-public:
-  StringSequence ();
-
-  static bool check (const ::DDS_StringSeq & dds_seq,
-                     const ::DDS::StringSeq & seq,
-                     const char * test);
-};
-
-#endif /* STRING_SEQ_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.cpp
deleted file mode 100644
index 4c2cb845842..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-#include "sub_qos_test.h"
-
-#include "group_data_qos_test.h"
-#include "entity_factory_qos_test.h"
-#include "presentation_qos_test.h"
-#include "partition_qos_test.h"
-
-SubscriberPolicyTest::SubscriberPolicyTest ()
-{
-}
-
-int
-SubscriberPolicyTest::run ()
-{
-  int ret = 0;
-  try
-    {
-      ::DDS::SubscriberQos policy;
-      DDS_SubscriberQos dds_policy_org, dds_policy;
-
-      dds_policy_org = DDS_SUBSCRIBER_QOS_DEFAULT;
-
-      policy <<= dds_policy_org;
-      dds_policy <<= policy;
-
-      if (!PresentationPolicyTest::check (dds_policy.presentation, policy.presentation))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR SUBSCRIBER : "
-                                "Error in PresentationQosPolicy.\n"));
-          ++ret;
-        }
-      if (!PartitionPolicyTest::check (dds_policy.partition, policy.partition))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR SUBSCRIBER : "
-                                "Error in PartitionQosPolicy.\n"));
-          ++ret;
-        }
-      if (!GroupDataPolicyTest::check (dds_policy.group_data, policy.group_data))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR SUBSCRIBER : "
-                                "Error in GroupDataQosPolicy.\n"));
-          ++ret;
-        }
-      if (!EntityFactoryPolicyTest::check (dds_policy.entity_factory, policy.entity_factory))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR SUBSCRIBER : "
-                                "Error in EntityFactoryQosPolicy.\n"));
-          ++ret;
-        }
-    }
-  catch (...)
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR SUBSCRIBER: Unexpected exception caught."));
-      return -1;
-    }
-  return ret;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.h
deleted file mode 100644
index ab88b9b099c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef SUBSCRIBER_QOS_TEST_H_
-#define SUBSCRIBER_QOS_TEST_H_
-
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/SubscriberQos.h"
-
-class SubscriberPolicyTest
-{
-public:
-  SubscriberPolicyTest ();
-
-  int run ();
-};
-
-#endif /* SUBSCRIBER_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.cpp
deleted file mode 100644
index 95fe1f566ec..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "tbf_qos_test.h"
-#include "duration.h"
-
-TimeBasedFilterPolicyTest::TimeBasedFilterPolicyTest ()
-{
-}
-
-bool
-TimeBasedFilterPolicyTest::check (const ::DDS_TimeBasedFilterQosPolicy & dds_qos,
-                                  const ::DDS::TimeBasedFilterQosPolicy & qos)
-{
-  return Duration::check (dds_qos.minimum_separation, qos.minimum_separation);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.h
deleted file mode 100644
index 832aa73a055..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef TIME_BASED_FILTER_QOS_TEST_H_
-#define TIME_BASED_FILTER_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/TimeBasedFilterQosPolicy.h"
-
-class TimeBasedFilterPolicyTest
-{
-public:
-  TimeBasedFilterPolicyTest ();
-
-  static bool check (const ::DDS_TimeBasedFilterQosPolicy & dds_qos,
-                     const ::DDS::TimeBasedFilterQosPolicy & qos);
-};
-
-#endif /* TIME_BASED_FILTER_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.cpp
deleted file mode 100644
index 154d4fa44e2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "tp_data_qos_test.h"
-
-#include "octet_seq.h"
-
-TopicDataPolicyTest::TopicDataPolicyTest ()
-{
-}
-
-bool
-TopicDataPolicyTest::check (const ::DDS_TopicDataQosPolicy & dds_qos,
-                            const ::DDS::TopicDataQosPolicy & qos)
-{
-  return OctetSequence::check (dds_qos.value,
-                               qos.value,
-                               "TopicDataPolicyTest");
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.h
deleted file mode 100644
index 94707413a0a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef TOPIC_DATA_QOS_TEST_H_
-#define TOPIC_DATA_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/TopicDataQosPolicy.h"
-
-class TopicDataPolicyTest
-{
-public:
-  TopicDataPolicyTest ();
-
-  static bool check (const ::DDS_TopicDataQosPolicy & dds_qos,
-                     const ::DDS::TopicDataQosPolicy & qos);
-};
-
-#endif /* TOPIC_DATA_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.cpp
deleted file mode 100644
index 65520b44e56..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-#include "tp_qos_test.h"
-
-#include "tp_data_qos_test.h"
-#include "dur_qos_test.h"
-#include "dur_service_qos_test.h"
-#include "deadline_qos_test.h"
-#include "lat_budget_qos_test.h"
-#include "liveliness_qos_test.h"
-#include "reliability_qos_test.h"
-#include "dest_order_qos_test.h"
-#include "hist_qos_test.h"
-#include "resource_limits_qos_test.h"
-#include "transport_prio_qos_test.h"
-#include "lifespan_qos_test.h"
-#include "ownership_qos_test.h"
-
-TopicPolicyTest::TopicPolicyTest ()
-{
-}
-
-int
-TopicPolicyTest::run ()
-{
-  int ret = 0;
-  try
-    {
-      ::DDS::TopicQos policy;
-      DDS_TopicQos dds_policy_org, dds_policy;
-
-      dds_policy_org = DDS_TOPIC_QOS_DEFAULT;
-
-      policy <<= dds_policy_org;
-      dds_policy <<= policy;
-
-
-      if (!TopicDataPolicyTest::check (dds_policy.topic_data,
-                                       policy.topic_data))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR TOPIC : "
-                                "Error in TopicDataQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!DurabilityPolicyTest::check (dds_policy.durability,
-                                        policy.durability))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR TOPIC : "
-                                "Error in DurabilityQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!DurabilityServicePolicyTest::check (dds_policy.durability_service,
-                                               policy.durability_service))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR TOPIC : "
-                                "Error in DurabilityServiceQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!DeadlinePolicyTest::check (dds_policy.deadline,
-                                      policy.deadline))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR TOPIC : "
-                                "Error in DeadlineQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!LatencyBudgetPolicyTest::check (dds_policy.latency_budget,
-                                           policy.latency_budget))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR TOPIC : "
-                                "Error in LatencyBudgetQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!LivelinessPolicyTest::check (dds_policy.liveliness,
-                                        policy.liveliness))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR TOPIC : "
-                                "Error in LivelinessQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!ReliabilityPolicyTest::check (dds_policy.reliability,
-                                         policy.reliability))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR TOPIC : "
-                                "Error in ReliabilityQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!DestinationOrderPolicyTest::check (dds_policy.destination_order,
-                                             policy.destination_order))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR TOPIC : "
-                                "Error in DestinationOrderQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!HistoryPolicyTest::check (dds_policy.history,
-                                     policy.history))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR TOPIC : "
-                                "Error in HistoryQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!ResourceLimitsPolicyTest::check (dds_policy.resource_limits,
-                                     policy.resource_limits))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR TOPIC : "
-                                "Error in ResourceLimitsQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!TransportPriorityPolicyTest::check (dds_policy.transport_priority,
-                                              policy.transport_priority))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR TOPIC : "
-                                "Error in TransportPriorityQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!LifespanPolicyTest::check (dds_policy.lifespan,
-                                      policy.lifespan))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR TOPIC : "
-                                "Error in LifespanQosPolicy.\n"));
-          ++ret;
-        }
-
-      if (!OwnershipPolicyTest::check (dds_policy.ownership,
-                                       policy.ownership))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR TOPIC : "
-                                "Error in OwnershipQosPolicy.\n"));
-          ++ret;
-        }
-    }
-  catch (...)
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR TOPIC: Unexpected exception caught."));
-      return -1;
-    }
-  return ret;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.h
deleted file mode 100644
index 9f5c6fc5357..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef TOPIC_QOS_TEST_H_
-#define TOPIC_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/TopicQos.h"
-
-class TopicPolicyTest
-{
-public:
-  TopicPolicyTest ();
-
-  int run ();
-};
-
-#endif /* TOPIC_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.cpp
deleted file mode 100644
index e776b9f132a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "transport_prio_qos_test.h"
-
-TransportPriorityPolicyTest::TransportPriorityPolicyTest ()
-{
-}
-
-bool
-TransportPriorityPolicyTest::check (const ::DDS_TransportPriorityQosPolicy & dds_qos,
-                                    const ::DDS::TransportPriorityQosPolicy & qos)
-{
-  return dds_qos.value == qos.value;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h
deleted file mode 100644
index fdc5ccf6155..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef TRANSPORT_PRIORITY_QOS_TEST_H_
-#define TRANSPORT_PRIORITY_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/TransportPriorityQosPolicy.h"
-
-class TransportPriorityPolicyTest
-{
-public:
-  TransportPriorityPolicyTest ();
-
-  static bool check (const ::DDS_TransportPriorityQosPolicy & dds_qos,
-                     const ::DDS::TransportPriorityQosPolicy & qos);
-};
-
-#endif /* TRANSPORT_PRIORITY_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.cpp
deleted file mode 100644
index 6f7ab19f9b7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "typeconsistencyenforcement_qos_test.h"
-
-#if defined (RTI_DDS_VERSION_MAJOR) && (RTI_DDS_VERSION_MAJOR >= 5)
-
-TypeConsistencyEnforcementPolicyPolicyTest::TypeConsistencyEnforcementPolicyPolicyTest ()
-{
-}
-
-bool
-TypeConsistencyEnforcementPolicyPolicyTest::check (const ::DDS_TypeConsistencyEnforcementQosPolicy & dds_qos,
-                              const ::DDS::TypeConsistencyEnforcementQosPolicy & qos)
-{
-  return dds_qos.kind == static_cast <DDS_TypeConsistencyKind> (qos.kind);
-}
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.h
deleted file mode 100644
index ba06c6420cd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef TYPECONSISTENCYENFORCEMENT_QOS_TEST_H_
-#define TYPECONSISTENCYENFORCEMENT_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/TypeConsistencyEnforcementQosPolicy.h"
-
-#if defined (RTI_DDS_VERSION_MAJOR) && (RTI_DDS_VERSION_MAJOR >= 5)
-
-class TypeConsistencyEnforcementPolicyPolicyTest
-{
-public:
-  TypeConsistencyEnforcementPolicyPolicyTest ();
-
-  static bool check (const ::DDS_TypeConsistencyEnforcementQosPolicy & dds_qos,
-                     const ::DDS::TypeConsistencyEnforcementQosPolicy & qos);
-};
-
-#endif
-
-#endif /* TYPECONSISTENCYENFORCEMENT_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.cpp
deleted file mode 100644
index 6658311fcf3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "user_data_qos_test.h"
-
-#include "octet_seq.h"
-
-UserDataPolicyTest::UserDataPolicyTest ()
-{
-}
-
-bool
-UserDataPolicyTest::check (const ::DDS_UserDataQosPolicy & dds_qos,
-                           const ::DDS::UserDataQosPolicy & qos)
-{
-  return OctetSequence::check (dds_qos.value,
-                               qos.value,
-                               "UserDataPolicyTest");
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.h
deleted file mode 100644
index e0ce81b4159..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef USER_DATA_QOS_TEST_H_
-#define USER_DATA_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/UserDataQosPolicy.h"
-
-class UserDataPolicyTest
-{
-public:
-  UserDataPolicyTest ();
-
-  static bool check (const ::DDS_UserDataQosPolicy & dds_qos,
-                     const ::DDS::UserDataQosPolicy & qos);
-};
-
-#endif /* USER_DATA_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.cpp
deleted file mode 100644
index cdc29b90cae..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "wr_lifecycle_qos_test.h"
-
-WriterDataLifecyclePolicyTest::WriterDataLifecyclePolicyTest ()
-{
-}
-
-bool
-WriterDataLifecyclePolicyTest::check (const ::DDS_WriterDataLifecycleQosPolicy & dds_qos,
-                                      const ::DDS::WriterDataLifecycleQosPolicy & qos)
-{
-  return dds_qos.autodispose_unregistered_instances ==
-         static_cast <DDS_Boolean> (qos.autodispose_unregistered_instances);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h
deleted file mode 100644
index 05536fc3dcd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef WRITER_DATA_LIFECYCLE_QOS_TEST_H_
-#define WRITER_DATA_LIFECYCLE_QOS_TEST_H_
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/ndds/convertors/WriterDataLifecycleQosPolicy.h"
-
-class WriterDataLifecyclePolicyTest
-{
-public:
-  WriterDataLifecyclePolicyTest ();
-
-  static bool check (const ::DDS_WriterDataLifecycleQosPolicy & dds_qos,
-                     const ::DDS::WriterDataLifecycleQosPolicy & qos);
-};
-
-#endif /* WRITER_DATA_LIFECYCLE_QOS_TEST_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/.gitignore b/CIAO/connectors/dds4ccm/tests/PortUsage/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl
deleted file mode 100644
index a5a6295900c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * @file PortUsage_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef PORTUSAGE_EVENT_TEST_BASE_IDL
-#define PORTUSAGE_EVENT_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/PortUsage_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/PortUsage_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "PortUsageTest"
-#pragma DCPS_DATA_KEY "PortUsageTest symbol"
-
-struct PortUsageTest {
-  string symbol; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<PortUsageTest> PortUsageTestSeq;
-#endif
-
-enum PORT_USAGE_ASSIGNMENT {
-  //event ports
-  PORTUSAGE_ASSIGNMENT_WRITE,
-  //event and state ports
-  PORTUSAGE_ASSIGNMENT_GET,
-  PORTUSAGE_ASSIGNMENT_LISTEN,
-  //state ports
-  PORTUSAGE_ASSIGNMENT_UPDATE,
-  PORTUSAGE_ASSIGNMENT_READ,
-  PORTUSAGE_ASSIGNMENT_STATELISTEN
-};
-
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc
deleted file mode 100644
index b541c285f2a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (PortUsage_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = PortUsage_Test_Base_stub
-  dynamicflags += PORTUSAGE_EVENT_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=PORTUSAGE_EVENT_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=PortUsage_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    PortUsage_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=PORTUSAGE_EVENT_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    PortUsage_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.idl
deleted file mode 100644
index 04e0340f5a6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef EVENT_COMPONENT_IDL
-#define EVENT_COMPONENT_IDL
-
-#include "EventConnector/PortUsageEvent_Connector.idl"
-
-module PortUsageEvent_Test
-{
-  component PortUsageEventComponent
-  {
-    port PortUsageTestConnector::DDS_Write write_port;
-    port PortUsageTestConnector::DDS_Get get_port;
-    port PortUsageTestConnector::DDS_Listen listen_port;
-
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    attribute PORT_USAGE_ASSIGNMENT portusage_assignment;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc
deleted file mode 100644
index 19ccda457ed..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(PortUsageEvent_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += PortUsageEvent_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Component_stub_export.h \
-              -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Component_svnt_export.h \
-              -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Component_svnt_export.h \
-              -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Component_exec_export.h -I..
-
-  IDL_Files {
-    PortUsageEvent_Component.idl
-  }
-}
-
-project(PortUsageEvent_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += PortUsageEvent_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    PortUsageEvent_ComponentE.idl
-  }
-}
-
-project(PortUsageEvent_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += PortUsageEvent_Component_lem_gen PortUsageEvent_Component_stub  \
-           PortUsageEvent_Connector_stub PortUsage_Test_Base_stub
-  libs  += EventComponent_stub PortUsageEvent_Connector_stub \
-           PortUsage_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = EventComponent_lem_stub
-  dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageEvent_ComponentEC.cpp
-  }
-
-  Header_Files {
-    PortUsageEvent_ComponentEC.h
-    Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    PortUsageEvent_ComponentEC.inl
-  }
-}
-
-project(PortUsageEvent_Component_stub) : ccm_stub, dds4ccm_base {
-  after += PortUsageEvent_Component_idl_gen  PortUsageEvent_Connector_stub \
-           PortUsage_Test_Base_stub PortUsageEvent_Connector_lem_gen
-  libs  += PortUsageEvent_Connector_stub PortUsage_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = EventComponent_stub
-  dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageEvent_ComponentC.cpp
-  }
-
-  Header_Files {
-    PortUsageEvent_ComponentC.h
-    Component_stub_export.h
-  }
-
-  Inline_Files {
-    PortUsageEvent_ComponentC.inl
-  }
-}
-
-project(PortUsageEvent_Component_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += PortUsageEvent_Component_lem_stub PortUsageEvent_Component_stub \
-             PortUsage_Test_Base_stub PortUsageEvent_Connector_stub \
-             PortUsageEvent_Connector_lem_stub 
-  sharedname = EventComponent_exec
-  libs += EventComponent_stub EventComponent_lem_stub PortUsage_Test_Base_stub \
-          PortUsageEvent_Connector_stub PortUsageEvent_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageEvent_Component_exec.cpp
-  }
-
-  Header_Files {
-    PortUsageEvent_Component_exec.h
-    Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(PortUsageEvent_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   PortUsageEvent_Component_lem_stub PortUsage_Test_Base_stub \
-                  PortUsageEvent_Connector_stub PortUsageEvent_Connector_svnt \
-                  PortUsageEvent_Component_exec PortUsageEvent_Connector_lem_stub 
-  sharedname  = EventComponent_svnt
-  libs       += EventComponent_stub EventComponent_lem_stub PortUsage_Test_Base_stub \
-                PortUsageEvent_Connector_stub PortUsageEvent_Connector_svnt \
-                EventComponent_exec PortUsageEvent_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageEvent_ComponentS.cpp
-    PortUsageEvent_Component_svnt.cpp
-  }
-
-  Header_Files {
-    PortUsageEvent_ComponentS.h
-    PortUsageEvent_Component_svnt.h
-    Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.cpp
deleted file mode 100644
index c932d5dd6bf..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.cpp
+++ /dev/null
@@ -1,291 +0,0 @@
-// -*- C++ -*-
-#include "PortUsageEvent_Component_exec.h"
-
-#include "ace/OS_NS_unistd.h"
-#include "ace/Log_Msg.h"
-#include "dds4ccm/impl/Utils.h"
-
-namespace CIAO_PortUsageEvent_Test_PortUsageEventComponent_Impl
-{
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-                                    Atomic_ULong& datareaders_count,
-                                    Atomic_ULong& datawriters_count)
-    : datareaders_count_ (datareaders_count),
-      datawriters_count_ (datawriters_count)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status (
-    ::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind status_kind)
-  {
-    ACE_DEBUG ((LM_DEBUG,
-              "ConnectorStatusListener_exec_i::on_unexpected_status <%C>\n",
-              CIAO::DDS4CCM::translate_statuskind (status_kind)));
-    if (status_kind == DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        DDS::DataWriter_var dw = DDS::DataWriter::_narrow (the_entity);
-        if (! ::CORBA::is_nil (dw.in ()))
-          {
-            ++this->datawriters_count_;
-            ACE_DEBUG ((LM_DEBUG, "DataWriters found until now <%u>\n",
-                this->datawriters_count_.value ()));
-          }
-        else
-          {
-            DDS::DataReader_var dr = DDS::DataReader::_narrow (the_entity);
-            if (! ::CORBA::is_nil (dr.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : DATAREADER isn't nil when receiving an "
-                                      "on_publication_matched status\n"));
-              }
-          }
-      }
-    if (status_kind == DDS::SUBSCRIPTION_MATCHED_STATUS)
-      {
-        DDS::DataReader_var dw = DDS::DataReader::_narrow (the_entity);
-        if (! ::CORBA::is_nil (dw.in ()))
-          {
-            ++this->datareaders_count_;
-            ACE_DEBUG ((LM_DEBUG, "DataReaders found until now <%u>\n",
-                this->datareaders_count_.value ()));
-          }
-        DDS::DataWriter_var dr = DDS::DataWriter::_narrow (the_entity);
-        if (! ::CORBA::is_nil (dr.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : DATAREADER isn't nil when receiving an "
-                                  "on_subscription_matched status\n"));
-          }
-      }
-  }
-
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  Component_exec_i::Component_exec_i (void)
-    : assignment_ (PORTUSAGE_ASSIGNMENT_WRITE),
-      datareaders_count_ (0),
-      datawriters_count_ (0)
-  {
-  }
-
-  Component_exec_i::~Component_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  void
-  Component_exec_i::check_writer ()
-  {
-     if (this->datawriters_count_.value () != 1)
-      {
-        ACE_ERROR ((LM_ERROR, "Component_exec_i::check_writer - "
-                  "ERROR : Unexpected number of DataWriters detected - "
-                  "expected <1> - detected <%u>\n",
-                  this->datawriters_count_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_writer - "
-                  "OK : Detected the expected number of DataWriters - "
-                  "expected <1> - detected <%u>\n",
-                  this->datawriters_count_.value ()));
-      }
-  }
-
-  void
-  Component_exec_i::check_getter ()
-  {
-     if (this->datareaders_count_.value () != 1)
-      {
-        ACE_ERROR ((LM_ERROR, "Component_exec_i::check_getter - "
-                  "ERROR : Unexpected number of DataReaders detected - "
-                  "expected <1> - detected <%u>\n",
-                  this->datareaders_count_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_getter - "
-                  "OK : Detected the expected number of DataReaders - "
-                  "expected <1> - detected <%u>\n",
-                  this->datareaders_count_.value ()));
-      }
-  }
-
-  void
-  Component_exec_i::check_listener ()
-  {
-     if (this->datareaders_count_.value () != 1)
-      {
-        ACE_ERROR ((LM_ERROR, "Component_exec_i::check_listener - "
-                  "ERROR : Unexpected number of DataReaders detected - "
-                  "expected <1> - detected <%u>\n",
-                  this->datareaders_count_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_listener - "
-                  "OK : Detected the expected number of DataReaders - "
-                  "expected <1> - detected <%u>\n",
-                  this->datareaders_count_.value ()));
-      }
-  }
-
-  // Component attributes.
-  PORT_USAGE_ASSIGNMENT
-  Component_exec_i::portusage_assignment()
-  {
-    return this->assignment_;
-  }
-
-  void
-  Component_exec_i::portusage_assignment(PORT_USAGE_ASSIGNMENT assignment)
-  {
-    switch (assignment)
-      {
-        case PORTUSAGE_ASSIGNMENT_WRITE:
-          ACE_DEBUG ((LM_DEBUG, "New assigment: 'check writer port'\n"));
-          break;
-        case PORTUSAGE_ASSIGNMENT_GET:
-          ACE_DEBUG ((LM_DEBUG, "New assigment: 'check getter port'\n"));
-          break;
-        case PORTUSAGE_ASSIGNMENT_LISTEN:
-          ACE_DEBUG ((LM_DEBUG, "New assigment: 'check listener port'\n"));
-          break;
-        default:
-          ACE_ERROR ((LM_ERROR, "Component_exec_i::portusage_assignment - "
-                                "ERROR : Unknown assignment\n"));
-          break;
-
-      }
-    this->assignment_ = assignment;
-  }
-
-  // Port operations.
-  CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_get_port_status()
-  {
-    return CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  PortUsageEvent_Test::PortUsageTestConnector::CCM_Listener_ptr
-  Component_exec_i::get_listen_port_data_listener()
-  {
-    return PortUsageEvent_Test::PortUsageTestConnector::CCM_Listener::_nil ();
-  }
-
-  CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_listen_port_status()
-  {
-    return CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Component_exec_i::get_connector_status ()
-  {
-    return new ConnectorStatusListener_exec_i (
-                  this->datareaders_count_,
-                  this->datawriters_count_);
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Component_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::PortUsageEvent_Test::CCM_PortUsageEventComponent_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Component_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_remove (void)
-  {
-    switch (this->assignment_)
-      {
-        case PORTUSAGE_ASSIGNMENT_WRITE:
-          this->check_writer ();
-          break;
-        case PORTUSAGE_ASSIGNMENT_GET:
-          this->check_getter ();
-          break;
-        case PORTUSAGE_ASSIGNMENT_LISTEN:
-          this->check_listener ();
-          break;
-        default:
-          ACE_ERROR ((LM_ERROR, "Component_exec_i::ccm_remove - "
-                                "ERROR : Unknown assignment\n"));
-          break;
-      }
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_PortUsageEvent_Component_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Component_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h
deleted file mode 100644
index e1e605e05a8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COMPONENT_EXEC_H_
-#define CIAO_COMPONENT_EXEC_H_
-
-#include "PortUsageEvent_ComponentEC.h"
-
-#include /**/ "Component_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_PortUsageEvent_Test_PortUsageEventComponent_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong> Atomic_ULong;
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class COMPONENT_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Atomic_ULong&,
-                                    Atomic_ULong&);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                     const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                               ::DDS::StatusKind status_kind);
-  private:
-    Atomic_ULong& datareaders_count_;
-    Atomic_ULong& datawriters_count_;
-  };
-
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  class COMPONENT_EXEC_Export Component_exec_i
-    : public virtual PortUsageEventComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Component_exec_i (void);
-    virtual ~Component_exec_i (void);
-
-    // Component attributes.
-    virtual PORT_USAGE_ASSIGNMENT
-    portusage_assignment (void);
-
-    virtual void
-    portusage_assignment (PORT_USAGE_ASSIGNMENT assignment);
-
-    // Port operations.
-    virtual CCM_DDS::CCM_PortStatusListener_ptr
-    get_get_port_status (void);
-
-    virtual PortUsageEvent_Test::PortUsageTestConnector::CCM_Listener_ptr
-    get_listen_port_data_listener (void);
-
-    virtual CCM_DDS::CCM_PortStatusListener_ptr
-    get_listen_port_status (void);
-
-    virtual CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status ();
-
-    // 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:
-    ::PortUsageEvent_Test::CCM_PortUsageEventComponent_Context_var context_;
-
-    PORT_USAGE_ASSIGNMENT assignment_;
-
-    Atomic_ULong datareaders_count_;
-    Atomic_ULong datawriters_count_;
-
-    // Supported operations and attributes.
-    void check_writer (void);
-
-    void check_getter (void);
-
-    void check_listener (void);
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_PortUsageEvent_Component_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl
deleted file mode 100644
index 0ef5034d5d1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file PortUsageEvent_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef PORTUSAGE_EVENT_TEST_CONNECTOR_IDL_
-#define PORTUSAGE_EVENT_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/PortUsage_Test_Base.idl"
-
-#pragma ciao lem "EventConnector/PortUsageEvent_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/PortUsage_Test_BaseTypeSupport.idl"
-#endif
-
-module PortUsageEvent_Test
-{
-  module ::CCM_DDS::Typed < ::PortUsageTest, ::PortUsageTestSeq> PortUsageTestConnector;
-};
-
-#endif /* PORTUSAGE_EVENT_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc
deleted file mode 100644
index 90cad48d622..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p PortUsage_Test_Base -l .. -o ../lib -u DDS PortUsageEvent_Connector"
-
-project(PortUsageEvent_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen PortUsage_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=PortUsageEvent_Connector_stub_export.h \
-              -Wb,skel_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=PortUsageEvent_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=PortUsageEvent_Connector_svnt_export.h \
-              -Wb,conn_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=PortUsageEvent_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    PortUsageEvent_Connector.idl
-  }
-}
-
-project(PortUsageEvent_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += PortUsageEvent_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=PortUsageEvent_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    PortUsageEvent_ConnectorE.idl
-  }
-}
-
-project(PortUsageEvent_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += PortUsageEvent_Connector_lem_gen PortUsageEvent_Connector_stub PortUsage_Test_Base_stub
-  libs  += PortUsage_Test_Base_stub PortUsageEvent_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = PortUsageEvent_Connector_lem_stub
-  dynamicflags += PORTUSAGE_EVENT_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageEvent_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    PortUsageEvent_ConnectorEC.h
-    PortUsageEvent_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    PortUsageEvent_ConnectorEC.inl
-  }
-}
-
-project(PortUsageEvent_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += PortUsageEvent_Connector_idl_gen PortUsage_Test_Base_stub
-  libs  += PortUsage_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = PortUsageEvent_Connector_stub
-  dynamicflags += PORTUSAGE_EVENT_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageEvent_ConnectorC.cpp
-  }
-
-  Header_Files {
-    PortUsageEvent_ConnectorC.h
-    PortUsageEvent_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    PortUsageEvent_ConnectorC.inl
-  }
-}
-
-project(PortUsageEvent_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += PortUsageEvent_Connector_lem_stub PortUsageEvent_Connector_stub PortUsage_Test_Base_stub
-  sharedname = PortUsageEvent_Connector_exec
-  libs += PortUsageEvent_Connector_stub PortUsageEvent_Connector_lem_stub PortUsage_Test_Base_stub PortUsage_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += PORTUSAGE_EVENT_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageEvent_Connector_conn.cpp
-  }
-
-  Header_Files {
-    PortUsageEvent_Connector_conn.h
-    PortUsageEvent_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(PortUsageEvent_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += PortUsageEvent_Connector_lem_stub PortUsageEvent_Connector_exec PortUsageEvent_Connector_stub
-  sharedname  = PortUsageEvent_Connector_svnt
-  libs       += PortUsageEvent_Connector_stub \
-                PortUsageEvent_Connector_lem_stub  \
-                PortUsage_Test_Base_stub \
-                PortUsageEvent_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += PORTUSAGE_EVENT_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageEvent_ConnectorS.cpp
-    PortUsageEvent_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    PortUsageEvent_ConnectorS.h
-    PortUsageEvent_Connector_svnt.h
-    PortUsageEvent_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.idl
deleted file mode 100644
index 67ee29bb7b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef STATE_COMPONENT_IDL
-#define STATE_COMPONENT_IDL
-
-#include "StateConnector/PortUsageState_Connector.idl"
-
-module PortUsageState_Test
-{
-  component PortUsageStateComponent
-  {
-    port PortUsageTestConnector::DDS_Update update_port;
-    port PortUsageTestConnector::DDS_Read read_port;
-    port PortUsageTestConnector::DDS_Get get_port;
-    port PortUsageTestConnector::DDS_Listen listen_port;
-    port PortUsageTestConnector::DDS_StateListen state_listen_port;
-
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    attribute PORT_USAGE_ASSIGNMENT portusage_assignment;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc
deleted file mode 100644
index 81252c6c330..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(PortUsageState_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += PortUsageState_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Component_stub_export.h \
-              -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Component_svnt_export.h \
-              -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Component_svnt_export.h \
-              -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Component_exec_export.h -I..
-
-  IDL_Files {
-    PortUsageState_Component.idl
-  }
-}
-
-project(PortUsageState_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += PortUsageState_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    PortUsageState_ComponentE.idl
-  }
-}
-
-project(PortUsageState_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += PortUsageState_Component_lem_gen PortUsageState_Component_stub  \
-           PortUsageState_Connector_stub PortUsage_Test_Base_stub
-  libs  += StateComponent_stub PortUsageState_Connector_stub \
-           PortUsage_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = StateComponent_lem_stub
-  dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageState_ComponentEC.cpp
-  }
-
-  Header_Files {
-    PortUsageState_ComponentEC.h
-    Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    PortUsageState_ComponentEC.inl
-  }
-}
-
-project(PortUsageState_Component_stub) : ccm_stub, dds4ccm_base {
-  after += PortUsageState_Component_idl_gen  PortUsageState_Connector_stub \
-           PortUsage_Test_Base_stub PortUsageState_Connector_lem_gen
-  libs  += PortUsageState_Connector_stub PortUsage_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = StateComponent_stub
-  dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageState_ComponentC.cpp
-  }
-
-  Header_Files {
-    PortUsageState_ComponentC.h
-    Component_stub_export.h
-  }
-
-  Inline_Files {
-    PortUsageState_ComponentC.inl
-  }
-}
-
-project(PortUsageState_Component_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += PortUsageState_Component_lem_stub PortUsageState_Component_stub \
-             PortUsage_Test_Base_stub PortUsageState_Connector_stub \
-             PortUsageState_Connector_lem_stub 
-  sharedname = StateComponent_exec
-  libs += StateComponent_stub StateComponent_lem_stub PortUsage_Test_Base_stub \
-          PortUsageState_Connector_stub PortUsageState_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageState_Component_exec.cpp
-  }
-
-  Header_Files {
-    PortUsageState_Component_exec.h
-    Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(PortUsageState_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   PortUsageState_Component_lem_stub PortUsage_Test_Base_stub \
-                  PortUsageState_Connector_stub PortUsageState_Connector_svnt \
-                  PortUsageState_Component_exec PortUsageState_Connector_lem_stub 
-  sharedname  = StateComponent_svnt
-  libs       += StateComponent_stub StateComponent_lem_stub PortUsage_Test_Base_stub \
-                PortUsageState_Connector_stub PortUsageState_Connector_svnt \
-                StateComponent_exec PortUsageState_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageState_ComponentS.cpp
-    PortUsageState_Component_svnt.cpp
-  }
-
-  Header_Files {
-    PortUsageState_ComponentS.h
-    PortUsageState_Component_svnt.h
-    Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp
deleted file mode 100644
index f53643b0832..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp
+++ /dev/null
@@ -1,360 +0,0 @@
-// -*- C++ -*-
-#include "PortUsageState_Component_exec.h"
-
-#include "ace/OS_NS_unistd.h"
-#include "ace/Log_Msg.h"
-#include "dds4ccm/impl/Utils.h"
-
-namespace CIAO_PortUsageState_Test_PortUsageStateComponent_Impl
-{
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-                                    Atomic_ULong& datareaders_count,
-                                    Atomic_ULong& datawriters_count)
-    : datareaders_count_ (datareaders_count),
-      datawriters_count_ (datawriters_count)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status (
-    ::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind status_kind)
-  {
-    ACE_DEBUG ((LM_DEBUG,
-              "ConnectorStatusListener_exec_i::on_unexpected_status <%C>\n",
-              CIAO::DDS4CCM::translate_statuskind (status_kind)));
-    if (status_kind == DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        DDS::DataWriter_var dw = DDS::DataWriter::_narrow (the_entity);
-        if (! ::CORBA::is_nil (dw.in ()))
-          {
-            ++this->datawriters_count_;
-            ACE_DEBUG ((LM_DEBUG, "DataWriters found until now <%u>\n",
-                this->datawriters_count_.value ()));
-          }
-        else
-          {
-            DDS::DataReader_var dr = DDS::DataReader::_narrow (the_entity);
-            if (! ::CORBA::is_nil (dr.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : DATAREADER isn't nil when receiving an "
-                                      "on_publication_matched status\n"));
-              }
-          }
-      }
-    if (status_kind == DDS::SUBSCRIPTION_MATCHED_STATUS)
-      {
-        DDS::DataReader_var dw = DDS::DataReader::_narrow (the_entity);
-        if (! ::CORBA::is_nil (dw.in ()))
-          {
-            ++this->datareaders_count_;
-            ACE_DEBUG ((LM_DEBUG, "DataReaders found until now <%u>\n",
-                this->datareaders_count_.value ()));
-          }
-        DDS::DataWriter_var dr = DDS::DataWriter::_narrow (the_entity);
-        if (! ::CORBA::is_nil (dr.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : DATAREADER isn't nil when receiving an "
-                                  "on_subscription_matched status\n"));
-          }
-      }
-  }
-
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  Component_exec_i::Component_exec_i (void)
-    : assignment_ (PORTUSAGE_ASSIGNMENT_WRITE),
-      datareaders_count_ (0),
-      datawriters_count_ (0)
-  {
-  }
-
-  Component_exec_i::~Component_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  void
-  Component_exec_i::check_updater ()
-  {
-     if (this->datawriters_count_.value () != 1)
-      {
-        ACE_ERROR ((LM_ERROR, "Component_exec_i::check_writer - "
-                  "ERROR : Unexpected number of DataWriters detected - "
-                  "expected <1> - detected <%u>\n",
-                  this->datawriters_count_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_writer - "
-                  "OK : Detected the expect number of DataWriters - "
-                  "expected <1> - detected <%u>\n",
-                  this->datawriters_count_.value ()));
-      }
-  }
-
-  void
-  Component_exec_i::check_getter ()
-  {
-     if (this->datareaders_count_.value () != 1)
-      {
-        ACE_ERROR ((LM_ERROR, "Component_exec_i::check_getter - "
-                  "ERROR : Unexpected number of DataReaders detected - "
-                  "expected <1> - detected <%u>\n",
-                  this->datareaders_count_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_getter - "
-                  "OK : Detected the expected number of DataReaders - "
-                  "expected <1> - detected <%u>\n",
-                  this->datareaders_count_.value ()));
-      }
-  }
-
-  void
-  Component_exec_i::check_listener ()
-  {
-     if (this->datareaders_count_.value () != 1)
-      {
-        ACE_ERROR ((LM_ERROR, "Component_exec_i::check_listener - "
-                  "ERROR : Unexpected number of DataReaders detected - "
-                  "expected <1> - detected <%u>\n",
-                  this->datareaders_count_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_listener - "
-                  "OK : Detected the expected number of DataReaders - "
-                  "expected <1> - detected <%u>\n",
-                  this->datareaders_count_.value ()));
-      }
-  }
-
-  void
-  Component_exec_i::check_reader ()
-  {
-     if (this->datareaders_count_.value () != 1)
-      {
-        ACE_ERROR ((LM_ERROR, "Component_exec_i::check_reader - "
-                  "ERROR : Unexpected number of DataReaders detected - "
-                  "expected <1> - detected <%u>\n",
-                  this->datareaders_count_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_reader - "
-                  "OK : Detected the expected number of DataReaders - "
-                  "expected <1> - detected <%u>\n",
-                  this->datareaders_count_.value ()));
-      }
-  }
-
-  void
-  Component_exec_i::check_state_listen ()
-  {
-     if (this->datareaders_count_.value () != 1)
-      {
-        ACE_ERROR ((LM_ERROR, "Component_exec_i::check_state_listen - "
-                  "ERROR : Unexpected number of DataReaders detected - "
-                  "expected <1> - detected <%u>\n",
-                  this->datareaders_count_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_state_listen - "
-                  "OK : Detected the expected number of DataReaders - "
-                  "expected <1> - detected <%u>\n",
-                  this->datareaders_count_.value ()));
-      }
-  }
-
-  // Component attributes.
-  PORT_USAGE_ASSIGNMENT
-  Component_exec_i::portusage_assignment()
-  {
-    return this->assignment_;
-  }
-
-  void
-  Component_exec_i::portusage_assignment (PORT_USAGE_ASSIGNMENT assignment)
-  {
-    switch (assignment)
-      {
-        case PORTUSAGE_ASSIGNMENT_UPDATE:
-          ACE_DEBUG ((LM_DEBUG, "New assigment: 'check updater port'\n"));
-          break;
-        case PORTUSAGE_ASSIGNMENT_GET:
-          ACE_DEBUG ((LM_DEBUG, "New assigment: 'check getter port'\n"));
-          break;
-        case PORTUSAGE_ASSIGNMENT_LISTEN:
-          ACE_DEBUG ((LM_DEBUG, "New assigment: 'check listener port'\n"));
-          break;
-        case PORTUSAGE_ASSIGNMENT_READ:
-          ACE_DEBUG ((LM_DEBUG, "New assigment: 'check reader port'\n"));
-          break;
-        case PORTUSAGE_ASSIGNMENT_STATELISTEN:
-          ACE_DEBUG ((LM_DEBUG, "New assigment: 'check state listen port'\n"));
-          break;
-        default:
-          ACE_ERROR ((LM_ERROR, "Component_exec_i::portusage_assignment - "
-                                "ERROR : Unknown assignment\n"));
-          break;
-
-      }
-    this->assignment_ = assignment;
-  }
-
-  // Port operations.
-  CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_read_port_status()
-  {
-    return CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  PortUsageState_Test::PortUsageTestConnector::CCM_StateListener_ptr
-  Component_exec_i::get_state_listen_port_data_listener()
-  {
-    return PortUsageState_Test::PortUsageTestConnector::CCM_StateListener::_nil ();
-  }
-
-  CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_state_listen_port_status()
-  {
-    return CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Component_exec_i::get_connector_status ()
-  {
-    return new ConnectorStatusListener_exec_i (
-                  this->datareaders_count_,
-                  this->datawriters_count_);
-  }
-
-  CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_get_port_status (void)
-  {
-    return CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  PortUsageState_Test::PortUsageTestConnector::CCM_Listener_ptr
-  Component_exec_i::get_listen_port_data_listener (void)
-  {
-    return PortUsageState_Test::PortUsageTestConnector::CCM_Listener::_nil ();
-  }
-
-  CCM_DDS::CCM_PortStatusListener_ptr
-  Component_exec_i::get_listen_port_status (void)
-  {
-    return CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-
-  // Operations from Components::SessionComponent.
-  void
-  Component_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::PortUsageState_Test::CCM_PortUsageStateComponent_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Component_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_remove (void)
-  {
-    switch (this->assignment_)
-      {
-        case PORTUSAGE_ASSIGNMENT_UPDATE:
-          this->check_updater ();
-          break;
-        case PORTUSAGE_ASSIGNMENT_GET:
-          this->check_getter ();
-          break;
-        case PORTUSAGE_ASSIGNMENT_LISTEN:
-          this->check_listener ();
-          break;
-        case PORTUSAGE_ASSIGNMENT_READ:
-          this->check_reader ();
-          break;
-        case PORTUSAGE_ASSIGNMENT_STATELISTEN:
-          this->check_state_listen ();
-          break;
-        default:
-          ACE_ERROR ((LM_ERROR, "Component_exec_i::ccm_remove - "
-                                "ERROR : Unknown assignment\n"));
-          break;
-      }
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_PortUsageState_Component_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Component_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h
deleted file mode 100644
index 04a8547e334..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h
+++ /dev/null
@@ -1,130 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COMPONENT_EXEC_H_
-#define CIAO_COMPONENT_EXEC_H_
-
-#include "PortUsageState_ComponentEC.h"
-
-#include /**/ "Component_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_PortUsageState_Test_PortUsageStateComponent_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong> Atomic_ULong;
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class COMPONENT_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Atomic_ULong&,
-                                    Atomic_ULong&);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                     const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                               ::DDS::StatusKind status_kind);
-  private:
-    Atomic_ULong& datareaders_count_;
-    Atomic_ULong& datawriters_count_;
-  };
-
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  class COMPONENT_EXEC_Export Component_exec_i
-    : public virtual PortUsageStateComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Component_exec_i (void);
-    virtual ~Component_exec_i (void);
-
-    // Component attributes.
-    virtual PORT_USAGE_ASSIGNMENT
-    portusage_assignment (void);
-
-    virtual void
-    portusage_assignment (PORT_USAGE_ASSIGNMENT assignment);
-
-    // Port operations.
-    virtual CCM_DDS::CCM_PortStatusListener_ptr
-    get_read_port_status (void);
-
-    virtual PortUsageState_Test::PortUsageTestConnector::CCM_StateListener_ptr
-    get_state_listen_port_data_listener (void);
-
-    virtual CCM_DDS::CCM_PortStatusListener_ptr
-    get_state_listen_port_status (void);
-
-    virtual CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status ();
-
-    virtual CCM_DDS::CCM_PortStatusListener_ptr
-    get_get_port_status (void);
-
-    virtual PortUsageState_Test::PortUsageTestConnector::CCM_Listener_ptr
-    get_listen_port_data_listener (void);
-
-    virtual CCM_DDS::CCM_PortStatusListener_ptr
-    get_listen_port_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:
-    ::PortUsageState_Test::CCM_PortUsageStateComponent_Context_var context_;
-
-    PORT_USAGE_ASSIGNMENT assignment_;
-
-    Atomic_ULong datareaders_count_;
-    Atomic_ULong datawriters_count_;
-
-    // Supported operations and attributes.
-    void check_updater (void);
-
-    void check_getter (void);
-
-    void check_listener (void);
-
-    void check_reader (void);
-
-    void check_state_listen (void);
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_PortUsageState_Component_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl
deleted file mode 100644
index 742b2087ac3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file PortUsageState_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef PORTUSAGE_STATE_CONNECTOR_IDL_
-#define PORTUSAGE_STATE_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/PortUsage_Test_Base.idl"
-
-#pragma ciao lem "StateConnector/PortUsageState_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/PortUsage_Test_BaseTypeSupport.idl"
-#endif
-
-module PortUsageState_Test
-{
-  module ::CCM_DDS::Typed < ::PortUsageTest, ::PortUsageTestSeq> PortUsageTestConnector;
-};
-
-#endif /* PORTUSAGE_STATE_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc
deleted file mode 100644
index c9dcc39fdb5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p PortUsage_Test_Base -l .. -o ../lib -u DDS PortUsageState_Connector"
-
-project(PortUsageState_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen PortUsage_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=PortUsageState_Connector_stub_export.h \
-              -Wb,skel_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=PortUsageState_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=PortUsageState_Connector_svnt_export.h \
-              -Wb,conn_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=PortUsageState_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    PortUsageState_Connector.idl
-  }
-}
-
-project(PortUsageState_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += PortUsageState_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=PortUsageState_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    PortUsageState_ConnectorE.idl
-  }
-}
-
-project(PortUsageState_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += PortUsageState_Connector_lem_gen PortUsageState_Connector_stub PortUsage_Test_Base_stub
-  libs  += PortUsage_Test_Base_stub PortUsageState_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = PortUsageState_Connector_lem_stub
-  dynamicflags += PORTUSAGE_EVENT_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageState_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    PortUsageState_ConnectorEC.h
-    PortUsageState_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    PortUsageState_ConnectorEC.inl
-  }
-}
-
-project(PortUsageState_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += PortUsageState_Connector_idl_gen PortUsage_Test_Base_stub
-  libs  += PortUsage_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = PortUsageState_Connector_stub
-  dynamicflags += PORTUSAGE_EVENT_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageState_ConnectorC.cpp
-  }
-
-  Header_Files {
-    PortUsageState_ConnectorC.h
-    PortUsageState_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    PortUsageState_ConnectorC.inl
-  }
-}
-
-project(PortUsageState_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += PortUsageState_Connector_lem_stub PortUsageState_Connector_stub PortUsage_Test_Base_stub
-  sharedname = PortUsageState_Connector_exec
-  libs += PortUsageState_Connector_stub PortUsageState_Connector_lem_stub PortUsage_Test_Base_stub PortUsage_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += PORTUSAGE_EVENT_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageState_Connector_conn.cpp
-  }
-
-  Header_Files {
-    PortUsageState_Connector_conn.h
-    PortUsageState_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(PortUsageState_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += PortUsageState_Connector_lem_stub PortUsageState_Connector_exec PortUsageState_Connector_stub
-  sharedname  = PortUsageState_Connector_svnt
-  libs       += PortUsageState_Connector_stub \
-                PortUsageState_Connector_lem_stub  \
-                PortUsage_Test_Base_stub \
-                PortUsageState_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += PORTUSAGE_EVENT_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    PortUsageState_ConnectorS.cpp
-    PortUsageState_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    PortUsageState_ConnectorS.h
-    PortUsageState_Connector_svnt.h
-    PortUsageState_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Get.cdp b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Get.cdp
deleted file mode 100644
index 999db538fa5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Get.cdp
+++ /dev/null
@@ -1,259 +0,0 @@
-<!--  -->
-<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>PortUsage_Test_Depl</label>
-  <UUID>PortUsage_Test_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageEvent_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageEvent_Test_PortUsageEventComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>EventComponent_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>EventComponent_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ConnectorImplementation">
-    <name>ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="PortUsageEvent_Connector_ExecArtifact" />
-    <artifact xmi:idref="PortUsageEvent_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_PortUsageEvent_Test_PortUsageTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageEvent_Test_PortUsageTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageEvent_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageEvent_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ComponentInstance">
-    <name>ComponentInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>portusage_assignment</name>
-      <value>
-        <type>
-          <kind>tk_enum</kind>
-          <enum>
-            <name>PORT_USAGE_ASSIGNMENT</name>
-            <typeId>IDL:PORT_USAGE_ASSIGNMENT:1.0</typeId>
-            <member>PORTUSAGE_ASSIGNMENT_WRITE</member>
-            <member>PORTUSAGE_ASSIGNMENT_GET</member>
-            <member>PORTUSAGE_ASSIGNMENT_LISTEN</member>
-            <member>PORTUSAGE_ASSIGNMENT_UPDATE</member>
-            <member>PORTUSAGE_ASSIGNMENT_READ</member>
-            <member>PORTUSAGE_ASSIGNMENT_STATELISTEN</member>
-          </enum>
-        </type>
-        <value>
-          <enum>PORTUSAGE_ASSIGNMENT_GET</enum>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ConnectorInstance">
-    <name>ConnectorInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsage_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- a writer is need to force an on_subscription_matched -->
-  <connection>
-    <name>write_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>get_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="PortUsageEvent_Connector_ExecArtifact">
-    <name>PortUsageEvent_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>PortUsageEvent_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="PortUsageEvent_Connector_SvntArtifact">
-    <name>PortUsageEvent_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>PortUsageEvent_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="PortUsageEvent_Connector_StubArtifact">
-    <name>PortUsageEvent_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>PortUsageEvent_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>EventComponent_exec</name>
-    <source/>
-    <node/>
-    <location>EventComponent_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>EventComponent_svnt</name>
-    <source/>
-    <node/>
-    <location>EventComponent_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Listen.cdp b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Listen.cdp
deleted file mode 100644
index 49954dfeee5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Listen.cdp
+++ /dev/null
@@ -1,259 +0,0 @@
-<!--  -->
-<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>PortUsage_Test_Depl</label>
-  <UUID>PortUsage_Test_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageEvent_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageEvent_Test_PortUsageEventComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>EventComponent_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>EventComponent_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ConnectorImplementation">
-    <name>ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="PortUsageEvent_Connector_ExecArtifact" />
-    <artifact xmi:idref="PortUsageEvent_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_PortUsageEvent_Test_PortUsageTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageEvent_Test_PortUsageTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageEvent_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageEvent_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ComponentInstance">
-    <name>ComponentInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>portusage_assignment</name>
-      <value>
-        <type>
-          <kind>tk_enum</kind>
-          <enum>
-            <name>PORT_USAGE_ASSIGNMENT</name>
-            <typeId>IDL:PORT_USAGE_ASSIGNMENT:1.0</typeId>
-            <member>PORTUSAGE_ASSIGNMENT_WRITE</member>
-            <member>PORTUSAGE_ASSIGNMENT_GET</member>
-            <member>PORTUSAGE_ASSIGNMENT_LISTEN</member>
-            <member>PORTUSAGE_ASSIGNMENT_UPDATE</member>
-            <member>PORTUSAGE_ASSIGNMENT_READ</member>
-            <member>PORTUSAGE_ASSIGNMENT_STATELISTEN</member>
-          </enum>
-        </type>
-        <value>
-          <enum>PORTUSAGE_ASSIGNMENT_LISTEN</enum>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ConnectorInstance">
-    <name>ConnectorInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsage_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- a writer is need to force an on_subscription_matched -->
-  <connection>
-    <name>write_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>listen_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="PortUsageEvent_Connector_ExecArtifact">
-    <name>PortUsageEvent_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>PortUsageEvent_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="PortUsageEvent_Connector_SvntArtifact">
-    <name>PortUsageEvent_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>PortUsageEvent_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="PortUsageEvent_Connector_StubArtifact">
-    <name>PortUsageEvent_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>PortUsageEvent_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>EventComponent_exec</name>
-    <source/>
-    <node/>
-    <location>EventComponent_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>EventComponent_svnt</name>
-    <source/>
-    <node/>
-    <location>EventComponent_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Write.cdp b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Write.cdp
deleted file mode 100644
index ce71a0f288c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/Event_Write.cdp
+++ /dev/null
@@ -1,259 +0,0 @@
-<!--  -->
-<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>PortUsage_Test_Depl</label>
-  <UUID>PortUsage_Test_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageEvent_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageEvent_Test_PortUsageEventComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>EventComponent_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>EventComponent_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ConnectorImplementation">
-    <name>ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="PortUsageEvent_Connector_ExecArtifact" />
-    <artifact xmi:idref="PortUsageEvent_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_PortUsageEvent_Test_PortUsageTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageEvent_Test_PortUsageTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageEvent_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageEvent_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ComponentInstance">
-    <name>ComponentInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>portusage_assignment</name>
-      <value>
-        <type>
-          <kind>tk_enum</kind>
-          <enum>
-            <name>PORT_USAGE_ASSIGNMENT</name>
-            <typeId>IDL:PORT_USAGE_ASSIGNMENT:1.0</typeId>
-            <member>PORTUSAGE_ASSIGNMENT_WRITE</member>
-            <member>PORTUSAGE_ASSIGNMENT_GET</member>
-            <member>PORTUSAGE_ASSIGNMENT_LISTEN</member>
-            <member>PORTUSAGE_ASSIGNMENT_UPDATE</member>
-            <member>PORTUSAGE_ASSIGNMENT_READ</member>
-            <member>PORTUSAGE_ASSIGNMENT_STATELISTEN</member>
-          </enum>
-        </type>
-        <value>
-          <enum>PORTUSAGE_ASSIGNMENT_WRITE</enum>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ConnectorInstance">
-    <name>ConnectorInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsage_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>write_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!-- a writer is need to force an on_publication_matched -->
-  <connection>
-    <name>listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>listen_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="PortUsageEvent_Connector_ExecArtifact">
-    <name>PortUsageEvent_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>PortUsageEvent_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="PortUsageEvent_Connector_SvntArtifact">
-    <name>PortUsageEvent_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>PortUsageEvent_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="PortUsageEvent_Connector_StubArtifact">
-    <name>PortUsageEvent_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>PortUsageEvent_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>EventComponent_exec</name>
-    <source/>
-    <node/>
-    <location>EventComponent_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>EventComponent_svnt</name>
-    <source/>
-    <node/>
-    <location>EventComponent_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Get.cdp b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Get.cdp
deleted file mode 100644
index 14df33ab775..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Get.cdp
+++ /dev/null
@@ -1,259 +0,0 @@
-<!--  -->
-<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>PortUsage_Test_Depl</label>
-  <UUID>PortUsage_Test_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Test_PortUsageStateComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>StateComponent_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>StateComponent_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ConnectorImplementation">
-    <name>ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="PortUsageState_Connector_ExecArtifact" />
-    <artifact xmi:idref="PortUsageState_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_PortUsageState_Test_PortUsageTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageState_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageState_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ComponentInstance">
-    <name>ComponentInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>portusage_assignment</name>
-      <value>
-        <type>
-          <kind>tk_enum</kind>
-          <enum>
-            <name>PORT_USAGE_ASSIGNMENT</name>
-            <typeId>IDL:PORT_USAGE_ASSIGNMENT:1.0</typeId>
-            <member>PORTUSAGE_ASSIGNMENT_WRITE</member>
-            <member>PORTUSAGE_ASSIGNMENT_GET</member>
-            <member>PORTUSAGE_ASSIGNMENT_LISTEN</member>
-            <member>PORTUSAGE_ASSIGNMENT_UPDATE</member>
-            <member>PORTUSAGE_ASSIGNMENT_READ</member>
-            <member>PORTUSAGE_ASSIGNMENT_STATELISTEN</member>
-          </enum>
-        </type>
-        <value>
-          <enum>PORTUSAGE_ASSIGNMENT_GET</enum>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ConnectorInstance">
-    <name>ConnectorInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsage_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- a writer is need to force an on_subscription_matched -->
-  <connection>
-    <name>update_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>update_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>get_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="PortUsageState_Connector_ExecArtifact">
-    <name>PortUsageState_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="PortUsageState_Connector_SvntArtifact">
-    <name>PortUsageState_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="PortUsageState_Connector_StubArtifact">
-    <name>PortUsageState_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>StateComponent_exec</name>
-    <source/>
-    <node/>
-    <location>StateComponent_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>StateComponent_svnt</name>
-    <source/>
-    <node/>
-    <location>StateComponent_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>StateComponent_stub</name>
-    <source/>
-    <node/>
-    <location>StateComponent_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Listen.cdp b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Listen.cdp
deleted file mode 100644
index b32f7add651..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Listen.cdp
+++ /dev/null
@@ -1,259 +0,0 @@
-<!--  -->
-<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>PortUsage_Test_Depl</label>
-  <UUID>PortUsage_Test_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Test_PortUsageStateComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>StateComponent_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>StateComponent_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ConnectorImplementation">
-    <name>ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="PortUsageState_Connector_ExecArtifact" />
-    <artifact xmi:idref="PortUsageState_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_PortUsageState_Test_PortUsageTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageState_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageState_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ComponentInstance">
-    <name>ComponentInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>portusage_assignment</name>
-      <value>
-        <type>
-          <kind>tk_enum</kind>
-          <enum>
-            <name>PORT_USAGE_ASSIGNMENT</name>
-            <typeId>IDL:PORT_USAGE_ASSIGNMENT:1.0</typeId>
-            <member>PORTUSAGE_ASSIGNMENT_WRITE</member>
-            <member>PORTUSAGE_ASSIGNMENT_GET</member>
-            <member>PORTUSAGE_ASSIGNMENT_LISTEN</member>
-            <member>PORTUSAGE_ASSIGNMENT_UPDATE</member>
-            <member>PORTUSAGE_ASSIGNMENT_READ</member>
-            <member>PORTUSAGE_ASSIGNMENT_STATELISTEN</member>
-          </enum>
-        </type>
-        <value>
-          <enum>PORTUSAGE_ASSIGNMENT_LISTEN</enum>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ConnectorInstance">
-    <name>ConnectorInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsage_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- a writer is need to force an on_subscription_matched -->
-  <connection>
-    <name>update_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>update_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>listen_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="PortUsageState_Connector_ExecArtifact">
-    <name>PortUsageState_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="PortUsageState_Connector_SvntArtifact">
-    <name>PortUsageState_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="PortUsageState_Connector_StubArtifact">
-    <name>PortUsageState_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>StateComponent_exec</name>
-    <source/>
-    <node/>
-    <location>StateComponent_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>StateComponent_svnt</name>
-    <source/>
-    <node/>
-    <location>StateComponent_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Read.cdp b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Read.cdp
deleted file mode 100644
index 71c98f743d0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Read.cdp
+++ /dev/null
@@ -1,247 +0,0 @@
-<!--  -->
-<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>PortUsage_Test_Depl</label>
-  <UUID>PortUsage_Test_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Test_PortUsageStateComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>StateComponent_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>StateComponent_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ConnectorImplementation">
-    <name>ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="PortUsageState_Connector_ExecArtifact" />
-    <artifact xmi:idref="PortUsageState_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_PortUsageState_Test_PortUsageTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageState_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageState_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ComponentInstance">
-    <name>ComponentInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>portusage_assignment</name>
-      <value>
-        <type>
-          <kind>tk_enum</kind>
-          <enum>
-            <name>PORT_USAGE_ASSIGNMENT</name>
-            <typeId>IDL:PORT_USAGE_ASSIGNMENT:1.0</typeId>
-            <member>PORTUSAGE_ASSIGNMENT_WRITE</member>
-            <member>PORTUSAGE_ASSIGNMENT_GET</member>
-            <member>PORTUSAGE_ASSIGNMENT_LISTEN</member>
-            <member>PORTUSAGE_ASSIGNMENT_UPDATE</member>
-            <member>PORTUSAGE_ASSIGNMENT_READ</member>
-            <member>PORTUSAGE_ASSIGNMENT_STATELISTEN</member>
-          </enum>
-        </type>
-        <value>
-          <enum>PORTUSAGE_ASSIGNMENT_READ</enum>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ConnectorInstance">
-    <name>ConnectorInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsage_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- a writer is need to force an on_subscription_matched -->
-  <connection>
-    <name>update_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>update_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>read_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>read_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="PortUsageState_Connector_ExecArtifact">
-    <name>PortUsageState_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="PortUsageState_Connector_SvntArtifact">
-    <name>PortUsageState_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>StateComponent_exec</name>
-    <source/>
-    <node/>
-    <location>StateComponent_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>StateComponent_svnt</name>
-    <source/>
-    <node/>
-    <location>StateComponent_svnt</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_StateListen.cdp b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_StateListen.cdp
deleted file mode 100644
index 8dd0fcd2878..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_StateListen.cdp
+++ /dev/null
@@ -1,259 +0,0 @@
-<!--  -->
-<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>PortUsage_Test_Depl</label>
-  <UUID>PortUsage_Test_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Test_PortUsageStateComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>StateComponent_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>StateComponent_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ConnectorImplementation">
-    <name>ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="PortUsageState_Connector_ExecArtifact" />
-    <artifact xmi:idref="PortUsageState_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_PortUsageState_Test_PortUsageTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageState_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageState_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ComponentInstance">
-    <name>ComponentInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>portusage_assignment</name>
-      <value>
-        <type>
-          <kind>tk_enum</kind>
-          <enum>
-            <name>PORT_USAGE_ASSIGNMENT</name>
-            <typeId>IDL:PORT_USAGE_ASSIGNMENT:1.0</typeId>
-            <member>PORTUSAGE_ASSIGNMENT_WRITE</member>
-            <member>PORTUSAGE_ASSIGNMENT_GET</member>
-            <member>PORTUSAGE_ASSIGNMENT_LISTEN</member>
-            <member>PORTUSAGE_ASSIGNMENT_UPDATE</member>
-            <member>PORTUSAGE_ASSIGNMENT_READ</member>
-            <member>PORTUSAGE_ASSIGNMENT_STATELISTEN</member>
-          </enum>
-        </type>
-        <value>
-          <enum>PORTUSAGE_ASSIGNMENT_STATELISTEN</enum>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ConnectorInstance">
-    <name>ConnectorInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsage_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- a writer is need to force an on_subscription_matched -->
-  <connection>
-    <name>update_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>update_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>state_listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>state_listen_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="PortUsageState_Connector_ExecArtifact">
-    <name>PortUsageState_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="PortUsageState_Connector_SvntArtifact">
-    <name>PortUsageState_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="PortUsageState_Connector_StubArtifact">
-    <name>PortUsageState_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>StateComponent_exec</name>
-    <source/>
-    <node/>
-    <location>StateComponent_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>StateComponent_svnt</name>
-    <source/>
-    <node/>
-    <location>StateComponent_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Update.cdp b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Update.cdp
deleted file mode 100644
index da83275473d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/State_Update.cdp
+++ /dev/null
@@ -1,259 +0,0 @@
-<!--  -->
-<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>PortUsage_Test_Depl</label>
-  <UUID>PortUsage_Test_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Test_PortUsageStateComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>StateComponent_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>StateComponent_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ConnectorImplementation">
-    <name>ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="PortUsageState_Connector_ExecArtifact" />
-    <artifact xmi:idref="PortUsageState_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_PortUsageState_Test_PortUsageTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_PortUsageState_Test_PortUsageTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageState_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsageState_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ComponentInstance">
-    <name>ComponentInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>portusage_assignment</name>
-      <value>
-        <type>
-          <kind>tk_enum</kind>
-          <enum>
-            <name>PORT_USAGE_ASSIGNMENT</name>
-            <typeId>IDL:PORT_USAGE_ASSIGNMENT:1.0</typeId>
-            <member>PORTUSAGE_ASSIGNMENT_WRITE</member>
-            <member>PORTUSAGE_ASSIGNMENT_GET</member>
-            <member>PORTUSAGE_ASSIGNMENT_LISTEN</member>
-            <member>PORTUSAGE_ASSIGNMENT_UPDATE</member>
-            <member>PORTUSAGE_ASSIGNMENT_READ</member>
-            <member>PORTUSAGE_ASSIGNMENT_STATELISTEN</member>
-          </enum>
-        </type>
-        <value>
-          <enum>PORTUSAGE_ASSIGNMENT_UPDATE</enum>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ConnectorInstance">
-    <name>ConnectorInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PortUsage_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>update_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>update_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!-- a reader is need to force an on_publication_matched -->
-  <connection>
-    <name>read_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>read_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="PortUsageState_Connector_ExecArtifact">
-    <name>PortUsageState_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="PortUsageState_Connector_SvntArtifact">
-    <name>PortUsageState_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="PortUsageState_Connector_StubArtifact">
-    <name>PortUsageState_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>PortUsageState_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>StateComponent_exec</name>
-    <source/>
-    <node/>
-    <location>StateComponent_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>StateComponent_svnt</name>
-    <source/>
-    <node/>
-    <location>StateComponent_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl
deleted file mode 100755
index 2fe18b6d1d0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/descriptors/run_test.pl
+++ /dev/null
@@ -1,216 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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 = 1;
-@ports = ( 60001 );
-@iorbases = ( "NodeApp1.ior" );
-@iorfiles = 0;
-@nodenames = ( "ComponentNode" );
-
-# 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;
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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 node daemon\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        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;
-}
-
-if ($#ARGV == -1) {
-    opendir(DIR, ".");
-    @files = grep(/\.cdp$/,readdir(DIR));
-    closedir(DIR);
-}
-else {
-    @files = @ARGV;
-}
-
-create_targets ();
-init_ior_files ();
-
-foreach $file (@files) {
-    print "*********** Starting test for deployment $file ***********\n";
-
-    print STDERR "Starting Naming Service\n";
-
-    $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-    $NS->Spawn ();
-
-    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 daemons\n";
-        kill_open_processes ();
-        exit 1;
-    }
-
-    $daemons_running = 1;
-
-    # Invoke execution manager.
-    print "Invoking execution manager\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";
-    $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                      "-x $file -k file://$ior_emfile");
-    $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ());
-
-    print "Sleeping 60 seconds to allow task to complete\n";
-    sleep (60);
-
-    print "Teardown the application\n";
-    $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                      "-k file://$ior_emfile -x $file -s");
-    $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ());
-    print "Executor finished.\n";
-
-    delete_ior_files ();
-    kill_open_processes ();
-}
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl
deleted file mode 100644
index 8f0e65bbb1a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file Proxy_RW_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef PROXY_RW_TEST_BASE_IDL
-#define PROXY_RW_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/Proxy_RW_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/Proxy_RW_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "ProxyReadWriteTest"
-#pragma DCPS_DATA_KEY "ProxyReadWriteTest key"
-
-struct ProxyReadWriteTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<ProxyReadWriteTest> ProxyReadWriteTestSeq;
-#endif
-
-#endif /* PROXY_RW_TEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.mpc
deleted file mode 100644
index d399d3e68b1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (Proxy_RW_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = Proxy_RW_Test_Base_stub
-  dynamicflags += PROXY_RW_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=PROXY_RW_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=Proxy_RW_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Proxy_RW_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=PROXY_RW_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Proxy_RW_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.idl
deleted file mode 100644
index d2af2883d1f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.idl
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * @file Reader_Starter.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef READER_STARTER_IDL
-#define READER_STARTER_IDL
-
-#pragma ciao lem "Base/Reader_StarterE.idl"
-
-interface ReaderStarter
-{
-  enum assignment {
-    READ_USING_IDL_PROXY,
-    TAKE_USING_IDL_PROXY,
-    READ_USING_CPP_PROXY,
-    TAKE_USING_CPP_PROXY
-  };
-  void start_read (in assignment task);
-  void set_reader_properties (in unsigned short nr_keys,
-                              in unsigned short nr_iterations);
-};
-
-interface WriterRestarter
-{
-  void restart_write (in ReaderStarter::assignment task);
-};
-
-#endif /* SAMPLE_INFO_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.mpc
deleted file mode 100644
index f5d4f9fb784..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.mpc
+++ /dev/null
@@ -1,110 +0,0 @@
-project(RW_RW_Reader_Starter_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after +=
-  idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
-              -Wb,stub_export_include=Reader_Starter_stub_export.h \
-              -Wb,skel_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,skel_export_include=Reader_Starter_svnt_export.h \
-              -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,svnt_export_include=Reader_Starter_svnt_export.h \
-              -Wb,exec_export_macro=READER_STARTER_EXEC_Export \
-              -Wb,exec_export_include=Reader_Starter_exec_export.h -I..
-
-  IDL_Files {
-    Reader_Starter.idl
-  }
-}
-
-project(RW_Reader_Starter_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += RW_RW_Reader_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \
-              -Wb,stub_export_include=RW_Reader_Starter_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Reader_StarterE.idl
-  }
-}
-
-project(RW_Reader_Starter_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += RW_Reader_Starter_lem_gen RW_Reader_Starter_stub
-  libs  += RW_Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = RW_Reader_Starter_lem_stub
-  dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterEC.cpp
-  }
-
-  Header_Files {
-    Reader_StarterEC.h
-    Reader_Starter_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_StarterEC.inl
-  }
-}
-
-project(RW_Reader_Starter_stub) : ccm_stub, dds4ccm_base {
-  after += RW_RW_Reader_Starter_idl_gen
-  libs  +=
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = RW_Reader_Starter_stub
-  dynamicflags += READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterC.cpp
-  }
-
-  Header_Files {
-    Reader_StarterC.h
-    Reader_Starter_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_StarterC.inl
-  }
-}
-
-
-project(RW_Reader_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   RW_Reader_Starter_lem_stub RW_Reader_Starter_stub
-  sharedname  = RW_Reader_Starter_svnt
-  libs       += RW_Reader_Starter_stub RW_Reader_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += READER_STARTER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterS.cpp
-    Reader_Starter_svnt.cpp
-  }
-
-  Header_Files {
-    Reader_StarterS.h
-    Reader_Starter_svnt.h
-    Reader_Starter_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.idl
deleted file mode 100644
index 57ce9775dcf..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file Proxy_RW_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef PROXY_RW_TEST_CONNECTOR_IDL_
-#define PROXY_RW_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Proxy_RW_Test_Base.idl"
-
-#pragma ciao lem "Connector/Proxy_RW_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Proxy_RW_Test_BaseTypeSupport.idl"
-#endif
-
-module Proxy_RW_Test
-{
-  module ::CCM_DDS::Typed < ::ProxyReadWriteTest, ::ProxyReadWriteTestSeq> ProxyReadWriteTestConnector;
-};
-
-#endif /* Reader_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc
deleted file mode 100644
index e29d85dabe9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p Proxy_RW_Test_Base -l .. -o ../lib -u DDS Proxy_RW_Test_Connector"
-
-project(Proxy_RW_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen Proxy_RW_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=PROXY_RW_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Proxy_RW_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=PROXY_RW_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Proxy_RW_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=PROXY_RW_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Proxy_RW_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=PROXY_RW_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Proxy_RW_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Proxy_RW_Test_Connector.idl
-  }
-}
-
-project(Proxy_RW_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += Proxy_RW_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=PROXY_RW_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Proxy_RW_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Proxy_RW_Test_ConnectorE.idl
-  }
-}
-
-project(Proxy_RW_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += Proxy_RW_Test_Connector_lem_gen Proxy_RW_Test_Connector_stub Proxy_RW_Test_Base_stub
-  libs  += Proxy_RW_Test_Base_stub Proxy_RW_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Proxy_RW_Test_Connector_lem_stub
-  dynamicflags += PROXY_RW_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Proxy_RW_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Proxy_RW_Test_ConnectorEC.h
-    Proxy_RW_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Proxy_RW_Test_ConnectorEC.inl
-  }
-}
-
-project(Proxy_RW_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += Proxy_RW_Test_Connector_idl_gen Proxy_RW_Test_Base_stub
-  libs  += Proxy_RW_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Proxy_RW_Test_Connector_stub
-  dynamicflags += PROXY_RW_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Proxy_RW_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Proxy_RW_Test_ConnectorC.h
-    Proxy_RW_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Proxy_RW_Test_ConnectorC.inl
-  }
-}
-
-project(Proxy_RW_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += Proxy_RW_Test_Connector_lem_stub Proxy_RW_Test_Connector_stub Proxy_RW_Test_Base_stub
-  sharedname = Proxy_RW_Test_Connector_exec
-  libs += Proxy_RW_Test_Connector_stub Proxy_RW_Test_Connector_lem_stub Proxy_RW_Test_Base_stub Proxy_RW_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += PROXY_RW_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Proxy_RW_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Proxy_RW_Test_Connector_conn.h
-    Proxy_RW_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(Proxy_RW_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += Proxy_RW_Test_Connector_lem_stub Proxy_RW_Test_Connector_exec Proxy_RW_Test_Connector_stub
-  sharedname  = Proxy_RW_Test_Connector_svnt
-  libs       += Proxy_RW_Test_Connector_stub \
-                Proxy_RW_Test_Connector_lem_stub  \
-                Proxy_RW_Test_Base_stub \
-                Proxy_RW_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += PROXY_RW_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Proxy_RW_Test_ConnectorS.cpp
-    Proxy_RW_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Proxy_RW_Test_ConnectorS.h
-    Proxy_RW_Test_Connector_svnt.h
-    Proxy_RW_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.idl
deleted file mode 100644
index 0a8fab4e505..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file Proxy_RW_Test_Receiver.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Proxy_RW_Test_Connector.idl"
-#include "Base/Reader_Starter.idl"
-
-module Proxy_RW_Test
-{
-  component Receiver
-  {
-    port ProxyReadWriteTestConnector::DDS_Listen info_out;
-
-    provides ReaderStarter reader_start;
-    uses WriterRestarter writer_restart;
-  };
-};
-
-#endif /* RECEIVER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.mpc
deleted file mode 100644
index 7fb6136a015..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.mpc
+++ /dev/null
@@ -1,155 +0,0 @@
-project(Proxy_RW_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += Proxy_RW_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 {
-    Proxy_RW_Test_Receiver.idl
-  }
-}
-
-project(Proxy_RW_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += Proxy_RW_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 {
-    Proxy_RW_Test_ReceiverE.idl
-  }
-}
-
-project(Proxy_RW_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += Proxy_RW_Test_Receiver_lem_gen Proxy_RW_Test_Receiver_stub  \
-           Proxy_RW_Test_Connector_stub Proxy_RW_Test_Base_stub \
-           RW_Reader_Starter_stub
-  libs  +=  Receiver_stub Proxy_RW_Test_Connector_stub \
-            Proxy_RW_Test_Base_stub RW_Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Proxy_RW_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Proxy_RW_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Proxy_RW_Test_ReceiverEC.inl
-  }
-}
-
-project(Proxy_RW_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += Proxy_RW_Test_Receiver_idl_gen  Proxy_RW_Test_Connector_stub \
-           Proxy_RW_Test_Base_stub Proxy_RW_Test_Connector_lem_gen \
-           RW_Reader_Starter_stub RW_Reader_Starter_lem_stub
-  libs  += Proxy_RW_Test_Connector_stub Proxy_RW_Test_Base_stub \
-           RW_Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Proxy_RW_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Proxy_RW_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Proxy_RW_Test_ReceiverC.inl
-  }
-}
-
-project(Proxy_RW_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub, dds4ccm_impl {
-  after   += Proxy_RW_Test_Receiver_lem_stub Proxy_RW_Test_Receiver_stub \
-             Proxy_RW_Test_Base_stub Proxy_RW_Test_Connector_stub \
-             Proxy_RW_Test_Connector_lem_stub \
-             RW_Reader_Starter_lem_stub RW_Reader_Starter_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub Proxy_RW_Test_Base_stub \
-          Proxy_RW_Test_Connector_stub Proxy_RW_Test_Connector_lem_stub \
-          RW_Reader_Starter_lem_stub RW_Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Proxy_RW_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Proxy_RW_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(Proxy_RW_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   Proxy_RW_Test_Receiver_lem_stub Proxy_RW_Test_Base_stub \
-                  Proxy_RW_Test_Connector_stub Proxy_RW_Test_Connector_svnt \
-                  Proxy_RW_Test_Receiver_exec Proxy_RW_Test_Connector_lem_stub \
-                  RW_Reader_Starter_stub \
-                  RW_Reader_Starter_svnt RW_Reader_Starter_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub Proxy_RW_Test_Base_stub \
-                Proxy_RW_Test_Connector_stub Proxy_RW_Test_Connector_svnt \
-                Receiver_exec Proxy_RW_Test_Connector_lem_stub \
-                RW_Reader_Starter_stub RW_Reader_Starter_svnt \
-                RW_Reader_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Proxy_RW_Test_ReceiverS.cpp
-    Proxy_RW_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Proxy_RW_Test_ReceiverS.h
-    Proxy_RW_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.cpp
deleted file mode 100644
index 51430bbe7c4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,584 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Proxy_RW_Test_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#include "Connector/Proxy_RW_Test_Connector_conn.h"
-#include "dds4ccm/impl/Utils.h"
-
-namespace CIAO_Proxy_RW_Test_Receiver_Impl
-{
-  /**
-   * Start Handler using IDL Proxy to Read
-   */
-
-  StartHandlerIdlProxyRead::StartHandlerIdlProxyRead (Receiver_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  StartHandlerIdlProxyRead::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.start_read_using_idl_proxy ();
-    return 0;
-  }
-
-  /**
-   * Start Handler using CPP Proxy to Take
-   */
-
-  StartHandlerIdlProxyTake::StartHandlerIdlProxyTake (Receiver_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  StartHandlerIdlProxyTake::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.start_take_using_idl_proxy ();
-    return 0;
-  }
-
-  /**
-   * Check last
-   */
-  LastSampleChecker::LastSampleChecker (Receiver_exec_i &callback,
-                                        const ::ReaderStarter::assignment &task,
-                                        const ::CORBA::UShort &iterations)
-    : callback_ (callback)
-      , task_ (task)
-      , iterations_ (iterations)
-  {
-  }
-
-  LastSampleChecker::~LastSampleChecker ()
-  {
-  }
-
-  int
-  LastSampleChecker::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Checking if last sample "
-                          "is available in DDS...\n"));
-    if (this->callback_.check_last (this->iterations_ + (this->iterations_ * this->task_)))
-      {
-        this->callback_.start_task (this->task_);
-      }
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::Proxy_RW_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Proxy_RW_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::Proxy_RW_Test::ProxyReadWriteTestConnector::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::ProxyReadWriteTest & /* datum */,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::ProxyReadWriteTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::Proxy_RW_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Proxy_RW_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: reader_start_exec_i
-   */
-
-  reader_start_exec_i::reader_start_exec_i (
-        ::Proxy_RW_Test::CCM_Receiver_Context_ptr ctx,
-        Receiver_exec_i &callback)
-    : ciao_context_ (
-        ::Proxy_RW_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  reader_start_exec_i::~reader_start_exec_i (void)
-  {
-  }
-
-  // Operations from ::ReaderStarter
-
-  void
-  reader_start_exec_i::start_read (::ReaderStarter::assignment task)
-  {
-    this->callback_.start_read (task);
-  }
-
-  void
-  reader_start_exec_i::set_reader_properties (::CORBA::UShort nr_keys,
-  ::CORBA::UShort nr_iterations)
-  {
-    this->callback_.keys (nr_keys);
-    this->callback_.iterations (nr_iterations);
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : iterations_ (0)
-      , keys_ (0)
-      , checker_ (0)
-  {
-    ACE_NEW_THROW_EX (this->rh_idl_read_,
-                      StartHandlerIdlProxyRead (*this),
-                      ::CORBA::NO_MEMORY ());
-    ACE_NEW_THROW_EX (this->rh_idl_take_,
-                      StartHandlerIdlProxyTake (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-    delete this->rh_idl_read_;
-    delete this->rh_idl_take_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  bool
-  Receiver_exec_i::check_last (const ::CORBA::UShort &iteration_to_check)
-  {
-    ::Proxy_RW_Test::ProxyReadWriteTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data ();
-    try
-      {
-        ProxyReadWriteTest datum;
-        ::CCM_DDS::ReadInfo readinfo;
-        char key[10];
-        ACE_OS::sprintf (key, "KEY_%d", this->keys_);
-        datum.key = CORBA::string_dup (key);
-        reader->read_one_last (
-                datum,
-                readinfo,
-                ::DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - "
-                              "last iteration <%02d> - <%02d>\n",
-                               datum.iteration,
-                               iteration_to_check));
-        return datum.iteration >= iteration_to_check;
-      }
-    catch (const ::CCM_DDS::InternalError &)
-      {
-      }
-    catch (const ::CCM_DDS::NonExistent &)
-      {
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: "
-                              "ERROR: Unexpected exception caught\n"));
-      }
-    return false;
-  }
-
-  void
-  Receiver_exec_i::check_samples (const ProxyReadWriteTestSeq & data,
-                                  ::ReaderStarter::assignment task)
-  {
-    for (::CORBA::ULong i = 0; i < data.length (); ++i)
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_samples - "
-                  "Received sample: key <%C> - iteration <%u>\n",
-                  data[i].key.in (),
-                  data[i].iteration));
-        //TODO Check for invalid iterataions
-      }
-    WriterRestarter_var restarter =
-      this->ciao_context_->get_connection_writer_restart ();
-    if (!::CORBA::is_nil (restarter.in ()))
-      {
-        if (task == ::ReaderStarter::READ_USING_IDL_PROXY)
-          {
-            ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_samples - "
-                      "Inform the Sender that is should write the next bunch.\n"));
-            restarter->restart_write (::ReaderStarter::TAKE_USING_IDL_PROXY);
-          }
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_samples - "
-                  "ERROR: Restarter is nil\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::start_read (::ReaderStarter::assignment task)
-  {
-    if (this->checker_)
-      {
-        this->reactor ()->cancel_timer (this->checker_);
-        delete this->checker_;
-        this->checker_ = 0;
-      }
-    ACE_NEW_THROW_EX (this->checker_,
-                      LastSampleChecker (*this,
-                                         task,
-                                         this->iterations_),
-                      ::CORBA::NO_MEMORY ());
-    this->schedule_timer ();
-  }
-
-  void
-  Receiver_exec_i::start_task (::ReaderStarter::assignment task)
-  {
-    if (this->checker_)
-      {
-        this->reactor ()->cancel_timer (this->checker_);
-        delete this->checker_;
-        this->checker_ = 0;
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::start_task - "
-                  "Timer canceled and deleted.\n"));
-      }
-    if (task == ::ReaderStarter::READ_USING_IDL_PROXY)
-      {
-        this->reactor ()->notify (this->rh_idl_read_);
-      }
-    else if (task == ::ReaderStarter::TAKE_USING_IDL_PROXY)
-      {
-        this->reactor ()->notify (this->rh_idl_take_);
-      }
-  }
-
-  void
-  Receiver_exec_i::schedule_timer (void)
-  {
-    if (this->reactor ()->schedule_timer (this->checker_,
-                                          0,
-                                          ACE_Time_Value (1, 0),
-                                          ACE_Time_Value (1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::schedule_timer - "
-                  "ERROR: Error while starting LastSampleChecker\n"));
-      }
-  }
-
-  Receiver_exec_i::TypedDataReader::_ptr_type
-  Receiver_exec_i::get_typed_idl_reader (void)
-  {
-    TypedDataReader::_var_type idl_reader;
-    ::DDS::DataReader_var dds_dr =
-      this->ciao_context_->get_connection_info_out_dds_entity ();
-
-    if (::CORBA::is_nil (dds_dr.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::get_typed_idl_reader - "
-                    "DataReader connection is NIL.\n"));
-        return TypedDataReader::_nil ();
-      }
-
-    ::CIAO::DDS4CCM::CCM_DataReader * ccm_dr =
-      dynamic_cast < ::CIAO::DDS4CCM::CCM_DataReader * > (dds_dr.in ());
-
-    if (ccm_dr)
-      {
-        ::DDS::DataReader_var tmp = ccm_dr->get_dds_entity ();
-        if (! ::CORBA::is_nil (tmp.in ()))
-          {
-            idl_reader =
-              ::CIAO_Proxy_RW_Test_ProxyReadWriteTestConnector_DDS_Event_Impl
-              ::ProxyReadWriteTest_DDS_Traits::typed_reader_type::_narrow (tmp.in ());
-            return idl_reader._retn ();
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_typed_idl_reader - "
-                      "ERROR: CCM DataReader returned NIL as DDS entity\n"));
-            return TypedDataReader::_nil ();
-          }
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_typed_idl_reader - "
-                  "ERROR: Unable to cast to CCM DataReader\n"));
-        return TypedDataReader::_nil ();
-      }
-  }
-
-  void
-  Receiver_exec_i::start_read_using_idl_proxy (void)
-  {
-    TypedDataReader::_var_type idl_reader = this->get_typed_idl_reader ();
-
-    if (!::CORBA::is_nil (idl_reader.in ()))
-      {
-
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::start_read_using_idl_proxy - "
-                  "Start reading."));
-        // Start to read
-        ProxyReadWriteTestSeq data;
-        ::DDS::SampleInfoSeq  info;
-
-        ::DDS::ReturnCode_t retcode = idl_reader->read (data,
-                                                        info,
-                                                        ::DDS::LENGTH_UNLIMITED,
-                                                        ::DDS::NOT_READ_SAMPLE_STATE,
-                                                        ::DDS::ANY_VIEW_STATE,
-                                                        ::DDS::ALIVE_INSTANCE_STATE);
-        if (retcode == ::DDS::RETCODE_OK)
-          {
-            this->check_samples (data,
-                                 ::ReaderStarter::READ_USING_IDL_PROXY);
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::start_read_using_idl_proxy - "
-                      "ERROR: Error during read: <%C>\n",
-                      ::CIAO::DDS4CCM::translate_retcode (retcode)));
-          }
-      }
-  }
-
-  void
-  Receiver_exec_i::start_take_using_idl_proxy (void)
-  {
-    TypedDataReader::_var_type idl_reader = this->get_typed_idl_reader ();
-
-    if (!::CORBA::is_nil (idl_reader.in ()))
-      {
-        // Start to read
-        ProxyReadWriteTestSeq data;
-        ::DDS::SampleInfoSeq  info;
-
-        ::DDS::ReturnCode_t retcode = idl_reader->take (data,
-                                                        info,
-                                                        ::DDS::LENGTH_UNLIMITED,
-                                                        ::DDS::NOT_READ_SAMPLE_STATE,
-                                                        ::DDS::ANY_VIEW_STATE,
-                                                        ::DDS::ALIVE_INSTANCE_STATE);
-        if (retcode == ::DDS::RETCODE_OK)
-          {
-            this->check_samples (data,
-                                 ::ReaderStarter::TAKE_USING_IDL_PROXY);
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::start_read_using_idl_proxy - "
-                      "ERROR: Error during read: <%C>\n",
-                      ::CIAO::DDS4CCM::translate_retcode (retcode)));
-          }
-      }
-  }
-
-  void
-  Receiver_exec_i::keys (::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  void
-  Receiver_exec_i::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-  // Component attributes and port operations.
-
-  ::Proxy_RW_Test::ProxyReadWriteTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in ()),
-            ::Proxy_RW_Test::ProxyReadWriteTestConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::Proxy_RW_Test::ProxyReadWriteTestConnector::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  ::CCM_ReaderStarter_ptr
-  Receiver_exec_i::get_reader_start (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_reader_start_.in ()))
-      {
-        reader_start_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          reader_start_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_ReaderStarter::_nil ());
-
-          this->ciao_reader_start_ = tmp;
-      }
-
-    return
-      ::CCM_ReaderStarter::_duplicate (
-        this->ciao_reader_start_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Proxy_RW_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Proxy_RW_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/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.h
deleted file mode 100644
index d6d49b11553..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.h
+++ /dev/null
@@ -1,280 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_PROXY_RW_TEST_RECEIVER_EXEC_IWMK2R_H_
-#define CIAO_PROXY_RW_TEST_RECEIVER_EXEC_IWMK2R_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Proxy_RW_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include "Connector/Proxy_RW_Test_Connector_conn.h"
-
-namespace CIAO_Proxy_RW_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  /**
-   * LastSampleChecker
-   */
-  class LastSampleChecker
-    : public ACE_Event_Handler
-  {
-  public:
-    LastSampleChecker (Receiver_exec_i &callback,
-                       const ::ReaderStarter::assignment &task,
-                       const ::CORBA::UShort &iterations);
-
-    virtual ~LastSampleChecker (void);
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Receiver_exec_i &callback_;
-    const ::ReaderStarter::assignment task_;
-    const ::CORBA::UShort iterations_;
-
-  };
-
-  /**
-   * Start Handler using IDL Proxy to Read
-   */
-
-  class StartHandlerIdlProxyRead :
-    public ACE_Event_Handler
-  {
-  public:
-    StartHandlerIdlProxyRead (Receiver_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Start Handler using IDL Proxy to Take
-   */
-
-  class StartHandlerIdlProxyTake :
-    public ACE_Event_Handler
-  {
-  public:
-    StartHandlerIdlProxyTake (Receiver_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::Proxy_RW_Test::ProxyReadWriteTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::Proxy_RW_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from Proxy_RW_Test::ProxyReadWriteTestConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::ProxyReadWriteTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::ProxyReadWriteTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::Proxy_RW_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::Proxy_RW_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Proxy_RW_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: reader_start_exec_i
-   */
-
-  class reader_start_exec_i
-    : public virtual ::CCM_ReaderStarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    reader_start_exec_i (
-      ::Proxy_RW_Test::CCM_Receiver_Context_ptr ctx,
-      Receiver_exec_i &callback);
-    virtual ~reader_start_exec_i (void);
-
-    //@{
-    /** Operations and attributes from ReaderStarter. */
-
-    virtual
-    void start_read (::ReaderStarter::assignment task);
-
-    virtual
-    void set_reader_properties (::CORBA::UShort nr_keys,
-    ::CORBA::UShort nr_iterations);
-    //@}
-
-  private:
-    ::Proxy_RW_Test::CCM_Receiver_Context_var ciao_context_;
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    typedef ::CIAO_Proxy_RW_Test_ProxyReadWriteTestConnector_DDS_Event_Impl
-            ::ProxyReadWriteTest_DDS_Traits::typed_reader_type
-            TypedDataReader;
-
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::Proxy_RW_Test::ProxyReadWriteTestConnector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CCM_ReaderStarter_ptr
-    get_reader_start (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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void keys (::CORBA::UShort keys);
-    void iterations (::CORBA::UShort iterations);
-
-    bool check_last (const ::CORBA::UShort &iteration_to_check);
-
-    void start_task (::ReaderStarter::assignment task);
-    void start_read (::ReaderStarter::assignment task);
-    void start_read_using_idl_proxy (void);
-    void start_take_using_idl_proxy (void);
-
-    //@}
-
-  private:
-    ::Proxy_RW_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::Proxy_RW_Test::ProxyReadWriteTestConnector::CCM_Listener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    ::CCM_ReaderStarter_var ciao_reader_start_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    ::CORBA::UShort iterations_;
-    ::CORBA::UShort keys_;
-
-    StartHandlerIdlProxyRead *rh_idl_read_;
-    StartHandlerIdlProxyTake *rh_idl_take_;
-
-    LastSampleChecker * checker_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void check_samples (const ProxyReadWriteTestSeq & data,
-                        ::ReaderStarter::assignment task);
-
-    void schedule_timer (void);
-    TypedDataReader::_ptr_type get_typed_idl_reader (void);
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Proxy_RW_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.idl
deleted file mode 100644
index f70bb9808a4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef PROXY_RW_TEST_SENDER_IDL
-#define PROXY_RW_TEST_SENDER_IDL
-
-#include "Connector/Proxy_RW_Test_Connector.idl"
-#include "Base/Reader_Starter.idl"
-
-module Proxy_RW_Test
-{
-  component Sender
-  {
-    port ProxyReadWriteTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
-
-    uses ReaderStarter start_reader;
-    provides WriterRestarter restart_writer;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif /* PROXY_RW_TEST_SENDER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.mpc
deleted file mode 100644
index 1a975f1dfa9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.mpc
+++ /dev/null
@@ -1,151 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p Proxy_RW_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(Proxy_RW_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += Proxy_RW_Test_Connector_idl_gen RW_Reader_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 {
-    Proxy_RW_Test_Sender.idl
-  }
-}
-
-project(Proxy_RW_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += Proxy_RW_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 {
-    Proxy_RW_Test_SenderE.idl
-  }
-}
-
-project(Proxy_RW_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += Proxy_RW_Test_Sender_lem_gen Proxy_RW_Test_Sender_stub \
-           Proxy_RW_Test_Base_stub RW_Reader_Starter_stub
-  libs  += Proxy_RW_Test_Base_stub Sender_stub RW_Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Proxy_RW_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    Proxy_RW_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Proxy_RW_Test_SenderEC.inl
-  }
-}
-
-project(Proxy_RW_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += Proxy_RW_Test_Sender_idl_gen Proxy_RW_Test_Base_stub \
-           Proxy_RW_Test_Connector_stub RW_Reader_Starter_stub \
-           RW_Reader_Starter_lem_stub
-  libs  += Proxy_RW_Test_Base_stub Proxy_RW_Test_Connector_stub \
-           RW_Reader_Starter_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Proxy_RW_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    Proxy_RW_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Proxy_RW_Test_SenderC.inl
-  }
-}
-
-project(Proxy_RW_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub, dds4ccm_impl {
-  after   += Proxy_RW_Test_Sender_lem_stub Proxy_RW_Test_Sender_stub \
-             Proxy_RW_Test_Connector_lem_stub Proxy_RW_Test_Connector_stub \
-             RW_Reader_Starter_svnt RW_Reader_Starter_lem_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub Proxy_RW_Test_Base_stub \
-             Proxy_RW_Test_Connector_lem_stub Proxy_RW_Test_Connector_stub \
-             RW_Reader_Starter_stub RW_Reader_Starter_svnt RW_Reader_Starter_lem_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Proxy_RW_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Proxy_RW_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(Proxy_RW_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += Proxy_RW_Test_Base_stub  Proxy_RW_Test_Sender_lem_stub \
-                Proxy_RW_Test_Connector_stub \
-                Proxy_RW_Test_Connector_svnt Proxy_RW_Test_Connector_lem_stub \
-                RW_Reader_Starter_stub RW_Reader_Starter_lem_stub RW_Reader_Starter_svnt
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub Proxy_RW_Test_Base_stub \
-                Proxy_RW_Test_Connector_stub Proxy_RW_Test_Connector_svnt \
-                Proxy_RW_Test_Connector_lem_stub RW_Reader_Starter_stub \
-                RW_Reader_Starter_lem_stub RW_Reader_Starter_svnt
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Proxy_RW_Test_SenderS.cpp
-    Proxy_RW_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Proxy_RW_Test_SenderS.h
-    Proxy_RW_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.cpp
deleted file mode 100644
index e895270cd84..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,420 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Proxy_RW_Test_Sender_exec.h"
-
-namespace CIAO_Proxy_RW_Test_Sender_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: restart_writer_exec_i
-   */
-
-  restart_writer_exec_i::restart_writer_exec_i (
-        ::Proxy_RW_Test::CCM_Sender_Context_ptr ctx,
-        Sender_exec_i &callback)
-    : ciao_context_ (
-        ::Proxy_RW_Test::CCM_Sender_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  restart_writer_exec_i::~restart_writer_exec_i (void)
-  {
-  }
-
-  // Operations from ::ReadGetRestarter
-
-  void
-  restart_writer_exec_i::restart_write (::ReaderStarter::assignment task)
-  {
-    this->callback_.restart_write (task);
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_connector_status_exec_i
-   */
-
-  info_out_connector_status_exec_i::info_out_connector_status_exec_i (
-        ::Proxy_RW_Test::CCM_Sender_Context_ptr ctx,
-        Sender_exec_i &callback)
-    : ciao_context_ (
-        ::Proxy_RW_Test::CCM_Sender_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  info_out_connector_status_exec_i::~info_out_connector_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-
-  void
-  info_out_connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */,
-  const ::DDS::InconsistentTopicStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleRejectedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_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)
-    : keys_ (0)
-      , iterations_ (0)
-      , done_ (false)
-      , ccm_activated_ (false)
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  Sender_exec_i::TypedDataWriter::_ptr_type
-  Sender_exec_i::get_typed_idl_writer (void)
-  {
-    TypedDataWriter::_var_type idl_writer;
-    ::DDS::DataWriter_var dds_dw =
-      this->ciao_context_->get_connection_info_write_dds_entity ();
-
-    if (::CORBA::is_nil (dds_dw.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::get_typed_idl_writer - "
-                    "Datawriter connection is NIL.\n"));
-        return TypedDataWriter::_nil ();
-      }
-
-    ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw =
-      dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dds_dw.in ());
-
-    if (ccm_dw)
-      {
-        ::DDS::DataWriter_var tmp = ccm_dw->get_dds_entity ();
-        if (! ::CORBA::is_nil (tmp.in ()))
-          {
-            idl_writer =
-              ::CIAO_Proxy_RW_Test_ProxyReadWriteTestConnector_DDS_Event_Impl
-              ::ProxyReadWriteTest_DDS_Traits::typed_writer_type::_narrow (tmp.in ());
-            return idl_writer._retn ();
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::get_typed_idl_writer - "
-                      "ERROR: CCM DataWriter returned NIL as DDS entity\n"));
-            return TypedDataWriter::_nil ();
-          }
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::get_typed_idl_writer - "
-                  "ERROR: Unable to cast to CCM DataWriter\n"));
-        return TypedDataWriter::_nil ();
-      }
-  }
-
-  void
-  Sender_exec_i::write_using_idl_proxy_for_read (void)
-  {
-    TypedDataWriter::_var_type idl_writer = this->get_typed_idl_writer ();
-
-    if (!::CORBA::is_nil (idl_writer.in ()))
-      {
-        ReaderStarter_var starter =
-          this->ciao_context_->get_connection_start_reader ();
-
-        if (! ::CORBA::is_nil (starter.in ()))
-          {
-            starter->set_reader_properties (this->keys_, this->iterations_);
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to start the sender\n")));
-            return;
-          }
-        for (CORBA::UShort iter_key = 1; iter_key < this->keys_ + 1; ++iter_key)
-          {
-            char key[7];
-            ProxyReadWriteTest *new_key = new ProxyReadWriteTest;
-            ACE_OS::sprintf (key, "KEY_%d", iter_key);
-            new_key->key = CORBA::string_dup(key);
-
-            const ::CORBA::UShort offset =
-              ::ReaderStarter::READ_USING_IDL_PROXY * this->iterations_ + 1;
-            for (CORBA::UShort iter = offset;
-                 iter < offset + this->iterations_;
-                 ++iter)
-              {
-                new_key->iteration = iter;
-                idl_writer->write (*new_key, ::DDS::HANDLE_NIL);
-                ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::write_using_idl_proxy_for_read - "
-                          "Written key <%C> with <%d>\n",
-                          key, iter));
-              }
-            delete new_key;
-          }
-        starter->start_read (::ReaderStarter::READ_USING_IDL_PROXY);
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::write_using_idl_proxy_for_read - "
-                  "ERROR: Error retrieving IDL DataWriter\n"));
-      }
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::write_using_idl_proxy_for_read - "
-              "Finished writing sample for read.\n"));
-  }
-
-  void
-  Sender_exec_i::write_using_idl_proxy_for_take (void)
-  {
-    TypedDataWriter::_var_type idl_writer = this->get_typed_idl_writer ();
-
-    if (!::CORBA::is_nil (idl_writer.in ()))
-      {
-        ReaderStarter_var starter =
-          this->ciao_context_->get_connection_start_reader ();
-
-        if (! ::CORBA::is_nil (starter.in ()))
-          {
-            starter->set_reader_properties (this->keys_, this->iterations_);
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to start the sender\n")));
-            return;
-          }
-        for (CORBA::UShort iter_key = 1; iter_key < this->keys_ + 1; ++iter_key)
-          {
-            char key[7];
-            ProxyReadWriteTest *new_key = new ProxyReadWriteTest;
-            ACE_OS::sprintf (key, "KEY_%d", iter_key);
-            new_key->key = CORBA::string_dup(key);
-
-            const ::CORBA::UShort offset =
-              ::ReaderStarter::TAKE_USING_IDL_PROXY * this->iterations_ + 1;
-            for (CORBA::UShort iter = offset;
-                 iter < offset + this->iterations_;
-                 ++iter)
-              {
-                new_key->iteration = iter;
-                idl_writer->write (*new_key, ::DDS::HANDLE_NIL);
-                ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::write_using_idl_proxy_for_take - "
-                          "Written key <%C> with <%d>\n",
-                          key, iter));
-              }
-            delete new_key;
-          }
-        starter->start_read (::ReaderStarter::TAKE_USING_IDL_PROXY);
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::write_using_idl_proxy_for_take - "
-                  "ERROR: Error retrieving IDL DataWriter\n"));
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    if (!this->done_ && this->ccm_activated_)
-      {
-        this->done_ = true;
-        this->write_using_idl_proxy_for_read ();
-      }
-  }
-
-  void
-  Sender_exec_i::restart_write (::ReaderStarter::assignment task)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::restart_write - "
-              "New assignment received <%d>", task));
-    if (task == ::ReaderStarter::TAKE_USING_IDL_PROXY)
-      {
-        this->write_using_idl_proxy_for_take ();
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_info_out_connector_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_connector_status_.in ()))
-      {
-        info_out_connector_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_connector_status_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_DDS::CCM_ConnectorStatusListener::_nil ());
-
-          this->ciao_info_out_connector_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate (
-        this->ciao_info_out_connector_status_.in ());
-  }
-
-  ::CCM_WriterRestarter_ptr
-  Sender_exec_i::get_restart_writer (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_restart_writer_.in ()))
-      {
-        restart_writer_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          restart_writer_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_WriterRestarter::_nil ());
-
-          this->ciao_restart_writer_ = tmp;
-      }
-
-    return
-      ::CCM_WriterRestarter::_duplicate (
-        this->ciao_restart_writer_.in ());
-  }
-
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Proxy_RW_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    this->ccm_activated_ = true;
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Proxy_RW_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/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.h
deleted file mode 100644
index fc357c79cd0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.h
+++ /dev/null
@@ -1,207 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_PROXY_RW_TEST_SENDER_EXEC_HWK1EN_H_
-#define CIAO_PROXY_RW_TEST_SENDER_EXEC_HWK1EN_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Proxy_RW_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include "Connector/Proxy_RW_Test_Connector_conn.h"
-
-namespace CIAO_Proxy_RW_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * Provider Executor Implementation Class: restart_writer_exec_i
-   */
-
-  class restart_writer_exec_i
-    : public virtual ::CCM_WriterRestarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    restart_writer_exec_i (
-      ::Proxy_RW_Test::CCM_Sender_Context_ptr ctx,
-      Sender_exec_i & callback);
-    virtual ~restart_writer_exec_i (void);
-
-    //@{
-    /** Operations and attributes from ReadGetRestarter. */
-
-    virtual
-    void restart_write (::ReaderStarter::assignment task);
-    //@}
-
-  private:
-    ::Proxy_RW_Test::CCM_Sender_Context_var ciao_context_;
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_connector_status_exec_i
-   */
-
-  class info_out_connector_status_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_connector_status_exec_i (
-      ::Proxy_RW_Test::CCM_Sender_Context_ptr ctx,
-      Sender_exec_i &callback);
-    virtual ~info_out_connector_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-    const ::DDS::InconsistentTopicStatus & status);
-
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedIncompatibleQosStatus & status);
-
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleRejectedStatus & status);
-
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedDeadlineMissedStatus & status);
-
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedIncompatibleQosStatus & status);
-
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind status_kind);
-    //@}
-
-  private:
-    ::Proxy_RW_Test::CCM_Sender_Context_var ciao_context_;
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    typedef ::CIAO_Proxy_RW_Test_ProxyReadWriteTestConnector_DDS_Event_Impl
-            ::ProxyReadWriteTest_DDS_Traits::typed_writer_type
-            TypedDataWriter;
-
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_info_out_connector_status (void);
-
-    virtual ::CCM_WriterRestarter_ptr
-    get_restart_writer (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-    void restart_write (::ReaderStarter::assignment task);
-    //@}
-
-  private:
-    ::Proxy_RW_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_info_out_connector_status_;
-    ::CCM_WriterRestarter_var ciao_restart_writer_;
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    bool done_;
-    bool ccm_activated_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void write_using_idl_proxy_for_read (void);
-    void write_using_idl_proxy_for_take (void);
-
-    TypedDataWriter::_ptr_type get_typed_idl_writer (void);
-    //@}
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Proxy_RW_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Plan.cdp
deleted file mode 100644
index af3d89f4e2b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Plan.cdp
+++ /dev/null
@@ -1,425 +0,0 @@
-<!--  -->
-<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>Proxy_RW_Test_Depl_1</label>
-  <UUID>Proxy_RW_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_Proxy_RW_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_Proxy_RW_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="Proxy_RW_Test_ConnectorComponentImplementation">
-    <name>Proxy_RW_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Proxy_RW_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Proxy_RW_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_Proxy_RW_Test_ProxyReadWriteTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Proxy_RW_Test_ProxyReadWriteTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Proxy_RW_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Proxy_RW_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_Proxy_RW_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_Proxy_RW_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="Proxy_RW_Test_ConnectorComponentInstance">
-    <name>Proxy_RW_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Proxy_RW_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Proxy_RW_Library#ProxyRWProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Proxy_RW_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Proxy_RW_Test_ConnectorComponentInstance2">
-    <name>Proxy_RW_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Proxy_RW_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Proxy_RW_Library#ProxyRWProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Proxy_RW_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_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_out_dds_entity</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Proxy_RW_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Proxy_RW_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_out_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Proxy_RW_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Proxy_RW_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>reader_starter</name>
-    <internalEndpoint>
-      <portName>start_reader</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>reader_start</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>restart_writer</name>
-    <internalEndpoint>
-      <portName>writer_restart</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>restart_writer</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </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="Proxy_RW_Test_Connector_ExecArtifact">
-    <name>Proxy_RW_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>Proxy_RW_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Proxy_RW_Test_Connector_SvntArtifact">
-    <name>Proxy_RW_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>Proxy_RW_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Proxy_RW_Test_Connector_StubArtifact">
-    <name>Proxy_RW_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>Proxy_RW_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/Proxies/ReadWrite/descriptors/Proxy_RW_Library.xml b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Proxy_RW_Library.xml
deleted file mode 100644
index 3ef510066e7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/Proxy_RW_Library.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="ProxyRWProfile">
-    <!-- QoS used to configure the data writer created in the example code -->
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index ffc32755202..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="Proxy_RW_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="ProxyRWProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/run_test.pl
deleted file mode 100755
index c5b1964e047..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/.gitignore b/CIAO/connectors/dds4ccm/tests/QosProfile/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl
deleted file mode 100644
index 9813ce3d75a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file QosProfile_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QOSPROFILE_TEST_BASE_IDL
-#define QOSPROFILE_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/QosProfile_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/QosProfile_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "QosProfileTest"
-#pragma DCPS_DATA_KEY "QosProfileTest symbol"
-
-struct QosProfileTest {
-  string symbol; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<QosProfileTest> QosProfileTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc
deleted file mode 100644
index da6d3f3b7d0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (QosProfile_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = QosProfile_Test_Base_stub
-  dynamicflags += COHERENT_WRITE_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=COHERENT_WRITE_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=QosProfile_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    QosProfile_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=COHERENT_WRITE_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    QosProfile_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl
deleted file mode 100644
index 5aec5157741..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COMPONENT_IDL
-#define COMPONENT_IDL
-
-#include "Connector/QosProfile_Test_Connector.idl"
-
-module QosProfile_Test
-{
-  component QosProfileComponent
-  {
-    port QosProfileTestConnector::DDS_Write info_write;
-  };
-};
-
-#endif /* COMPONENT_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc
deleted file mode 100644
index 20004d702df..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(QosProfile_Test_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += QosProfile_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Component_stub_export.h \
-              -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Component_svnt_export.h \
-              -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Component_svnt_export.h \
-              -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Component_exec_export.h -I..
-
-  IDL_Files {
-    QosProfile_Test_Component.idl
-  }
-}
-
-project(QosProfile_Test_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += QosProfile_Test_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    QosProfile_Test_ComponentE.idl
-  }
-}
-
-project(QosProfile_Test_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += QosProfile_Test_Component_lem_gen QosProfile_Test_Component_stub  \
-           QosProfile_Test_Connector_stub QosProfile_Test_Base_stub
-  libs  +=  Component_stub QosProfile_Test_Connector_stub \
-            QosProfile_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_lem_stub
-  dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QosProfile_Test_ComponentEC.cpp
-  }
-
-  Header_Files {
-    QosProfile_Test_ComponentEC.h
-    Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QosProfile_Test_ComponentEC.inl
-  }
-}
-
-project(QosProfile_Test_Component_stub) : ccm_stub, dds4ccm_base {
-  after += QosProfile_Test_Component_idl_gen  QosProfile_Test_Connector_stub \
-           QosProfile_Test_Base_stub QosProfile_Test_Connector_lem_gen
-  libs  += QosProfile_Test_Connector_stub QosProfile_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_stub
-  dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QosProfile_Test_ComponentC.cpp
-  }
-
-  Header_Files {
-    QosProfile_Test_ComponentC.h
-    Component_stub_export.h
-  }
-
-  Inline_Files {
-    QosProfile_Test_ComponentC.inl
-  }
-}
-
-project(QosProfile_Test_Component_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += QosProfile_Test_Component_lem_stub QosProfile_Test_Component_stub \
-             QosProfile_Test_Base_stub QosProfile_Test_Connector_stub \
-             QosProfile_Test_Connector_lem_stub 
-  sharedname = Component_exec
-  libs += Component_stub Component_lem_stub QosProfile_Test_Base_stub \
-          QosProfile_Test_Connector_stub QosProfile_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QosProfile_Test_Component_exec.cpp
-  }
-
-  Header_Files {
-    QosProfile_Test_Component_exec.h
-    Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QosProfile_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   QosProfile_Test_Component_lem_stub QosProfile_Test_Base_stub \
-                  QosProfile_Test_Connector_stub QosProfile_Test_Connector_svnt \
-                  QosProfile_Test_Component_exec QosProfile_Test_Connector_lem_stub 
-  sharedname  = Component_svnt
-  libs       += Component_stub Component_lem_stub QosProfile_Test_Base_stub \
-                QosProfile_Test_Connector_stub QosProfile_Test_Connector_svnt \
-                Component_exec QosProfile_Test_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QosProfile_Test_ComponentS.cpp
-    QosProfile_Test_Component_svnt.cpp
-  }
-
-  Header_Files {
-    QosProfile_Test_ComponentS.h
-    QosProfile_Test_Component_svnt.h
-    Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.cpp
deleted file mode 100644
index 868450365c9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// -*- C++ -*-
-#include "QosProfile_Test_Component_exec.h"
-
-namespace CIAO_QosProfile_Test_QosProfileComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  Component_exec_i::Component_exec_i (void)
-  {
-  }
-
-  Component_exec_i::~Component_exec_i (void)
-  {
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Component_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::QosProfile_Test::CCM_QosProfileComponent_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Component_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QosProfile_Test_Component_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Component_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h
deleted file mode 100644
index 0c5b8442e0c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COMPONENT_EXEC_H_
-#define CIAO_COMPONENT_EXEC_H_
-
-#include "QosProfile_Test_ComponentEC.h"
-
-#include /**/ "Component_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_QosProfile_Test_QosProfileComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  class COMPONENT_EXEC_Export Component_exec_i
-    : public virtual QosProfileComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Component_exec_i (void);
-    virtual ~Component_exec_i (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:
-    ::QosProfile_Test::CCM_QosProfileComponent_Context_var context_;
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QosProfile_Test_Component_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl
deleted file mode 100644
index d0ddb1d9a6c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file QosProfile_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QOS_PROFILE_TEST_CONNECTOR_IDL_
-#define QOS_PROFILE_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/QosProfile_Test_Base.idl"
-
-#pragma ciao lem "Connector/QosProfile_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/QosProfile_Test_BaseTypeSupport.idl"
-#endif
-
-module QosProfile_Test
-{
-  module ::CCM_DDS::Typed < ::QosProfileTest, ::QosProfileTestSeq> QosProfileTestConnector;
-};
-
-#endif /* QOS_PROFILE_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc
deleted file mode 100644
index 8f32d311e41..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p QosProfile_Test_Base -l .. -o ../lib -u DDS QosProfile_Test_Connector"
-
-project(QosProfile_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen QosProfile_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COHERENT_WRITE_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=QosProfile_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=COHERENT_WRITE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=QosProfile_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=COHERENT_WRITE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=QosProfile_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=COHERENT_WRITE_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=QosProfile_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    QosProfile_Test_Connector.idl
-  }
-}
-
-project(QosProfile_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += QosProfile_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COHERENT_WRITE_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=QosProfile_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    QosProfile_Test_ConnectorE.idl
-  }
-}
-
-project(QosProfile_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += QosProfile_Test_Connector_lem_gen QosProfile_Test_Connector_stub QosProfile_Test_Base_stub
-  libs  += QosProfile_Test_Base_stub QosProfile_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QosProfile_Test_Connector_lem_stub
-  dynamicflags += COHERENT_WRITE_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QosProfile_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    QosProfile_Test_ConnectorEC.h
-    QosProfile_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QosProfile_Test_ConnectorEC.inl
-  }
-}
-
-project(QosProfile_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += QosProfile_Test_Connector_idl_gen QosProfile_Test_Base_stub
-  libs  += QosProfile_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QosProfile_Test_Connector_stub
-  dynamicflags += COHERENT_WRITE_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QosProfile_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    QosProfile_Test_ConnectorC.h
-    QosProfile_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    QosProfile_Test_ConnectorC.inl
-  }
-}
-
-project(QosProfile_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += QosProfile_Test_Connector_lem_stub QosProfile_Test_Connector_stub QosProfile_Test_Base_stub
-  sharedname = QosProfile_Test_Connector_exec
-  libs += QosProfile_Test_Connector_stub QosProfile_Test_Connector_lem_stub QosProfile_Test_Base_stub QosProfile_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COHERENT_WRITE_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QosProfile_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    QosProfile_Test_Connector_conn.h
-    QosProfile_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QosProfile_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += QosProfile_Test_Connector_lem_stub QosProfile_Test_Connector_exec QosProfile_Test_Connector_stub
-  sharedname  = QosProfile_Test_Connector_svnt
-  libs       += QosProfile_Test_Connector_stub \
-                QosProfile_Test_Connector_lem_stub  \
-                QosProfile_Test_Base_stub \
-                QosProfile_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COHERENT_WRITE_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QosProfile_Test_ConnectorS.cpp
-    QosProfile_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    QosProfile_Test_ConnectorS.h
-    QosProfile_Test_Connector_svnt.h
-    QosProfile_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanMultipleHashes.cdp b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanMultipleHashes.cdp
deleted file mode 100644
index c3d16970d98..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanMultipleHashes.cdp
+++ /dev/null
@@ -1,206 +0,0 @@
-<!--  -->
-<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>QosProfile_Test_Depl_1</label>
-  <UUID>QosProfile_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ComponentComponentImplementation">
-    <name>ComponentComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QosProfile_Test_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QosProfile_Test_QosProfileComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="QosProfile_Test_ConnectorComponentImplementation">
-    <name>QosProfile_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="QosProfile_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="QosProfile_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_QosProfile_Test_QosProfileTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QosProfile_Test_QosProfileTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QosProfile_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QosProfile_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ComponentComponentInstance">
-    <name>ComponentComponent</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentComponentImplementation" />
-  </instance>
-  <instance xmi:id="QosProfile_Test_ConnectorComponentInstance">
-    <name>QosProfile_Test_ConnectorComponent</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QosProfile_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QosProfile_Library#QosProfile_Profile#TooMany</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QosProfile_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_write_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QosProfile_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="QosProfile_Test_Connector_ExecArtifact">
-    <name>QosProfile_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>QosProfile_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="QosProfile_Test_Connector_SvntArtifact">
-    <name>QosProfile_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>QosProfile_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="QosProfile_Test_Connector_StubArtifact">
-    <name>QosProfile_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>QosProfile_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanNoHash.cdp b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanNoHash.cdp
deleted file mode 100644
index 8bef833b7bc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanNoHash.cdp
+++ /dev/null
@@ -1,206 +0,0 @@
-<!--  -->
-<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>QosProfile_Test_Depl_1</label>
-  <UUID>QosProfile_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ComponentComponentImplementation">
-    <name>ComponentComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QosProfile_Test_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QosProfile_Test_QosProfileComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="QosProfile_Test_ConnectorComponentImplementation">
-    <name>QosProfile_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="QosProfile_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="QosProfile_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_QosProfile_Test_QosProfileTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QosProfile_Test_QosProfileTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QosProfile_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QosProfile_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ComponentComponentInstance">
-    <name>ComponentComponent</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentComponentImplementation" />
-  </instance>
-  <instance xmi:id="QosProfile_Test_ConnectorComponentInstance">
-    <name>QosProfile_Test_ConnectorComponent</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QosProfile_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QosProfile_Library::QosProfileProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QosProfile_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_write_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QosProfile_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="QosProfile_Test_Connector_ExecArtifact">
-    <name>QosProfile_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>QosProfile_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="QosProfile_Test_Connector_SvntArtifact">
-    <name>QosProfile_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>QosProfile_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="QosProfile_Test_Connector_StubArtifact">
-    <name>QosProfile_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>QosProfile_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanWrongNames.cdp b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanWrongNames.cdp
deleted file mode 100644
index b8525348547..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/PlanWrongNames.cdp
+++ /dev/null
@@ -1,206 +0,0 @@
-<!--  -->
-<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>QosProfile_Test_Depl_1</label>
-  <UUID>QosProfile_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ComponentComponentImplementation">
-    <name>ComponentComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QosProfile_Test_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QosProfile_Test_QosProfileComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="QosProfile_Test_ConnectorComponentImplementation">
-    <name>QosProfile_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="QosProfile_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="QosProfile_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_QosProfile_Test_QosProfileTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QosProfile_Test_QosProfileTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QosProfile_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QosProfile_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ComponentComponentInstance">
-    <name>ComponentComponent</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentComponentImplementation" />
-  </instance>
-  <instance xmi:id="QosProfile_Test_ConnectorComponentInstance">
-    <name>QosProfile_Test_ConnectorComponent</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QosProfile_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Wrong_Library#WrongProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QosProfile_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_write_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QosProfile_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="QosProfile_Test_Connector_ExecArtifact">
-    <name>QosProfile_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>QosProfile_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="QosProfile_Test_Connector_SvntArtifact">
-    <name>QosProfile_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>QosProfile_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="QosProfile_Test_Connector_StubArtifact">
-    <name>QosProfile_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>QosProfile_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/QosProfile_Library.xml b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/QosProfile_Library.xml
deleted file mode 100644
index f6b2c3c06d5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/QosProfile_Library.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="QosProfileProfile">
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-    </datawriter_qos>
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 7652e49300c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<dds xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <qos_library name="QosProfile_Library">
-    <qos_profile name="QosProfileProfile" is_default_qos="false">
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl
deleted file mode 100755
index d23862e4e88..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl
+++ /dev/null
@@ -1,229 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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 = 1;
-@ports = ( 60001 );
-@iorbases = ( "NodeApp1.ior" );
-@iorfiles = 0;
-@nodenames = ( "ComponentNode" );
-
-# 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;
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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 node daemon\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        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;
-}
-
-if ($#ARGV == -1) {
-    opendir(DIR, ".");
-    @files = grep(/\.cdp$/,readdir(DIR));
-    closedir(DIR);
-}
-else {
-    @files = @ARGV;
-}
-
-create_targets ();
-init_ior_files ();
-
-foreach $file (@files) {
-    print "*********** Starting test for deployment $file ***********\n";
-
-    print STDERR "Starting Naming Service\n";
-
-    $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-    $NS->Spawn ();
-
-    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 daemons\n";
-        kill_open_processes ();
-        exit 1;
-    }
-
-    $daemons_running = 1;
-
-    # Invoke execution manager.
-    print "Invoking execution manager\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 $file -k file://$ior_emfile -q");
-    $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-    if ($pl_status != 0) {
-        print STDERR "OK: dance_plan_launcher returned an error status ($pl_status)\n";
-        kill_open_processes ();
-    }
-    else {
-        print "ERROR : dance_plan_launcher didn't return with an error.\n";
-        $status=$pl_status;
-    }
-
-
-    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;
-        }
-    }
-
-    delete_ior_files ();
-    kill_open_processes ();
-}
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl
deleted file mode 100644
index de514308408..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.idl
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @file Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef BASE_IDL_
-#define BASE_IDL_
-
-struct QueryConditionTest {
-  string symbol; //@key
-  long iteration;
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc
deleted file mode 100644
index 351304a0a57..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc
+++ /dev/null
@@ -1,13 +0,0 @@
-project(QC_Base_stub) : ndds_ts_defaults, nddslib {
-  sharedname = QC_Base_stub
-  dynamicflags += NDDS_USER_DLL_EXPORT
-  libout = ../descriptors
-
-  NDDSTypeSupport_Files {
-    Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc
deleted file mode 100644
index 7a9b9e20b27..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc
+++ /dev/null
@@ -1,19 +0,0 @@
-project(*qc_receiver) : aceexe, nddslib, ndds_ts_defaults {
-  exename = DDS_receiver
-  after += QC_Base_stub
-
-  includes += ../Base
-
-  libs += QC_Base_stub
-  libpaths += ../descriptors
-
-  exeout += ../descriptors
-
-  Source_Files {
-    QC_Receiver.cpp
-  }
-
-  Header_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp
deleted file mode 100644
index 72620a0ce0f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/QC_Receiver.cpp
+++ /dev/null
@@ -1,418 +0,0 @@
-#include <stdio.h>
-#include <iostream>
-
-using namespace std;
-
-#include "Base.h"
-#include "BaseSupport.h"
-
-#include "ace/OS_main.h"
-#include "ace/OS_NS_stdlib.h"
-
-#define LIBRARY_NAME  "QueryCondition_Library"
-#define PROFILE_NAME  "QueryConditionProfile"
-
-bool shutdown_flag = false;
-long num_samples = 0;
-long received_samples = 0;
-long expected_samples_run1 = 1 * 2;    //only sample 2 should be received of 2 keys
-long expected_samples_run2 = 1 * 2;   //only sample 5 should be received o 2 keys
-long expected_samples_run3 = (9 - 2) * 2; //all samples 1-9 except sample 2 and 5 of both keys.
-
-DDSWaitSet* ws_ = new DDSWaitSet ();
-DDS_Duration_t dur_ = {9, 0};
-
-void sleep_now (int sleeptime)
-{
-#ifdef RTI_WIN32
-        Sleep(sleeptime * 1000);
-#else
-        sleep(sleeptime);
-#endif
-}
-
-void check_iter (const QueryConditionTest & sample,
-                   const DDS_SampleInfo & readinfo,
-                   const int & run)
-{
-  bool error = false;
-  if (run == 1)
-    {
-      //only sample 2 should be received
-      error = sample.iteration <= 1 && sample.iteration >= 3;
-    }
-  else if (run == 2)
-    {
-      //only samples 8 should be received
-      error = sample.iteration <= 4 && sample.iteration >= 6;
-    }
-  else if (run == 3)
-    {
-      //all other unread samples.
-      error = sample.iteration == 2;
-      error |= sample.iteration ==5;
-    }
-
-  error
-    ?
-    cerr << "ERROR Received: key <"
-        << sample.symbol
-        << "> - iteration <"
-        << sample.iteration
-        << ">"
-        << endl
-    :
-    cout << "Received: key <"
-        << sample.symbol
-        << "> - iteration <"
-        << sample.iteration
-        << "> - instance status <"
-        << readinfo.instance_state
-        << "> - view status <"
-        << readinfo.view_state
-        << "> - sample status <"
-        << readinfo.sample_state
-        << ">"
-        << endl;
-}
-
-
-void read (DDSDataReader * dr,
-           DDSQueryCondition * qc,
-           DDSReadCondition * rc,
-           const int & run)
-{
-  QueryConditionTestDataReader* typed_dr = QueryConditionTestDataReader::narrow (dr);
-
-  DDSConditionSeq cond;
-
-  if (ws_->wait (cond, dur_) == DDS_RETCODE_TIMEOUT)
-    {
-      cerr << "ERROR: wait timed out" << endl;
-    }
-  else
-    {
-      //wait a moment to allow DDS to write all samples we need here...
-      QueryConditionTestSeq data;
-      DDS_SampleInfoSeq     info_seq;
-      sleep_now (3);
-      for (DDS_Long i = 0; i < cond.length (); ++i)
-        {
-          if (run == 3)
-            {
-              sleep_now (10);
-              if (cond[i] == rc)
-                {
-                  received_samples = 0;
-
-                  //  **************  read all in one
-                  cout << "CHECKING..... SAMPLES with read_w_condition with readcondition:" << endl;
-                  typed_dr->read_w_condition (data,
-                                              info_seq,
-                                              DDS_LENGTH_UNLIMITED,
-                                              rc);
-                  for (DDS_Long y = 0; y < data.length (); ++y)
-                    {
-                      if (info_seq[y].valid_data)
-                        {
-                          check_iter (data[y], info_seq[y], run);
-                          received_samples ++;
-                        }
-                    }
-                  typed_dr->return_loan (data, info_seq);
-                  if (received_samples !=  expected_samples_run3)
-                    {
-                      cerr << "ERROR: run  3 unexpected number of samples received : "
-                           << "expected < "
-                           <<  expected_samples_run3 << "> - received <"
-                           << received_samples << ">" << endl;
-                    }
-                // end read all in one
-
-                }
-              else
-                {
-                  cerr << "ERROR: Should be woken up on ReadCondition" << endl;
-                }
-            }
-          else // run 1 and 2
-            {
-              if (cond[i] == qc)
-                {
-                  received_samples = 0;
-                  cout << "CHECKING..... SAMPLES with read_w_condition with querycondition:" << endl;
-                  typed_dr->read_w_condition (data,
-                                               info_seq,
-                                              DDS_LENGTH_UNLIMITED,
-                                              qc);
-                  for (DDS_Long i = 0; i < data.length (); ++i)
-                     {
-                       if (info_seq[i].valid_data)
-                         {
-                           check_iter (data[i], info_seq[i], run);
-                           received_samples ++;
-                         }
-                     }
-                   typed_dr->return_loan (data, info_seq);
-
-                  if (run == 1)
-                    {
-                      if (received_samples !=  expected_samples_run1)
-                        {
-                          cerr << "ERROR: run  1 unexpected number of samples received : "
-                          << "expected < "
-                          <<  expected_samples_run1 << "> - received <"
-                          << received_samples << ">" << endl;
-                        }
-                    }
-                  else
-                    {
-                      if (received_samples !=  expected_samples_run2)
-                        {
-                           cerr << "ERROR: run  2 unexpected number of samples received : "
-                           << "expected < "
-                           <<  expected_samples_run2 << "> - received <"
-                           << received_samples << ">" << endl;
-                        }
-                    }
-                 }
-              else
-                {
-                  cerr << "ERROR: Should be woken up on QueryCondition" << endl;
-                }
-             }
-        }
-      if (run != 3)
-        {
-        }
-
-    }
-
-  //check if all samples are still available.
-  if (run == 3)
-    {
-      QueryConditionTestSeq data;
-      DDS_SampleInfoSeq     info_seq;
-      sleep_now (3);
-      typed_dr->read (data,
-                      info_seq,
-                      DDS_LENGTH_UNLIMITED);
-      cout << "\nCHECKING..... TOTAL NUMBER OF SAMPLES IN DDS with a read : <"
-             << data.length ()
-             << ">"
-             << endl;
-      for (DDS_Long i = 0; i < data.length (); ++i)
-        {
-          cout << "Received: key <"
-              << data[i].symbol
-              << "> - iteration <"
-              << data[i].iteration
-              << "> - instance status <"
-              << info_seq[i].instance_state
-              << "> - view status <"
-              << info_seq[i].view_state
-              << "> - sample status <"
-              << info_seq[i].sample_state
-              << ">"
-              << endl;
-        }
-      if (data.length () != 18)
-        {
-          cerr << "ERROR: unexpected number of samples received : "
-          << "expected <18> - received <"
-          << data.length () << ">" << endl;
-        }
-      typed_dr->return_loan (data, info_seq);
-    }
-    sleep_now (5);
-}
-
-int clean_up (DDSDomainParticipant * participant)
-{
-  DDS_ReturnCode_t    retcode = DDS_RETCODE_OK;
-  int main_result = 0;
-
-  cout << "RECEIVER: Exiting ..." << endl;
-  if (participant) {
-    retcode = participant->delete_contained_entities();
-    if (retcode != DDS_RETCODE_OK) {
-      main_result = 1;
-    }
-    retcode = DDSDomainParticipantFactory::get_instance()->
-      delete_participant(participant);
-    if (retcode != DDS_RETCODE_OK) {
-      main_result = 1;
-    }
-  }
-  delete ws_;
-  DDSDomainParticipantFactory::finalize_instance ();
-  return main_result;
-}
-
-int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  DDSTopic*           topic = 0;
-  DDSDataReader*      data_reader = 0;
-  DDSSubscriber*      sub = 0;
-  DDS_ReturnCode_t    retcode = DDS_RETCODE_OK;
-  QueryConditionTestDataReader* typed_dr = 0;
-  DDSQueryCondition*  qc = 0;
-  DDSReadCondition*   rc = 0;
-  int run = 0;
-
-//     NDDS_Config_LogVerbosity n_verbosity =
-//       static_cast <NDDS_Config_LogVerbosity> (3);
-//     NDDSConfigLogger::get_instance()->set_verbosity (n_verbosity);
-
-  const ACE_TCHAR * env_domain_id = 0;
-  if (argc > 1)
-    {
-      env_domain_id = argv[1];
-    }
-  if (!env_domain_id)
-    {
-      printf ("Environment variable DEFAULT_DOMAIN_ID not set "
-              "=> setting it to 2\n");
-      env_domain_id = "2";
-    }
-  else
-    printf ("Domain ID set to %s\n", env_domain_id);
-
-  const int domain_id = ACE_OS::atoi (env_domain_id);
-  /* Create the domain participant on domain ID 0 */
-  DDSDomainParticipant *participant = DDSDomainParticipantFactory::get_instance()->
-      create_participant_with_profile (domain_id,    /* Domain ID */
-                                       LIBRARY_NAME, /* QoS */
-                                       PROFILE_NAME,
-                                       0,            /* Listener */
-                                       DDS_STATUS_MASK_NONE);
-  if (!participant) {
-    cerr << "RECEIVER: Error creating participant" << endl;
-    return 1;
-  }
-
-  retcode = QueryConditionTestTypeSupport::register_type(
-    participant, QueryConditionTestTypeSupport::get_type_name ());
-
-  if (retcode != DDS_RETCODE_OK) {
-    cerr << "RECEIVER: Error registering type" << endl;
-    return clean_up (participant);
-  }
-
-  topic = participant->create_topic_with_profile (
-                                    "QC",                   /* Topic name*/
-                                    QueryConditionTestTypeSupport::get_type_name (), /* Type name */
-                                    LIBRARY_NAME,       /* QoS */
-                                    PROFILE_NAME,
-                                    0,                  /* Listener  */
-                                    DDS_STATUS_MASK_NONE);
-  if (!topic) {
-    cerr << "RECEIVER: Error creating topic" << endl;
-    return clean_up (participant);
-  }
-
-  sub = participant->create_subscriber_with_profile (LIBRARY_NAME,
-                                                     PROFILE_NAME,
-                                                     0,
-                                                     0);
-  if (!sub) {
-    cerr << "RECEIVER: Error creating subscriber" << endl;
-    return clean_up (participant);
-  }
-
-  data_reader = sub->create_datareader_with_profile (
-                                               topic,
-                                               LIBRARY_NAME, /* QoS */
-                                               PROFILE_NAME,
-                                               0,            /* Listener */
-                                               DDS_STATUS_MASK_NONE);
-  if (!data_reader) {
-    cerr << "RECEIVER: Error creating data reader" << endl;
-    return clean_up (participant);
-  }
-
-  typed_dr = QueryConditionTestDataReader::narrow (data_reader);
-
-  if (!typed_dr) {
-    cerr << "RECEIVER: Unable to cast to a type specific data reader" << endl;
-    return clean_up (participant);
-  }
-
-  const char* PARAMS_RUN_1[] = {"1", "3"};
-  DDS_StringSeq parameters_run_1;
-  parameters_run_1.from_array (PARAMS_RUN_1, 2);
-
-  qc = typed_dr->create_querycondition (
-                                DDS_NOT_READ_SAMPLE_STATE,
-                                DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,
-                                DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE,
-                                "iteration > %0 AND iteration < %1",
-                                parameters_run_1);
-  if (!qc) {
-    cerr << "RECEIVER: Error creating query condition" << endl;
-    return clean_up (participant);
-  }
-  else
-    cout << "RECEIVER: query condition created : iteration > 1 AND iteration < 3" << endl;
-
-  ws_->attach_condition (qc);
-
-  cout << "RECEIVER: Expecting two samples (key_1 and key_2) with iteration 3." <<endl;
-
-  read (data_reader, qc, rc, ++run);
-
-  //Second run: change the parameters
-  if (qc)
-    {
-      const char* PARAMS_RUN_2[] = {"4", "6"};
-      DDS_StringSeq parameters_run_2;
-      parameters_run_2.from_array (PARAMS_RUN_2, 2);
-      if (qc->set_query_parameters (parameters_run_2) != DDS_RETCODE_OK)
-        {
-          cerr << "RECEIVER: Unable the set the new query parameters!!!" << endl;
-          return clean_up (participant);
-        }
-    }
-  cout << "RECEIVER: query condition changed : iteration > 4 AND iteration < 6" << endl;
-
-  cout << "RECEIVER: Expecting two samples (key_1 and key_2) with iterations 5" <<endl;
-
-  read (data_reader, qc, rc, ++run);
-  // Third run: Detach querycondition and create read condition instead.
-  // Remove the qc from the waitset and create a readcondition and start receiving
-  // samples
-  if (ws_->detach_condition (qc) != DDS_RETCODE_OK)
-    {
-      cerr << "RECEIVER: Error detaching query condition" << endl;
-      return clean_up (participant);
-    }
-  cout << "RECEIVER: query condition deleted" << endl;
-  cout << "RECEIVER: create read condition : DDS_NOT_READ_SAMPLE_STATE,"
-       << "DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,"
-       << "DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE" << endl;
-
-  // Delete the query condition from the data reader
-  typed_dr->delete_readcondition (qc);
-  sleep_now(10);
-
-  rc = typed_dr->create_readcondition (
-                            DDS_NOT_READ_SAMPLE_STATE,
-                            DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,
-                            DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE);
-  if (!rc) {
-    cerr << "RECEIVER: Error creating read condition" << endl;
-    return clean_up (participant);
-  }
-
-  if (ws_->attach_condition (rc) != DDS_RETCODE_OK)
-    {
-      cerr << "RECEIVER: Error attaching read condition" << endl;
-      return clean_up (participant);
-    }
-
-  cout << "RECEIVER: Expecting ALL UNREAD samples (key_1 and key_2) with iterations between 1 and 9, except 2 and 5" <<endl;
-
-  read (data_reader, qc, rc, ++run);
-
-  return clean_up (participant);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc
deleted file mode 100644
index a58d846f7cd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc
+++ /dev/null
@@ -1,18 +0,0 @@
-project(*qc_sender) : aceexe, nddslib, ndds_ts_defaults {
-  exename = DDS_Sender
-  after += QC_Base_stub
-
-  includes += ../Base
-
-  exeout += ../descriptors
-  libs += QC_Base_stub
-  libpaths += ../descriptors
-
-  Source_Files {
-    QC_Sender.cpp
-  }
-
-  Header_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp
deleted file mode 100644
index 3c018dc45f2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/QC_Sender.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-#include <stdio.h>
-#include <iostream>
-
-using namespace std;
-
-#include "Base.h"
-#include "BaseSupport.h"
-
-#include "ace/OS_main.h"
-#include "ace/OS_NS_stdlib.h"
-
-#define LIBRARY_NAME  "QueryCondition_Library"
-#define PROFILE_NAME  "QueryConditionProfile"
-
-const int number_of_iterations_ = 3;
-
-const int number_of_keys_ = 2;
-
-int last_iteration_ = 0;
-int run_ = 0;
-
-void sleep_now (int sleeptime)
-{
-#ifdef RTI_WIN32
-        Sleep(sleeptime * 1000);
-#else
-        sleep(sleeptime);
-#endif
-}
-
-void write (DDSDataWriter * writer)
-{
-  QueryConditionTestDataWriter* typed_writer = 0;
-  typed_writer = QueryConditionTestDataWriter::narrow (writer);
-  for (int iter_key = 1; iter_key < number_of_keys_ + 1; ++iter_key)
-    {
-      char key[7];
-      QueryConditionTest new_key;
-      sprintf (key, "KEY_%d", iter_key);
-      new_key.symbol = key;
-      for (int iter = 1;
-          iter < number_of_iterations_ + 1;
-          ++iter)
-        {
-          new_key.iteration = iter + last_iteration_;
-          DDS_ReturnCode_t retcode = typed_writer->write (new_key, DDS_HANDLE_NIL);
-          if (retcode != DDS_RETCODE_OK)
-            {
-              cout << "ERROR writing symbol <"
-                  << key
-                  << "> - iteration <"
-                  << new_key.iteration
-                  << ">"
-                  << endl;
-            }
-        }
-      cout << "Sender: Written samples with symbol <"
-            << key
-            << "> and iteration <"
-            << last_iteration_ + 1
-            << "> through <"
-            << new_key.iteration
-            << ">"
-            << endl;
-    }
-  ++run_;
-  last_iteration_ = number_of_iterations_ * run_;
-}
-
-int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-    DDS_ReturnCode_t    retcode;
-    DDSTopic*           topic = 0;
-    DDSDataWriter*      data_writer = 0;
-    DDSPublisher*       publisher = 0;
-    int                 main_result = 1; /* error by default */
-
-//     NDDS_Config_LogVerbosity n_verbosity =
-//       static_cast <NDDS_Config_LogVerbosity> (3);
-//     NDDSConfigLogger::get_instance()->set_verbosity (n_verbosity);
-    const ACE_TCHAR * env_domain_id = 0;
-    if (argc > 1)
-      {
-        env_domain_id = argv[1];
-      }
-    if (!env_domain_id)
-      {
-        printf ("Environment variable DEFAULT_DOMAIN_ID not set "
-                "=> setting it to 2\n");
-        env_domain_id = "2";
-      }
-    else
-      printf ("Domain ID set to %s\n", env_domain_id);
-
-    const int domain_id = ACE_OS::atoi (env_domain_id);
-
-    DDSDomainParticipant *participant = DDSDomainParticipantFactory::get_instance()->
-        create_participant_with_profile (domain_id,    /* Domain ID */
-                                         LIBRARY_NAME, /* QoS */
-                                         PROFILE_NAME,
-                                         0,            /* Listener */
-                                         DDS_STATUS_MASK_NONE);
-    if (!participant) {
-      cerr << "SENDER: Error creating participant" << endl;
-      goto clean_exit;
-    }
-
-    retcode = QueryConditionTestTypeSupport::register_type(
-      participant, QueryConditionTestTypeSupport::get_type_name ());
-
-    if (retcode != DDS_RETCODE_OK) {
-      cerr << "SENDER: Error registering type" << endl;
-      goto clean_exit;
-    }
-
-    topic = participant->create_topic_with_profile (
-                                      "QC",                   /* Topic name*/
-                                      QueryConditionTestTypeSupport::get_type_name (), /* Type name */
-                                      LIBRARY_NAME,       /* QoS */
-                                      PROFILE_NAME,
-                                      0,                  /* Listener  */
-                                      DDS_STATUS_MASK_NONE);
-    if (!topic) {
-      cerr << "SENDER: Error creating topic" << endl;
-      goto clean_exit;
-    }
-
-    publisher = participant->create_publisher_with_profile (LIBRARY_NAME,
-                                                            PROFILE_NAME,
-                                                            0,
-                                                            0);
-    if (!publisher) {
-      cerr << "SENDER: Error creating publisher" << endl;
-      goto clean_exit;
-    }
-
-    data_writer = publisher->create_datawriter_with_profile (
-                                               topic,
-                                               LIBRARY_NAME, /* QoS */
-                                               PROFILE_NAME,
-                                               0,            /* Listener */
-                                               DDS_STATUS_MASK_NONE);
-    if (!data_writer) {
-      cerr << "SENDER: Error creating data writer" << endl;
-      goto clean_exit;
-    }
-
-    write (data_writer);
-    sleep_now (8);
-    write (data_writer);
-    sleep_now (8);
-    write (data_writer);
-    sleep_now (30);
-
-    main_result = 0;
-clean_exit:
-    cout << "SENDER: Exiting ..." << endl;
-    if (participant) {
-        retcode = participant->delete_contained_entities();
-        if (retcode != DDS_RETCODE_OK) {
-            main_result = 1;
-        }
-        retcode = DDSDomainParticipantFactory::get_instance()->
-                        delete_participant(participant);
-        if (retcode != DDS_RETCODE_OK) {
-            main_result = 1;
-        }
-    }
-    DDSDomainParticipantFactory::finalize_instance ();
-    return main_result;
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/README b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/README
deleted file mode 100644
index b276b44a76f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/README
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-This is a plain DDS test, which test the use of 2 different query conditions, followed through a
-readcondition.
-
-Use a sample with {
-  string symbol; //@key
-  long iteration;
-}
-
-The sender writes samples with symbol <KEY_1> and <KEY_2> and iteration <1> through <3>
-The  receiver uses a querycondition with 'iteration > 1 AND iteration < 3' and use a
-read_w_condition with this querycondition.
-
-What we expect is that the receiver receives two samples (key_1 and key_2) with iteration 2.
-
-Next, the sender writes samples with symbol <KEY_1> and <KEY_2> and iteration <4> through <6>
-The  receiver changes the querycondition with 'iteration > 4 AND iteration < 6' and use a
-read_w_condition with this querycondition.
-
-What we expect is that the receiver receives two samples (key_1 and key_2) with iteration 5.
-
-Next, the sender writes samples with symbol <KEY_1> and <KEY_2> and iteration <7> through <9>
-The receiver deletes the query condition and creates the next  readcondition:
-  "DDS_NOT_READ_SAMPLE_STATE,DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE"
-and uses a read_w_condition with this readcondition and number of samples = DDS_LENGTH_UNLIMITED.
-
-(This test (QueryCondition/DDS) differs with the test QueryCondition/DDS_OneByOne that the DDS_OneByOne test does use a loop with
-read_w_condition with this readcondition and number of samples = 1.)
-
-
-What we expect is that the receiver receives samples (key_1 and key_2) with iterations between 1 and 9, except 2 and 5 which
-are already received before.
-
-Next we check the number of samples in DDS with a plain read.
-What we expect is that the receiver receives all 18 samples.
-
-
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index d061e075aae..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5c/scripts/../resource/rtiddsgen/../qos_profiles_4.5c/schema/rti_dds_qos_profiles.xsd"
-     version="4.5c">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="QueryCondition_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="QueryConditionProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/run_test.pl
deleted file mode 100755
index a24f5ff02ac..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/run_test.pl
+++ /dev/null
@@ -1,31 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$tg_sender = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-$tg_receiver = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-
-$domain_id = "$ENV{'DDS4CCM_DEFAULT_DOMAIN_ID'}";
-
-print "Start receiver\n";
-$R = $tg_receiver->CreateProcess ("./DDS_receiver", "$domain_id");
-$R->Spawn();
-
-sleep (1);
-
-print "Start sender\n";
-$S = $tg_sender->CreateProcess ("./DDS_Sender", "$domain_id");
-$S->Spawn ();
-
-
-sleep (90);
-
-$R->Kill ();
-$S->Kill ();
-
-exit 0;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.idl
deleted file mode 100644
index 57e69fd440c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.idl
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @file Base_ObO.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef BASE_OBO_IDL_
-#define BASE_OBO_IDL_
-
-struct QueryConditionTest {
-  string symbol; //@key
-  long iteration;
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc
deleted file mode 100644
index 89919baf0de..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc
+++ /dev/null
@@ -1,13 +0,0 @@
-project(Base_obo_stub) : ndds_ts_defaults, nddslib {
-  sharedname = Base_obo_stub
-  dynamicflags += NDDS_USER_DLL_EXPORT
-  libout = ../descriptors
-
-  NDDSTypeSupport_Files {
-    Base_ObO.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc
deleted file mode 100644
index e42dd1dad99..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc
+++ /dev/null
@@ -1,19 +0,0 @@
-project(*qc_receiver) : aceexe, nddslib, ndds_ts_defaults {
-  exename = DDS_ObO_receiver
-  after += Base_obo_stub
-
-  includes += ../Base
-
-  libs += Base_obo_stub
-  libpaths += ../descriptors
-
-  exeout += ../descriptors
-
-  Source_Files {
-    ObO_Receiver.cpp
-  }
-
-  Header_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp
deleted file mode 100644
index e2e21d90d6b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/ObO_Receiver.cpp
+++ /dev/null
@@ -1,432 +0,0 @@
-#include <stdio.h>
-#include <iostream>
-
-using namespace std;
-
-#include "ace/OS_main.h"
-#include "ace/OS_NS_stdlib.h"
-
-#include "Base_ObO.h"
-#include "Base_ObOSupport.h"
-
-#define LIBRARY_NAME  "QueryCondition_Library"
-#define PROFILE_NAME  "QueryConditionProfile"
-
-bool shutdown_flag = false;
-long num_samples = 0;
-long received_samples = 0;
-long expected_samples_run1 = 1 * 2;    //only sample 2 should be received of 2 keys
-long expected_samples_run2 = 1 * 2;   //only sample 5 should be received o 2 keys
-long expected_samples_run3 = (9 - 2) * 2; //all samples 1-9 except sample 2 and 5 of both keys.
-
-DDSWaitSet* ws_ = new DDSWaitSet ();
-DDS_Duration_t dur_ = {9, 0};
-
-void sleep_now (int sleeptime)
-{
-#ifdef RTI_WIN32
-        Sleep(sleeptime * 1000);
-#else
-        sleep(sleeptime);
-#endif
-}
-
-
-void check_iter (const QueryConditionTest & sample,
-                   const DDS_SampleInfo & readinfo,
-                   const int & run)
-{
-  bool error = false;
-  if (run == 1)
-    {
-      //only sample 2 should be received
-      error = sample.iteration <= 1 && sample.iteration >= 3;
-    }
-  else if (run == 2)
-    {
-      //only samples 5 should be received
-      error = sample.iteration <= 4 && sample.iteration >= 6;
-    }
-  else if (run == 3)
-    {
-      //all other unread samples.
-      error = sample.iteration == 2;
-      error |= sample.iteration ==5;
-    }
-
-  error
-    ?
-    cerr << "ERROR Received: key <"
-        << sample.symbol
-        << "> - iteration <"
-        << sample.iteration
-        << ">"
-        << endl
-    :
-    cout << "Received: key <"
-        << sample.symbol
-        << "> - iteration <"
-        << sample.iteration
-        << "> - instance status <"
-        << readinfo.instance_state
-        << "> - view status <"
-        << readinfo.view_state
-        << "> - sample status <"
-        << readinfo.sample_state
-        << ">"
-        << endl;
-}
-
-
-void read (DDSDataReader * dr,
-           DDSQueryCondition * qc,
-           DDSReadCondition * rc,
-           const int & run)
-{
-  QueryConditionTestDataReader* typed_dr = QueryConditionTestDataReader::narrow (dr);
-
-  DDSConditionSeq cond;
-
-  if (ws_->wait (cond, dur_) == DDS_RETCODE_TIMEOUT)
-    {
-      cerr << "ERROR: wait timed out" << endl;
-    }
-  else
-    {
-      //wait a moment to allow DDS to write all samples we need here...
-      QueryConditionTestSeq data;
-      DDS_SampleInfoSeq     info_seq;
-      sleep_now (3);
-      for (DDS_Long i = 0; i < cond.length (); ++i)
-        {
-          if (run == 3)
-            {
-              sleep_now (10);
-              if (cond[i] == rc)
-                {
-
-                // *************** read one by one : max_number of samples = 1 ************
-                  int loop = 0;
-                  cout << "CHECKING..... SAMPLES with read_w_condition with readcondition:" << endl;
-
-                  received_samples = 0;
-
-                  while (loop  < 30)
-                    {
-                      DDS_ReturnCode_t retcode = typed_dr->read_w_condition (data,
-                                                            info_seq,
-                                                            1,
-                                                            rc);
-                      loop ++;
-                      if (retcode == 0)
-                        {
-                          for (DDS_Long y = 0; y < data.length (); ++y)
-                            {
-                              if (info_seq[y].valid_data)
-                                {
-                                  check_iter (data[y], info_seq[y], run);
-                                  received_samples ++;
-                                }
-                            }
-                        }
-                      typed_dr->return_loan (data, info_seq);
-
-                    }
-                  // *************** end read one by one
-                  if (received_samples !=  expected_samples_run3)
-                    {
-                      cerr << "ERROR: RUN 3 UNEXPECTED NUMBER OF SAMPLES RECEIVED : "
-                           << "with read_w_condition and read condition, expected < "
-                           <<  expected_samples_run3 << "> - received <"
-                           << received_samples << ">" << endl;
-                    }
-                  // check readcondition
-                  //DDS_SampleStateMask sample = rc->get_sample_state_mask ();
-                  //DDS_ViewStateMask view = rc->get_view_state_mask ();
-                  //DDS_InstanceStateMask instance = rc->get_instance_state_mask ();
-                  //::printf("************sample_state %ld, view_state %ld instance_state %ld\n",
-                  //                             (long)sample, (long)view, (long)instance);
-                }
-              else
-                {
-                  cerr << "ERROR: Should be woken up on ReadCondition" << endl;
-                }
-            }
-          else   // run 1 and 2
-            {
-              if (cond[i] == qc)
-                {
-                  cout << "CHECKING..... SAMPLES with read_w_condition with querycondition:" << endl;
-                  received_samples = 0;
-                  typed_dr->read_w_condition (data,
-                                              info_seq,
-                                              DDS_LENGTH_UNLIMITED,
-                                              qc);
-
-                  for (DDS_Long i = 0; i < data.length (); ++i)
-                    {
-                      if (info_seq[i].valid_data)
-                        {
-                          check_iter (data[i], info_seq[i], run);
-                          received_samples ++;
-                        }
-                    }
-                  typed_dr->return_loan (data, info_seq);
-                  if (run == 1)
-                    {
-                      if (received_samples !=  expected_samples_run1)
-                        {
-                          cerr << "ERROR: run  1 unexpected number of samples received : "
-                          << "expected < "
-                          <<  expected_samples_run1 << "> - received <"
-                          << received_samples << ">" << endl;
-                        }
-                    }
-                  else
-                    {
-                      if (received_samples !=  expected_samples_run2)
-                        {
-                           cerr << "ERROR: run  2 unexpected number of samples received : "
-                           << "expected < "
-                           <<  expected_samples_run2 << "> - received <"
-                           << received_samples << ">" << endl;
-                        }
-                    }
-                }
-              else
-                {
-                  cerr << "ERROR: Should be woken up on QueryCondition" << endl;
-                }
-            }
-        }
-    }
-
-
-  //check after run 3 if all samples are still available.
-  if (run == 3)
-    {
-      QueryConditionTestSeq data;
-      DDS_SampleInfoSeq     info_seq;
-      sleep_now (3);
-      typed_dr->read (data,
-                      info_seq,
-                      DDS_LENGTH_UNLIMITED);
-      cout << "\nCHECKING..... TOTAL NUMBER OF SAMPLES IN DDS with a read : <"
-            << data.length ()
-            << ">"
-            << endl;
-      for (DDS_Long i = 0; i < data.length (); ++i)
-        {
-          cout << "Received: key <"
-              << data[i].symbol
-              << "> - iteration <"
-              << data[i].iteration
-              << "> - instance status <"
-              << info_seq[i].instance_state
-              << "> - view status <"
-              << info_seq[i].view_state
-              << "> - sample status <"
-              << info_seq[i].sample_state
-              << ">"
-              << endl;
-        }
-      if (data.length () != 18)
-        {
-          cerr << "ERROR: unexpected number of samples received : "
-          << "expected <18> - received <"
-          << data.length () << ">" << endl;
-        }
-      typed_dr->return_loan (data, info_seq);
-    }
-    sleep_now (5);
-}
-
-int clean_up (DDSDomainParticipant * participant)
-{
-  DDS_ReturnCode_t    retcode = DDS_RETCODE_OK;
-  int main_result = 0;
-
-  cout << "RECEIVER: Exiting ..." << endl;
-  if (participant) {
-    retcode = participant->delete_contained_entities();
-    if (retcode != DDS_RETCODE_OK) {
-      main_result = 1;
-    }
-    retcode = DDSDomainParticipantFactory::get_instance()->
-      delete_participant(participant);
-    if (retcode != DDS_RETCODE_OK) {
-      main_result = 1;
-    }
-  }
-  delete ws_;
-  DDSDomainParticipantFactory::finalize_instance ();
-  return main_result;
-}
-
-int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  DDSTopic*           topic = 0;
-  DDSDataReader*      data_reader = 0;
-  DDSSubscriber*      sub = 0;
-  DDS_ReturnCode_t    retcode = DDS_RETCODE_OK;
-  QueryConditionTestDataReader* typed_dr = 0;
-  DDSQueryCondition*  qc = 0;
-  DDSReadCondition*   rc = 0;
-  int run = 0;
-
-//     NDDS_Config_LogVerbosity n_verbosity =
-//       static_cast <NDDS_Config_LogVerbosity> (3);
-//     NDDSConfigLogger::get_instance()->set_verbosity (n_verbosity);
-
-  const ACE_TCHAR * env_domain_id = 0;
-  if (argc > 1)
-    {
-      env_domain_id = argv[1];
-    }
-  if (!env_domain_id)
-    {
-      printf ("Environment variable DEFAULT_DOMAIN_ID not set "
-              "=> setting it to 2\n");
-      env_domain_id = "2";
-    }
-  else
-    printf ("Domain ID set to %s\n", env_domain_id);
-
-  const int domain_id = ACE_OS::atoi (env_domain_id);
-
-  DDSDomainParticipant *participant = DDSDomainParticipantFactory::get_instance()->
-      create_participant_with_profile (domain_id,    /* Domain ID */
-                                       LIBRARY_NAME, /* QoS */
-                                       PROFILE_NAME,
-                                       0,            /* Listener */
-                                       DDS_STATUS_MASK_NONE);
-  if (!participant) {
-    cerr << "RECEIVER: Error creating participant" << endl;
-    return 1;
-  }
-
-  retcode = QueryConditionTestTypeSupport::register_type(
-    participant, QueryConditionTestTypeSupport::get_type_name ());
-
-  if (retcode != DDS_RETCODE_OK) {
-    cerr << "RECEIVER: Error registering type" << endl;
-    return clean_up (participant);
-  }
-
-  topic = participant->create_topic_with_profile (
-                                    "QC",                   /* Topic name*/
-                                    QueryConditionTestTypeSupport::get_type_name (), /* Type name */
-                                    LIBRARY_NAME,       /* QoS */
-                                    PROFILE_NAME,
-                                    0,                  /* Listener  */
-                                    DDS_STATUS_MASK_NONE);
-  if (!topic) {
-    cerr << "RECEIVER: Error creating topic" << endl;
-    return clean_up (participant);
-  }
-
-  sub = participant->create_subscriber_with_profile (LIBRARY_NAME,
-                                                     PROFILE_NAME,
-                                                     0,
-                                                     0);
-  if (!sub) {
-    cerr << "RECEIVER: Error creating subscriber" << endl;
-    return clean_up (participant);
-  }
-
-  data_reader = sub->create_datareader_with_profile (
-                                               topic,
-                                               LIBRARY_NAME, /* QoS */
-                                               PROFILE_NAME,
-                                               0,            /* Listener */
-                                               DDS_STATUS_MASK_NONE);
-  if (!data_reader) {
-    cerr << "RECEIVER: Error creating data reader" << endl;
-    return clean_up (participant);
-  }
-
-  typed_dr = QueryConditionTestDataReader::narrow (data_reader);
-
-  if (!typed_dr) {
-    cerr << "RECEIVER: Unable to cast to a type specific data reader" << endl;
-    return clean_up (participant);
-  }
-
-  const char* PARAMS_RUN_1[] = {"1", "3"};
-  DDS_StringSeq parameters_run_1;
-  parameters_run_1.from_array (PARAMS_RUN_1, 2);
-
-  qc = typed_dr->create_querycondition (
-                                DDS_NOT_READ_SAMPLE_STATE,
-                                DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,
-                                DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE,
-                                "iteration > %0 AND iteration < %1",
-                                parameters_run_1);
-  if (!qc) {
-    cerr << "RECEIVER: Error creating query condition" << endl;
-    return clean_up (participant);
-  }
-  else
-    cout << "RECEIVER: query condition created : iteration > 1 AND iteration < 3" << endl;
-
-  ws_->attach_condition (qc);
-
-  cout << "RECEIVER: Expecting two samples (key_1 and key_2) with iteration 2." <<endl;
-
-  read (data_reader, qc, rc, ++run);
-
-  //Second run: change the parameters
-  if (qc)
-    {
-      const char* PARAMS_RUN_2[] = {"4", "6"};
-      DDS_StringSeq parameters_run_2;
-      parameters_run_2.from_array (PARAMS_RUN_2, 2);
-      if (qc->set_query_parameters (parameters_run_2) != DDS_RETCODE_OK)
-        {
-          cerr << "RECEIVER: Unable the set the new query parameters!!!" << endl;
-          return clean_up (participant);
-        }
-    }
-  cout << "RECEIVER: query condition changed : iteration > 4 AND iteration < 6" << endl;
-
-  cout << "RECEIVER: Expecting two samples (key_1 and key_2) with iterations 5" <<endl;
-
-  read (data_reader, qc, rc, ++run);
-  // Third run: Detach querycondition and create read condition instead.
-  // Remove the qc from the waitset and create a readcondition and start receiving
-  // samples
-  if (ws_->detach_condition (qc) != DDS_RETCODE_OK)
-    {
-      cerr << "RECEIVER: Error detaching query condition" << endl;
-      return clean_up (participant);
-    }
-  // Delete the query condition from the data reader
-  typed_dr->delete_readcondition (qc);
-  cout << "RECEIVER: query condition deleted" << endl;
-  cout << "RECEIVER: create read condition : DDS_NOT_READ_SAMPLE_STATE,"
-       << "DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,"
-       << "DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE" << endl;
-
-  sleep_now(10);
-
-  rc = typed_dr->create_readcondition (
-                            DDS_NOT_READ_SAMPLE_STATE,
-                            DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,
-                            DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE);
-  if (!rc) {
-    cerr << "RECEIVER: Error creating read condition" << endl;
-    return clean_up (participant);
-  }
-
-  if (ws_->attach_condition (rc) != DDS_RETCODE_OK)
-    {
-      cerr << "RECEIVER: Error attaching read condition" << endl;
-      return clean_up (participant);
-    }
-
-  cout << "RECEIVER: Expecting ALL UNREAD samples (key_1 and key_2) with iterations between 1 and 9, except 2 and 5" <<endl;
-
-  read (data_reader, qc, rc, ++run);
-
-  return clean_up (participant);
-}
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc
deleted file mode 100644
index 1f88cb930a2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc
+++ /dev/null
@@ -1,18 +0,0 @@
-project(*qc_sender) : aceexe, nddslib, ndds_ts_defaults {
-  exename = DDS_ObO_Sender
-  after += Base_obo_stub
-
-  includes += ../Base
-
-  exeout += ../descriptors
-  libs += Base_obo_stub
-  libpaths += ../descriptors
-
-  Source_Files {
-    ObO_Sender.cpp
-  }
-
-  Header_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp
deleted file mode 100644
index b4fd5eae5e3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/ObO_Sender.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-#include <stdio.h>
-#include <iostream>
-
-using namespace std;
-
-#include "ace/OS_main.h"
-#include "ace/OS_NS_stdlib.h"
-
-#include "Base_ObO.h"
-#include "Base_ObOSupport.h"
-
-#define LIBRARY_NAME  "QueryCondition_Library"
-#define PROFILE_NAME  "QueryConditionProfile"
-
-const int number_of_iterations_ = 3;
-
-const int number_of_keys_ = 2;
-
-int last_iteration_ = 0;
-int run_ = 0;
-
-void sleep_now (int sleeptime)
-{
-#ifdef RTI_WIN32
-        Sleep(sleeptime * 1000);
-#else
-        sleep(sleeptime);
-#endif
-}
-
-void write (DDSDataWriter * writer)
-{
-  QueryConditionTestDataWriter* typed_writer = 0;
-  typed_writer = QueryConditionTestDataWriter::narrow (writer);
-  for (int iter_key = 1; iter_key < number_of_keys_ + 1; ++iter_key)
-    {
-      char key[7];
-      QueryConditionTest new_key;
-      sprintf (key, "KEY_%d", iter_key);
-      new_key.symbol = key;
-      for (int iter = 1;
-          iter < number_of_iterations_ + 1;
-          ++iter)
-        {
-          new_key.iteration = iter + last_iteration_;
-          DDS_ReturnCode_t retcode = typed_writer->write (new_key, DDS_HANDLE_NIL);
-          if (retcode != DDS_RETCODE_OK)
-            {
-              cout << "ERROR writing symbol <"
-                  << key
-                  << "> - iteration <"
-                  << new_key.iteration
-                  << ">"
-                  << endl;
-            }
-         }
-      cout << "Sender: Written samples with symbol <"
-            << key
-            << "> and iteration <"
-            << last_iteration_ + 1
-            << "> through <"
-            << new_key.iteration
-            << ">"
-            << endl;
-    }
-  ++run_;
-  last_iteration_ = number_of_iterations_ * run_;
-}
-
-int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-    DDS_ReturnCode_t    retcode;
-    DDSTopic*           topic = 0;
-    DDSDataWriter*      data_writer = 0;
-    DDSPublisher*       publisher = 0;
-    int                 main_result = 1; /* error by default */
-
-//     NDDS_Config_LogVerbosity n_verbosity =
-//       static_cast <NDDS_Config_LogVerbosity> (3);
-//     NDDSConfigLogger::get_instance()->set_verbosity (n_verbosity);
-    const ACE_TCHAR * env_domain_id = 0;
-    if (argc > 1)
-      {
-        env_domain_id = argv[1];
-      }
-    if (!env_domain_id)
-      {
-        printf ("Environment variable DEFAULT_DOMAIN_ID not set "
-                "=> setting it to 2\n");
-        env_domain_id = "2";
-      }
-    else
-      printf ("Domain ID set to %s\n", env_domain_id);
-
-    const int domain_id = ACE_OS::atoi (env_domain_id);
-
-    DDSDomainParticipant *participant = DDSDomainParticipantFactory::get_instance()->
-        create_participant_with_profile (domain_id,    /* Domain ID */
-                                         LIBRARY_NAME, /* QoS */
-                                         PROFILE_NAME,
-                                         0,            /* Listener */
-                                         DDS_STATUS_MASK_NONE);
-    if (!participant) {
-      cerr << "SENDER: Error creating participant" << endl;
-      goto clean_exit;
-    }
-
-    retcode = QueryConditionTestTypeSupport::register_type(
-      participant, QueryConditionTestTypeSupport::get_type_name ());
-
-    if (retcode != DDS_RETCODE_OK) {
-      cerr << "SENDER: Error registering type" << endl;
-      goto clean_exit;
-    }
-
-    topic = participant->create_topic_with_profile (
-                                      "QC",                   /* Topic name*/
-                                      QueryConditionTestTypeSupport::get_type_name (), /* Type name */
-                                      LIBRARY_NAME,       /* QoS */
-                                      PROFILE_NAME,
-                                      0,                  /* Listener  */
-                                      DDS_STATUS_MASK_NONE);
-    if (!topic) {
-      cerr << "SENDER: Error creating topic" << endl;
-      goto clean_exit;
-    }
-
-    publisher = participant->create_publisher_with_profile (LIBRARY_NAME,
-                                                            PROFILE_NAME,
-                                                            0,
-                                                            0);
-    if (!publisher) {
-      cerr << "SENDER: Error creating publisher" << endl;
-      goto clean_exit;
-    }
-
-    data_writer = publisher->create_datawriter_with_profile (
-                                               topic,
-                                               LIBRARY_NAME, /* QoS */
-                                               PROFILE_NAME,
-                                               0,            /* Listener */
-                                               DDS_STATUS_MASK_NONE);
-    if (!data_writer) {
-      cerr << "SENDER: Error creating data writer" << endl;
-      goto clean_exit;
-    }
-
-    write (data_writer);
-    sleep_now (8);
-    write (data_writer);
-    sleep_now (8);
-    write (data_writer);
-    sleep_now (30);
-
-    main_result = 0;
-clean_exit:
-    cout << "SENDER: Exiting ..." << endl;
-    if (participant) {
-        retcode = participant->delete_contained_entities();
-        if (retcode != DDS_RETCODE_OK) {
-            main_result = 1;
-        }
-        retcode = DDSDomainParticipantFactory::get_instance()->
-                        delete_participant(participant);
-        if (retcode != DDS_RETCODE_OK) {
-            main_result = 1;
-        }
-    }
-    DDSDomainParticipantFactory::finalize_instance ();
-    return main_result;
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/README b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/README
deleted file mode 100644
index ff6cdedb542..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/README
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-This is a plain DDS test, which test the use of 2 different query conditions, followed through a
-readcondition.
-
-Use a sample with {
-  string symbol; //@key
-  long iteration;
-}
-
-The sender writes samples with symbol <KEY_1> and <KEY_2> and iteration <1> through <3>
-The  receiver uses a querycondition with 'iteration > 1 AND iteration < 3' and use a
-read_w_condition with this querycondition.
-
-What we expect is that the receiver receives two samples (key_1 and key_2) with iteration 2.
-
-Next, the sender writes samples with symbol <KEY_1> and <KEY_2> and iteration <4> through <6>
-The  receiver changes the querycondition with 'iteration > 4 AND iteration < 6' and use a
-read_w_condition with this querycondition.
-
-What we expect is that the receiver receives two samples (key_1 and key_2) with iteration 5.
-
-Next, the sender writes samples with symbol <KEY_1> and <KEY_2> and iteration <7> through <9>
-The receiver deletes the query condition and creates the next readcondition:
-  "DDS_NOT_READ_SAMPLE_STATE,DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE"
-and uses, in a loop, a read_w_condition with this readcondition and number of samples = 1.
-
-(This test (QueryCondition/DDS_OneByOne) differs with the test QueryCondition/DDS that the DDS test doesn't use a loop, but a
-read_w_condition with this readcondition and number of samples = DDS_LENGTH_UNLIMITED.)
-
-
-What we expect is that the receiver receives samples (key_1 and key_2) with iterations between 1 and 9, except 2 and 5 which
-are already received before.
-
-Next we check the number of samples in DDS with a plain read.
-What we expect is that the receiver receives all 18 samples.
-
-
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index d061e075aae..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5c/scripts/../resource/rtiddsgen/../qos_profiles_4.5c/schema/rti_dds_qos_profiles.xsd"
-     version="4.5c">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="QueryCondition_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="QueryConditionProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/run_test.pl
deleted file mode 100755
index 10b65e2a7e6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/run_test.pl
+++ /dev/null
@@ -1,31 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$tg_sender = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-$tg_receiver = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-
-$domain_id = "$ENV{'DDS4CCM_DEFAULT_DOMAIN_ID'}";
-
-print "Start receiver\n";
-$R = $tg_receiver->CreateProcess ("./DDS_ObO_receiver", "$domain_id");
-$R->Spawn();
-
-sleep (1);
-
-print "Start sender\n";
-$S = $tg_sender->CreateProcess ("./DDS_ObO_Sender", "$domain_id");
-$S->Spawn ();
-
-
-sleep (90);
-
-$R->Kill ();
-$S->Kill ();
-
-exit 0;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl
deleted file mode 100644
index fd242249ca4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file Different_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DIFFERENT_TEST_BASE_IDL
-#define DIFFERENT_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/Different_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/Different_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "QueryConditionTest"
-#pragma DCPS_DATA_KEY "QueryConditionTest symbol"
-
-struct QueryConditionTest {
-  string symbol; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<QueryConditionTest> QueryConditionTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.mpc
deleted file mode 100644
index e547afe5044..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project(QC_Different_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = QC_Different_Test_Base_stub
-  dynamicflags += QUERY_CONDITION_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=QUERY_CONDITION_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=Different_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Different_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=QUERY_CONDITION_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Different_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.idl
deleted file mode 100644
index ac2292fbeff..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file Different_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_TEST_CONNECTOR_IDL_
-#define QUERY_CONDITION_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Different_Test_Base.idl"
-
-#pragma ciao lem "Connector/Different_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Different_Test_BaseTypeSupport.idl"
-#endif
-
-module Different_Test
-{
-  module ::CCM_DDS::Typed < ::QueryConditionTest, ::QueryConditionTestSeq> QueryConditionTestConnector;
-};
-
-#endif /* QUERY_CONDITION_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc
deleted file mode 100644
index 9ec837bc806..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p Different_Test_Base -l .. -o ../lib -u DDS Different_Test_Connector"
-
-project(QC_Different_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen QC_Different_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Different_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Different_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Different_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=QUERY_CONDITION_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Different_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Different_Test_Connector.idl
-  }
-}
-
-project(QC_Different_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += QC_Different_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Different_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Different_Test_ConnectorE.idl
-  }
-}
-
-project(QC_Different_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += QC_Different_Test_Connector_lem_gen QC_Different_Test_Connector_stub \
-           QC_Different_Test_Base_stub
-  libs  += QC_Different_Test_Base_stub QC_Different_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_Different_Test_Connector_lem_stub
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Different_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Different_Test_ConnectorEC.h
-    Different_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Different_Test_ConnectorEC.inl
-  }
-}
-
-project(QC_Different_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += QC_Different_Test_Connector_idl_gen QC_Different_Test_Base_stub
-  libs  += QC_Different_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_Different_Test_Connector_stub
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Different_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Different_Test_ConnectorC.h
-    Different_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Different_Test_ConnectorC.inl
-  }
-}
-
-project(QC_Different_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += QC_Different_Test_Connector_lem_stub QC_Different_Test_Connector_stub \
-             QC_Different_Test_Base_stub
-  sharedname = QC_Different_Test_Connector_exec
-  libs += QC_Different_Test_Connector_stub QC_Different_Test_Connector_lem_stub \
-          QC_Different_Test_Base_stub QC_Different_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Different_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Different_Test_Connector_conn.h
-    Different_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QC_Different_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += QC_Different_Test_Connector_lem_stub QC_Different_Test_Connector_exec \
-                QC_Different_Test_Connector_stub
-  sharedname  = QC_Different_Test_Connector_svnt
-  libs       += QC_Different_Test_Connector_stub \
-                QC_Different_Test_Connector_lem_stub  \
-                QC_Different_Test_Base_stub \
-                QC_Different_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Different_Test_ConnectorS.cpp
-    Different_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Different_Test_ConnectorS.h
-    Different_Test_Connector_svnt.h
-    Different_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/README b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/README
deleted file mode 100644
index 7fb894432cc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/README
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-Test whether Querycondition are NOT shared between two extended ports.
-
-The receiver uses two extend ports of the DDS4CCM State connector:
-1. the DDS_Get port
-2. the DDS_Read port
-
-The Queryfilter on the reader interface of the DDS_Get extended port is different
-from the Queryfilter on the reader interface of the DDS_Read extended port.
-This test checks whether that's the case by checking the query filter expressions.
-Besides that, it verifies that the received data is correct according to the filter
-expression and parameters.
-
-The sender sends 15 samples which are kept in DDS (KEEP_ALL Qos) with iteration 1 to 15.
-The Getter extended port should receive iterations between 6 and 9
-(thus samples with iteration 7 and 8).
-The Reader should receive the other samples (and not samples with iteration 7 and 8).
-
-There's one DDS4CCM connector instance connected to the Receiver.
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.idl
deleted file mode 100644
index 3c2cac4f3dd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Different_Test_Connector.idl"
-
-module Different_Test
-{
-  component Receiver
-  {
-    port QueryConditionTestConnector::DDS_Get get_port;
-    port QueryConditionTestConnector::DDS_Read read_port;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc
deleted file mode 100644
index 263e0419596..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-project(QC_Different_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += QC_Different_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 {
-    Different_Test_Receiver.idl
-  }
-}
-
-project(QC_Different_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += QC_Different_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 {
-    Different_Test_ReceiverE.idl
-  }
-}
-
-project(QC_Different_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += QC_Different_Test_Receiver_lem_gen QC_Different_Test_Receiver_stub  \
-           QC_Different_Test_Connector_stub QC_Different_Test_Base_stub
-  libs  +=  Receiver_stub QC_Different_Test_Connector_stub \
-            QC_Different_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Different_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Different_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Different_Test_ReceiverEC.inl
-  }
-}
-
-project(QC_Different_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += QC_Different_Test_Receiver_idl_gen  QC_Different_Test_Connector_stub \
-           QC_Different_Test_Base_stub QC_Different_Test_Connector_lem_gen
-  libs  += QC_Different_Test_Connector_stub QC_Different_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Different_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Different_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Different_Test_ReceiverC.inl
-  }
-}
-
-project(QC_Different_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += QC_Different_Test_Receiver_lem_stub QC_Different_Test_Receiver_stub \
-             QC_Different_Test_Base_stub QC_Different_Test_Connector_stub \
-             QC_Different_Test_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub QC_Different_Test_Base_stub \
-          QC_Different_Test_Connector_stub QC_Different_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Different_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Different_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QC_Different_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   QC_Different_Test_Receiver_lem_stub QC_Different_Test_Base_stub \
-                  QC_Different_Test_Connector_stub QC_Different_Test_Connector_svnt \
-                  QC_Different_Test_Receiver_exec QC_Different_Test_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub QC_Different_Test_Base_stub \
-                QC_Different_Test_Connector_stub QC_Different_Test_Connector_svnt \
-                Receiver_exec QC_Different_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Different_Test_ReceiverS.cpp
-    Different_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Different_Test_ReceiverS.h
-    Different_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp
deleted file mode 100644
index 78b7c696c59..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,661 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Different_Test_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-#define QUERY_GETTER "( (iteration > %0) AND (iteration < %1) )"
-#define QUERY_READER "( (iteration < %0) OR (iteration > %1) )"
-
-#define MIN_ITERATION "6"
-#define MAX_ITERATION "9"
-
-namespace CIAO_Different_Test_Receiver_Impl
-{
-  /**
-   * Read action Generator
-   */
-
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Checking if last sample "
-                          "is available in DDS...\n"));
-    if (this->callback_.check_last ())
-      {
-        this->callback_.run ();
-      }
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: get_port_status_exec_i
-   */
-
-  get_port_status_exec_i::get_port_status_exec_i (
-        ::Different_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Different_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  get_port_status_exec_i::~get_port_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  get_port_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  get_port_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: read_port_status_exec_i
-   */
-
-  read_port_status_exec_i::read_port_status_exec_i (
-        ::Different_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Different_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  read_port_status_exec_i::~read_port_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  read_port_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  read_port_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : iterations_ (15)
-      , keys_ (5)
-      , ticker_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  bool
-  Receiver_exec_i::check_last ()
-  {
-    ::Different_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_get_port_data ();
-
-    try
-      {
-        QueryConditionTest queryfiltertest_info;
-        ::CCM_DDS::ReadInfo readinfo;
-        char key[10];
-        ACE_OS::sprintf (key, "KEY_%d", this->keys_);
-        queryfiltertest_info.symbol = CORBA::string_dup (key);
-        reader->read_one_last (
-                queryfiltertest_info,
-                readinfo,
-                ::DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - "
-                              "last iteration <%d> - <%d>\n",
-                               queryfiltertest_info.iteration,
-                               this->iterations_));
-        return queryfiltertest_info.iteration == this->iterations_;
-      }
-    catch (const ::CCM_DDS::InternalError &)
-      {
-      }
-    catch (const ::CCM_DDS::NonExistent &)
-      {
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: "
-                              "ERROR: Unexpected exception caught\n"));
-      }
-    return false;
-  }
-
-  // Supported operations and attributes.
-  void
-  Receiver_exec_i::check_iter_reader (const QueryConditionTest & sample)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ALL : ")
-        ACE_TEXT ("sample received for <%C>: iteration <%u>\n"),
-        sample.symbol.in (),
-        sample.iteration));
-    if (sample.iteration > ACE_OS::atoi (MIN_ITERATION) &&
-        sample.iteration < ACE_OS::atoi (MAX_ITERATION))
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL : ")
-                              ACE_TEXT ("Didn't expect samples between ")
-                              ACE_TEXT ("%C and %C\n"),
-                              MIN_ITERATION,
-                              MAX_ITERATION));
-      }
-  }
-
-  bool
-  Receiver_exec_i::check_iter_getter (const QueryConditionTest & sample)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET ALL : ")
-        ACE_TEXT ("sample received for <%C>: iteration <%u>\n"),
-        sample.symbol.in (),
-        sample.iteration));
-    if (sample.iteration <= ACE_OS::atoi (MIN_ITERATION))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: GET ALL: "
-                              "Didn't expect samples with iteration %C "
-                              "<= %C\n", sample.iteration,
-                              MIN_ITERATION));
-        return false;
-      }
-    if (sample.iteration > ACE_OS::atoi (MAX_ITERATION))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: GET ALL: "
-                              "Didn't expect samples with iteration %C"
-                              "> %C\n", sample.iteration,
-                              MAX_ITERATION));
-        return false;
-      }
-    return true;
-  }
-
-
-  void
-  Receiver_exec_i::read_all (void)
-  {
-    ::Different_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_read_port_data ();
-
-    QueryConditionTestSeq queryfiltertest_info_seq;
-    ::CCM_DDS::ReadInfoSeq readinfo_seq;
-    reader->read_all (queryfiltertest_info_seq, readinfo_seq);
-    if (queryfiltertest_info_seq.length () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::read_all : "
-                              "No samples available in Reader!\n"));
-      }
-    for (CORBA::ULong it = 0; it < queryfiltertest_info_seq.length (); ++it)
-      {
-        this->check_iter_reader (queryfiltertest_info_seq[it]);
-      }
-  }
-
-  void
-  Receiver_exec_i::get_all (void)
-  {
-    ::Different_Test::QueryConditionTestConnector::Getter_var getter =
-      this->ciao_context_->get_connection_get_port_fresh_data ();
-
-    if (::CORBA::is_nil (getter.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - "
-                              "ERROR: No Getter\n"));
-      }
-    QueryConditionTest_var qf_info;
-    ::CCM_DDS::ReadInfo readinfo;
-    CORBA::Boolean result = getter->get_one (qf_info.out (), readinfo);
-    if (result)
-      {
-        if (!this->check_iter_getter (qf_info.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - "
-                                  "ERROR: got unexpected "
-                                  "sample, bailing out\n"));
-          }
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - "
-                              "ERROR: time out when retrieving "
-                              "first sample.\n"));
-      }
-    while (result)
-      {
-        result = getter->get_one (qf_info.out (), readinfo);
-        if (result)
-          {
-            if (!this->check_iter_getter (qf_info.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - "
-                                      "ERROR: got unexpected "
-                                      "sample, bailing out\n"));
-                break;
-              }
-          }
-      }
-  }
-
-  void
-  Receiver_exec_i::test_all ()
-  {
-    const char * test = "GET ALL";
-    try
-      {
-        get_all ();
-        test = "READ ALL";
-        read_all ();
-      }
-    catch (const CCM_DDS::NonExistent& ex)
-      {
-        for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ERROR %C: ")
-                  ACE_TEXT ("caught expected exception: index <%u>\n"),
-                  test,
-                  ex.indexes[i]));
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: %C: ")
-              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-              test,
-              ex.error_code));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception (test);
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::test_all : Exception caught\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::check_filters (void)
-  {
-    ::Different_Test::QueryConditionTestConnector::Reader_var get_reader =
-      this->ciao_context_->get_connection_get_port_data ();
-    if (! ::CORBA::is_nil (get_reader.in ()))
-      {
-        this->check_filter (get_reader.in (), true);
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to retrieve pointer to the reader.\n"));
-      }
-
-    ::Different_Test::QueryConditionTestConnector::Reader_var read_reader =
-      this->ciao_context_->get_connection_read_port_data ();
-    if (! ::CORBA::is_nil (read_reader.in ()))
-      {
-        this->check_filter (read_reader.in (), false);
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to retrieve pointer to the reader.\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::check_filter (
-    ::Different_Test::QueryConditionTestConnector::Reader_ptr reader,
-    bool check_getter)
-  {
-    ::CCM_DDS::QueryFilter_var filter;
-    try
-      {
-        filter = reader->query ();
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                              "caught InternalError exception: retval <%u>\n",
-                              ex.error_code));
-        return;
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Receiver_exec_i::check_filter: ");
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                              "Exception caught\n"));
-        return;
-      }
-
-    //check query
-    bool error = false;
-
-    const char * query = "";
-    const char * port = "";
-    if (check_getter)
-      {
-        query = QUERY_GETTER;
-        port = "GETTER";
-      }
-    else
-      {
-        query = QUERY_READER;
-        port = "READER";
-      }
-
-    if (ACE_OS::strcmp (filter->expression, query) != 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter <%C> - "
-                              "Unexpected query when retrieving filter: "
-                              "expected <%C> - received <%C>\n",
-                              port, query, filter->expression.in ()));
-        error = true;
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_filter <%C> - "
-                              "Query expression seems correct : "
-                              "expected <%C> - received <%C>\n",
-                              port, query, filter->expression.in ()));
-      }
-    //check current parameters.
-    if (filter->parameters.length () != 2)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter <%C> - "
-                              "Unexpected number of parameters: "
-                              "expected <%d> - received <%d>\n",
-                              port, 2, filter->parameters.length ()));
-        error = true;
-      }
-
-    if (filter->parameters.length () >= 1)
-      {
-        if (ACE_OS::atoi (filter->parameters[0]) != ACE_OS::atoi(MIN_ITERATION))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter <%C> - "
-                                  "Unexpected param value: "
-                                  "expected <%d> - received <%C>\n",
-                                  port,
-                                  MIN_ITERATION,
-                                  filter->parameters[0].in ()));
-            error = true;
-          }
-      }
-    if (filter->parameters.length () >= 2)
-      {
-        if (ACE_OS::atoi (filter->parameters[1]) != ACE_OS::atoi (MAX_ITERATION))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter <%C> - "
-                                  "Unexpected query when retrieving filter: "
-                                  "expected <%d> - received <%C>\n",
-                                  port,
-                                  MAX_ITERATION,
-                                  filter->parameters[1].in ()));
-            error = true;
-          }
-      }
-    if (!error)
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_filter <%C> - "
-                              "Passed check_filter test.\n",
-                              port));
-      }
-  }
-
-  void
-  Receiver_exec_i::set_filters ()
-  {
-    ACE_DEBUG ((LM_DEBUG, "Set filters\n"));
-
-    try
-      {
-        ::Different_Test::QueryConditionTestConnector::Reader_var get_reader =
-          this->ciao_context_->get_connection_get_port_data ();
-
-        ::Different_Test::QueryConditionTestConnector::Reader_var read_reader =
-          this->ciao_context_->get_connection_read_port_data ();
-
-        ::CCM_DDS::QueryFilter get_filter;
-        get_filter.expression = CORBA::string_dup (QUERY_GETTER);
-        get_filter.parameters.length (2);
-        get_filter.parameters[0] = CORBA::string_dup (MIN_ITERATION);
-        get_filter.parameters[1] = CORBA::string_dup (MAX_ITERATION);
-        get_reader->query (get_filter);
-        ACE_DEBUG ((LM_DEBUG, "Filter set for the getter.\n"));
-
-
-        ::CCM_DDS::QueryFilter read_filter;
-        read_filter.expression = CORBA::string_dup (QUERY_READER);
-        read_filter.parameters.length (2);
-        read_filter.parameters[0] = CORBA::string_dup (MIN_ITERATION);
-        read_filter.parameters[1] = CORBA::string_dup (MAX_ITERATION);
-        read_reader->query (read_filter);
-        ACE_DEBUG ((LM_DEBUG, "Filter set for the reader.\n"));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_filters () - "
-                    "Unexpected exception caught.\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::start_read (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Start reading by starting a timer.\n"));
-
-    this->ticker_ = new read_action_Generator (*this);
-    if (this->reactor ()->schedule_timer (
-                                          this->ticker_,
-                                          0,
-                                          ACE_Time_Value(1, 0),
-                                          ACE_Time_Value(1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::run (void)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-    this->test_all ();
-  }
-  void
-  Receiver_exec_i::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  void
-  Receiver_exec_i::keys (::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_get_port_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_get_port_status_.in ()))
-      {
-        get_port_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          get_port_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_get_port_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_get_port_status_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_read_port_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_read_port_status_.in ()))
-      {
-        read_port_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          read_port_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_read_port_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_read_port_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Different_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::Different_Test::QueryConditionTestConnector::Getter_var getter =
-      this->ciao_context_->get_connection_get_port_fresh_data ();
-    DDS::Duration_t to;
-    to.sec = 5;
-    to.nanosec = 0;
-    if (! ::CORBA::is_nil (getter))
-      {
-        getter->time_out (to);
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Unable to set time out.\n"));
-      }
-
-    this->set_filters ();
-    this->check_filters ();
-    this->start_read ();
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Different_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/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h
deleted file mode 100644
index 2f38be10194..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h
+++ /dev/null
@@ -1,212 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_DIFFERENT_TEST_RECEIVER_EXEC_IK2VYJ_H_
-#define CIAO_DIFFERENT_TEST_RECEIVER_EXEC_IK2VYJ_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Different_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_Different_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  /**
-   * Read action generator
-   */
-
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: get_port_status_exec_i
-   */
-
-  class get_port_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    get_port_status_exec_i (
-      ::Different_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~get_port_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Different_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: read_port_status_exec_i
-   */
-
-  class read_port_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    read_port_status_exec_i (
-      ::Different_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~read_port_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Different_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_get_port_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_read_port_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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    bool check_last (void);
-    void start_read (void);
-    void run (void);
-
-    void iterations (::CORBA::UShort iterations);
-    void keys (::CORBA::UShort keys);
-
-    //@}
-
-  private:
-    ::Different_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_get_port_status_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_read_port_status_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    CORBA::UShort   iterations_;
-    CORBA::UShort   keys_;
-
-    read_action_Generator *ticker_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void test_all (void);
-    void read_all (void);
-    void get_all (void);
-
-    void check_iter_reader (const QueryConditionTest & sample);
-    bool check_iter_getter (const QueryConditionTest & sample);
-
-    void check_filters (void);
-    void check_filter (
-      ::Different_Test::QueryConditionTestConnector::Reader_ptr reader,
-      bool check_getter);
-
-    void set_filters (void);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Different_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.idl
deleted file mode 100644
index 9fcd7823e7b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_QUERY_CONDITION_TEST_SENDER_IDL
-#define DDS_QUERY_CONDITION_TEST_SENDER_IDL
-
-#include "Connector/Different_Test_Connector.idl"
-
-module Different_Test
-{
-  component Sender
-  {
-    port Different_Test::QueryConditionTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc
deleted file mode 100644
index 618c9190c21..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p Different_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(QC_Different_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += QC_Different_Test_Connector_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 {
-    Different_Test_Sender.idl
-  }
-}
-
-project(QC_Different_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += QC_Different_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 {
-    Different_Test_SenderE.idl
-  }
-}
-
-project(QC_Different_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += QC_Different_Test_Sender_lem_gen QC_Different_Test_Sender_stub \
-           QC_Different_Test_Base_stub
-  libs  += QC_Different_Test_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Different_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    Different_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Different_Test_SenderEC.inl
-  }
-}
-
-project(QC_Different_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += QC_Different_Test_Sender_idl_gen QC_Different_Test_Base_stub \
-           QC_Different_Test_Connector_stub
-  libs  += QC_Different_Test_Base_stub QC_Different_Test_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Different_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    Different_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Different_Test_SenderC.inl
-  }
-}
-
-project(QC_Different_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += QC_Different_Test_Sender_lem_stub QC_Different_Test_Sender_stub \
-             QC_Different_Test_Connector_lem_stub QC_Different_Test_Connector_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub QC_Different_Test_Base_stub \
-             QC_Different_Test_Connector_lem_stub QC_Different_Test_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Different_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Different_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QC_Different_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += QC_Different_Test_Base_stub  QC_Different_Test_Sender_lem_stub \
-                QC_Different_Test_Connector_stub \
-                QC_Different_Test_Connector_svnt QC_Different_Test_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub QC_Different_Test_Base_stub \
-                QC_Different_Test_Connector_stub QC_Different_Test_Connector_svnt \
-                QC_Different_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Different_Test_SenderS.cpp
-    Different_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Different_Test_SenderS.h
-    Different_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.cpp
deleted file mode 100644
index f9b4abe9103..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,262 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Different_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#define ITERATIONS 15
-
-namespace CIAO_Different_Test_Sender_Impl
-{
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  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 /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.get_started ();
-      }
-  }
-
-  /**
-   * WriteHandler
-   */
-
-  WriteHandler::WriteHandler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteHandler::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.start ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (5)
-      , iterations_ (ITERATIONS)
-  {
-    ACE_NEW_THROW_EX (this->wh_,
-                      WriteHandler (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->wh_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    try
-      {
-        this->reactor ()->notify (this->wh_);
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: get_started : Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: get_started : Unknown exception caught\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    for (CORBA::UShort iter_key = 1; iter_key < this->keys_ + 1; ++iter_key)
-      {
-        char key[7];
-        QueryConditionTest new_key;
-        ACE_OS::sprintf (key, "KEY_%d", iter_key);
-        new_key.symbol = CORBA::string_dup(key);
-        for (CORBA::UShort iter = 1;
-            iter < this->iterations_ + 1;
-            ++iter)
-          {
-            new_key.iteration = iter;
-            ::Different_Test::QueryConditionTestConnector::Writer_var writer
-              = this->ciao_context_->get_connection_info_write_data ();
-            writer->write_one (new_key, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written key <%C> with <%d>\n"),
-                        key, iter));
-          }
-      }
-    ACE_OS::sleep (1);
-  }
-
-  // Component attributes and port operations.
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Different_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Different_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/QueryCondition/Different/Sender/Different_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.h
deleted file mode 100644
index 547e17478ab..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.h
+++ /dev/null
@@ -1,162 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_DIFFERENT_TEST_SENDER_EXEC_7V9ND5_H_
-#define CIAO_DIFFERENT_TEST_SENDER_EXEC_7V9ND5_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Different_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_Different_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * WriteHandler
-   */
-
-  class WriteHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteHandler (Sender_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-    void get_started (void);
-    //@}
-
-  private:
-    ::Different_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    CORBA::UShort iterations_;
-    WriteHandler *wh_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Different_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/Plan.cdp
deleted file mode 100644
index a6cc92082b6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/Plan.cdp
+++ /dev/null
@@ -1,458 +0,0 @@
-<!--  -->
-<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>Different_Test_Depl_1</label>
-  <UUID>Different_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_Different_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_Different_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="Different_Test_ReceiverConnectorComponentImplementation">
-    <name>Different_Test_ReceiverConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Different_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Different_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_Different_Test_QueryConditionTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Different_Test_QueryConditionTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_Different_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_Different_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Different_Test_SenderConnectorComponentImplementation">
-    <name>Different_Test_SenderConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Different_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Different_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_Different_Test_QueryConditionTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Different_Test_QueryConditionTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_Different_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_Different_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_Different_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_Different_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="Different_Test_SenderConnectorComponentInstance">
-    <name>Different_Test_SenderConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Different_Test_SenderConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QueryCondition_Library#QueryConditionProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Different_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Different_Test_ReceiverConnectorComponentInstance">
-    <name>Different_Test_ReceiverConnectorComponentInstance</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Different_Test_ReceiverConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QueryCondition_Library#QueryConditionProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Different_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_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>read_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>read_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Different_Test_ReceiverConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>get_port_fresh_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Different_Test_ReceiverConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>get_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Different_Test_ReceiverConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="Different_Test_SenderConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Different_Test_SenderConnectorComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </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="Different_Test_Connector_ExecArtifact">
-    <name>QC_Different_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>QC_Different_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Different_Test_Connector_SvntArtifact">
-    <name>QC_Different_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>QC_Different_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Different_Test_Connector_StubArtifact">
-    <name>QC_Different_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>QC_Different_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/QueryCondition/Different/descriptors/QueryCondition_Library.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/QueryCondition_Library.xml
deleted file mode 100644
index b9cba6277a3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/QueryCondition_Library.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="QueryConditionProfile">
-    <!-- QoS used to configure the data writer created in the example code -->
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 37e7ff8dec9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="QueryCondition_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="QueryConditionProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/run_test.pl
deleted file mode 100755
index 638d55cd247..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl
deleted file mode 100644
index f0bfd6bcc95..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file QCLE_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_LISTEN_EVENT_TEST_BASE_IDL
-#define QUERY_CONDITION_LISTEN_EVENT_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/QCLE_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/QCLE_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "QueryConditionListenEventTest"
-#pragma DCPS_DATA_KEY "QueryConditionListenEventTest key"
-
-struct QueryConditionListenEventTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<QueryConditionListenEventTest> QueryConditionListenEventTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.mpc
deleted file mode 100644
index e9918ebd97a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_QCLE_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_QCLE_Test_Base_stub
-  dynamicflags += QUERY_CONDITION_LISTEN_EVENT_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=QUERY_CONDITION_LISTEN_EVENT_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=QCLE_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    QCLE_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=QUERY_CONDITION_LISTEN_EVENT_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    QCLE_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl
deleted file mode 100644
index 8224dd82403..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file QCLE_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_IDL_
-#define QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/QCLE_Test_Base.idl"
-
-#pragma ciao lem "Connector/QCLE_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/QCLE_Test_BaseTypeSupport.idl"
-#endif
-
-module QCLE_Test
-{
-  module ::CCM_DDS::Typed < ::QueryConditionListenEventTest, ::QueryConditionListenEventTestSeq> QueryConditionListenEventTestConnector;
-};
-
-#endif /* QCLE_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc
deleted file mode 100644
index da83149c589..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_QCLE_Test_Base -l .. -o ../lib -u DDS QCLE_Test_Connector"
-
-project(DDS_QCLE_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_QCLE_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=QCLE_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=QCLE_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=QCLE_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=QCLE_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    QCLE_Test_Connector.idl
-  }
-}
-
-project(DDS_QCLE_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_QCLE_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=QCLE_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    QCLE_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_QCLE_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_QCLE_Test_Connector_lem_gen DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Base_stub
-  libs  += DDS_QCLE_Test_Base_stub DDS_QCLE_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_QCLE_Test_Connector_lem_stub
-  dynamicflags += QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLE_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    QCLE_Test_ConnectorEC.h
-    QCLE_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCLE_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_QCLE_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_QCLE_Test_Connector_idl_gen DDS_QCLE_Test_Base_stub
-  libs  += DDS_QCLE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_QCLE_Test_Connector_stub
-  dynamicflags += QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLE_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    QCLE_Test_ConnectorC.h
-    QCLE_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    QCLE_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_QCLE_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_QCLE_Test_Connector_lem_stub DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Base_stub
-  sharedname = DDS_QCLE_Test_Connector_exec
-  libs += DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Connector_lem_stub DDS_QCLE_Test_Base_stub DDS_QCLE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLE_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    QCLE_Test_Connector_conn.h
-    QCLE_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_QCLE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_QCLE_Test_Connector_lem_stub DDS_QCLE_Test_Connector_exec DDS_QCLE_Test_Connector_stub
-  sharedname  = DDS_QCLE_Test_Connector_svnt
-  libs       += DDS_QCLE_Test_Connector_stub \
-                DDS_QCLE_Test_Connector_lem_stub  \
-                DDS_QCLE_Test_Base_stub \
-                DDS_QCLE_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLE_Test_ConnectorS.cpp
-    QCLE_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    QCLE_Test_ConnectorS.h
-    QCLE_Test_Connector_svnt.h
-    QCLE_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.idl
deleted file mode 100644
index 613ef825f4c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/QCLE_Test_Connector.idl"
-
-module QCLE_Test
-{
-  component Receiver
-  {
-    port QueryConditionListenEventTestConnector::DDS_Listen info_listen;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc
deleted file mode 100644
index df60dc7545c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-project(DDS_QCLE_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_QCLE_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 {
-    QCLE_Test_Receiver.idl
-  }
-}
-
-project(DDS_QCLE_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_QCLE_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 {
-    QCLE_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_QCLE_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_QCLE_Test_Receiver_lem_gen DDS_QCLE_Test_Receiver_stub  \
-           DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Base_stub
-  libs  +=  Receiver_stub DDS_QCLE_Test_Connector_stub \
-            DDS_QCLE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLE_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    QCLE_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCLE_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_QCLE_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_QCLE_Test_Receiver_idl_gen  DDS_QCLE_Test_Connector_stub \
-           DDS_QCLE_Test_Base_stub DDS_QCLE_Test_Connector_lem_gen
-  libs  += DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLE_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    QCLE_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    QCLE_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_QCLE_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_QCLE_Test_Receiver_lem_stub DDS_QCLE_Test_Receiver_stub \
-             DDS_QCLE_Test_Base_stub DDS_QCLE_Test_Connector_stub \
-             DDS_QCLE_Test_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_QCLE_Test_Base_stub \
-          DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLE_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    QCLE_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_QCLE_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_QCLE_Test_Receiver_lem_stub DDS_QCLE_Test_Base_stub \
-                  DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Connector_svnt \
-                  DDS_QCLE_Test_Receiver_exec DDS_QCLE_Test_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_QCLE_Test_Base_stub \
-                DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Connector_svnt \
-                Receiver_exec DDS_QCLE_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLE_Test_ReceiverS.cpp
-    QCLE_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    QCLE_Test_ReceiverS.h
-    QCLE_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp
deleted file mode 100644
index 189a1b08bf8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,364 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "QCLE_Test_Receiver_exec.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-#define QUERY "( (iteration > %0) AND (iteration < %1) )"
-
-#define MIN_ITERATION "2"
-#define MAX_ITERATION "5"
-
-#define SAMPLES_PER_KEY 2 //only iteration 3 and 4 should be coming in....
-
-namespace CIAO_QCLE_Test_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_listen_data_listener_exec_i
-   */
-
-  info_listen_data_listener_exec_i::info_listen_data_listener_exec_i (
-        ::QCLE_Test::CCM_Receiver_Context_ptr ctx,
-        ACE_Thread_ID &thread_id,
-        Atomic_Long &samples_received)
-    : ciao_context_ (
-        ::QCLE_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , thread_id_ (thread_id)
-      , samples_received_ (samples_received)
-  {
-  }
-
-  info_listen_data_listener_exec_i::~info_listen_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::QCLE_Test::QueryConditionListenEventTestConnector::Listener
-
-  void
-  info_listen_data_listener_exec_i::on_one_data (const ::QueryConditionListenEventTest & datum,
-  const ::CCM_DDS::ReadInfo & info)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_ = t_id;
-    ++this->samples_received_;
-
-    ACE_DEBUG ((LM_DEBUG, "QueryConditionListenEventTest_Listener::on_one_data: "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.iteration));
-    if (info.instance_handle == ::DDS::HANDLE_NIL)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QueryConditionListenEventTest_Listener::on_one_data: "
-                            "instance handle seems to be invalid "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.iteration));
-      }
-    if (info.source_timestamp.sec == 0 &&
-        info.source_timestamp.nanosec == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QueryConditionListenEventTest_Listener::on_one_data: "
-                            "source timestamp seems to be invalid (nil) "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.iteration));
-      }
-    if (datum.iteration <= ACE_OS::atoi (MIN_ITERATION) ||
-        datum.iteration  > ACE_OS::atoi (MAX_ITERATION) )
-      {
-        ACE_ERROR ((LM_ERROR, "QueryConditionListenEventTest_Listener::on_one_data: "
-                              "ERROR: Unexpected iteration received.\n"));
-      }
-  }
-
-  void
-  info_listen_data_listener_exec_i::on_many_data (const ::QueryConditionListenEventTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_listen_status_exec_i
-   */
-
-  info_listen_status_exec_i::info_listen_status_exec_i (
-        ::QCLE_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::QCLE_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_listen_status_exec_i::~info_listen_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_listen_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_listen_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : keys_ (5)
-      , iterations_ (10)
-      , thread_id_listener_ (0, 0)
-      , samples_expected_ (keys_ * SAMPLES_PER_KEY)
-      , samples_received_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  void
-  Receiver_exec_i::start ()
-  {
-    ::CCM_DDS::DataListenerControl_var dlc =
-        this->ciao_context_->get_connection_info_listen_data_control ();
-    dlc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  // Component attributes and port operations.
-
-  ::QCLE_Test::QueryConditionListenEventTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_listen_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_listen_data_listener_.in ()))
-      {
-        info_listen_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_listen_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->thread_id_listener_,
-            this->samples_received_),
-            ::QCLE_Test::QueryConditionListenEventTestConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_listen_data_listener_ = tmp;
-      }
-
-    return
-      ::QCLE_Test::QueryConditionListenEventTestConnector::CCM_Listener::_duplicate (
-        this->ciao_info_listen_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_listen_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_listen_status_.in ()))
-      {
-        info_listen_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_listen_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_listen_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_listen_status_.in ());
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Receiver_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::QCLE_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - "
-                          "Set filter.\n"));
-
-    CCM_DDS::QueryFilter filter;
-    filter.expression = CORBA::string_dup (QUERY);
-    filter.parameters.length (2);
-    filter.parameters[0] = CORBA::string_dup (MIN_ITERATION);
-    filter.parameters[1] = CORBA::string_dup (MAX_ITERATION);
-
-    ::QCLE_Test::QueryConditionListenEventTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_listen_data ();
-
-    reader->query (filter);
-
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - "
-                          "Start listening.\n"));
-    start ();
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_.to_string (list_buf);
-
-
-    if (this->thread_id_listener_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for ReaderListener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "QF_EVENT: "
-                              "Thread switch for ReaderListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QF_EVENT: "
-                              "Thread switch for ReaderListener "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QF_EVENT: ReaderListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                               "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "QF_EVENT: ReaderListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #endif
-    if (this->samples_received_ != this->samples_expected_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QF_EVENT: ReaderListener: "
-                              "Unexpected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_,
-                              this->samples_received_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "QF_EVENT: ReaderListener: "
-                              "Expected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_,
-                              this->samples_received_.value ()));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCLE_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/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h
deleted file mode 100644
index 00745c85c30..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h
+++ /dev/null
@@ -1,191 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_QCLE_TEST_RECEIVER_EXEC_EETZIS_H_
-#define CIAO_QCLE_TEST_RECEIVER_EXEC_EETZIS_H_
-
-#include /**/ "ace/pre.h"
-
-#include "QCLE_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_QCLE_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Long> Atomic_Long;
-
-  /**
-   * Provider Executor Implementation Class: info_listen_data_listener_exec_i
-   */
-
-  class info_listen_data_listener_exec_i
-    : public virtual ::QCLE_Test::QueryConditionListenEventTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_listen_data_listener_exec_i (
-      ::QCLE_Test::CCM_Receiver_Context_ptr ctx,
-      ACE_Thread_ID &thread_id,
-      Atomic_Long &samples_received);
-    virtual ~info_listen_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from QCLE_Test::QueryConditionListenEventTestConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::QueryConditionListenEventTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::QueryConditionListenEventTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::QCLE_Test::CCM_Receiver_Context_var ciao_context_;
-    ACE_Thread_ID &thread_id_;
-    Atomic_Long &samples_received_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_listen_status_exec_i
-   */
-
-  class info_listen_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_listen_status_exec_i (
-      ::QCLE_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_listen_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::QCLE_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::QCLE_Test::QueryConditionListenEventTestConnector::CCM_Listener_ptr
-    get_info_listen_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_listen_status (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-
-    //@}
-
-  private:
-    ::QCLE_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::QCLE_Test::QueryConditionListenEventTestConnector::CCM_Listener_var ciao_info_listen_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_listen_status_;
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    ACE_Thread_ID thread_id_listener_;
-
-    CORBA::Long samples_expected_;
-    Atomic_Long samples_received_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCLE_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.idl
deleted file mode 100644
index 174c6d68a69..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_QUERY_CONDITION_LISTEN_EVENT_TEST_SENDER_IDL
-#define DDS_QUERY_CONDITION_LISTEN_EVENT_TEST_SENDER_IDL
-
-#include "Connector/QCLE_Test_Connector.idl"
-
-module QCLE_Test
-{
-  component Sender
-  {
-    port QueryConditionListenEventTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc
deleted file mode 100644
index 6db4c023bf0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_QCLE_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_QCLE_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_QCLE_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 {
-    QCLE_Test_Sender.idl
-  }
-}
-
-project(DDS_QCLE_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_QCLE_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 {
-    QCLE_Test_SenderE.idl
-  }
-}
-
-project(DDS_QCLE_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_QCLE_Test_Sender_lem_gen DDS_QCLE_Test_Sender_stub \
-           DDS_QCLE_Test_Base_stub
-  libs  += DDS_QCLE_Test_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLE_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    QCLE_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCLE_Test_SenderEC.inl
-  }
-}
-
-project(DDS_QCLE_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_QCLE_Test_Sender_idl_gen DDS_QCLE_Test_Base_stub \
-           DDS_QCLE_Test_Connector_stub
-  libs  += DDS_QCLE_Test_Base_stub DDS_QCLE_Test_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLE_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    QCLE_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    QCLE_Test_SenderC.inl
-  }
-}
-
-project(DDS_QCLE_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_QCLE_Test_Sender_lem_stub DDS_QCLE_Test_Sender_stub \
-             DDS_QCLE_Test_Connector_lem_stub DDS_QCLE_Test_Connector_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub DDS_QCLE_Test_Base_stub \
-             DDS_QCLE_Test_Connector_lem_stub DDS_QCLE_Test_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLE_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    QCLE_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_QCLE_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_QCLE_Test_Base_stub  DDS_QCLE_Test_Sender_lem_stub \
-                DDS_QCLE_Test_Connector_stub \
-                DDS_QCLE_Test_Connector_svnt DDS_QCLE_Test_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub DDS_QCLE_Test_Base_stub \
-                DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Connector_svnt \
-                DDS_QCLE_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLE_Test_SenderS.cpp
-    QCLE_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    QCLE_Test_SenderS.h
-    QCLE_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp
deleted file mode 100644
index 4da701e33f9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,323 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "QCLE_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_QCLE_Test_Sender_Impl
-{
-  /**
-   * Write ticker
-   */
-  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 /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.get_started ();
-      }
-  }
-
-  /**
-   * Write ticker
-   */
-
-  WriteTicker::WriteTicker (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteTicker::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.write_one ();
-    return 0;
-  }
-
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (5)
-      , iterations_ (10)
-  {
-    this->ticker_ = new WriteTicker (*this);
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::write_one (void)
-  {
-    if (this->last_key_ != this->samples_.end ())
-      {
-        try
-          {
-            ::QCLE_Test::QueryConditionListenEventTestConnector::Writer_var writer =
-              this->ciao_context_->get_connection_info_write_data ();
-
-            ++this->last_key_->second->iteration;
-            writer->write_one (this->last_key_->second, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, "Written key <%C> - <%u>\n",
-                          this->last_key_->first.c_str (),
-                          this->last_key_->second->iteration));
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                        ACE_TEXT ("while updating writer info for <%C>.\n"),
-                          this->last_key_->first.c_str ()));
-          }
-        ++this->last_key_;
-      }
-    else
-      {
-        //onto the next iteration
-        this->last_key_ = this->samples_.begin ();
-        while (this->last_key_ != this->samples_.end ())
-          {
-            if (this->last_key_->second->iteration == this->iterations_)
-              {
-                //next key
-                ++this->last_key_;
-              }
-            else
-              {
-                break;
-              }
-          }
-        if (this->last_key_ == this->samples_.end ())
-          {
-            this->reactor ()->cancel_timer (this->ticker_);
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    try
-      {
-        this->start ();
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::get_started: Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::get_started: Unknown exception caught\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        QueryConditionListenEventTest* new_key = new QueryConditionListenEventTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->iteration = 0;
-
-        this->samples_[key] = new_key;
-      }
-   this->last_key_ = this->samples_.begin ();
-   if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (5, 50000),
-                ACE_Time_Value (0, 50000)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  // Component attributes and port operations.
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::QCLE_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCLE_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/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.h
deleted file mode 100644
index 63db4bc3888..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.h
+++ /dev/null
@@ -1,179 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_QCLE_TEST_SENDER_EXEC_ZNGRZK_H_
-#define CIAO_QCLE_TEST_SENDER_EXEC_ZNGRZK_H_
-
-#include /**/ "ace/pre.h"
-
-#include "QCLE_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_QCLE_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Write ticker
-   */
-
-  class WriteTicker :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteTicker (Sender_exec_i &callback);
-    int handle_timeout (const ACE_Time_Value &, const void *);
-  private:
-    /// Maintains a handle that actually process the event
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void get_started (void);
-    void write_one (void);
-
-    //@}
-
-  private:
-    ::QCLE_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    WriteTicker *ticker_;
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, QueryConditionListenEventTest_var> Writer_Table;
-    Writer_Table samples_;
-
-    Writer_Table::iterator last_key_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start (void);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCLE_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/Plan.cdp
deleted file mode 100644
index e3b0bb0a926..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/Plan.cdp
+++ /dev/null
@@ -1,413 +0,0 @@
-<!--  -->
-<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>QCLE_Test_Depl_1</label>
-  <UUID>QCLE_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_QCLE_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_QCLE_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="QCLE_Test_ConnectorComponentImplementation">
-    <name>QCLE_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="QCLE_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="QCLE_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_QCLE_Test_QueryConditionListenEventTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCLE_Test_QueryConditionListenEventTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCLE_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCLE_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_QCLE_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_QCLE_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" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="QCLE_Test_ConnectorComponentInstance">
-    <name>QCLE_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QCLE_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCLE_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="QCLE_Test_ConnectorComponentInstance2">
-    <name>QCLE_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QCLE_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCLE_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_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_listen_reader_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCLE_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="QCLE_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="QCLE_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="QCLE_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="QCLE_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </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="QCLE_Test_Connector_ExecArtifact">
-    <name>QCLE_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_QCLE_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="QCLE_Test_Connector_SvntArtifact">
-    <name>QCLE_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_QCLE_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="QCLE_Test_Connector_StubArtifact">
-    <name>QCLE_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_QCLE_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/QueryCondition/EventListener/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/run_test.pl
deleted file mode 100755
index d8b4eca445d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.idl
deleted file mode 100644
index b61d30c7687..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file ReadGet_Starter.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERYCONDITION_STARTER_IDL
-#define QUERYCONDITION_STARTER_IDL
-
-#pragma ciao lem "Base/ReadGet_StarterE.idl"
-
-interface ReadGetStarter
-{
-  void set_reader_properties (in unsigned short nr_keys,
-                              in unsigned short nr_iterations);
-  void start_read (in unsigned short run);
-};
-
-interface ReadGetRestarter
-{
-  void restart_write ();
-};
-
-#endif /* QUERYCONDITION_STARTER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc
deleted file mode 100644
index 4c41bda9f0c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc
+++ /dev/null
@@ -1,109 +0,0 @@
-project(QC_ReadGet_Starter_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
-              -Wb,stub_export_include=ReadGet_Starter_stub_export.h \
-              -Wb,skel_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,skel_export_include=ReadGet_Starter_svnt_export.h \
-              -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,svnt_export_include=ReadGet_Starter_svnt_export.h \
-              -Wb,exec_export_macro=READER_STARTER_EXEC_Export \
-              -Wb,exec_export_include=ReadGet_Starter_exec_export.h -I..
-
-  IDL_Files {
-    ReadGet_Starter.idl
-  }
-}
-
-project(QC_ReadGet_Starter_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += QC_ReadGet_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \
-              -Wb,stub_export_include=ReadGet_Starter_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    ReadGet_StarterE.idl
-  }
-}
-
-project(QC_ReadGet_Starter_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += QC_ReadGet_Starter_lem_gen QC_ReadGet_Starter_stub
-  libs  += QC_ReadGet_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_ReadGet_Starter_lem_stub
-  dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_StarterEC.cpp
-  }
-
-  Header_Files {
-    ReadGet_StarterEC.h
-    ReadGet_Starter_lem_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_StarterEC.inl
-  }
-}
-
-project(QC_ReadGet_Starter_stub) : ccm_stub, dds4ccm_base {
-  after += QC_ReadGet_Starter_idl_gen
-  libs  +=
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_ReadGet_Starter_stub
-  dynamicflags += READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_StarterC.cpp
-  }
-
-  Header_Files {
-    ReadGet_StarterC.h
-    ReadGet_Starter_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_StarterC.inl
-  }
-}
-
-
-project(QC_ReadGet_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += QC_ReadGet_Starter_lem_stub QC_ReadGet_Starter_stub
-  sharedname  = QC_ReadGet_Starter_svnt
-  libs       += QC_ReadGet_Starter_stub QC_ReadGet_Starter_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += READER_STARTER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_StarterS.cpp
-    ReadGet_Starter_svnt.cpp
-  }
-
-  Header_Files {
-    ReadGet_StarterS.h
-    ReadGet_Starter_svnt.h
-    ReadGet_Starter_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl
deleted file mode 100644
index 7fadf380e9f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file ReadGet_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_TEST_BASE_IDL
-#define QUERY_CONDITION_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/ReadGet_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/ReadGet_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "QueryConditionTest"
-#pragma DCPS_DATA_KEY "QueryConditionTest symbol"
-
-struct QueryConditionTest {
-  string symbol; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<QueryConditionTest> QueryConditionTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc
deleted file mode 100644
index ee8127d2cb3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project(QC_ReadGet_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = QC_ReadGet_Test_Base_stub
-  dynamicflags += QUERY_CONDITION_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=QUERY_CONDITION_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=ReadGet_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    ReadGet_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=QUERY_CONDITION_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    ReadGet_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl
deleted file mode 100644
index 7a280e41771..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file ReadGet_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_TEST_CONNECTOR_IDL_
-#define QUERY_CONDITION_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/ReadGet_Test_Base.idl"
-
-#pragma ciao lem "Connector/ReadGet_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/ReadGet_Test_BaseTypeSupport.idl"
-#endif
-
-module ReadGet_Test
-{
-  module ::CCM_DDS::Typed < ::QueryConditionTest, ::QueryConditionTestSeq> QueryConditionTestConnector;
-};
-
-#endif /* QUERY_CONDITION_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc
deleted file mode 100644
index bf66a086bcf..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p ReadGet_Test_Base -l .. -o ../lib -u DDS ReadGet_Test_Connector"
-
-project(QC_ReadGet_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen QC_ReadGet_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=ReadGet_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=ReadGet_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=ReadGet_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=QUERY_CONDITION_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=ReadGet_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    ReadGet_Test_Connector.idl
-  }
-}
-
-project(QC_ReadGet_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += QC_ReadGet_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=ReadGet_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    ReadGet_Test_ConnectorE.idl
-  }
-}
-
-project(QC_ReadGet_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += QC_ReadGet_Test_Connector_lem_gen QC_ReadGet_Test_Connector_stub \
-           QC_ReadGet_Test_Base_stub
-  libs  += QC_ReadGet_Test_Base_stub QC_ReadGet_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_ReadGet_Test_Connector_lem_stub
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_ConnectorEC.h
-    ReadGet_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_Test_ConnectorEC.inl
-  }
-}
-
-project(QC_ReadGet_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += QC_ReadGet_Test_Connector_idl_gen QC_ReadGet_Test_Base_stub
-  libs  += QC_ReadGet_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_ReadGet_Test_Connector_stub
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_ConnectorC.h
-    ReadGet_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_Test_ConnectorC.inl
-  }
-}
-
-project(QC_ReadGet_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += QC_ReadGet_Test_Connector_lem_stub QC_ReadGet_Test_Connector_stub \
-             QC_ReadGet_Test_Base_stub
-  sharedname = QC_ReadGet_Test_Connector_exec
-  libs += QC_ReadGet_Test_Connector_stub QC_ReadGet_Test_Connector_lem_stub \
-          QC_ReadGet_Test_Base_stub QC_ReadGet_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_Connector_conn.h
-    ReadGet_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QC_ReadGet_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += QC_ReadGet_Test_Connector_lem_stub QC_ReadGet_Test_Connector_exec \
-                QC_ReadGet_Test_Connector_stub
-  sharedname  = QC_ReadGet_Test_Connector_svnt
-  libs       += QC_ReadGet_Test_Connector_stub \
-                QC_ReadGet_Test_Connector_lem_stub  \
-                QC_ReadGet_Test_Base_stub \
-                QC_ReadGet_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_ConnectorS.cpp
-    ReadGet_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_ConnectorS.h
-    ReadGet_Test_Connector_svnt.h
-    ReadGet_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.idl
deleted file mode 100644
index d77408ba757..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/ReadGet_Test_Connector.idl"
-#include "Base/ReadGet_Starter.idl"
-
-module ReadGet_Test
-{
-  component Receiver
-  {
-    port QueryConditionTestConnector::DDS_Get get_port;
-    port QueryConditionTestConnector::DDS_Read check_port;
-
-    provides ReadGetStarter reader_start;
-    uses ReadGetRestarter writer_restart;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc
deleted file mode 100644
index ff25d209f83..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc
+++ /dev/null
@@ -1,155 +0,0 @@
-project(QC_ReadGet_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += QC_ReadGet_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 {
-    ReadGet_Test_Receiver.idl
-  }
-}
-
-project(QC_ReadGet_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += QC_ReadGet_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 {
-    ReadGet_Test_ReceiverE.idl
-  }
-}
-
-project(QC_ReadGet_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += QC_ReadGet_Test_Receiver_lem_gen QC_ReadGet_Test_Receiver_stub  \
-           QC_ReadGet_Test_Connector_stub QC_ReadGet_Test_Base_stub \
-           QC_ReadGet_Starter_stub
-  libs  +=  Receiver_stub QC_ReadGet_Test_Connector_stub \
-            QC_ReadGet_Test_Base_stub QC_ReadGet_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_Test_ReceiverEC.inl
-  }
-}
-
-project(QC_ReadGet_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += QC_ReadGet_Test_Receiver_idl_gen  QC_ReadGet_Test_Connector_stub \
-           QC_ReadGet_Test_Base_stub QC_ReadGet_Test_Connector_lem_gen \
-           QC_ReadGet_Starter_stub QC_ReadGet_Starter_lem_stub
-  libs  += QC_ReadGet_Test_Connector_stub QC_ReadGet_Test_Base_stub \
-           QC_ReadGet_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_Test_ReceiverC.inl
-  }
-}
-
-project(QC_ReadGet_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += QC_ReadGet_Test_Receiver_lem_stub QC_ReadGet_Test_Receiver_stub \
-             QC_ReadGet_Test_Base_stub QC_ReadGet_Test_Connector_stub \
-             QC_ReadGet_Test_Connector_lem_stub \
-             QC_ReadGet_Starter_lem_stub QC_ReadGet_Starter_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub QC_ReadGet_Test_Base_stub \
-          QC_ReadGet_Test_Connector_stub QC_ReadGet_Test_Connector_lem_stub \
-          QC_ReadGet_Starter_lem_stub QC_ReadGet_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QC_ReadGet_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   QC_ReadGet_Test_Receiver_lem_stub QC_ReadGet_Test_Base_stub \
-                  QC_ReadGet_Test_Connector_stub QC_ReadGet_Test_Connector_svnt \
-                  QC_ReadGet_Test_Receiver_exec QC_ReadGet_Test_Connector_lem_stub \
-                  QC_ReadGet_Starter_stub \
-                  QC_ReadGet_Starter_svnt QC_ReadGet_Starter_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub QC_ReadGet_Test_Base_stub \
-                QC_ReadGet_Test_Connector_stub QC_ReadGet_Test_Connector_svnt \
-                Receiver_exec QC_ReadGet_Test_Connector_lem_stub \
-                QC_ReadGet_Starter_stub QC_ReadGet_Starter_svnt \
-                QC_ReadGet_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_ReceiverS.cpp
-    ReadGet_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_ReceiverS.h
-    ReadGet_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp
deleted file mode 100644
index cc2da4b2fb7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,823 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "ReadGet_Test_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "dds4ccm/impl/dds4ccm_utils.h"
-
-#define QUERY "( (iteration > %0) AND (iteration < %1) )"
-
-#define MIN_ITERATION_1 "2"
-#define MAX_ITERATION_1 "5"
-
-// First run filtered in : 2 (iteration 3 and 4)
-
-// Since QueryCondition contains a bug, we've changed
-// the iterations of the second run in order for this test
-// to succeed. There's a different tests which reproduces
-// the bug.
-// #define MIN_ITERATION_2 "22"
-// #define MAX_ITERATION_2 "34"
-
-#define MIN_ITERATION_2 "7"
-#define MAX_ITERATION_2 "9"
-
-// Should be : Second run filtered in : 11 (iterations between 22 and 34)
-// Is now : Second run filtered in : 1 (only iteration 8)
-
-#define SAMPLES_PER_KEY_GETTER (2 + 1)
-
-// Reader also reads already read samples.
-#define SAMPLES_PER_KEY_READER (2 + 1)
-
-namespace CIAO_ReadGet_Test_Receiver_Impl
-{
-  /**
-   * Read Action Generator
-   */
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback,
-                                                int run)
-    : callback_ (callback),
-      run_ (run)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Checking if last sample "
-                          "is available in DDS...\n"));
-    if (this->run_ == 1 || this->callback_.check_last ())
-      {
-        this->callback_.run (this->run_);
-      }
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: get_port_status_exec_i
-   */
-
-  get_port_status_exec_i::get_port_status_exec_i (
-        ::ReadGet_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::ReadGet_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  get_port_status_exec_i::~get_port_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  get_port_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  get_port_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: check_port_status_exec_i
-   */
-
-  check_port_status_exec_i::check_port_status_exec_i (
-        ::ReadGet_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::ReadGet_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  check_port_status_exec_i::~check_port_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  check_port_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  check_port_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: reader_start_exec_i
-   */
-
-  reader_start_exec_i::reader_start_exec_i (
-        ::ReadGet_Test::CCM_Receiver_Context_ptr ctx,
-        Receiver_exec_i &callback)
-    : ciao_context_ (
-        ::ReadGet_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  reader_start_exec_i::~reader_start_exec_i (void)
-  {
-  }
-
-  // Operations from ::ReadGetStarter
-
-  void
-  reader_start_exec_i::set_reader_properties (::CORBA::UShort nr_keys,
-  ::CORBA::UShort nr_iterations)
-  {
-    this->callback_.keys (nr_keys);
-    this->callback_.iterations (nr_iterations);
-  }
-
-  void
-  reader_start_exec_i::start_read (::CORBA::UShort run)
-  {
-    this->callback_.start_read (run);
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-      : iterations_ (20)
-        , keys_ (5)
-        , current_min_iteration_ (ACE_OS::atoi (MIN_ITERATION_1))
-        , current_max_iteration_ (ACE_OS::atoi (MAX_ITERATION_1))
-        , ticker_ (0)
-        , samples_expected_getter_ (0)
-        , samples_received_getter_ (0)
-        , samples_expected_reader_ (0)
-        , samples_received_reader_ (0)
-
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  bool
-  Receiver_exec_i::check_last ()
-  {
-    ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_get_port_data ();
-
-    try
-      {
-        QueryConditionTest queryfiltertest_info;
-        ::CCM_DDS::ReadInfo readinfo;
-        char key[10];
-        ACE_OS::sprintf (key, "KEY_%d", this->keys_);
-        queryfiltertest_info.symbol = CORBA::string_dup (key);
-        reader->read_one_last (
-                queryfiltertest_info,
-                readinfo,
-                ::DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - "
-                              "last iteration <%02d> - <%02d>\n",
-                               queryfiltertest_info.iteration,
-                               this->current_max_iteration_ - 1));
-        return queryfiltertest_info.iteration >= this->current_max_iteration_ - 1;
-      }
-    catch (const ::CCM_DDS::InternalError &)
-      {
-      }
-    catch (const ::CCM_DDS::NonExistent &)
-      {
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: "
-                              "ERROR: Unexpected exception caught\n"));
-      }
-    return false;
-  }
-
-  // Supported operations and attributes.
-  void
-  Receiver_exec_i::check_iter (const QueryConditionTest & sample,
-                               const char * test)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%C ALL : ")
-        ACE_TEXT ("sample received for <%C>: iteration <%02u>\n"),
-        test,
-        sample.symbol.in (),
-        sample.iteration));
-    if (sample.iteration <= ACE_OS::atoi (MIN_ITERATION_1))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: %C ALL: "
-                              "Didn't expect samples with iterations "
-                              "<= %02d\n",
-                              test,
-                              this->current_min_iteration_));
-      }
-    if (sample.iteration > this->current_max_iteration_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: %C ALL: "
-                              "Didn't expect samples with iterations "
-                              "> %02d\n",
-                              test,
-                              this->current_max_iteration_));
-      }
-  }
-
-
-  void
-  Receiver_exec_i::read_all (void)
-  {
-    ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_get_port_data ();
-
-    QueryConditionTestSeq queryfiltertest_info_seq;
-    ::CCM_DDS::ReadInfoSeq readinfo_seq;
-    reader->read_all (queryfiltertest_info_seq, readinfo_seq);
-    if (queryfiltertest_info_seq.length () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::read_all : "
-                              "No samples available in Reader!\n"));
-      }
-    for (CORBA::ULong it = 0; it < queryfiltertest_info_seq.length (); ++it)
-      {
-        this->check_iter (queryfiltertest_info_seq[it], "READ");
-      }
-    this->samples_received_reader_ += queryfiltertest_info_seq.length ();
-  }
-
-  void
-  Receiver_exec_i::get_all (void)
-  {
-    ::ReadGet_Test::QueryConditionTestConnector::Getter_var getter =
-      this->ciao_context_->get_connection_get_port_fresh_data ();
-
-    if (::CORBA::is_nil (getter.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - "
-                              "ERROR: No Getter\n"));
-      }
-    QueryConditionTest_var qf_info;
-    ::CCM_DDS::ReadInfo readinfo;
-    CORBA::Boolean result = getter->get_one (qf_info.out (), readinfo);
-    if (ACE_OS::strlen (qf_info->symbol.in ()) == 0)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::get_all - ")
-                              ACE_TEXT ("Name of key seems to be empty-> bailing out\n")));
-        return;
-      }
-    if (result)
-      {
-        this->check_iter (qf_info.in (), "GET");
-        ++this->samples_received_getter_;
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - "
-                              "ERROR: time out when retrieving "
-                              "first sample.\n"));
-      }
-    while (result)
-      {
-        result = getter->get_one (qf_info.out (), readinfo);
-        if (result)
-          {
-            this->check_iter (qf_info.in (), "GET");
-            ++this->samples_received_getter_;
-          }
-      }
-  }
-
-  void
-  Receiver_exec_i::check_all (void)
-  {
-    ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_check_port_data ();
-
-    QueryConditionTestSeq queryfiltertest_info_seq;
-    ::CCM_DDS::ReadInfoSeq readinfo_seq;
-    reader->read_all (queryfiltertest_info_seq, readinfo_seq);
-
-    for (CORBA::ULong it = 0; it < queryfiltertest_info_seq.length (); ++it)
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\t\tCHECK ALL : ")
-            ACE_TEXT ("sample received for <%C>: iteration <%02u> - ")
-            ACE_TEXT ("access_status <%C> - instance_status <%d>\n"),
-            queryfiltertest_info_seq[it].symbol.in (),
-            queryfiltertest_info_seq[it].iteration,
-            CIAO::DDS4CCM::translate_ccm_dds_accessstatus (readinfo_seq[it].access_status),
-            readinfo_seq[it].instance_status));
-      }
-    CORBA::ULong expected = 0;
-    if (this->current_min_iteration_ == ACE_OS::atoi (MIN_ITERATION_1))
-      {
-        expected = this->iterations_ * this->keys_;
-      }
-    else if (this->current_min_iteration_ == ACE_OS::atoi (MIN_ITERATION_2))
-      {
-        expected = this->iterations_ * this->keys_ * 2;
-      }
-    if (queryfiltertest_info_seq.length () == expected)
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_all - "
-                    "OK : All samples received on the DDS_Read port: "
-                    "expected <%02u> - received <%02u>\n",
-                    expected,
-                    queryfiltertest_info_seq.length ()));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_all - "
-                    "ERROR: Unexpected number of samples received "
-                    "on the DDS_Read port: "
-                    "expected <%u> - received <%u>\n",
-                    expected,
-                    queryfiltertest_info_seq.length ()));
-      }
-  }
-
-  void
-  Receiver_exec_i::test_all ()
-  {
-    const char * test = "GET ALL";
-    try
-      {
-        get_all ();
-        test = "READ ALL";
-        read_all ();
-        // reading all samples on a different port.
-         check_all ();
-      }
-    catch (const CCM_DDS::NonExistent& ex)
-      {
-        for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ERROR %C: ")
-                  ACE_TEXT ("caught expected exception: index <%u>\n"),
-                  test,
-                  ex.indexes[i]));
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: %C: ")
-              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-              test,
-              ex.error_code));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception (test);
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::test_all : Exception caught\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::test_exception ()
-  {
-    ::CCM_DDS::QueryFilter_var query;
-    ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_get_port_data ();
-
-    try
-      {
-        query = reader->query ();
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::test_excep - "
-                              "Expected InternalErr excep caught : retval <%u>\n",
-                              ex.error_code));
-        return;
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Receiver_exec_i::test_exception: ");
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::test_exception - "
-                              "Unexpected exception caught\n"));
-        return;
-      }
-    ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::test_exception - "
-                          "No exception caught while retrieving unset filter.\n"));
-  }
-
-  void
-  Receiver_exec_i::check_filter ()
-  {
-    ::CCM_DDS::QueryFilter_var filter;
-    ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_get_port_data ();
-    try
-      {
-        filter = reader->query ();
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                              "caught InternalError exception: retval <%u>\n",
-                              ex.error_code));
-        return;
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Receiver_exec_i::check_filter: ");
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                              "Exception caught\n"));
-        return;
-      }
-
-    //check query
-    bool error = false;
-    if (ACE_OS::strcmp (filter->expression, QUERY) != 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                              "Unexpected query when retrieving filter: "
-                              "expected <%C> - received <%C>\n",
-                              QUERY, filter->expression.in ()));
-        error = true;
-      }
-    //check current parameters.
-    if (filter->parameters.length () != 2)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                              "Unexpected number of parameters: "
-                              "expected <%d> - received <%d>\n",
-                              2, filter->parameters.length ()));
-        error = true;
-      }
-
-    if (filter->parameters.length () >= 1)
-      {
-        if (ACE_OS::atoi (filter->parameters[0]) != this->current_min_iteration_)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                                  "Unexpected param value: "
-                                  "expected <%d> - received <%C>\n",
-                                  this->current_min_iteration_,
-                                  filter->parameters[0].in ()));
-            error = true;
-          }
-      }
-    if (filter->parameters.length () >= 2)
-      {
-        if (ACE_OS::atoi (filter->parameters[1]) != this->current_max_iteration_)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                                  "Unexpected param value: "
-                                  "expected <%d> - received <%C>\n",
-                                  this->current_max_iteration_,
-                                  filter->parameters[1].in ()));
-            error = true;
-          }
-      }
-    if (!error)
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_filter - "
-                              "Passed check_filter test.\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::test_set_query_parameters ()
-  {
-    try
-      {
-        ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader =
-          this->ciao_context_->get_connection_get_port_data ();
-
-        ::CCM_DDS::QueryFilter filter;
-        filter.expression = CORBA::string_dup (QUERY);
-        filter.parameters.length (2);
-        filter.parameters[0] = CORBA::string_dup (MIN_ITERATION_2);
-        filter.parameters[1] = CORBA::string_dup (MAX_ITERATION_2);
-        reader->query (filter);
-        this->current_min_iteration_ = ACE_OS::atoi (MIN_ITERATION_2);
-        this->current_max_iteration_ = ACE_OS::atoi (MAX_ITERATION_2);
-
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::test_set_query_parameters - "
-                    "New query parameters set (<%C> - <%C>)!\n",
-                    MIN_ITERATION_2, MAX_ITERATION_2));
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::test_set_query_parameters - "
-                              "caught InternalError exception: retval <%u>\n",
-                              ex.error_code));
-        return;
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Receiver_exec_i::test_set_query_parameters: ");
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::test_set_query_parameters - "
-                              "Exception caught\n"));
-        return;
-      }
-  }
-
-  void
-  Receiver_exec_i::set_filter ()
-  {
-    ACE_DEBUG ((LM_DEBUG, "Set filter\n"));
-    ::ReadGet_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_get_port_data ();
-    ::CCM_DDS::QueryFilter filter;
-    filter.expression = CORBA::string_dup (QUERY);
-    filter.parameters.length (2);
-    filter.parameters[0] = CORBA::string_dup (MIN_ITERATION_1);
-    filter.parameters[1] = CORBA::string_dup (MAX_ITERATION_1);
-    reader->query (filter);
-  }
-
-  void
-  Receiver_exec_i::start_read (CORBA::UShort run)
-  {
-    this->ticker_ = new read_action_Generator (*this, run);
-    if (this->reactor ()->schedule_timer (this->ticker_,
-                                          0,
-                                          ACE_Time_Value(1, 0),
-                                          ACE_Time_Value(1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::run (CORBA::UShort run)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::run - "
-                          "Starting run number <%d>\n",
-                          run));
-    switch (run)
-    {
-      case 1:
-        {
-          this->test_exception ();
-          this->set_filter ();
-          this->restarter_->restart_write ();
-        }
-        break;
-      case 2:
-        {
-          this->test_all ();
-          check_filter ();
-          this->test_set_query_parameters ();
-          this->restarter_->restart_write ();
-        }
-        break;
-      case 3:
-        {
-          this->test_all ();
-          this->check_filter ();
-        }
-        break;
-    }
-  }
-
-  void
-  Receiver_exec_i::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-
-  }
-
-  void
-  Receiver_exec_i::keys (::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-
-    this->samples_expected_getter_ = (this->keys_ - 1) * SAMPLES_PER_KEY_GETTER;
-    this->samples_expected_reader_ = (this->keys_) * SAMPLES_PER_KEY_READER;
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_get_port_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_get_port_status_.in ()))
-      {
-        get_port_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          get_port_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_get_port_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_get_port_status_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_check_port_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_check_port_status_.in ()))
-      {
-        check_port_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          check_port_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_check_port_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_check_port_status_.in ());
-  }
-
-  ::CCM_ReadGetStarter_ptr
-  Receiver_exec_i::get_reader_start (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_reader_start_.in ()))
-      {
-        reader_start_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          reader_start_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_ReadGetStarter::_nil ());
-
-          this->ciao_reader_start_ = tmp;
-      }
-
-    return
-      ::CCM_ReadGetStarter::_duplicate (
-        this->ciao_reader_start_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::ReadGet_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::ReadGet_Test::QueryConditionTestConnector::Getter_var getter =
-      this->ciao_context_->get_connection_get_port_fresh_data ();
-    DDS::Duration_t to;
-    to.sec = 5;
-    to.nanosec = 0;
-    if (! ::CORBA::is_nil (getter))
-      {
-        getter->time_out (to);
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Unable to set time out.\n"));
-      }
-    this->restarter_ = this->ciao_context_->get_connection_writer_restart ();
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->samples_received_getter_ != this->samples_expected_getter_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: READGET GETTER : "
-                              "Unexpected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_getter_,
-                              this->samples_received_getter_));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "READGET : GETTER : "
-                              "Expected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_getter_,
-                              this->samples_received_getter_));
-      }
-    if (this->samples_received_reader_ != this->samples_expected_reader_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: READGET READER : "
-                              "Unexpected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_reader_,
-                              this->samples_received_reader_));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "READGET : READER : "
-                              "Expected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_reader_,
-                              this->samples_received_reader_));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_ReadGet_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/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h
deleted file mode 100644
index 9411f74f4b6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h
+++ /dev/null
@@ -1,253 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_READGET_TEST_RECEIVER_EXEC_WOPYWH_H_
-#define CIAO_READGET_TEST_RECEIVER_EXEC_WOPYWH_H_
-
-#include /**/ "ace/pre.h"
-
-#include "ReadGet_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_ReadGet_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  /**
-   * Read action generator
-   */
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback,
-                           int run);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Receiver_exec_i &callback_;
-    int run_;
-
-  };
-
-
-  /**
-   * Provider Executor Implementation Class: get_port_status_exec_i
-   */
-
-  class get_port_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    get_port_status_exec_i (
-      ::ReadGet_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~get_port_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::ReadGet_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: check_port_status_exec_i
-   */
-
-  class check_port_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    check_port_status_exec_i (
-      ::ReadGet_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~check_port_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::ReadGet_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: reader_start_exec_i
-   */
-
-  class reader_start_exec_i
-    : public virtual ::CCM_ReadGetStarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    reader_start_exec_i (
-      ::ReadGet_Test::CCM_Receiver_Context_ptr ctx,
-      Receiver_exec_i &callback);
-    virtual ~reader_start_exec_i (void);
-
-    //@{
-    /** Operations and attributes from ReadGetStarter. */
-
-    virtual
-    void set_reader_properties (::CORBA::UShort nr_keys,
-    ::CORBA::UShort nr_iterations);
-
-    virtual
-    void start_read (::CORBA::UShort run);
-    //@}
-
-  private:
-    ::ReadGet_Test::CCM_Receiver_Context_var ciao_context_;
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_get_port_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_check_port_status (void);
-
-    virtual ::CCM_ReadGetStarter_ptr
-    get_reader_start (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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void iterations (CORBA::UShort iterations);
-    void keys (::CORBA::UShort keys);
-
-    bool check_last (void);
-    void start_read (::CORBA::UShort run);
-    void run (::CORBA::UShort run);
-    //@}
-
-  private:
-    ::ReadGet_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_get_port_status_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_check_port_status_;
-    ::CCM_ReadGetStarter_var ciao_reader_start_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    ReadGetRestarter_var restarter_;
-    ::CORBA::UShort   iterations_;
-    ::CORBA::UShort   keys_;
-
-    int current_min_iteration_;
-    int current_max_iteration_;
-
-    read_action_Generator *ticker_;
-
-    ::CORBA::ULong samples_expected_getter_;
-    ::CORBA::ULong samples_received_getter_;
-    ::CORBA::ULong samples_expected_reader_;
-    ::CORBA::ULong samples_received_reader_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void test_all (void);
-    void read_all (void);
-    void get_all (void);
-    void check_all (void);
-    void check_iter (const QueryConditionTest & sample,
-                     const char * test);
-    void check_filter (void);
-    void test_exception (void);
-    void test_set_query_parameters (void);
-    void set_filter (void);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_ReadGet_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.idl
deleted file mode 100644
index fa2aa12902b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_QUERY_CONDITION_TEST_SENDER_IDL
-#define DDS_QUERY_CONDITION_TEST_SENDER_IDL
-
-#include "Connector/ReadGet_Test_Connector.idl"
-#include "Base/ReadGet_Starter.idl"
-
-module ReadGet_Test
-{
-  component Sender
-  {
-    port ReadGet_Test::QueryConditionTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    uses ReadGetStarter start_reader;
-    provides ReadGetRestarter restart_writer;
-
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc
deleted file mode 100644
index 324b3be379a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc
+++ /dev/null
@@ -1,153 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p ReadGet_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(QC_ReadGet_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += QC_ReadGet_Test_Connector_idl_gen QC_ReadGet_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 {
-    ReadGet_Test_Sender.idl
-  }
-}
-
-project(QC_ReadGet_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += QC_ReadGet_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 {
-    ReadGet_Test_SenderE.idl
-  }
-}
-
-project(QC_ReadGet_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += QC_ReadGet_Test_Sender_lem_gen QC_ReadGet_Test_Sender_stub \
-           QC_ReadGet_Test_Base_stub QC_ReadGet_Starter_stub
-  libs  += QC_ReadGet_Test_Base_stub Sender_stub QC_ReadGet_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_Test_SenderEC.inl
-  }
-}
-
-project(QC_ReadGet_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += QC_ReadGet_Test_Sender_idl_gen QC_ReadGet_Test_Base_stub \
-           QC_ReadGet_Test_Connector_stub QC_ReadGet_Starter_stub \
-           QC_ReadGet_Starter_lem_stub
-  libs  += QC_ReadGet_Test_Base_stub QC_ReadGet_Test_Connector_stub \
-           QC_ReadGet_Starter_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    ReadGet_Test_SenderC.inl
-  }
-}
-
-project(QC_ReadGet_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += QC_ReadGet_Test_Sender_lem_stub QC_ReadGet_Test_Sender_stub \
-             QC_ReadGet_Test_Connector_lem_stub QC_ReadGet_Test_Connector_stub \
-             QC_ReadGet_Starter_lem_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub QC_ReadGet_Test_Base_stub \
-             QC_ReadGet_Test_Connector_lem_stub QC_ReadGet_Test_Connector_stub \
-             QC_ReadGet_Starter_stub QC_ReadGet_Starter_lem_stub \
-             QC_ReadGet_Starter_lem_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QC_ReadGet_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += QC_ReadGet_Test_Base_stub  QC_ReadGet_Test_Sender_lem_stub \
-                QC_ReadGet_Test_Connector_stub \
-                QC_ReadGet_Test_Connector_svnt QC_ReadGet_Test_Connector_lem_stub \
-                QC_ReadGet_Starter_stub QC_ReadGet_Starter_svnt \
-                QC_ReadGet_Starter_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub QC_ReadGet_Test_Base_stub \
-                QC_ReadGet_Test_Connector_stub QC_ReadGet_Test_Connector_svnt \
-                QC_ReadGet_Test_Connector_lem_stub QC_ReadGet_Starter_stub \
-                QC_ReadGet_Starter_svnt QC_ReadGet_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReadGet_Test_SenderS.cpp
-    ReadGet_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    ReadGet_Test_SenderS.h
-    ReadGet_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp
deleted file mode 100644
index 65ef479b4dc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,345 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "ReadGet_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#define ITERATIONS 20
-
-namespace CIAO_ReadGet_Test_Sender_Impl
-{
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Sender_exec_i &callback)
-    : callback_ (callback)
-    , started_ (false)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (!this->started_ && status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        this->started_ = true;
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.get_started ();
-      }
-  }
-
-  /**
-   * Writehandler
-   */
-
-  WriteHandler::WriteHandler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteHandler::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.start ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: restart_writer_exec_i
-   */
-
-  restart_writer_exec_i::restart_writer_exec_i (
-        ::ReadGet_Test::CCM_Sender_Context_ptr ctx,
-        Sender_exec_i &callback)
-    : ciao_context_ (
-        ::ReadGet_Test::CCM_Sender_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  restart_writer_exec_i::~restart_writer_exec_i (void)
-  {
-  }
-
-  // Operations from ::ReadGetRestarter
-
-  void
-  restart_writer_exec_i::restart_write (void)
-  {
-    this->callback_.restart ();
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (5)
-      , iterations_ (ITERATIONS)
-      , run_ (1)
-  {
-    ACE_NEW_THROW_EX (this->wh_,
-                      WriteHandler (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->wh_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::restart (void)
-  {
-    ++this->run_;
-    if (this->wh_)
-      {
-        delete this->wh_;
-        this->wh_ = 0;
-      }
-    ACE_NEW_THROW_EX (this->wh_,
-                      WriteHandler (*this),
-                      ::CORBA::NO_MEMORY ());
-    this->reactor ()->notify (this->wh_);
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    try
-      {
-        this->reactor ()->notify (this->wh_);
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: get_started : Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: get_started : Unknown exception caught\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    ::ReadGet_Test::QueryConditionTestConnector::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-    ReadGetStarter_var starter =
-      this->ciao_context_->get_connection_start_reader ();
-
-    if (! ::CORBA::is_nil (starter.in ()))
-      {
-        starter->set_reader_properties (this->keys_, this->iterations_);
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to start the reader\n")));
-        return;
-      }
-    if (this->run_ > 1)
-      {
-        for (CORBA::UShort iter_key = 1; iter_key < this->keys_ + 1; ++iter_key)
-          {
-            char key[7];
-            QueryConditionTest new_key;
-            ACE_OS::sprintf (key, "KEY_%d", iter_key);
-            new_key.symbol = CORBA::string_dup(key);
-            CORBA::UShort iter = 1;
-            if (this->run_ == 3)
-              {
-                iter = this->iterations_ + 1;
-              }
-            while (iter < (this->run_ - 1) * this->iterations_ + 1)
-              {
-                new_key.iteration = iter;
-                writer->write_one (new_key, ::DDS::HANDLE_NIL);
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written key <%C> with <%d>\n"),
-                            key, iter));
-                ++iter;
-              }
-          }
-        ACE_OS::sleep (1);
-      }
-    starter->start_read (this->run_);
-  }
-
-  // Component attributes and port operations.
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  ::CCM_ReadGetRestarter_ptr
-  Sender_exec_i::get_restart_writer (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_restart_writer_.in ()))
-      {
-        restart_writer_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          restart_writer_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_ReadGetRestarter::_nil ());
-
-          this->ciao_restart_writer_ = tmp;
-      }
-
-    return
-      ::CCM_ReadGetRestarter::_duplicate (
-        this->ciao_restart_writer_.in ());
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::ReadGet_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_ReadGet_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/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h
deleted file mode 100644
index f0e764a708b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h
+++ /dev/null
@@ -1,195 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_READGET_TEST_SENDER_EXEC_CB6ML7_H_
-#define CIAO_READGET_TEST_SENDER_EXEC_CB6ML7_H_
-
-#include /**/ "ace/pre.h"
-
-#include "ReadGet_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_ReadGet_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-    bool started_;
-  };
-
-  /**
-   * Write Handler
-   */
-  class WriteHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteHandler (Sender_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: restart_writer_exec_i
-   */
-
-  class restart_writer_exec_i
-    : public virtual ::CCM_ReadGetRestarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    restart_writer_exec_i (
-      ::ReadGet_Test::CCM_Sender_Context_ptr ctx,
-      Sender_exec_i & callback);
-    virtual ~restart_writer_exec_i (void);
-
-    //@{
-    /** Operations and attributes from ReadGetRestarter. */
-
-    virtual
-    void restart_write (void);
-    //@}
-
-  private:
-    ::ReadGet_Test::CCM_Sender_Context_var ciao_context_;
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CCM_ReadGetRestarter_ptr
-    get_restart_writer (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void get_started (void);
-    void start (void);
-    void restart (void);
-
-    //@}
-
-  private:
-    ::ReadGet_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_ReadGetRestarter_var ciao_restart_writer_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    ::CORBA::UShort iterations_;
-    ::CORBA::UShort run_;
-    WriteHandler *wh_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_ReadGet_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/Plan.cdp
deleted file mode 100644
index 49eda282c3c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/Plan.cdp
+++ /dev/null
@@ -1,516 +0,0 @@
-<!--  -->
-<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>ReadGet_Test_Depl_1</label>
-  <UUID>ReadGet_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_ReadGet_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_ReadGet_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="ReadGet_Test_EventConnectorImplementation">
-    <name>ReadGet_Test_EventConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="ReadGet_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="ReadGet_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_ReadGet_Test_QueryConditionTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ReadGet_Test_QueryConditionTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_ReadGet_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_ReadGet_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="ReadGet_Test_StateConnectorImplementation">
-    <name>ReadGet_Test_StateConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="ReadGet_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="ReadGet_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_ReadGet_Test_QueryConditionTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ReadGet_Test_QueryConditionTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_ReadGet_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_ReadGet_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_ReadGet_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_ReadGet_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="ReadGet_Test_SenderConnectorInstance">
-    <name>ReadGet_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReadGet_Test_EventConnectorImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QueryCondition_Library#QueryConditionProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReadGet_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ReadGet_Test_EventConnector">
-    <name>ReadGet_Test_EventConnector</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReadGet_Test_EventConnectorImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QueryCondition_Library#QueryConditionProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReadGet_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="ReadGet_Test_StateConnector">
-    <name>ReadGet_Test_ConnectorComponent3</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReadGet_Test_StateConnectorImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QueryCondition_Library#QueryConditionProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReadGet_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_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>get_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReadGet_Test_EventConnector" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>check_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>check_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReadGet_Test_StateConnector" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>get_port_fresh_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReadGet_Test_EventConnector" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="ReadGet_Test_SenderConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>reader_starter</name>
-    <internalEndpoint>
-      <portName>start_reader</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>reader_start</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>restart_writer</name>
-    <internalEndpoint>
-      <portName>writer_restart</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>restart_writer</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReadGet_Test_SenderConnectorInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </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="ReadGet_Test_Connector_ExecArtifact">
-    <name>QC_ReadGet_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>QC_ReadGet_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="ReadGet_Test_Connector_SvntArtifact">
-    <name>QC_ReadGet_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>QC_ReadGet_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="ReadGet_Test_Connector_StubArtifact">
-    <name>QC_ReadGet_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>QC_ReadGet_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/QueryCondition/ReadGet/descriptors/QueryCondition_Library.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/QueryCondition_Library.xml
deleted file mode 100644
index b9cba6277a3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/QueryCondition_Library.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="QueryConditionProfile">
-    <!-- QoS used to configure the data writer created in the example code -->
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 37e7ff8dec9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="QueryCondition_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="QueryConditionProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/run_test.pl
deleted file mode 100755
index 638d55cd247..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl
deleted file mode 100644
index 2f470af6d24..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file QCLS_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_LISTEN_STATE_TEST_BASE_IDL
-#define QUERY_CONDITION_LISTEN_STATE_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/QCLS_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/QCLS_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "QueryConditionListenStateTest"
-#pragma DCPS_DATA_KEY "QueryConditionListenStateTest key"
-
-struct QueryConditionListenStateTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<QueryConditionListenStateTest> QueryConditionListenStateTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.mpc
deleted file mode 100644
index 99a8da1826c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_QCLS_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_QCLS_Test_Base_stub
-  dynamicflags += QUERY_CONDITION_LISTEN_STATE_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=QUERY_CONDITION_LISTEN_STATE_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=QCLS_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    QCLS_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=QUERY_CONDITION_LISTEN_STATE_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    QCLS_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl
deleted file mode 100644
index 02f87bf8135..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file QCLS_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_IDL_
-#define QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/QCLS_Test_Base.idl"
-
-#pragma ciao lem "Connector/QCLS_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/QCLS_Test_BaseTypeSupport.idl"
-#endif
-
-module QCLS_Test
-{
-  module ::CCM_DDS::Typed < ::QueryConditionListenStateTest, ::QueryConditionListenStateTestSeq> QueryConditionListenStateTestConnector;
-};
-
-#endif /* QCLS_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc
deleted file mode 100644
index 345969c2e1d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_QCLS_Test_Base -l .. -o ../lib -u DDS QCLS_Test_Connector"
-
-project(DDS_QCLS_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_QCLS_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=QCLS_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=QCLS_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=QCLS_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=QCLS_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    QCLS_Test_Connector.idl
-  }
-}
-
-project(DDS_QCLS_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_QCLS_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=QCLS_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    QCLS_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_QCLS_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_QCLS_Test_Connector_lem_gen DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Base_stub
-  libs  += DDS_QCLS_Test_Base_stub DDS_QCLS_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_QCLS_Test_Connector_lem_stub
-  dynamicflags += QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLS_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    QCLS_Test_ConnectorEC.h
-    QCLS_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCLS_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_QCLS_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_QCLS_Test_Connector_idl_gen DDS_QCLS_Test_Base_stub
-  libs  += DDS_QCLS_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_QCLS_Test_Connector_stub
-  dynamicflags += QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLS_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    QCLS_Test_ConnectorC.h
-    QCLS_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    QCLS_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_QCLS_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_QCLS_Test_Connector_lem_stub DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Base_stub
-  sharedname = DDS_QCLS_Test_Connector_exec
-  libs += DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Connector_lem_stub DDS_QCLS_Test_Base_stub DDS_QCLS_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLS_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    QCLS_Test_Connector_conn.h
-    QCLS_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_QCLS_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_QCLS_Test_Connector_lem_stub DDS_QCLS_Test_Connector_exec DDS_QCLS_Test_Connector_stub
-  sharedname  = DDS_QCLS_Test_Connector_svnt
-  libs       += DDS_QCLS_Test_Connector_stub \
-                DDS_QCLS_Test_Connector_lem_stub  \
-                DDS_QCLS_Test_Base_stub \
-                DDS_QCLS_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLS_Test_ConnectorS.cpp
-    QCLS_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    QCLS_Test_ConnectorS.h
-    QCLS_Test_Connector_svnt.h
-    QCLS_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.idl
deleted file mode 100644
index 6aaeda5aab0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/QCLS_Test_Connector.idl"
-
-module QCLS_Test
-{
-  component Receiver
-  {
-    port QueryConditionListenStateTestConnector::DDS_StateListen info_state;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc
deleted file mode 100644
index d5fb10e8472..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-project(DDS_QCLS_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_QCLS_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 {
-    QCLS_Test_Receiver.idl
-  }
-}
-
-project(DDS_QCLS_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_QCLS_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 {
-    QCLS_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_QCLS_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_QCLS_Test_Receiver_lem_gen DDS_QCLS_Test_Receiver_stub  \
-           DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Base_stub
-  libs  +=  Receiver_stub DDS_QCLS_Test_Connector_stub \
-            DDS_QCLS_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLS_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    QCLS_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCLS_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_QCLS_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_QCLS_Test_Receiver_idl_gen  DDS_QCLS_Test_Connector_stub \
-           DDS_QCLS_Test_Base_stub DDS_QCLS_Test_Connector_lem_gen
-  libs  += DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLS_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    QCLS_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    QCLS_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_QCLS_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_QCLS_Test_Receiver_lem_stub DDS_QCLS_Test_Receiver_stub \
-             DDS_QCLS_Test_Base_stub DDS_QCLS_Test_Connector_stub \
-             DDS_QCLS_Test_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_QCLS_Test_Base_stub \
-          DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLS_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    QCLS_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_QCLS_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_QCLS_Test_Receiver_lem_stub DDS_QCLS_Test_Base_stub \
-                  DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Connector_svnt \
-                  DDS_QCLS_Test_Receiver_exec DDS_QCLS_Test_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_QCLS_Test_Base_stub \
-                DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Connector_svnt \
-                Receiver_exec DDS_QCLS_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLS_Test_ReceiverS.cpp
-    QCLS_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    QCLS_Test_ReceiverS.h
-    QCLS_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp
deleted file mode 100644
index 86b3ac813d2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,371 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "QCLS_Test_Receiver_exec.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-#define QUERY "( (iteration > %0) AND (iteration < %1) )"
-
-#define MIN_ITERATION "2"
-#define MAX_ITERATION "5"
-
-#define SAMPLES_PER_KEY 2 //only iteration 3 and 4 should be coming in....
-
-namespace CIAO_QCLS_Test_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_state_data_listener_exec_i
-   */
-
-  info_state_data_listener_exec_i::info_state_data_listener_exec_i (
-        ::QCLS_Test::CCM_Receiver_Context_ptr ctx,
-        ACE_Thread_ID &thread_id,
-        Atomic_Long &samples_received)
-    : ciao_context_ (
-        ::QCLS_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , thread_id_ (thread_id)
-      , samples_received_ (samples_received)
-  {
-  }
-
-  info_state_data_listener_exec_i::~info_state_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::QCLS_Test::QueryConditionListenStateTestConnector::StateListener
-
-  void
-  info_state_data_listener_exec_i::on_creation (const ::QueryConditionListenStateTest & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ++this->samples_received_;
-
-    ACE_DEBUG ((LM_DEBUG, "QueryConditionListenStateTest_Listener::on_creation: "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.iteration));
-    if (datum.iteration <= ACE_OS::atoi (MIN_ITERATION) ||
-        datum.iteration  > ACE_OS::atoi (MAX_ITERATION) )
-      {
-        ACE_ERROR ((LM_ERROR, "QueryConditionListenStateTest_Listener::on_creation: "
-                              "ERROR: Unexpected iteration received.\n"));
-      }
-  }
-
-  void
-  info_state_data_listener_exec_i::on_one_update (const ::QueryConditionListenStateTest & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_ = t_id;
-    ++this->samples_received_;
-
-    ACE_DEBUG ((LM_DEBUG, "QueryConditionListenStateTest_Listener::on_one_update: "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.iteration));
-    if (datum.iteration <= ACE_OS::atoi (MIN_ITERATION) ||
-        datum.iteration  > ACE_OS::atoi (MAX_ITERATION) )
-      {
-        ACE_ERROR ((LM_ERROR, "QueryConditionListenStateTest_Listener::on_one_update: "
-                              "ERROR: Unexpected iteration received.\n"));
-      }
-  }
-
-  void
-  info_state_data_listener_exec_i::on_many_updates (const ::QueryConditionListenStateTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_state_data_listener_exec_i::on_deletion (const ::QueryConditionListenStateTest & /* datum */,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_state_status_exec_i
-   */
-
-  info_state_status_exec_i::info_state_status_exec_i (
-        ::QCLS_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::QCLS_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_state_status_exec_i::~info_state_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_state_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_state_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : keys_ (5)
-      , iterations_ (10)
-      , thread_id_listener_ (0, 0)
-      , samples_expected_ (keys_ * SAMPLES_PER_KEY)
-      , samples_received_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  void
-  Receiver_exec_i::start ()
-  {
-    ::CCM_DDS::DataListenerControl_var dlc =
-        this->ciao_context_->get_connection_info_state_data_control ();
-    dlc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  // Component attributes and port operations.
-
-  ::QCLS_Test::QueryConditionListenStateTestConnector::CCM_StateListener_ptr
-  Receiver_exec_i::get_info_state_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_state_data_listener_.in ()))
-      {
-        info_state_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_state_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->thread_id_listener_,
-            this->samples_received_),
-            ::QCLS_Test::QueryConditionListenStateTestConnector::CCM_StateListener::_nil ());
-
-          this->ciao_info_state_data_listener_ = tmp;
-      }
-
-    return
-      ::QCLS_Test::QueryConditionListenStateTestConnector::CCM_StateListener::_duplicate (
-        this->ciao_info_state_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_state_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_state_status_.in ()))
-      {
-        info_state_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_state_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_state_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_state_status_.in ());
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Receiver_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-    this->samples_expected_ = SAMPLES_PER_KEY * this->keys_;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::QCLS_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - "
-                          "Set filter.\n"));
-    ::CCM_DDS::QueryFilter filter;
-    filter.expression = CORBA::string_dup (QUERY);
-    filter.parameters.length (2);
-    filter.parameters[0] = CORBA::string_dup (MIN_ITERATION);
-    filter.parameters[1] = CORBA::string_dup (MAX_ITERATION);
-    ::QCLS_Test::QueryConditionListenStateTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_state_data ();
-
-    reader->query (filter);
-
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - "
-                          "Start listening.\n"));
-    start ();
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_.to_string (list_buf);
-
-
-    if (this->thread_id_listener_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for ReaderListener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "QF_STATE: "
-                              "Thread switch for ReaderListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QF_STATE: "
-                              "Thread switch for ReaderListener "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QF_STATE: ReaderListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "QF_STATE: ReaderListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #endif
-    if (this->samples_received_ != this->samples_expected_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QF_STATE: ReaderListener: "
-                              "Unexpected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_,
-                              this->samples_received_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "QF_STATE: ReaderListener: "
-                              "Expected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_,
-                              this->samples_received_.value ()));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCLS_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/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h
deleted file mode 100644
index d6667fb3fda..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h
+++ /dev/null
@@ -1,198 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_QCLS_TEST_RECEIVER_EXEC_GHBRF4_H_
-#define CIAO_QCLS_TEST_RECEIVER_EXEC_GHBRF4_H_
-
-#include /**/ "ace/pre.h"
-
-#include "QCLS_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_QCLS_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Long> Atomic_Long;
-
-  /**
-   * Provider Executor Implementation Class: info_state_data_listener_exec_i
-   */
-
-  class info_state_data_listener_exec_i
-    : public virtual ::QCLS_Test::QueryConditionListenStateTestConnector::CCM_StateListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_state_data_listener_exec_i (
-      ::QCLS_Test::CCM_Receiver_Context_ptr ctx,
-      ACE_Thread_ID &thread_id,
-      Atomic_Long &samples_received);
-    virtual ~info_state_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from QCLS_Test::QueryConditionListenStateTestConnector::StateListener. */
-
-    virtual
-    void on_creation (const ::QueryConditionListenStateTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_one_update (const ::QueryConditionListenStateTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_updates (const ::QueryConditionListenStateTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-
-    virtual
-    void on_deletion (const ::QueryConditionListenStateTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-    //@}
-
-  private:
-    ::QCLS_Test::CCM_Receiver_Context_var ciao_context_;
-    ACE_Thread_ID &thread_id_;
-    Atomic_Long &samples_received_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_state_status_exec_i
-   */
-
-  class info_state_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_state_status_exec_i (
-      ::QCLS_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_state_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::QCLS_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::QCLS_Test::QueryConditionListenStateTestConnector::CCM_StateListener_ptr
-    get_info_state_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_state_status (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-
-    //@}
-
-  private:
-    ::QCLS_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::QCLS_Test::QueryConditionListenStateTestConnector::CCM_StateListener_var ciao_info_state_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_state_status_;
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    ACE_Thread_ID thread_id_listener_;
-
-    CORBA::Long samples_expected_;
-    Atomic_Long samples_received_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start (void);
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCLS_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.idl
deleted file mode 100644
index c82196ec2cd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_QUERY_CONDITION_LISTEN_STATE_TEST_SENDER_IDL
-#define DDS_QUERY_CONDITION_LISTEN_STATE_TEST_SENDER_IDL
-
-#include "Connector/QCLS_Test_Connector.idl"
-
-module QCLS_Test
-{
-  component Sender
-  {
-    port QueryConditionListenStateTestConnector::DDS_Update info_update;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc
deleted file mode 100644
index 78a9a56c2a8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_QCLS_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_QCLS_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_QCLS_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 {
-    QCLS_Test_Sender.idl
-  }
-}
-
-project(DDS_QCLS_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_QCLS_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 {
-    QCLS_Test_SenderE.idl
-  }
-}
-
-project(DDS_QCLS_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_QCLS_Test_Sender_lem_gen DDS_QCLS_Test_Sender_stub \
-           DDS_QCLS_Test_Base_stub
-  libs  += DDS_QCLS_Test_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLS_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    QCLS_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCLS_Test_SenderEC.inl
-  }
-}
-
-project(DDS_QCLS_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_QCLS_Test_Sender_idl_gen DDS_QCLS_Test_Base_stub \
-           DDS_QCLS_Test_Connector_stub
-  libs  += DDS_QCLS_Test_Base_stub DDS_QCLS_Test_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLS_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    QCLS_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    QCLS_Test_SenderC.inl
-  }
-}
-
-project(DDS_QCLS_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_QCLS_Test_Sender_lem_stub DDS_QCLS_Test_Sender_stub \
-             DDS_QCLS_Test_Connector_lem_stub DDS_QCLS_Test_Connector_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub DDS_QCLS_Test_Base_stub \
-             DDS_QCLS_Test_Connector_lem_stub DDS_QCLS_Test_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLS_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    QCLS_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_QCLS_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_QCLS_Test_Base_stub  DDS_QCLS_Test_Sender_lem_stub \
-                DDS_QCLS_Test_Connector_stub \
-                DDS_QCLS_Test_Connector_svnt DDS_QCLS_Test_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub DDS_QCLS_Test_Base_stub \
-                DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Connector_svnt \
-                DDS_QCLS_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCLS_Test_SenderS.cpp
-    QCLS_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    QCLS_Test_SenderS.h
-    QCLS_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp
deleted file mode 100644
index 7189daaa26b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,311 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "QCLS_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_QCLS_Test_Sender_Impl
-{
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  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 /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.start ();
-      }
-  }
-
-  /**
-   * Start Handler
-   */
-
-  StartHandler::StartHandler(Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  StartHandler::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.run ();
-    return 0;
-  }
-
-  /**
-   * Update Ticker
-   */
-
-  UpdateTicker::UpdateTicker (Sender_exec_i &callback)
-    : callback_ (callback),
-      last_iter_ (0)
-  {
-  }
-
-  int
-  UpdateTicker::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.update_one (++this->last_iter_);
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (5)
-      , iterations_ (10)
-  {
-    this->ticker_ = new UpdateTicker (*this);
-    this->rh_ = new StartHandler (*this);
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->rh_;
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::update_one (CORBA::UShort iter)
-  {
-    ::QCLS_Test::QueryConditionListenStateTestConnector::Updater_var
-      updater = this->ciao_context_->get_connection_info_update_data ();
-
-    if (! ::CORBA::is_nil (updater.in ()) &&
-        iter <= this->iterations ())
-      {
-        for (CORBA::UShort i = 1; i < this->keys () + 1; ++i)
-          {
-            char key[7];
-            ACE_OS::sprintf (key, "KEY_%d", i);
-            QueryConditionListenStateTest update_key;
-            update_key.key = CORBA::string_dup (key);
-            update_key.iteration = iter;
-            updater->update_one (update_key, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, "Updated key <%C> - <%u>\n",
-                          key, iter));
-
-          }
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::update_one - "
-                              "Finished updating. Cancel Timer.\n"));
-        this->reactor ()->cancel_timer (this->ticker_);
-      }
-  }
-
-  void
-  Sender_exec_i::run ()
-  {
-    ::QCLS_Test::QueryConditionListenStateTestConnector::Updater_var
-      updater = this->ciao_context_->get_connection_info_update_data ();
-    // First create the instances for consecutive updating.
-    for (::CORBA::UShort i = 1;
-         i < this->keys () + 1 && !::CORBA::is_nil (updater.in ());
-         ++i)
-      {
-        char key[7];
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        QueryConditionListenStateTest new_key;
-        new_key.key = CORBA::string_dup(key);
-        new_key.iteration = 0;
-        updater->create_one (new_key);
-      }
-
-   if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (5, 50000),
-                ACE_Time_Value (0, 50000)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    this->reactor ()->notify (this->rh_);
-  }
-
-  // Component attributes and port operations.
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::QCLS_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCLS_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/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.h
deleted file mode 100644
index a30ac6593d5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.h
+++ /dev/null
@@ -1,186 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_QCLS_TEST_SENDER_EXEC_GHBRF4_H_
-#define CIAO_QCLS_TEST_SENDER_EXEC_GHBRF4_H_
-
-#include /**/ "ace/pre.h"
-
-#include "QCLS_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_QCLS_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Start Handler
-   */
-
-  class StartHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    StartHandler (Sender_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Update Ticker
-   */
-
-  class UpdateTicker :
-    public ACE_Event_Handler
-  {
-  public:
-    UpdateTicker (Sender_exec_i &callback);
-    int handle_timeout (const ACE_Time_Value &, const void *);
-  private:
-    Sender_exec_i &callback_;
-    CORBA::UShort last_iter_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-    void run (void);
-    void update_one (CORBA::UShort iter);
-
-    //@}
-
-  private:
-    ::QCLS_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    UpdateTicker *ticker_;
-    StartHandler *rh_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCLS_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/Plan.cdp
deleted file mode 100644
index 77795d9c1e3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/Plan.cdp
+++ /dev/null
@@ -1,413 +0,0 @@
-<!--  -->
-<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>QCLS_Test_Depl_1</label>
-  <UUID>QCLS_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_QCLS_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_QCLS_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="QCLS_Test_ConnectorComponentImplementation">
-    <name>QCLS_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="QCLS_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="QCLS_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_QCLS_Test_QueryConditionListenStateTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCLS_Test_QueryConditionListenStateTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCLS_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCLS_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_QCLS_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_QCLS_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" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="QCLS_Test_ConnectorComponentInstance">
-    <name>QCLS_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QCLS_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCLS_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="QCLS_Test_ConnectorComponentInstance2">
-    <name>QCLS_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QCLS_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCLS_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_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_state_rdr</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_state_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCLS_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_state_dl</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_state_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="QCLS_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_state_dc</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_state_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCLS_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>updater_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCLS_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="QCLS_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </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="QCLS_Test_Connector_ExecArtifact">
-    <name>QCLS_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_QCLS_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="QCLS_Test_Connector_SvntArtifact">
-    <name>QCLS_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_QCLS_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="QCLS_Test_Connector_StubArtifact">
-    <name>QCLS_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_QCLS_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/QueryCondition/StateListener/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/run_test.pl
deleted file mode 100755
index d8b4eca445d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl
deleted file mode 100644
index 9d99e5b6378..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file QCTL_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_TWO_LISTENERS_TEST_BASE_IDL
-#define QUERY_CONDITION_TWO_LISTENERS_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/QCTL_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/QCTL_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "QueryConditionTwoListenersTest"
-#pragma DCPS_DATA_KEY "QueryConditionTwoListenersTest key"
-
-struct QueryConditionTwoListenersTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<QueryConditionTwoListenersTest> QueryConditionTwoListenersTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.mpc
deleted file mode 100644
index d15827ffb44..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_QCTL_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_QCTL_Test_Base_stub
-  dynamicflags += QUERY_CONDITION_TWO_LISTENERS_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=QUERY_CONDITION_TWO_LISTENERS_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=QCTL_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    QCTL_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=QUERY_CONDITION_TWO_LISTENERS_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    QCTL_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl
deleted file mode 100644
index b58d65550e9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file QCTL_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_IDL_
-#define QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/QCTL_Test_Base.idl"
-
-#pragma ciao lem "Connector/QCTL_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/QCTL_Test_BaseTypeSupport.idl"
-#endif
-
-module QCTL_Test
-{
-  module ::CCM_DDS::Typed < ::QueryConditionTwoListenersTest, ::QueryConditionTwoListenersTestSeq> QueryConditionTwoListenersTestConnector;
-};
-
-#endif /* QCTL_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc
deleted file mode 100644
index 0a40f94e8c0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_QCTL_Test_Base -l .. -o ../lib -u DDS QCTL_Test_Connector"
-
-project(DDS_QCTL_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_QCTL_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=QCTL_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=QCTL_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=QCTL_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=QCTL_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    QCTL_Test_Connector.idl
-  }
-}
-
-project(DDS_QCTL_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_QCTL_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=QCTL_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    QCTL_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_QCTL_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_QCTL_Test_Connector_lem_gen DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Base_stub
-  libs  += DDS_QCTL_Test_Base_stub DDS_QCTL_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_QCTL_Test_Connector_lem_stub
-  dynamicflags += QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTL_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    QCTL_Test_ConnectorEC.h
-    QCTL_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCTL_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_QCTL_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_QCTL_Test_Connector_idl_gen DDS_QCTL_Test_Base_stub
-  libs  += DDS_QCTL_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_QCTL_Test_Connector_stub
-  dynamicflags += QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTL_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    QCTL_Test_ConnectorC.h
-    QCTL_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    QCTL_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_QCTL_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_QCTL_Test_Connector_lem_stub DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Base_stub
-  sharedname = DDS_QCTL_Test_Connector_exec
-  libs += DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Connector_lem_stub DDS_QCTL_Test_Base_stub DDS_QCTL_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTL_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    QCTL_Test_Connector_conn.h
-    QCTL_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_QCTL_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_QCTL_Test_Connector_lem_stub DDS_QCTL_Test_Connector_exec DDS_QCTL_Test_Connector_stub
-  sharedname  = DDS_QCTL_Test_Connector_svnt
-  libs       += DDS_QCTL_Test_Connector_stub \
-                DDS_QCTL_Test_Connector_lem_stub  \
-                DDS_QCTL_Test_Base_stub \
-                DDS_QCTL_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTL_Test_ConnectorS.cpp
-    QCTL_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    QCTL_Test_ConnectorS.h
-    QCTL_Test_Connector_svnt.h
-    QCTL_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.idl
deleted file mode 100644
index 38fc0004b02..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/QCTL_Test_Connector.idl"
-
-module QCTL_Test
-{
-  component Receiver
-  {
-    port QueryConditionTwoListenersTestConnector::DDS_Listen info_listen_1;
-    port QueryConditionTwoListenersTestConnector::DDS_Listen info_listen_2;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc
deleted file mode 100644
index 916535d17c6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-project(DDS_QCTL_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_QCTL_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 {
-    QCTL_Test_Receiver.idl
-  }
-}
-
-project(DDS_QCTL_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_QCTL_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 {
-    QCTL_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_QCTL_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_QCTL_Test_Receiver_lem_gen DDS_QCTL_Test_Receiver_stub  \
-           DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Base_stub
-  libs  +=  Receiver_stub DDS_QCTL_Test_Connector_stub \
-            DDS_QCTL_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTL_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    QCTL_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCTL_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_QCTL_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_QCTL_Test_Receiver_idl_gen  DDS_QCTL_Test_Connector_stub \
-           DDS_QCTL_Test_Base_stub DDS_QCTL_Test_Connector_lem_gen
-  libs  += DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTL_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    QCTL_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    QCTL_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_QCTL_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_QCTL_Test_Receiver_lem_stub DDS_QCTL_Test_Receiver_stub \
-             DDS_QCTL_Test_Base_stub DDS_QCTL_Test_Connector_stub \
-             DDS_QCTL_Test_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_QCTL_Test_Base_stub \
-          DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTL_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    QCTL_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_QCTL_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_QCTL_Test_Receiver_lem_stub DDS_QCTL_Test_Base_stub \
-                  DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Connector_svnt \
-                  DDS_QCTL_Test_Receiver_exec DDS_QCTL_Test_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_QCTL_Test_Base_stub \
-                DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Connector_svnt \
-                Receiver_exec DDS_QCTL_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTL_Test_ReceiverS.cpp
-    QCTL_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    QCTL_Test_ReceiverS.h
-    QCTL_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp
deleted file mode 100644
index 2dd12cfab1e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,593 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "QCTL_Test_Receiver_exec.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-#define QUERY_1 "( (iteration > %0) AND (iteration < %1) )"
-#define QUERY_2 "( (iteration < %0) OR (iteration > %1) )"
-
-#define MIN_ITERATION "2"
-#define MAX_ITERATION "5"
-
-#define SAMPLES_PER_KEY_1 2
-
-namespace CIAO_QCTL_Test_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_listen_1_data_listener_exec_i
-   */
-
-  info_listen_1_data_listener_exec_i::info_listen_1_data_listener_exec_i (
-        ::QCTL_Test::CCM_Receiver_Context_ptr ctx,
-        ACE_Thread_ID &thread_id,
-        Atomic_Long &samples_received)
-    : ciao_context_ (
-        ::QCTL_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , thread_id_1_ (thread_id)
-      , samples_received_1_ (samples_received)
-  {
-  }
-
-  info_listen_1_data_listener_exec_i::~info_listen_1_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::QCTL_Test::QueryConditionTwoListenersTestConnector::Listener
-
-  void
-  info_listen_1_data_listener_exec_i::on_one_data (const ::QueryConditionTwoListenersTest & datum,
-  const ::CCM_DDS::ReadInfo & info)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_1_ = t_id;
-    ++this->samples_received_1_;
-
-    ACE_DEBUG ((LM_DEBUG, "QueryConditionTwoListenersTest_Listener_1::on_one_data: "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.iteration));
-    if (::DDS::HANDLE_NIL == info.instance_handle)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QueryConditionTwoListenersTest_Listener_1::on_one_data: "
-                            "instance handle seems to be invalid "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.iteration));
-      }
-    if (info.source_timestamp.sec == 0 &&
-        info.source_timestamp.nanosec == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QueryConditionTwoListenersTest_Listener_1::on_one_data: "
-                            "source timestamp seems to be invalid (nil) "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.iteration));
-      }
-    if (datum.iteration <= ACE_OS::atoi (MIN_ITERATION) ||
-        datum.iteration  > ACE_OS::atoi (MAX_ITERATION) )
-      {
-        ACE_ERROR ((LM_ERROR, "QueryConditionTwoListenersTest_Listener_1::on_one_data: "
-                              "ERROR: Unexpected iteration received.\n"));
-      }
-  }
-
-  void
-  info_listen_1_data_listener_exec_i::on_many_data (const ::QueryConditionTwoListenersTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_listen_1_status_exec_i
-   */
-
-  info_listen_1_status_exec_i::info_listen_1_status_exec_i (
-        ::QCTL_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::QCTL_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_listen_1_status_exec_i::~info_listen_1_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_listen_1_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_listen_1_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_listen_2_data_listener_exec_i
-   */
-
-  info_listen_2_data_listener_exec_i::info_listen_2_data_listener_exec_i (
-        ::QCTL_Test::CCM_Receiver_Context_ptr ctx,
-        ACE_Thread_ID &thread_id,
-        Atomic_Long &samples_received)
-    : ciao_context_ (
-        ::QCTL_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , thread_id_2_ (thread_id)
-      , samples_received_2_ (samples_received)
-  {
-  }
-
-  info_listen_2_data_listener_exec_i::~info_listen_2_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::QCTL_Test::QueryConditionTwoListenersTestConnector::Listener
-
-  void
-  info_listen_2_data_listener_exec_i::on_one_data (const ::QueryConditionTwoListenersTest & datum,
-  const ::CCM_DDS::ReadInfo & info)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_2_ = t_id;
-
-    ++this->samples_received_2_;
-
-    ACE_DEBUG ((LM_DEBUG, "QueryConditionTwoListenersTest_Listener_2::on_one_data: "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.iteration));
-    if (::DDS::HANDLE_NIL == info.instance_handle)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QueryConditionTwoListenersTest_Listener_2::on_one_data: "
-                            "instance handle seems to be invalid "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.iteration));
-      }
-    if (info.source_timestamp.sec == 0 &&
-        info.source_timestamp.nanosec == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QueryConditionTwoListenersTest_Listener_2::on_one_data: "
-                            "source timestamp seems to be invalid (nil) "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.iteration));
-      }
-    if (datum.iteration > ACE_OS::atoi (MIN_ITERATION) &&
-        datum.iteration  < ACE_OS::atoi (MAX_ITERATION) )
-      {
-        ACE_ERROR ((LM_ERROR, "QueryConditionTwoListenersTest_Listener_2::on_one_data: "
-                              "ERROR: Unexpected iteration received.\n"));
-      }
-  }
-
-  void
-  info_listen_2_data_listener_exec_i::on_many_data (const ::QueryConditionTwoListenersTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_listen_2_status_exec_i
-   */
-
-  info_listen_2_status_exec_i::info_listen_2_status_exec_i (
-        ::QCTL_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::QCTL_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_listen_2_status_exec_i::~info_listen_2_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_listen_2_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_listen_2_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : keys_ (5)
-      , iterations_ (10)
-      , thread_id_listener_1_ (0, 0)
-      , thread_id_listener_2_ (0, 0)
-      , samples_expected_1_ (keys_ * SAMPLES_PER_KEY_1)
-      , samples_received_1_ (0)
-      , samples_expected_2_ (keys_ * (this->iterations_ - 4))
-      , samples_received_2_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  void
-  Receiver_exec_i::start ()
-  {
-    ::CCM_DDS::DataListenerControl_var dlc1 =
-        this->ciao_context_->get_connection_info_listen_1_data_control ();
-    dlc1->mode (::CCM_DDS::ONE_BY_ONE);
-
-    ::CCM_DDS::DataListenerControl_var dlc2 =
-        this->ciao_context_->get_connection_info_listen_2_data_control ();
-    dlc2->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  // Component attributes and port operations.
-
-  ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_listen_1_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_listen_1_data_listener_.in ()))
-      {
-        info_listen_1_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_listen_1_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->thread_id_listener_1_,
-            this->samples_received_1_),
-            ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_listen_1_data_listener_ = tmp;
-      }
-
-    return
-      ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener::_duplicate (
-        this->ciao_info_listen_1_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_listen_1_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_listen_1_status_.in ()))
-      {
-        info_listen_1_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_listen_1_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_listen_1_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_listen_1_status_.in ());
-  }
-
-  ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_listen_2_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_listen_2_data_listener_.in ()))
-      {
-        info_listen_2_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_listen_2_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->thread_id_listener_2_,
-            this->samples_received_2_),
-            ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_listen_2_data_listener_ = tmp;
-      }
-
-    return
-      ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener::_duplicate (
-        this->ciao_info_listen_2_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_listen_2_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_listen_2_status_.in ()))
-      {
-        info_listen_2_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_listen_2_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_listen_2_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_listen_2_status_.in ());
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Receiver_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-    // Iterations between min and max (including min and max) are not received.
-    this->samples_expected_2_ = keys_ * (this->iterations_ - 4);
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::QCTL_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - "
-                          "Set filter 1.\n"));
-
-    CCM_DDS::QueryFilter filter_1;
-    filter_1.expression = CORBA::string_dup (QUERY_1);
-    filter_1.parameters.length (2);
-    filter_1.parameters[0] = CORBA::string_dup (MIN_ITERATION);
-    filter_1.parameters[1] = CORBA::string_dup (MAX_ITERATION);
-
-    ::QCTL_Test::QueryConditionTwoListenersTestConnector::Reader_var reader_1 =
-      this->ciao_context_->get_connection_info_listen_1_data ();
-
-    reader_1->query (filter_1);
-
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - "
-                      "Set filter 2.\n"));
-
-    CCM_DDS::QueryFilter filter_2;
-    filter_2.expression = CORBA::string_dup (QUERY_2);
-    filter_2.parameters.length (2);
-    filter_2.parameters[0] = CORBA::string_dup (MIN_ITERATION);
-    filter_2.parameters[1] = CORBA::string_dup (MAX_ITERATION);
-
-    ::QCTL_Test::QueryConditionTwoListenersTestConnector::Reader_var reader_2 =
-      this->ciao_context_->get_connection_info_listen_2_data ();
-
-    reader_2->query (filter_2);
-
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate - "
-                          "Start listening on both listeners.\n"));
-    start ();
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    // get current thread
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf_1 [65];
-    this->thread_id_listener_1_.to_string (list_buf_1);
-
-    if (this->thread_id_listener_1_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for ReaderListener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_1_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "QF_TWO_LISTENERS: "
-                              "Thread switch for ReaderListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_1,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QF_TWO_LISTENERS: "
-                              "Thread switch for ReaderListener "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_1,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_1_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QF_TWO_LISTENERS: ReaderListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_1,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "QF_TWO_LISTENERS: ReaderListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_1,
-                              ccm_buf));
-     }
-    #endif
-   char list_buf_2 [65];
-   this->thread_id_listener_2_.to_string (list_buf_2);
-   if (this->thread_id_listener_2_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for ReaderListener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_2_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "QF_TWO_LISTENERS: "
-                              "Thread switch for ReaderListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                               "listener <%C> - component <%C>\n",
-                              list_buf_2,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QF_TWO_LISTENERS: "
-                              "Thread switch for ReaderListener "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_2,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_2_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QF_TWO_LISTENERS: ReaderListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_2,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "QF_TWO_LISTENERS: ReaderListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf_2,
-                              ccm_buf));
-      }
-    #endif
-    //first listener
-    if (this->samples_received_1_ != this->samples_expected_1_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QF_TWO_LISTENERS: ReaderListener: "
-                              "Unexpected number of samples received "
-                              "on first listener : "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_1_,
-                              this->samples_received_1_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "QF_TWO_LISTENERS: ReaderListener: "
-                              "Expected number of samples received "
-                              "on first listener : "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_1_,
-                              this->samples_received_1_.value ()));
-      }
-    //Second listener
-    if (this->samples_received_2_ != this->samples_expected_2_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: QF_TWO_LISTENERS: ReaderListener: "
-                              "Unexpected number of samples received` "
-                              "on second listener : "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_2_,
-                              this->samples_received_2_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "QF_TWO_LISTENERS: ReaderListener: "
-                              "Expected number of samples received "
-                              "on second listener : "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_2_,
-                              this->samples_received_2_.value ()));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCTL_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/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h
deleted file mode 100644
index 58165f75751..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h
+++ /dev/null
@@ -1,265 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_QCTL_TEST_RECEIVER_EXEC_OT3CNP_H_
-#define CIAO_QCTL_TEST_RECEIVER_EXEC_OT3CNP_H_
-
-#include /**/ "ace/pre.h"
-
-#include "QCTL_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_QCTL_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Long> Atomic_Long;
-
-  /**
-   * Provider Executor Implementation Class: info_listen_1_data_listener_exec_i
-   */
-
-  class info_listen_1_data_listener_exec_i
-    : public virtual ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_listen_1_data_listener_exec_i (
-      ::QCTL_Test::CCM_Receiver_Context_ptr ctx,
-      ACE_Thread_ID &thread_id,
-      Atomic_Long &samples_received);
-
-    virtual ~info_listen_1_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from QCTL_Test::QueryConditionTwoListenersTestConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::QueryConditionTwoListenersTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::QueryConditionTwoListenersTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::QCTL_Test::CCM_Receiver_Context_var ciao_context_;
-    ACE_Thread_ID &thread_id_1_;
-    Atomic_Long &samples_received_1_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_listen_1_status_exec_i
-   */
-
-  class info_listen_1_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_listen_1_status_exec_i (
-      ::QCTL_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_listen_1_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::QCTL_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_listen_2_data_listener_exec_i
-   */
-
-  class info_listen_2_data_listener_exec_i
-    : public virtual ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_listen_2_data_listener_exec_i (
-      ::QCTL_Test::CCM_Receiver_Context_ptr ctx,
-      ACE_Thread_ID &thread_id,
-      Atomic_Long &samples_received);
-    virtual ~info_listen_2_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from QCTL_Test::QueryConditionTwoListenersTestConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::QueryConditionTwoListenersTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::QueryConditionTwoListenersTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::QCTL_Test::CCM_Receiver_Context_var ciao_context_;
-    ACE_Thread_ID &thread_id_2_;
-    Atomic_Long &samples_received_2_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_listen_2_status_exec_i
-   */
-
-  class info_listen_2_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_listen_2_status_exec_i (
-      ::QCTL_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_listen_2_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::QCTL_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener_ptr
-    get_info_listen_1_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_listen_1_status (void);
-
-    virtual ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener_ptr
-    get_info_listen_2_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_listen_2_status (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-
-    //@}
-
-  private:
-    ::QCTL_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener_var ciao_info_listen_1_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_listen_1_status_;
-    ::QCTL_Test::QueryConditionTwoListenersTestConnector::CCM_Listener_var ciao_info_listen_2_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_listen_2_status_;
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    ACE_Thread_ID thread_id_listener_1_;
-    ACE_Thread_ID thread_id_listener_2_;
-
-    CORBA::Long samples_expected_1_;
-    Atomic_Long samples_received_1_;
-
-    CORBA::Long samples_expected_2_;
-    Atomic_Long samples_received_2_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCTL_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.idl
deleted file mode 100644
index c91392633f0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_QUERY_CONDITION_TWO_LISTENERS_TEST_SENDER_IDL
-#define DDS_QUERY_CONDITION_TWO_LISTENERS_TEST_SENDER_IDL
-
-#include "Connector/QCTL_Test_Connector.idl"
-
-module QCTL_Test
-{
-  component Sender
-  {
-    port QueryConditionTwoListenersTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc
deleted file mode 100644
index ffe3bb76dcc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_QCTL_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_QCTL_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_QCTL_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 {
-    QCTL_Test_Sender.idl
-  }
-}
-
-project(DDS_QCTL_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_QCTL_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 {
-    QCTL_Test_SenderE.idl
-  }
-}
-
-project(DDS_QCTL_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_QCTL_Test_Sender_lem_gen DDS_QCTL_Test_Sender_stub \
-           DDS_QCTL_Test_Base_stub
-  libs  += DDS_QCTL_Test_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTL_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    QCTL_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCTL_Test_SenderEC.inl
-  }
-}
-
-project(DDS_QCTL_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_QCTL_Test_Sender_idl_gen DDS_QCTL_Test_Base_stub \
-           DDS_QCTL_Test_Connector_stub
-  libs  += DDS_QCTL_Test_Base_stub DDS_QCTL_Test_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTL_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    QCTL_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    QCTL_Test_SenderC.inl
-  }
-}
-
-project(DDS_QCTL_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_QCTL_Test_Sender_lem_stub DDS_QCTL_Test_Sender_stub \
-             DDS_QCTL_Test_Connector_lem_stub DDS_QCTL_Test_Connector_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub DDS_QCTL_Test_Base_stub \
-             DDS_QCTL_Test_Connector_lem_stub DDS_QCTL_Test_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTL_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    QCTL_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_QCTL_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_QCTL_Test_Base_stub  DDS_QCTL_Test_Sender_lem_stub \
-                DDS_QCTL_Test_Connector_stub \
-                DDS_QCTL_Test_Connector_svnt DDS_QCTL_Test_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub DDS_QCTL_Test_Base_stub \
-                DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Connector_svnt \
-                DDS_QCTL_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTL_Test_SenderS.cpp
-    QCTL_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    QCTL_Test_SenderS.h
-    QCTL_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.cpp
deleted file mode 100644
index ed9a7139adc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,306 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "QCTL_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_QCTL_Test_Sender_Impl
-{
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  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 /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.start ();
-      }
-  }
-
-
-  /**
-   * Write ticker
-   */
-
-  WriteTicker::WriteTicker (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteTicker::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.write_one ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (5)
-      , iterations_ (10)
-  {
-    this->ticker_ = new WriteTicker (*this);
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::write_one (void)
-  {
-    if (this->last_key_ != this->samples_.end ())
-      {
-        try
-          {
-            ::QCTL_Test::QueryConditionTwoListenersTestConnector::Writer_var writer =
-              this->ciao_context_->get_connection_info_write_data ();
-
-            ++this->last_key_->second->iteration;
-            writer->write_one (this->last_key_->second, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, "Written key <%C> - <%u>\n",
-                          this->last_key_->first.c_str (),
-                          this->last_key_->second->iteration));
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                        ACE_TEXT ("while updating writer info for <%C>.\n"),
-                          this->last_key_->first.c_str ()));
-          }
-        ++this->last_key_;
-      }
-    else
-      {
-        //onto the next iteration
-        this->last_key_ = this->samples_.begin ();
-        while (this->last_key_ != this->samples_.end ())
-          {
-            if (this->last_key_->second->iteration == this->iterations_)
-              {
-                //next key
-                ++this->last_key_;
-              }
-            else
-              {
-                break;
-              }
-          }
-        if (this->last_key_ == this->samples_.end ())
-          {
-            this->reactor ()->cancel_timer (this->ticker_);
-          }
-      }
-  }
-
-
-  void
-  Sender_exec_i::start (void)
-  {
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        QueryConditionTwoListenersTest* new_key = new QueryConditionTwoListenersTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->iteration = 0;
-
-        this->samples_[key] = new_key;
-      }
-   this->last_key_ = this->samples_.begin ();
-   if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (5, 50000),
-                ACE_Time_Value (0, 50000)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::QCTL_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCTL_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/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.h
deleted file mode 100644
index 8782e933fc1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.h
+++ /dev/null
@@ -1,177 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_QCTL_TEST_SENDER_EXEC_1OAY5Q_H_
-#define CIAO_QCTL_TEST_SENDER_EXEC_1OAY5Q_H_
-
-#include /**/ "ace/pre.h"
-
-#include "QCTL_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_QCTL_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Write ticker
-   */
-
-  class WriteTicker :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteTicker (Sender_exec_i &callback);
-    int handle_timeout (const ACE_Time_Value &, const void *);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr get_connector_status (
-      void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-    void write_one (void);
-
-    //@}
-
-  private:
-    ::QCTL_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    WriteTicker *ticker_;
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, QueryConditionTwoListenersTest_var> Writer_Table;
-    Writer_Table samples_;
-
-    Writer_Table::iterator last_key_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCTL_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/Plan.cdp
deleted file mode 100644
index 1360f42e586..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/Plan.cdp
+++ /dev/null
@@ -1,492 +0,0 @@
-<!--  -->
-<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>QCTL_Test_Depl_1</label>
-  <UUID>QCTL_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_QCTL_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_QCTL_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="QCTL_Test_ConnectorComponentImplementation">
-    <name>QCTL_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="QCTL_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="QCTL_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_QCTL_Test_QueryConditionTwoListenersTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCTL_Test_QueryConditionTwoListenersTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCTL_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCTL_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_QCTL_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_QCTL_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" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="QCTL_Test_SenderConnectorInstance">
-    <name>QCTL_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QCTL_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCTL_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="QCTL_Test_ReceiverConnectorInstance_1">
-    <name>QCTL_Test_ReceiverConnectorInstance_1</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QCTL_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCTL_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="QCTL_Test_ReceiverConnectorInstance_2">
-    <name>QCTL_Test_ReceiverConnectorInstance_2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QCTL_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCTL_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_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_listen_1_reader_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_1_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCTL_Test_ReceiverConnectorInstance_1" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_1_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_1_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="QCTL_Test_ReceiverConnectorInstance_1" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_1_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_1_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="QCTL_Test_ReceiverConnectorInstance_1" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_2_reader_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_2_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCTL_Test_ReceiverConnectorInstance_2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_2_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_2_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="QCTL_Test_ReceiverConnectorInstance_2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_2_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_2_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="QCTL_Test_ReceiverConnectorInstance_2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>test_topic_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="QCTL_Test_SenderConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="QCTL_Test_SenderConnectorInstance" />
-    </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="QCTL_Test_Connector_ExecArtifact">
-    <name>QCTL_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_QCTL_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="QCTL_Test_Connector_SvntArtifact">
-    <name>QCTL_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_QCTL_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="QCTL_Test_Connector_StubArtifact">
-    <name>QCTL_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_QCTL_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/QueryCondition/TwoListeners/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/run_test.pl
deleted file mode 100755
index d8b4eca445d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.idl
deleted file mode 100644
index 55aafc4a95c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file QCTQ_Starter.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERYCONDITION_STARTER_IDL
-#define QUERYCONDITION_STARTER_IDL
-
-#pragma ciao lem "Base/QCTQ_StarterE.idl"
-
-interface TwoQueriesStarter
-{
-  void set_reader_properties (in unsigned short nr_keys,
-                              in unsigned short nr_iterations);
-  void start_read (in unsigned short run);
-};
-
-interface TwoQueriesRestarter
-{
-  void restart_write ();
-};
-
-#endif /* QUERYCONDITION_STARTER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc
deleted file mode 100644
index 6928a4e4c83..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc
+++ /dev/null
@@ -1,109 +0,0 @@
-project(QC_QCTQ_Starter_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
-              -Wb,stub_export_include=QCTQ_Starter_stub_export.h \
-              -Wb,skel_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,skel_export_include=QCTQ_Starter_svnt_export.h \
-              -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,svnt_export_include=QCTQ_Starter_svnt_export.h \
-              -Wb,exec_export_macro=READER_STARTER_EXEC_Export \
-              -Wb,exec_export_include=QCTQ_Starter_exec_export.h -I..
-
-  IDL_Files {
-    QCTQ_Starter.idl
-  }
-}
-
-project(QC_QCTQ_Starter_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += QC_QCTQ_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \
-              -Wb,stub_export_include=QCTQ_Starter_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    QCTQ_StarterE.idl
-  }
-}
-
-project(QC_QCTQ_Starter_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += QC_QCTQ_Starter_lem_gen QC_QCTQ_Starter_stub
-  libs  += QC_QCTQ_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_QCTQ_Starter_lem_stub
-  dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_StarterEC.cpp
-  }
-
-  Header_Files {
-    QCTQ_StarterEC.h
-    QCTQ_Starter_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQ_StarterEC.inl
-  }
-}
-
-project(QC_QCTQ_Starter_stub) : ccm_stub, dds4ccm_base {
-  after += QC_QCTQ_Starter_idl_gen
-  libs  +=
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_QCTQ_Starter_stub
-  dynamicflags += READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_StarterC.cpp
-  }
-
-  Header_Files {
-    QCTQ_StarterC.h
-    QCTQ_Starter_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQ_StarterC.inl
-  }
-}
-
-
-project(QC_QCTQ_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += QC_QCTQ_Starter_lem_stub QC_QCTQ_Starter_stub
-  sharedname  = QC_QCTQ_Starter_svnt
-  libs       += QC_QCTQ_Starter_stub QC_QCTQ_Starter_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += READER_STARTER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_StarterS.cpp
-    QCTQ_Starter_svnt.cpp
-  }
-
-  Header_Files {
-    QCTQ_StarterS.h
-    QCTQ_Starter_svnt.h
-    QCTQ_Starter_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl
deleted file mode 100644
index ef66771bb8f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file QCTQ_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_TEST_BASE_IDL
-#define QUERY_CONDITION_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/QCTQ_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/QCTQ_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "QueryConditionTest"
-#pragma DCPS_DATA_KEY "QueryConditionTest symbol"
-
-struct QueryConditionTest {
-  string symbol; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<QueryConditionTest> QueryConditionTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.mpc
deleted file mode 100644
index f959ec8a225..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project(QC_QCTQ_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = QC_QCTQ_Test_Base_stub
-  dynamicflags += QUERY_CONDITION_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=QUERY_CONDITION_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=QCTQ_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    QCTQ_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=QUERY_CONDITION_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    QCTQ_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.idl
deleted file mode 100644
index 069d2eda9b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file QCTQ_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_TEST_CONNECTOR_IDL_
-#define QUERY_CONDITION_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/QCTQ_Test_Base.idl"
-
-#pragma ciao lem "Connector/QCTQ_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/QCTQ_Test_BaseTypeSupport.idl"
-#endif
-
-module QCTQ_Test
-{
-  module ::CCM_DDS::Typed < ::QueryConditionTest, ::QueryConditionTestSeq> QueryConditionTestConnector;
-};
-
-#endif /* QUERY_CONDITION_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc
deleted file mode 100644
index 091cfc4ba36..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p QCTQ_Test_Base -l .. -o ../lib -u DDS QCTQ_Test_Connector"
-
-project(QC_QCTQ_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen QC_QCTQ_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=QCTQ_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=QCTQ_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=QCTQ_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=QUERY_CONDITION_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=QCTQ_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    QCTQ_Test_Connector.idl
-  }
-}
-
-project(QC_QCTQ_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += QC_QCTQ_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=QCTQ_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    QCTQ_Test_ConnectorE.idl
-  }
-}
-
-project(QC_QCTQ_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += QC_QCTQ_Test_Connector_lem_gen QC_QCTQ_Test_Connector_stub \
-           QC_QCTQ_Test_Base_stub
-  libs  += QC_QCTQ_Test_Base_stub QC_QCTQ_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_QCTQ_Test_Connector_lem_stub
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    QCTQ_Test_ConnectorEC.h
-    QCTQ_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQ_Test_ConnectorEC.inl
-  }
-}
-
-project(QC_QCTQ_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += QC_QCTQ_Test_Connector_idl_gen QC_QCTQ_Test_Base_stub
-  libs  += QC_QCTQ_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_QCTQ_Test_Connector_stub
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    QCTQ_Test_ConnectorC.h
-    QCTQ_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQ_Test_ConnectorC.inl
-  }
-}
-
-project(QC_QCTQ_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += QC_QCTQ_Test_Connector_lem_stub QC_QCTQ_Test_Connector_stub \
-             QC_QCTQ_Test_Base_stub
-  sharedname = QC_QCTQ_Test_Connector_exec
-  libs += QC_QCTQ_Test_Connector_stub QC_QCTQ_Test_Connector_lem_stub \
-          QC_QCTQ_Test_Base_stub QC_QCTQ_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    QCTQ_Test_Connector_conn.h
-    QCTQ_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QC_QCTQ_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += QC_QCTQ_Test_Connector_lem_stub QC_QCTQ_Test_Connector_exec \
-                QC_QCTQ_Test_Connector_stub
-  sharedname  = QC_QCTQ_Test_Connector_svnt
-  libs       += QC_QCTQ_Test_Connector_stub \
-                QC_QCTQ_Test_Connector_lem_stub  \
-                QC_QCTQ_Test_Base_stub \
-                QC_QCTQ_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_Test_ConnectorS.cpp
-    QCTQ_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    QCTQ_Test_ConnectorS.h
-    QCTQ_Test_Connector_svnt.h
-    QCTQ_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/README b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/README
deleted file mode 100644
index f2d19fb4eff..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/README
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-The TwoQueries exists of 4 runs. During each run the Sender writes 20 samples to DDS.
-After that it informs the receiver that the samples were written. The receiver
-in turn sets a filter and starts to pull the samples from DDS, using the Getter.
-Once the receiver has received all samples, it informs the Sender that the next
-run can be started.
-Since the getter only receives non-read samples, an extra check is build in. The
-receiver also performs a read on a different port in order to check whether the
-right samples are available in DDS. This Reader should always receive ALL samples
-since the QueryFilter only applies to the Getter.
-
-The following query expression is defined:
-  ( (iteration > %0) AND (iteration < %1) )
-
-The following runs are defined:
-
-1.  Sender writes iterations 1-20 to DDS for a certain number of keys,
-    defined in the deployment plan. The receiver sets the filter and filter
-    parameters and starts receiving the samples one by one, using get_one.
-    After that it changes the filter parameters and informs the Sender that a
-    new run can be started.
-2.  Sender writes iterations 21-40 to DDS for the defined number of keys. After
-    that it informs the receiver which starts to get the samples from DDS. After
-    that, the receiver reset the QueryFilter (by setting the expression to an
-    empty string) and informs the Sender that a new run can be started.
-3.  Sender writes iterations 41-60 to DDS for the defined number of keys. After
-    that it informs the receiver which should receive all samples with iterations
-    1-60 without the ones it read during run 1, 2 and 3.
-    The receiver then creates a new filter, using the same expression as used during
-    runs 1, 2 and 3 but with different parameters. Again the receiver informs the
-    Sender that a new run can be started.
-4.  Sender writes iterations 61-80 to DDS for the defined number of keys. Again it
-    informs the receiver about this action. The receiver should only get the samples
-    according to the query expression and its parameters.
-
-After each get-action, the receiver reads the data from DDS. During this read action,
-the receiver should read all samples the Sender has written up to that moment. Since
-there's no filter applied to this reader, all sample states should be 'FRESH_INFO'.
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.idl
deleted file mode 100644
index 80d9f1fb76e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/QCTQ_Test_Connector.idl"
-#include "Base/QCTQ_Starter.idl"
-
-module QCTQ_Test
-{
-  component Receiver
-  {
-    port QueryConditionTestConnector::DDS_Get get_port;
-    port QueryConditionTestConnector::DDS_Read read_port;
-
-    provides TwoQueriesStarter reader_start;
-    uses TwoQueriesRestarter writer_restart;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc
deleted file mode 100644
index f38fa33da42..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc
+++ /dev/null
@@ -1,155 +0,0 @@
-project(QC_QCTQ_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += QC_QCTQ_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 {
-    QCTQ_Test_Receiver.idl
-  }
-}
-
-project(QC_QCTQ_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += QC_QCTQ_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 {
-    QCTQ_Test_ReceiverE.idl
-  }
-}
-
-project(QC_QCTQ_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += QC_QCTQ_Test_Receiver_lem_gen QC_QCTQ_Test_Receiver_stub  \
-           QC_QCTQ_Test_Connector_stub QC_QCTQ_Test_Base_stub \
-           QC_QCTQ_Starter_stub
-  libs  +=  Receiver_stub QC_QCTQ_Test_Connector_stub \
-            QC_QCTQ_Test_Base_stub QC_QCTQ_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    QCTQ_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQ_Test_ReceiverEC.inl
-  }
-}
-
-project(QC_QCTQ_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += QC_QCTQ_Test_Receiver_idl_gen  QC_QCTQ_Test_Connector_stub \
-           QC_QCTQ_Test_Base_stub QC_QCTQ_Test_Connector_lem_gen \
-           QC_QCTQ_Starter_stub QC_QCTQ_Starter_lem_stub
-  libs  += QC_QCTQ_Test_Connector_stub QC_QCTQ_Test_Base_stub \
-           QC_QCTQ_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    QCTQ_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQ_Test_ReceiverC.inl
-  }
-}
-
-project(QC_QCTQ_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += QC_QCTQ_Test_Receiver_lem_stub QC_QCTQ_Test_Receiver_stub \
-             QC_QCTQ_Test_Base_stub QC_QCTQ_Test_Connector_stub \
-             QC_QCTQ_Test_Connector_lem_stub \
-             QC_QCTQ_Starter_lem_stub QC_QCTQ_Starter_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub QC_QCTQ_Test_Base_stub \
-          QC_QCTQ_Test_Connector_stub QC_QCTQ_Test_Connector_lem_stub \
-          QC_QCTQ_Starter_lem_stub QC_QCTQ_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    QCTQ_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QC_QCTQ_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   QC_QCTQ_Test_Receiver_lem_stub QC_QCTQ_Test_Base_stub \
-                  QC_QCTQ_Test_Connector_stub QC_QCTQ_Test_Connector_svnt \
-                  QC_QCTQ_Test_Receiver_exec QC_QCTQ_Test_Connector_lem_stub \
-                  QC_QCTQ_Starter_stub \
-                  QC_QCTQ_Starter_svnt QC_QCTQ_Starter_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub QC_QCTQ_Test_Base_stub \
-                QC_QCTQ_Test_Connector_stub QC_QCTQ_Test_Connector_svnt \
-                Receiver_exec QC_QCTQ_Test_Connector_lem_stub \
-                QC_QCTQ_Starter_stub QC_QCTQ_Starter_svnt \
-                QC_QCTQ_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_Test_ReceiverS.cpp
-    QCTQ_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    QCTQ_Test_ReceiverS.h
-    QCTQ_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp
deleted file mode 100644
index 5982d0f880f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,806 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "QCTQ_Test_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-#include "dds4ccm/impl/Utils.h"
-#include "dds4ccm/impl/dds4ccm_utils.h"
-
-#define QUERY "( (iteration > %0) AND (iteration < %1) )"
-// #define QUERY_2 "( (iteration > %0) AND (iteration < %1) )"
-
-#define MIN_ITERATION_1 "2"
-#define MAX_ITERATION_1 "5"
-
-#define MIN_ITERATION_2 "22"
-#define MAX_ITERATION_2 "34"
-
-#define MIN_ITERATION_3 "68"
-#define MAX_ITERATION_3 "77"
-
-// Reader also reads already read samples.
-// The getter receives the following iterations:
-// During run 1: 2 (iterations 3 and 4)
-// During run 2: 11 (iterations between 22 and 34)
-// During run 3: 2 (all unread samples, meaning iterations 1-60
-//               without iteration 3, 4 and iterations between 22 and 34)
-// During run 4: 8 (iterations between 68 and 77)
-
-#define SAMPLES_PER_KEY_GETTER (2 + 11 + 47 + 8)
-
-namespace CIAO_QCTQ_Test_Receiver_Impl
-{
-  /**
-   * Read action generator
-   */
-
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback, int run)
-    : callback_ (callback),
-      run_ (run)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Checking if last sample "
-                          "is available in DDS...\n"));
-    if (this->callback_.check_last ())
-      {
-        this->callback_.run (this->run_);
-      }
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: get_port_status_exec_i
-   */
-
-  get_port_status_exec_i::get_port_status_exec_i (
-        ::QCTQ_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::QCTQ_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  get_port_status_exec_i::~get_port_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  get_port_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  get_port_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: reader_start_exec_i
-   */
-
-  reader_start_exec_i::reader_start_exec_i (
-        ::QCTQ_Test::CCM_Receiver_Context_ptr ctx,
-        Receiver_exec_i & callback)
-    : ciao_context_ (
-        ::QCTQ_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  reader_start_exec_i::~reader_start_exec_i (void)
-  {
-  }
-
-  // Operations from ::TwoQueriesStarter
-
-  void
-  reader_start_exec_i::set_reader_properties (::CORBA::UShort nr_keys,
-  ::CORBA::UShort nr_iterations)
-  {
-    this->callback_.keys (nr_keys);
-    this->callback_.iterations (nr_iterations);
-  }
-
-  void
-  reader_start_exec_i::start_read (::CORBA::UShort run)
-  {
-    this->callback_.start_read (run);
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : iterations_ (20)
-      , keys_ (5)
-      , current_min_iteration_ (ACE_OS::atoi (MIN_ITERATION_1))
-      , current_max_iteration_ (ACE_OS::atoi (MAX_ITERATION_1))
-      , ticker_ (0)
-      , samples_expected_ (0)
-      , samples_received_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  bool
-  Receiver_exec_i::check_last ()
-  {
-    ::QCTQ_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_get_port_data ();
-
-    try
-      {
-        QueryConditionTest queryfiltertest_info;
-        ::CCM_DDS::ReadInfo readinfo;
-        char key[10];
-        ACE_OS::sprintf (key, "KEY_%d", this->keys_);
-        queryfiltertest_info.symbol = ::CORBA::string_dup (key);
-        reader->read_one_last (
-                queryfiltertest_info,
-                readinfo,
-                ::DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - "
-                              "last iteration <%02d> - <%02d>\n",
-                               queryfiltertest_info.iteration,
-                               this->current_max_iteration_ - 1));
-        return queryfiltertest_info.iteration >= this->current_max_iteration_ - 1;
-      }
-    catch (const ::CCM_DDS::InternalError &)
-      {
-      }
-    catch (const ::CCM_DDS::NonExistent &)
-      {
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: "
-                              "ERROR: Unexpected exception caught\n"));
-      }
-    return false;
-  }
-
-  // Supported operations and attributes.
-  bool
-  Receiver_exec_i::check_iter (const QueryConditionTest & sample,
-                               ::CORBA::UShort run,
-                               ::CCM_DDS::ReadInfo * info)
-  {
-    if (!info)
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET ALL : ")
-            ACE_TEXT ("sample received for <%C>: iteration <%d>\n"),
-            sample.symbol.in (),
-            sample.iteration));
-      }
-    if (run == 3)
-      {
-        // We need to receive all UNread samples. Therefor we should
-        // receive all samples except the ones between
-        // MIN_ITERATION_1 and MAX_ITERATION_1 and between
-        // MIN_ITERATION_2 and MAX_ITERATION_2
-        if ((sample.iteration > ACE_OS::atoi (MIN_ITERATION_1)  &&
-             sample.iteration < ACE_OS::atoi (MAX_ITERATION_1)) ||
-            (sample.iteration > ACE_OS::atoi (MIN_ITERATION_2)  &&
-             sample.iteration < ACE_OS::atoi (MAX_ITERATION_2)))
-          {
-            // Read supplies info. There check the sample status mask
-            // as well
-            if (info != 0)
-              { // access mask should be "ALREADY_SEEN" since the getter should
-                // already have seen this sample.
-                if (info->access_status != ::CCM_DDS::ALREADY_SEEN)
-                  {
-                    // READ ALL since this check is only performed
-                    // during a read.
-                    ACE_ERROR ((LM_ERROR, "ERROR: READ ALL: "
-                                "Unexpected sample access mask - "
-                                "expected <%C> - "
-                                "received <%C>\n",
-                                CIAO::DDS4CCM::translate_ccm_dds_accessstatus (::CCM_DDS::ALREADY_SEEN),
-                                CIAO::DDS4CCM::translate_ccm_dds_accessstatus (info->access_status)
-                                ));
-                    return false;
-                  }
-              }
-            else
-              {
-                // Getter functionality
-                ACE_ERROR ((LM_ERROR, "ERROR: GET ALL: "
-                                      "Didn't except samples between "
-                                      "<%02d> and <%02d> and between "
-                                      "<%02d> and <%02d>\n",
-                                      ACE_OS::atoi (MIN_ITERATION_1),
-                                      ACE_OS::atoi (MAX_ITERATION_1),
-                                      ACE_OS::atoi (MIN_ITERATION_2),
-                                      ACE_OS::atoi (MAX_ITERATION_2)));
-                return false;
-              }
-          }
-      }
-    else if (!info)
-      {
-        if (sample.iteration <= current_min_iteration_)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: GET ALL: "
-                                  "Didn't expect samples with iteration %d "
-                                  "<= %d\n", sample.iteration,
-                                  this->current_min_iteration_));
-            return false;
-          }
-        if (sample.iteration > this->current_max_iteration_)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: GET ALL: "
-                                  "Didn't expect samples with iteration %d "
-                                  "> %2d\n", sample.iteration,
-                                  this->current_max_iteration_));
-            return false;
-          }
-      }
-    if (info != 0)
-      { // access mask should be "FRESH_INFO" since the getter has not
-        // "seen" this sample but the reader has seen the samples
-        // of the previous runs.
-        if (sample.iteration > this->current_min_iteration_)
-          {
-            if (info->access_status != ::CCM_DDS::FRESH_INFO)
-              {
-                // READ ALL since this check is only performed
-                // during a read.
-                ACE_ERROR ((LM_ERROR, "ERROR: READ ALL: "
-                            "Unexpected sample access mask - "
-                            "expected <%C> - "
-                            "received <%C>\n",
-                            CIAO::DDS4CCM::translate_ccm_dds_accessstatus (::CCM_DDS::FRESH_INFO),
-                            CIAO::DDS4CCM::translate_ccm_dds_accessstatus (info->access_status)));
-                return false;
-              }
-          }
-      }
-    return true;
-  }
-
-
-  void
-  Receiver_exec_i::read_all (::CORBA::UShort run)
-  {
-    ::QCTQ_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_read_port_data ();
-
-    if (::CORBA::is_nil (reader.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::read_all - "
-                              "ERROR: No Reader\n"));
-        return;
-      }
-    QueryConditionTestSeq qf_info;
-    ::CCM_DDS::ReadInfoSeq readinfos;
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::read_all - "
-                "Start checking samples in DDS\n"));
-    reader->read_all (qf_info, readinfos);
-    ::CORBA::ULong expected =
-      static_cast < ::CORBA::ULong > (run * this->iterations_ * this->keys_);
-    if (qf_info.length () != expected)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_all - "
-                              "Unexpected number of samples received: "
-                              "expected <%d> - received <%u>\n",
-                               expected, qf_info.length ()));
-      }
-    for (::CORBA::ULong i = 0; i < qf_info.length (); ++i)
-      {
-        ACE_DEBUG ((LM_DEBUG, "READ ALL : Receiver_exec_i::read_all - "
-                              "Sample received: key <%C> - iteration <%d> - "
-                              "sample_read_state <%C>\n",
-                              qf_info[i].symbol.in (),
-                              qf_info[i].iteration,
-                              CIAO::DDS4CCM::translate_ccm_dds_accessstatus (readinfos[i].access_status)));
-        if (!this->check_iter (qf_info[i], run, &readinfos[i]))
-          break;
-      }
-  }
-
-
-  ::CORBA::ULong
-  Receiver_exec_i::get_all (::CORBA::UShort run)
-  {
-    ::QCTQ_Test::QueryConditionTestConnector::Getter_var getter =
-      this->ciao_context_->get_connection_get_port_fresh_data ();
-    ::CORBA::ULong samples_received = 0;
-
-    if (::CORBA::is_nil (getter.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - "
-                              "ERROR: No Getter\n"));
-        return 0;
-      }
-    QueryConditionTest_var qf_info;
-    ::CCM_DDS::ReadInfo readinfo;
-    ::CORBA::Boolean result = getter->get_one (qf_info.out (), readinfo);
-    if (result)
-      {
-        this->check_iter (qf_info.in (), run);
-        ++samples_received;
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - "
-                              "ERROR: time out when retrieving "
-                              "first sample.\n"));
-      }
-    while (result)
-      {
-        result = getter->get_one (qf_info.out (), readinfo);
-        if (result)
-          {
-            if (!this->check_iter (qf_info.in (), run))
-              break;
-            ++samples_received;
-          }
-      }
-    return samples_received;
-  }
-
-  ::CORBA::ULong
-  Receiver_exec_i::test_all (::CORBA::UShort run)
-  {
-    try
-      {
-        return get_all (run);
-      }
-    catch (const CCM_DDS::NonExistent& ex)
-      {
-        for (::CORBA::ULong i = 0; i < ex.indexes.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ERROR test_all <%d>: ")
-                  ACE_TEXT ("caught expected exception: index <%u>\n"),
-                  run,
-                  ex.indexes[i]));
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: test_all <%d>: ")
-              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-              run,
-              ex.error_code));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("test_all");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::test_all <%d> : Exception caught\n"),
-          run));
-      }
-    return 0;
-  }
-
-  void
-  Receiver_exec_i::check_filter (::CORBA::UShort run)
-  {
-    ::CCM_DDS::QueryFilter_var filter;
-    ::QCTQ_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_get_port_data ();
-    try
-      {
-        filter = reader->query ();
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        if (run == 3)
-          {
-            ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_filter - "
-                                  "caught expected InternalEr excep: retval <%u>\n",
-                                  ex.error_code));
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                                  "caught InternalError exception: retval <%u>\n",
-                                  ex.error_code));
-          }
-        return;
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Receiver_exec_i::check_filter: ");
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                              "Exception caught\n"));
-        return;
-      }
-
-    //check query
-    bool error = false;
-
-    if (ACE_OS::strcmp (filter->expression, QUERY) != 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                              "Unexpected query when retrieving filter: "
-                              "expected <%C> - received <%C>\n",
-                              QUERY, filter->expression.in ()));
-        error = true;
-      }
-    //check current parameters.
-    if (filter->parameters.length () != 2)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                              "Unexpected number of parameters: "
-                              "expected <%d> - received <%d>\n",
-                              2, filter->parameters.length ()));
-        error = true;
-      }
-
-    if (filter->parameters.length () >= 1)
-      {
-        if (ACE_OS::atoi (filter->parameters[0]) != this->current_min_iteration_)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                                  "Unexpected param value: "
-                                  "expected <%d> - received <%C>\n",
-                                  this->current_min_iteration_,
-                                  filter->parameters[0].in ()));
-            error = true;
-          }
-      }
-    if (filter->parameters.length () >= 2)
-      {
-        if (ACE_OS::atoi (filter->parameters[1]) != this->current_max_iteration_)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                                  "Unexpected param value: "
-                                  "expected <%d> - received <%C>\n",
-                                  this->current_max_iteration_,
-                                  filter->parameters[1].in ()));
-            error = true;
-          }
-      }
-    if (!error)
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_filter - "
-                              "Passed check_filter test for run <%d>.\n",
-                              run));
-      }
-  }
-
-  void
-  Receiver_exec_i::set_filter (::CORBA::UShort run)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Set filter for run <%d>\n", run));
-    ::QCTQ_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_get_port_data ();
-
-    try
-      {
-        ::CCM_DDS::QueryFilter filter;
-        run != 3 ? filter.expression = ::CORBA::string_dup (QUERY) :
-                   filter.expression = ::CORBA::string_dup ("");
-        filter.parameters.length (2);
-        if (run == 1)
-          {
-            filter.parameters[0] = ::CORBA::string_dup (MIN_ITERATION_1);
-            filter.parameters[1] = ::CORBA::string_dup (MAX_ITERATION_1);
-            this->current_min_iteration_ = ACE_OS::atoi (MIN_ITERATION_1);
-            this->current_max_iteration_ = ACE_OS::atoi (MAX_ITERATION_1);
-          }
-        else if (run == 2)
-          {
-            filter.parameters[0] = ::CORBA::string_dup (MIN_ITERATION_2);
-            filter.parameters[1] = ::CORBA::string_dup (MAX_ITERATION_2);
-            this->current_min_iteration_ = ACE_OS::atoi (MIN_ITERATION_2);
-            this->current_max_iteration_ = ACE_OS::atoi (MAX_ITERATION_2);
-          }
-        else if (run == 3)
-          {
-            filter.parameters[0] = ::CORBA::string_dup ("0");
-            filter.parameters[1] = ::CORBA::string_dup ("0");
-            this->current_min_iteration_ = (run - 1) * this->iterations_;
-            this->current_max_iteration_ = run * this->iterations_;
-          }
-        else if (run == 4)
-          {
-            filter.parameters[0] = ::CORBA::string_dup (MIN_ITERATION_3);
-            filter.parameters[1] = ::CORBA::string_dup (MAX_ITERATION_3);
-            this->current_min_iteration_ = ACE_OS::atoi (MIN_ITERATION_3);
-            this->current_max_iteration_ = ACE_OS::atoi (MAX_ITERATION_3);
-          }
-        ACE_DEBUG ((LM_DEBUG, "Filter : Query <%C>, parameter[0] <%C>, parameter[1] <%C>\n",
-              filter.expression.in (), filter.parameters[0].in (), filter.parameters[1].in ()));
-        reader->query (filter);
-      }
-    catch (const ::CCM_DDS::InternalError &ex)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::set_filter - "
-                    "ERROR: Unexpected InternalError exception caught "
-                    "with <%C> as error\n.",
-                    ::CIAO::DDS4CCM::translate_retcode (ex.error_code)));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::set_filter - "
-                    "ERROR: Unexpected exception caught.\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::start_read (::CORBA::UShort run)
-  {
-    this->ticker_ = new read_action_Generator (*this, run);
-    if (this->reactor ()->schedule_timer (this->ticker_,
-                                          0,
-                                          ACE_Time_Value(1, 0),
-                                          ACE_Time_Value(1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::run (::CORBA::UShort run)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::run - "
-                          "Starting run number <%d>\n",
-                          run));
-    TwoQueriesRestarter_var restarter =
-      this->ciao_context_->get_connection_writer_restart ();
-    if (!::CORBA::is_nil (restarter.in ()))
-      {
-        switch (run)
-        {
-          case 1:
-            {
-              this->samples_received_ += this->test_all (run);
-              this->check_filter (run);
-              this->read_all (run);
-              //set filter for the next run
-              this->set_filter (run + 1);
-              // inform the sender that it may start the next run
-              restarter->restart_write ();
-            }
-            break;
-          case 2:
-            {
-              this->samples_received_ += this->test_all (run);
-              check_filter (run);
-              this->read_all (run);
-              //set filter for the next run
-              this->set_filter (run + 1);
-              // inform the sender that it may start the next run
-              restarter->restart_write ();
-            }
-            break;
-          case 3:
-            {
-              this->samples_received_ += this->test_all (run);
-              this->check_filter (run);
-              this->read_all (run);
-              //set filter for the next run
-              this->set_filter (run + 1);
-              // inform the sender that it may start the next run
-              restarter->restart_write ();
-            }
-            break;
-          case 4:
-            {
-              this->samples_received_ += this->test_all (run);
-              this->read_all (run);
-            }
-        }
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::run - "
-                  "ERROR: Reference to Restarter not found\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-
-  }
-
-  void
-  Receiver_exec_i::keys (::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-
-    this->samples_expected_ = (this->keys_ - 1) * SAMPLES_PER_KEY_GETTER;
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_get_port_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_get_port_status_.in ()))
-      {
-        get_port_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          get_port_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_get_port_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_get_port_status_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_read_port_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_TwoQueriesStarter_ptr
-  Receiver_exec_i::get_reader_start (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_reader_start_.in ()))
-      {
-        reader_start_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          reader_start_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_TwoQueriesStarter::_nil ());
-
-          this->ciao_reader_start_ = tmp;
-      }
-
-    return
-      ::CCM_TwoQueriesStarter::_duplicate (
-        this->ciao_reader_start_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::QCTQ_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::QCTQ_Test::QueryConditionTestConnector::Getter_var getter =
-      this->ciao_context_->get_connection_get_port_fresh_data ();
-    DDS::Duration_t to;
-    to.sec = 5; to.nanosec = 0;
-    getter->time_out (to);
-    // Set filter for the first run
-    this->set_filter (1);
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->samples_received_ != this->samples_expected_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: TWO QUERIES GETTER : "
-                              "Unexpected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_,
-                              this->samples_received_));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "TWO QUERIES : GETTER : "
-                              "Expected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_,
-                              this->samples_received_));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCTQ_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/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h
deleted file mode 100644
index de5c32eda55..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h
+++ /dev/null
@@ -1,221 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_QCTQ_TEST_RECEIVER_EXEC_HWBPVD_H_
-#define CIAO_QCTQ_TEST_RECEIVER_EXEC_HWBPVD_H_
-
-#include /**/ "ace/pre.h"
-
-#include "QCTQ_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_QCTQ_Test_Receiver_Impl
-{
-
-  class Receiver_exec_i;
-
-  /**
-   * Read action generator
-   */
-
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback,
-                           int run);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Receiver_exec_i &callback_;
-    int run_;
-
-  };
-
-  /**
-   * Provider Executor Implementation Class: get_port_status_exec_i
-   */
-
-  class get_port_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    get_port_status_exec_i (
-      ::QCTQ_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~get_port_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::QCTQ_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: reader_start_exec_i
-   */
-
-  class reader_start_exec_i
-    : public virtual ::CCM_TwoQueriesStarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    reader_start_exec_i (
-      ::QCTQ_Test::CCM_Receiver_Context_ptr ctx,
-      Receiver_exec_i & callback);
-    virtual ~reader_start_exec_i (void);
-
-    //@{
-    /** Operations and attributes from TwoQueriesStarter. */
-
-    virtual
-    void set_reader_properties (::CORBA::UShort nr_keys,
-    ::CORBA::UShort nr_iterations);
-
-    virtual
-    void start_read (::CORBA::UShort run);
-    //@}
-
-  private:
-    ::QCTQ_Test::CCM_Receiver_Context_var ciao_context_;
-    Receiver_exec_i & callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_get_port_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_read_port_status (void);
-
-
-    virtual ::CCM_TwoQueriesStarter_ptr
-    get_reader_start (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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void iterations (CORBA::UShort iterations);
-    void keys (::CORBA::UShort keys);
-
-    bool check_last (void);
-    void start_read (::CORBA::UShort run);
-    void run (::CORBA::UShort run);
-    //@}
-
-  private:
-    ::QCTQ_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_get_port_status_;
-    ::CCM_TwoQueriesStarter_var ciao_reader_start_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    ::CORBA::UShort iterations_;
-    ::CORBA::UShort keys_;
-
-    int current_min_iteration_;
-    int current_max_iteration_;
-
-    read_action_Generator *ticker_;
-
-    ::CORBA::ULong samples_expected_;
-    ::CORBA::ULong samples_received_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    ::CORBA::ULong test_all (::CORBA::UShort run);
-    ::CORBA::ULong get_all (::CORBA::UShort run);
-    void read_all (::CORBA::UShort run);
-    bool check_iter (const QueryConditionTest & sample,
-                     ::CORBA::UShort run,
-                     ::CCM_DDS::ReadInfo * info = 0);
-    void check_filter (::CORBA::UShort run);
-    void set_filter (::CORBA::UShort run);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCTQ_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.idl
deleted file mode 100644
index 0b691cb570e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_QUERY_CONDITION_TEST_SENDER_IDL
-#define DDS_QUERY_CONDITION_TEST_SENDER_IDL
-
-#include "Connector/QCTQ_Test_Connector.idl"
-#include "Base/QCTQ_Starter.idl"
-
-module QCTQ_Test
-{
-  component Sender
-  {
-    port QCTQ_Test::QueryConditionTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    uses TwoQueriesStarter start_reader;
-    provides TwoQueriesRestarter restart_writer;
-
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc
deleted file mode 100644
index 22fb33b6792..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc
+++ /dev/null
@@ -1,153 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p QCTQ_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(QC_QCTQ_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += QC_QCTQ_Test_Connector_idl_gen QC_QCTQ_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 {
-    QCTQ_Test_Sender.idl
-  }
-}
-
-project(QC_QCTQ_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += QC_QCTQ_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 {
-    QCTQ_Test_SenderE.idl
-  }
-}
-
-project(QC_QCTQ_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += QC_QCTQ_Test_Sender_lem_gen QC_QCTQ_Test_Sender_stub \
-           QC_QCTQ_Test_Base_stub QC_QCTQ_Starter_stub
-  libs  += QC_QCTQ_Test_Base_stub Sender_stub QC_QCTQ_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    QCTQ_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQ_Test_SenderEC.inl
-  }
-}
-
-project(QC_QCTQ_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += QC_QCTQ_Test_Sender_idl_gen QC_QCTQ_Test_Base_stub \
-           QC_QCTQ_Test_Connector_stub QC_QCTQ_Starter_stub \
-           QC_QCTQ_Starter_lem_stub
-  libs  += QC_QCTQ_Test_Base_stub QC_QCTQ_Test_Connector_stub \
-           QC_QCTQ_Starter_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    QCTQ_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQ_Test_SenderC.inl
-  }
-}
-
-project(QC_QCTQ_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += QC_QCTQ_Test_Sender_lem_stub QC_QCTQ_Test_Sender_stub \
-             QC_QCTQ_Test_Connector_lem_stub QC_QCTQ_Test_Connector_stub \
-             QC_QCTQ_Starter_lem_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub QC_QCTQ_Test_Base_stub \
-             QC_QCTQ_Test_Connector_lem_stub QC_QCTQ_Test_Connector_stub \
-             QC_QCTQ_Starter_stub QC_QCTQ_Starter_lem_stub \
-             QC_QCTQ_Starter_lem_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    QCTQ_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QC_QCTQ_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += QC_QCTQ_Test_Base_stub  QC_QCTQ_Test_Sender_lem_stub \
-                QC_QCTQ_Test_Connector_stub \
-                QC_QCTQ_Test_Connector_svnt QC_QCTQ_Test_Connector_lem_stub \
-                QC_QCTQ_Starter_stub QC_QCTQ_Starter_svnt \
-                QC_QCTQ_Starter_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub QC_QCTQ_Test_Base_stub \
-                QC_QCTQ_Test_Connector_stub QC_QCTQ_Test_Connector_svnt \
-                QC_QCTQ_Test_Connector_lem_stub QC_QCTQ_Starter_stub \
-                QC_QCTQ_Starter_svnt QC_QCTQ_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQ_Test_SenderS.cpp
-    QCTQ_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    QCTQ_Test_SenderS.h
-    QCTQ_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.cpp
deleted file mode 100644
index 6f3213ead99..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,349 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "QCTQ_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#define ITERATIONS 20
-
-namespace CIAO_QCTQ_Test_Sender_Impl
-{
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Sender_exec_i &callback)
-    : callback_ (callback)
-    , started_ (false)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (!this->started_ && status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        this->started_ = true;
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.get_started ();
-      }
-  }
-
-  /**
-   * WriteHandler
-   */
-
-  WriteHandler::WriteHandler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteHandler::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.start ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: restart_writer_exec_i
-   */
-
-  restart_writer_exec_i::restart_writer_exec_i (
-        ::QCTQ_Test::CCM_Sender_Context_ptr ctx,
-        Sender_exec_i & callback)
-    : ciao_context_ (
-        ::QCTQ_Test::CCM_Sender_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  restart_writer_exec_i::~restart_writer_exec_i (void)
-  {
-  }
-
-  // Operations from ::TwoQueriesRestarter
-
-  void
-  restart_writer_exec_i::restart_write (void)
-  {
-    this->callback_.restart ();
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : keys_ (0)
-      , iterations_ (ITERATIONS)
-      , run_ (1)
-      , wh_ (0)
-
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    if (this->wh_)
-      {
-        delete this->wh_;
-      }
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::restart (void)
-  {
-    ++this->run_;
-    if (this->wh_)
-      {
-        delete this->wh_;
-        this->wh_ = 0;
-      }
-    ACE_NEW_THROW_EX (this->wh_,
-                     WriteHandler (*this),
-                     ::CORBA::NO_MEMORY ());
-    this->reactor ()->notify (this->wh_);
-  }
-
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    try
-      {
-        if (this->wh_)
-          {
-            delete this->wh_;
-            this->wh_ = 0;
-          }
-        ACE_NEW_THROW_EX (this->wh_,
-                          WriteHandler (*this),
-                          ::CORBA::NO_MEMORY ());
-        this->reactor ()->notify (this->wh_);
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: get_started : Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: get_started : Unknown exception caught\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    ::QCTQ_Test::QueryConditionTestConnector::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-    TwoQueriesStarter_var starter =
-      this->ciao_context_->get_connection_start_reader ();
-
-    if (! ::CORBA::is_nil (starter.in ()))
-      {
-        starter->set_reader_properties (this->keys_, this->iterations_);
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to start the reader\n")));
-        return;
-      }
-    for (CORBA::UShort iter_key = 1; iter_key < this->keys_ + 1; ++iter_key)
-      {
-        char key[7];
-        QueryConditionTest new_key;
-        ACE_OS::sprintf (key, "KEY_%d", iter_key);
-        new_key.symbol = CORBA::string_dup(key);
-        CORBA::UShort iter = ((this->run_ - 1) * this->iterations_) + 1;
-        while (iter < this->run_ * this->iterations_ + 1)
-          {
-            new_key.iteration = iter;
-            writer->write_one (new_key, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written key <%C> with <%d>\n"),
-                        key, iter));
-            ++iter;
-          }
-      }
-    ACE_OS::sleep (2);
-    starter->start_read (this->run_);
-  }
-
-  // Component attributes and port operations.
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  ::CCM_TwoQueriesRestarter_ptr
-  Sender_exec_i::get_restart_writer (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_restart_writer_.in ()))
-      {
-        restart_writer_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          restart_writer_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_TwoQueriesRestarter::_nil ());
-
-          this->ciao_restart_writer_ = tmp;
-      }
-
-    return
-      ::CCM_TwoQueriesRestarter::_duplicate (
-        this->ciao_restart_writer_.in ());
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::QCTQ_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCTQ_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/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.h
deleted file mode 100644
index 37b8f265fb3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.h
+++ /dev/null
@@ -1,196 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_QCTQ_TEST_SENDER_EXEC_VZMKKL_H_
-#define CIAO_QCTQ_TEST_SENDER_EXEC_VZMKKL_H_
-
-#include /**/ "ace/pre.h"
-
-#include "QCTQ_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_QCTQ_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-    bool started_;
-  };
-
-  /**
-   * WriteHandler
-   */
-
-  class WriteHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteHandler (Sender_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: restart_writer_exec_i
-   */
-
-  class restart_writer_exec_i
-    : public virtual ::CCM_TwoQueriesRestarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    restart_writer_exec_i (
-      ::QCTQ_Test::CCM_Sender_Context_ptr ctx,
-      Sender_exec_i & callback);
-    virtual ~restart_writer_exec_i (void);
-
-    //@{
-    /** Operations and attributes from TwoQueriesRestarter. */
-
-    virtual
-    void restart_write (void);
-    //@}
-
-  private:
-    ::QCTQ_Test::CCM_Sender_Context_var ciao_context_;
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CCM_TwoQueriesRestarter_ptr
-    get_restart_writer (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void get_started (void);
-    void start (void);
-    void restart (void);
-
-    //@}
-
-  private:
-    ::QCTQ_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_TwoQueriesRestarter_var ciao_restart_writer_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    CORBA::UShort iterations_;
-    CORBA::UShort run_;
-    WriteHandler *wh_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCTQ_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/Plan.cdp
deleted file mode 100644
index 8349f74fcb1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/Plan.cdp
+++ /dev/null
@@ -1,520 +0,0 @@
-<!--  -->
-<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>QCTQ_Test_Depl_1</label>
-  <UUID>QCTQ_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_QCTQ_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_QCTQ_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="QCTQ_Test_EventConnectorImplementation">
-    <name>QCTQ_Test_EventConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="QCTQ_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="QCTQ_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_QCTQ_Test_QueryConditionTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCTQ_Test_QueryConditionTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_QCTQ_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_QCTQ_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="QCTQ_Test_StateConnectorImplementation">
-    <name>QCTQ_Test_StateConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="QCTQ_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="QCTQ_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_QCTQ_Test_QueryConditionTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCTQ_Test_QueryConditionTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_QCTQ_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_QCTQ_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_QCTQ_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_QCTQ_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="QCTQ_Test_SenderConnectorInstance">
-    <name>QCTQ_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QCTQ_Test_EventConnectorImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QueryCondition_Library#QueryConditionProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCTQ_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="QCTQ_Test_EventConnector">
-    <name>QCTQ_Test_EventConnector</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QCTQ_Test_EventConnectorImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QueryCondition_Library#QueryConditionProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCTQ_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="QCTQ_Test_StateConnector">
-    <name>QCTQ_Test_StateConnector</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QCTQ_Test_StateConnectorImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QueryCondition_Library#QueryConditionProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCTQ_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_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>read_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>read_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCTQ_Test_StateConnector" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>get_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCTQ_Test_EventConnector" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>get_port_fresh_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCTQ_Test_EventConnector" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="QCTQ_Test_SenderConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>reader_starter</name>
-    <internalEndpoint>
-      <portName>start_reader</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>reader_start</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>restart_writer</name>
-    <internalEndpoint>
-      <portName>writer_restart</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>restart_writer</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="QCTQ_Test_SenderConnectorInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </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="QCTQ_Test_Connector_ExecArtifact">
-    <name>QC_QCTQ_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>QC_QCTQ_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="QCTQ_Test_Connector_SvntArtifact">
-    <name>QC_QCTQ_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>QC_QCTQ_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="QCTQ_Test_Connector_StubArtifact">
-    <name>QC_QCTQ_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>QC_QCTQ_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/QueryCondition/TwoQueries/descriptors/QueryCondition_Library.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/QueryCondition_Library.xml
deleted file mode 100644
index b9cba6277a3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/QueryCondition_Library.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="QueryConditionProfile">
-    <!-- QoS used to configure the data writer created in the example code -->
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 37e7ff8dec9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="QueryCondition_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="QueryConditionProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/run_test.pl
deleted file mode 100755
index b87434bef7e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 60 seconds to allow task to complete\n";
-sleep (60);
-
-# 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 -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.idl
deleted file mode 100644
index d9b7dc87807..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file QCTQM_Starter.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef QUERYCONDITION_STARTER_IDL
-#define QUERYCONDITION_STARTER_IDL
-
-#pragma ciao lem "Base/QCTQM_StarterE.idl"
-
-interface TwoQueriesStarter
-{
-  void set_reader_properties (in unsigned short nr_keys,
-                              in unsigned short nr_iterations);
-  void start_read (in unsigned short run);
-};
-
-interface TwoQueriesRestarter
-{
-  void restart_write ();
-};
-
-#endif /* QUERYCONDITION_STARTER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.mpc
deleted file mode 100644
index d5696898dd6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.mpc
+++ /dev/null
@@ -1,109 +0,0 @@
-project(QC_QCTQM_Starter_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
-              -Wb,stub_export_include=QCTQM_Starter_stub_export.h \
-              -Wb,skel_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,skel_export_include=QCTQM_Starter_svnt_export.h \
-              -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,svnt_export_include=QCTQM_Starter_svnt_export.h \
-              -Wb,exec_export_macro=READER_STARTER_EXEC_Export \
-              -Wb,exec_export_include=QCTQM_Starter_exec_export.h -I..
-
-  IDL_Files {
-    QCTQM_Starter.idl
-  }
-}
-
-project(QC_QCTQM_Starter_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += QC_QCTQM_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \
-              -Wb,stub_export_include=QCTQM_Starter_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    QCTQM_StarterE.idl
-  }
-}
-
-project(QC_QCTQM_Starter_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += QC_QCTQM_Starter_lem_gen QC_QCTQM_Starter_stub
-  libs  += QC_QCTQM_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_QCTQM_Starter_lem_stub
-  dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_StarterEC.cpp
-  }
-
-  Header_Files {
-    QCTQM_StarterEC.h
-    QCTQM_Starter_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQM_StarterEC.inl
-  }
-}
-
-project(QC_QCTQM_Starter_stub) : ccm_stub, dds4ccm_base {
-  after += QC_QCTQM_Starter_idl_gen
-  libs  +=
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_QCTQM_Starter_stub
-  dynamicflags += READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_StarterC.cpp
-  }
-
-  Header_Files {
-    QCTQM_StarterC.h
-    QCTQM_Starter_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQM_StarterC.inl
-  }
-}
-
-
-project(QC_QCTQM_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += QC_QCTQM_Starter_lem_stub QC_QCTQM_Starter_stub
-  sharedname  = QC_QCTQM_Starter_svnt
-  libs       += QC_QCTQM_Starter_stub QC_QCTQM_Starter_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += READER_STARTER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_StarterS.cpp
-    QCTQM_Starter_svnt.cpp
-  }
-
-  Header_Files {
-    QCTQM_StarterS.h
-    QCTQM_Starter_svnt.h
-    QCTQM_Starter_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl
deleted file mode 100644
index 71a086999ce..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file QCTQM_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_TEST_BASE_IDL
-#define QUERY_CONDITION_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/QCTQM_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/QCTQM_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "QueryConditionTest"
-#pragma DCPS_DATA_KEY "QueryConditionTest symbol"
-
-struct QueryConditionTest {
-  string symbol; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<QueryConditionTest> QueryConditionTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.mpc
deleted file mode 100644
index 148f7d99637..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project(QC_QCTQM_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = QC_QCTQM_Test_Base_stub
-  dynamicflags += QUERY_CONDITION_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=QUERY_CONDITION_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=QCTQM_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    QCTQM_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=QUERY_CONDITION_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    QCTQM_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl
deleted file mode 100644
index a390ca52507..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file QCTQM_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef QUERY_CONDITION_TEST_CONNECTOR_IDL_
-#define QUERY_CONDITION_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/QCTQM_Test_Base.idl"
-
-#pragma ciao lem "Connector/QCTQM_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/QCTQM_Test_BaseTypeSupport.idl"
-#endif
-
-module QCTQM_Test
-{
-  module ::CCM_DDS::Typed < ::QueryConditionTest, ::QueryConditionTestSeq> QueryConditionTestConnector;
-};
-
-#endif /* QUERY_CONDITION_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc
deleted file mode 100644
index cbbeffe6a03..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p QCTQM_Test_Base -l .. -o ../lib -u DDS QCTQM_Test_Connector"
-
-project(QC_QCTQM_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen QC_QCTQM_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=QCTQM_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=QCTQM_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=QCTQM_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=QUERY_CONDITION_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=QCTQM_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    QCTQM_Test_Connector.idl
-  }
-}
-
-project(QC_QCTQM_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += QC_QCTQM_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=QCTQM_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    QCTQM_Test_ConnectorE.idl
-  }
-}
-
-project(QC_QCTQM_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += QC_QCTQM_Test_Connector_lem_gen QC_QCTQM_Test_Connector_stub \
-           QC_QCTQM_Test_Base_stub
-  libs  += QC_QCTQM_Test_Base_stub QC_QCTQM_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_QCTQM_Test_Connector_lem_stub
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    QCTQM_Test_ConnectorEC.h
-    QCTQM_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQM_Test_ConnectorEC.inl
-  }
-}
-
-project(QC_QCTQM_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += QC_QCTQM_Test_Connector_idl_gen QC_QCTQM_Test_Base_stub
-  libs  += QC_QCTQM_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = QC_QCTQM_Test_Connector_stub
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    QCTQM_Test_ConnectorC.h
-    QCTQM_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQM_Test_ConnectorC.inl
-  }
-}
-
-project(QC_QCTQM_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += QC_QCTQM_Test_Connector_lem_stub QC_QCTQM_Test_Connector_stub \
-             QC_QCTQM_Test_Base_stub
-  sharedname = QC_QCTQM_Test_Connector_exec
-  libs += QC_QCTQM_Test_Connector_stub QC_QCTQM_Test_Connector_lem_stub \
-          QC_QCTQM_Test_Base_stub QC_QCTQM_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    QCTQM_Test_Connector_conn.h
-    QCTQM_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QC_QCTQM_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += QC_QCTQM_Test_Connector_lem_stub QC_QCTQM_Test_Connector_exec \
-                QC_QCTQM_Test_Connector_stub
-  sharedname  = QC_QCTQM_Test_Connector_svnt
-  libs       += QC_QCTQM_Test_Connector_stub \
-                QC_QCTQM_Test_Connector_lem_stub  \
-                QC_QCTQM_Test_Base_stub \
-                QC_QCTQM_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += QUERY_CONDITION_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_Test_ConnectorS.cpp
-    QCTQM_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    QCTQM_Test_ConnectorS.h
-    QCTQM_Test_Connector_svnt.h
-    QCTQM_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/README b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/README
deleted file mode 100644
index 81b1c73a9cb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/README
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-The TwoQueriesMany exists of 4 runs. During each run the Sender writes 20 samples to DDS.
-After that it informs the receiver that the samples were written. The receiver
-in turn sets a filter and starts to pull the samples from DDS, using the Getter.
-Once the receiver has received all samples, it informs the Sender that the next
-run can be started.
-Since the getter only receives non-read samples, an extra check is build in. The
-receiver also performs a read on a different port in order to check whether the
-right samples are available in DDS. This Reader should always receive ALL samples
-since the QueryFilter only applies to the Getter.
-
-The following query expression is defined:
-  ( (iteration > %0) AND (iteration < %1) )
-
-The following runs are defined:
-
-1.  Sender writes iterations 1-20 to DDS for a certain number of keys,
-    defined in the deployment plan. The receiver sets the filter and filter
-    parameters and starts receiving the samples at once, using get_many.
-    After that it changes the filter parameters and informs the Sender that a
-    new run can be started.
-2.  Sender writes iterations 21-40 to DDS for the defined number of keys. After
-    that it informs the receiver which starts to get the samples from DDS. After
-    that, the receiver reset the QueryFilter (by setting the expression to an
-    empty string) and informs the Sender that a new run can be started.
-3.  Sender writes iterations 41-60 to DDS for the defined number of keys. After
-    that it informs the receiver which should receive with a get_many all samples
-    with iterations 1-60 without the ones it read during run 1 and 2.
-    The receiver then creates a new filter, using the same expression as used during
-    runs 1 and 2 but with different parameters. Again the receiver informs the
-    Sender that a new run can be started.
-4.  Sender writes iterations 61-80 to DDS for the defined number of keys. Again it
-    informs the receiver about this action. The receiver should only get the samples
-    according to the query expression and its parameters.
-
-After each get-action, the receiver reads the data from DDS. During this read action,
-the receiver should read all samples the Sender has written up to that moment. Since
-there's no filter applied to this reader, all sample states should be 'FRESH_INFO'.
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.idl
deleted file mode 100644
index 5b6a79bf452..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/QCTQM_Test_Connector.idl"
-#include "Base/QCTQM_Starter.idl"
-
-module QCTQM_Test
-{
-  component Receiver
-  {
-    port QueryConditionTestConnector::DDS_Get get_port;
-    port QueryConditionTestConnector::DDS_Read read_port;
-
-    provides TwoQueriesStarter reader_start;
-    uses TwoQueriesRestarter writer_restart;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.mpc
deleted file mode 100644
index d81eac6889b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.mpc
+++ /dev/null
@@ -1,155 +0,0 @@
-project(QC_QCTQM_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += QC_QCTQM_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 {
-    QCTQM_Test_Receiver.idl
-  }
-}
-
-project(QC_QCTQM_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += QC_QCTQM_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 {
-    QCTQM_Test_ReceiverE.idl
-  }
-}
-
-project(QC_QCTQM_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += QC_QCTQM_Test_Receiver_lem_gen QC_QCTQM_Test_Receiver_stub  \
-           QC_QCTQM_Test_Connector_stub QC_QCTQM_Test_Base_stub \
-           QC_QCTQM_Starter_stub
-  libs  +=  Receiver_stub QC_QCTQM_Test_Connector_stub \
-            QC_QCTQM_Test_Base_stub QC_QCTQM_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    QCTQM_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQM_Test_ReceiverEC.inl
-  }
-}
-
-project(QC_QCTQM_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += QC_QCTQM_Test_Receiver_idl_gen  QC_QCTQM_Test_Connector_stub \
-           QC_QCTQM_Test_Base_stub QC_QCTQM_Test_Connector_lem_gen \
-           QC_QCTQM_Starter_stub QC_QCTQM_Starter_lem_stub
-  libs  += QC_QCTQM_Test_Connector_stub QC_QCTQM_Test_Base_stub \
-           QC_QCTQM_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    QCTQM_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQM_Test_ReceiverC.inl
-  }
-}
-
-project(QC_QCTQM_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += QC_QCTQM_Test_Receiver_lem_stub QC_QCTQM_Test_Receiver_stub \
-             QC_QCTQM_Test_Base_stub QC_QCTQM_Test_Connector_stub \
-             QC_QCTQM_Test_Connector_lem_stub \
-             QC_QCTQM_Starter_lem_stub QC_QCTQM_Starter_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub QC_QCTQM_Test_Base_stub \
-          QC_QCTQM_Test_Connector_stub QC_QCTQM_Test_Connector_lem_stub \
-          QC_QCTQM_Starter_lem_stub QC_QCTQM_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    QCTQM_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QC_QCTQM_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   QC_QCTQM_Test_Receiver_lem_stub QC_QCTQM_Test_Base_stub \
-                  QC_QCTQM_Test_Connector_stub QC_QCTQM_Test_Connector_svnt \
-                  QC_QCTQM_Test_Receiver_exec QC_QCTQM_Test_Connector_lem_stub \
-                  QC_QCTQM_Starter_stub \
-                  QC_QCTQM_Starter_svnt QC_QCTQM_Starter_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub QC_QCTQM_Test_Base_stub \
-                QC_QCTQM_Test_Connector_stub QC_QCTQM_Test_Connector_svnt \
-                Receiver_exec QC_QCTQM_Test_Connector_lem_stub \
-                QC_QCTQM_Starter_stub QC_QCTQM_Starter_svnt \
-                QC_QCTQM_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_Test_ReceiverS.cpp
-    QCTQM_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    QCTQM_Test_ReceiverS.h
-    QCTQM_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.cpp
deleted file mode 100644
index 58bd8cc763f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,831 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "QCTQM_Test_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "ace/OS_NS_unistd.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-#include "dds4ccm/impl/Utils.h"
-#include "dds4ccm/impl/dds4ccm_utils.h"
-
-#define QUERY "( (iteration > %0) AND (iteration < %1) )"
-
-//run 1
-#define MIN_ITERATION_1 "2"
-#define MAX_ITERATION_1 "5"
-//run 2
-#define MIN_ITERATION_2 "22"
-#define MAX_ITERATION_2 "34"
-//run 4
-#define MIN_ITERATION_3 "68"
-#define MAX_ITERATION_3 "77"
-
-// Reader also reads already read samples.
-// The getter receives the following iterations:
-// During run 1: 2 (iterations 3 and 4)
-// During run 2: 11 (iterations between 22 and 34)
-// During run 3: 47 (all unread samples, meaning iterations 1-60
-//               without iteration 3, 4 and iterations between 22 and 34)
-// During run 4: 8 (iterations between 68 and 77)
-
-#define SAMPLES_PER_KEY_GETTER (2 + 11 + 47 + 8)
-
-namespace CIAO_QCTQM_Test_Receiver_Impl
-{
-  /**
-   * Read action generator
-   */
-
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback, int run)
-    : callback_ (callback),
-      run_ (run)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Checking if last sample "
-                          "is available in DDS...\n"));
-    if (this->callback_.check_last ())
-      {
-        this->callback_.run (this->run_);
-      }
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: get_port_status_exec_i
-   */
-
-  get_port_status_exec_i::get_port_status_exec_i (
-        ::QCTQM_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::QCTQM_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  get_port_status_exec_i::~get_port_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  get_port_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  get_port_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: reader_start_exec_i
-   */
-
-  reader_start_exec_i::reader_start_exec_i (
-        ::QCTQM_Test::CCM_Receiver_Context_ptr ctx,
-        Receiver_exec_i & callback)
-    : ciao_context_ (
-        ::QCTQM_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  reader_start_exec_i::~reader_start_exec_i (void)
-  {
-  }
-
-  // Operations from ::TwoQueriesStarter
-
-  void
-  reader_start_exec_i::set_reader_properties (::CORBA::UShort nr_keys,
-  ::CORBA::UShort nr_iterations)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Set reader propeties nr_keys %u, nr_iterations %u\n",
-                nr_keys, nr_iterations));
-
-    this->callback_.keys (nr_keys);
-    this->callback_.iterations (nr_iterations);
-  }
-
-  void
-  reader_start_exec_i::start_read (::CORBA::UShort run)
-  {
-    this->callback_.start_read (run);
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-  : iterations_ (20)
-      , keys_ (5)
-      , current_min_iteration_ (ACE_OS::atoi (MIN_ITERATION_1))
-      , current_max_iteration_ (ACE_OS::atoi (MAX_ITERATION_1))
-      , ticker_ (0)
-      , samples_expected_ (0)
-      , samples_received_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  // check if last key is received, if so we can assume
-  // that other key's are arrived too in Receiver.
-  bool
-  Receiver_exec_i::check_last ()
-  {
-     ::QCTQM_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_get_port_data ();
-
-    try
-      {
-        QueryConditionTest queryfiltertest_info;
-        ::CCM_DDS::ReadInfo readinfo;
-        char key[10];
-        ACE_OS::sprintf (key, "KEY_%d", this->keys_);
-
-        queryfiltertest_info.symbol = ::CORBA::string_dup (key);
-        reader->read_one_last (
-                queryfiltertest_info,
-                readinfo,
-                ::DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - "
-                              "last iteration <%02d> - <%02d> this->keys_ %s\n",
-                               queryfiltertest_info.iteration,
-                               this->current_max_iteration_ - 1, key));
-        return queryfiltertest_info.iteration >= this->current_max_iteration_ - 1;
-      }
-    catch (const ::CCM_DDS::InternalError &)
-      {
-      }
-    catch (const ::CCM_DDS::NonExistent &)
-      {
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: "
-                              "ERROR: Unexpected exception caught\n"));
-      }
-    return false;
-  }
-
-  // Supported operations and attributes.
-
-  // Check for correct iteration belonging to a run.
-  // If info == 0, check iteration after a get,
-  // else check iteration after a read
-  void
-  Receiver_exec_i::check_iter (const QueryConditionTest & sample,
-                               ::CORBA::UShort run,
-                               ::CCM_DDS::ReadInfo * info)
-  {
-    if (run == 3)
-      {
-        // We need to receive all UNread samples. Therefore we should
-        // receive all samples except the ones between
-        // MIN_ITERATION_1 and MAX_ITERATION_1 and between
-        // MIN_ITERATION_2 and MAX_ITERATION_2
-        if ((sample.iteration > ACE_OS::atoi (MIN_ITERATION_1)  &&
-             sample.iteration < ACE_OS::atoi (MAX_ITERATION_1)) ||
-            (sample.iteration > ACE_OS::atoi (MIN_ITERATION_2)  &&
-             sample.iteration < ACE_OS::atoi (MAX_ITERATION_2)))
-          {
-            // Read supplies info. There check the sample status mask
-            // as well
-            if (info != 0)
-              { // access mask should be "ALREADY_SEEN" since the getter should
-                // already have seen this sample.
-                if (info->access_status != ::CCM_DDS::ALREADY_SEEN)
-                  {
-                    // READ ALL since this check is only performed
-                    // during a read.
-                    ACE_ERROR ((LM_ERROR, "ERROR: READ ALL: "
-                                "Unexpected sample access mask - "
-                                "expected <%C> - "
-                                "received <%C>\n",
-                                CIAO::DDS4CCM::translate_ccm_dds_accessstatus (::CCM_DDS::ALREADY_SEEN),
-                                CIAO::DDS4CCM::translate_ccm_dds_accessstatus (info->access_status)
-                                ));
-                  }
-              }
-            else
-              {
-                // Getter functionality
-                ACE_ERROR ((LM_ERROR, "ERROR: GET ALL: "
-                                      "Didn't except samples between "
-                                      "<%02d> and <%02d> and between "
-                                      "<%02d> and <%02d>\n",
-                                      ACE_OS::atoi (MIN_ITERATION_1),
-                                      ACE_OS::atoi (MAX_ITERATION_1),
-                                      ACE_OS::atoi (MIN_ITERATION_2),
-                                      ACE_OS::atoi (MAX_ITERATION_2)));
-              }
-          }
-      }
-    else  //run 1,2, and 4
-      {
-        //after get
-        if (!info)
-          {
-            if (sample.iteration <= current_min_iteration_)
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: GET ALL: "
-                                      "Didn't expect samples with iterations "
-                                      "<= %02d\n",
-                                      this->current_min_iteration_));
-              }
-            if (sample.iteration > this->current_max_iteration_)
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: GET ALL: "
-                                      "Didn't expect samples with iterations "
-                                      "> %02d\n",
-                                      this->current_max_iteration_));
-              }
-          }
-        // after read
-        else if (info != 0)
-          { // access mask should be "FRESH_INFO" since the getter has not
-            // "seen" this sample.
-            if (sample.iteration > this->current_min_iteration_)
-              {
-                if (info->access_status != ::CCM_DDS::FRESH_INFO)
-                  {
-                    // READ ALL since this check is only performed
-                    // during a read.
-                    ACE_ERROR ((LM_ERROR, "ERROR: READ ALL: "
-                                "Unexpected sample access mask - "
-                                "expected <%C> - "
-                                "received <%C>\n",
-                                CIAO::DDS4CCM::translate_ccm_dds_accessstatus (::CCM_DDS::FRESH_INFO),
-                                CIAO::DDS4CCM::translate_ccm_dds_accessstatus (info->access_status)
-                                ));
-                  }
-              }
-          }
-      }
-  }
-
-
-  void
-  Receiver_exec_i::read_all (::CORBA::UShort run)
-  {
-    ::QCTQM_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_read_port_data ();
-
-    if (::CORBA::is_nil (reader.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::read_all - "
-                              "ERROR: No Reader\n"));
-        return;
-      }
-    QueryConditionTestSeq qf_info;
-    ::CCM_DDS::ReadInfoSeq readinfos;
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::read_all - "
-                "Start checking samples in DDS\n"));
-    reader->read_all (qf_info, readinfos);
-    if (qf_info.length () !=
-        static_cast < ::CORBA::ULong > (run * this->iterations_ * this->keys_))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::read_all - "
-                              "Unexpected number of samples received: "
-                              "expected <%d> - received <%u>\n",
-                              run * this->iterations_, qf_info.length ()));
-      }
-    for (::CORBA::ULong i = 0; i < qf_info.length (); ++i)
-      {
- /*     ACE_DEBUG ((LM_DEBUG, "READ ALL : Receiver_exec_i::read_all - "
-                              "Sample received: key <%C> - iteration <%d> - "
-                              "sample_read_state <%d>\n",
-                              qf_info[i].symbol.in (),
-                              qf_info[i].iteration,
-                              readinfos[i].access_status));
- */
-        this->check_iter (qf_info[i], run, &readinfos[i]);
-      }
-  }
-
-
-  ::CORBA::ULong
-  Receiver_exec_i::get_all (::CORBA::UShort run)
-  {
-
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET ALL  run %d: \n"), run));
-    ACE_OS::sleep (3);
-
-    ::QCTQM_Test::QueryConditionTestConnector::Getter_var getter =
-      this->ciao_context_->get_connection_get_port_fresh_data ();
-    ::CORBA::ULong samples_received = 0;
-
-    if (::CORBA::is_nil (getter.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - "
-                              "ERROR: No Getter\n"));
-        return 0;
-      }
-    DDS::Duration_t to;
-    to.sec = 10;
-    to.nanosec = 0;
-
-    getter->time_out (to);
-    getter->max_delivered_data (0);
-    QueryConditionTestSeq gettertest_seq;
-    ::CCM_DDS::ReadInfoSeq readinfo;
-    bool const res = getter->get_many (gettertest_seq, readinfo);
-    if (res)
-      {
-        if (gettertest_seq.length () == 0)
-          {
-            ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_many: "
-                                   "No data returned. "
-                                   "number of samples: "
-                                   "expected at least one - received <0>, res = %u\n", res));
-          }
-        for (CORBA::ULong i = 0; i < gettertest_seq.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_many: "
-                                  "Returned data : key <%C> - iteration <%d>,"
-                                  "instance status <%u> - access status <%C>\n",
-                                  gettertest_seq[i].symbol.in (),
-                                  gettertest_seq[i].iteration,
-                                  readinfo[i].instance_status,
-                                  CIAO::DDS4CCM::translate_ccm_dds_accessstatus(readinfo[i].access_status)));
-            this->check_iter (gettertest_seq[i], run);
-            ++samples_received;
-          }
-       }
-     else
-       {
-         ACE_ERROR ((LM_ERROR, "ERROR: GET MANY: "
-                               "Time out occurred\n"));
-       }
-    return samples_received;
-  }
-
-  ::CORBA::ULong
-  Receiver_exec_i::test_all (::CORBA::UShort run)
-  {
-    try
-      {
-        return get_all (run);
-      }
-    catch (const CCM_DDS::NonExistent& ex)
-      {
-        for (::CORBA::ULong i = 0; i < ex.indexes.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ERROR test_all <%d>: ")
-                  ACE_TEXT ("caught expected exception: index <%u>\n"),
-                  run,
-                  ex.indexes[i]));
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: test_all <%d>: ")
-              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-              run,
-              ex.error_code));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("test_all");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::test_all <%d> : Exception caught\n"),
-          run));
-      }
-    return 0;
-  }
-
-  void
-  Receiver_exec_i::check_filter (::CORBA::UShort run)
-  {
-    ::CCM_DDS::QueryFilter_var filter;
-    ::QCTQM_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_get_port_data ();
-    try
-      {
-        filter = reader->query ();
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        if (run == 3)
-          {
-            ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_filter - "
-                                  "caught expected InternalEr excep: retval <%u>\n",
-                                  ex.error_code));
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                                  "caught InternalError exception: retval <%u>\n",
-                                  ex.error_code));
-          }
-        return;
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: Receiver_exec_i::check_filter: ");
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                              "Exception caught\n"));
-        return;
-      }
-
-    //check query
-    bool error = false;
-
-    if (run != 3)
-      {
-        if (ACE_OS::strcmp (filter->expression, QUERY) != 0)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                                  "Unexpected query when retrieving filter: "
-                                  "expected <%C> - received <%C>\n",
-                                  QUERY, filter->expression.in ()));
-            error = true;
-          }
-        //check current parameters.
-        if (filter->parameters.length () != 2)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                                  "Unexpected number of parameters: "
-                                  "expected <%d> - received <%d>\n",
-                                  2, filter->parameters.length ()));
-            error = true;
-          }
-
-        if (filter->parameters.length () >= 1)
-          {
-            if (ACE_OS::atoi (filter->parameters[0]) != this->current_min_iteration_)
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                                      "Unexpected param value: "
-                                      "expected <%d> - received <%C>\n",
-                                      this->current_min_iteration_,
-                                      filter->parameters[0].in ()));
-                error = true;
-              }
-          }
-        if (filter->parameters.length () >= 2)
-          {
-            if (ACE_OS::atoi (filter->parameters[1]) != this->current_max_iteration_)
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - "
-                                      "Unexpected param value: "
-                                      "expected <%d> - received <%C>\n",
-                                      this->current_max_iteration_,
-                                      filter->parameters[1].in ()));
-                error = true;
-              }
-          }
-      }
-    if (!error)
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_filter - "
-                              "Passed check_filter test for run <%d>.\n",
-                              run));
-      }
-  }
-
-  void
-  Receiver_exec_i::set_filter (::CORBA::UShort run)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Set filter for run <%d>\n", run));
-    ::QCTQM_Test::QueryConditionTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_get_port_data ();
-
-    try
-      {
-        ::CCM_DDS::QueryFilter filter;
-        run != 3 ? filter.expression = ::CORBA::string_dup (QUERY) :
-                    filter.expression = ::CORBA::string_dup ("");
-
-        filter.parameters.length (2);
-        if (run == 1)
-          {
-            filter.parameters[0] = ::CORBA::string_dup (MIN_ITERATION_1);
-            filter.parameters[1] = ::CORBA::string_dup (MAX_ITERATION_1);
-            this->current_min_iteration_ = ACE_OS::atoi (MIN_ITERATION_1);
-            this->current_max_iteration_ = ACE_OS::atoi (MAX_ITERATION_1);
-          }
-        else if (run == 2)
-          {
-            filter.parameters[0] = ::CORBA::string_dup (MIN_ITERATION_2);
-            filter.parameters[1] = ::CORBA::string_dup (MAX_ITERATION_2);
-            this->current_min_iteration_ = ACE_OS::atoi (MIN_ITERATION_2);
-            this->current_max_iteration_ = ACE_OS::atoi (MAX_ITERATION_2);
-          }
-        else if (run == 3)
-          {
-            // get all not yet seen by the getter samples of run 1, 2 and 3.
-            this->current_min_iteration_ = 1;
-            this->current_max_iteration_ = run * this->iterations_;
-            filter.parameters[0] = ::CORBA::string_dup (0);
-            filter.parameters[1] = ::CORBA::string_dup (0);
-          }
-        else if (run == 4)
-          {
-            filter.parameters[0] = ::CORBA::string_dup (MIN_ITERATION_3);
-            filter.parameters[1] = ::CORBA::string_dup (MAX_ITERATION_3);
-            this->current_min_iteration_ = ACE_OS::atoi (MIN_ITERATION_3);
-            this->current_max_iteration_ = ACE_OS::atoi (MAX_ITERATION_3);
-          }
-        ACE_DEBUG ((LM_DEBUG, "Filter : Query <%C>, parameter[0] <%C>, parameter[1] <%C>\n",
-              filter.expression.in (), filter.parameters[0].in (), filter.parameters[1].in ()));
-        reader->query (filter);
-      }
-    catch (const ::CCM_DDS::InternalError &ex)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::set_filter - "
-                    "ERROR: Unexpected InternalError exception caught "
-                    "with <%C> as error\n.",
-                    ::CIAO::DDS4CCM::translate_retcode (ex.error_code)));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::set_filter - "
-                    "ERROR: Unexpected exception caught.\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::start_read (::CORBA::UShort run)
-  {
-    this->ticker_ = new read_action_Generator (*this, run);
-    if (this->reactor ()->schedule_timer (this->ticker_,
-                                          0,
-                                          ACE_Time_Value(1, 0),
-                                          ACE_Time_Value(1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::run (::CORBA::UShort run)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-    ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::run - "
-                          "Starting run number <%d>\n",
-                          run));
-    TwoQueriesRestarter_var restarter =
-      this->ciao_context_->get_connection_writer_restart ();
-    if (!::CORBA::is_nil (restarter.in ()))
-      {
-        switch (run)
-        {
-          case 1:
-            {
-              this->samples_received_ += this->test_all (run);
-              this->check_filter (run);
-              this->read_all (run);
-              //set filter for the next run
-              this->set_filter (run + 1);
-              // inform the sender that it may start the next run
-              restarter->restart_write ();
-            }
-            break;
-          case 2:
-            {
-              this->samples_received_ += this->test_all (run);
-              check_filter (run);
-              this->read_all (run);
-              //set filter for the next run
-              this->set_filter (run + 1);
-              // inform the sender that it may start the next run
-              restarter->restart_write ();
-            }
-            break;
-          case 3:
-            {
-              this->samples_received_ += this->test_all (run);
-              this->check_filter (run);
-              this->read_all (run);
-              //set filter for the next run
-              this->set_filter (run + 1);
-              // inform the sender that it may start the next run
-              restarter->restart_write ();
-            }
-            break;
-          case 4:
-            {
-              this->samples_received_ += this->test_all (run);
-              this->read_all (run);
-            }
-        }
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::run - "
-                  "ERROR: Reference to Restarter not found\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  void
-  Receiver_exec_i::keys (::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-
-    //the last key is used for checking if all samples are received and therefore
-    //get access status 1. So these samples are not read by following
-    //get_all method.
-    this->samples_expected_ = (this->keys_ - 1) * SAMPLES_PER_KEY_GETTER;
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_get_port_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_get_port_status_.in ()))
-      {
-        get_port_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          get_port_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_get_port_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_get_port_status_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_read_port_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_TwoQueriesStarter_ptr
-  Receiver_exec_i::get_reader_start (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_reader_start_.in ()))
-      {
-        reader_start_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          reader_start_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_TwoQueriesStarter::_nil ());
-
-          this->ciao_reader_start_ = tmp;
-      }
-
-    return
-      ::CCM_TwoQueriesStarter::_duplicate (
-        this->ciao_reader_start_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::QCTQM_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::QCTQM_Test::QueryConditionTestConnector::Getter_var getter =
-      this->ciao_context_->get_connection_get_port_fresh_data ();
-    DDS::Duration_t to;
-    to.sec = 5; to.nanosec = 0;
-    getter->time_out (to);
-    //set filter for the first run
-    this->set_filter (1);
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    if (this->ticker_)
-      {
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->samples_received_ != this->samples_expected_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: TWO QUERIES GET_MANY : "
-                              "Unexpected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_,
-                              this->samples_received_));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "TWO QUERIES : GET_MANY : "
-                              "Expected number of samples received: "
-                              "expected <%d> - received <%d>\n",
-                              this->samples_expected_,
-                              this->samples_received_));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCTQM_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/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.h
deleted file mode 100644
index 43cec44cf93..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver_exec.h
+++ /dev/null
@@ -1,221 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_QCTQM_TEST_RECEIVER_EXEC_HWBPVD_H_
-#define CIAO_QCTQM_TEST_RECEIVER_EXEC_HWBPVD_H_
-
-#include /**/ "ace/pre.h"
-
-#include "QCTQM_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_QCTQM_Test_Receiver_Impl
-{
-
-  class Receiver_exec_i;
-
-  /**
-   * Read action generator
-   */
-
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback,
-                           int run);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Receiver_exec_i &callback_;
-    int run_;
-
-  };
-
-  /**
-   * Provider Executor Implementation Class: get_port_status_exec_i
-   */
-
-  class get_port_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    get_port_status_exec_i (
-      ::QCTQM_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~get_port_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::QCTQM_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: reader_start_exec_i
-   */
-
-  class reader_start_exec_i
-    : public virtual ::CCM_TwoQueriesStarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    reader_start_exec_i (
-      ::QCTQM_Test::CCM_Receiver_Context_ptr ctx,
-      Receiver_exec_i & callback);
-    virtual ~reader_start_exec_i (void);
-
-    //@{
-    /** Operations and attributes from TwoQueriesStarter. */
-
-    virtual
-    void set_reader_properties (::CORBA::UShort nr_keys,
-    ::CORBA::UShort nr_iterations);
-
-    virtual
-    void start_read (::CORBA::UShort run);
-    //@}
-
-  private:
-    ::QCTQM_Test::CCM_Receiver_Context_var ciao_context_;
-    Receiver_exec_i & callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_get_port_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_read_port_status (void);
-
-
-    virtual ::CCM_TwoQueriesStarter_ptr
-    get_reader_start (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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void iterations (CORBA::UShort iterations);
-    void keys (::CORBA::UShort keys);
-
-    bool check_last (void);
-    void start_read (::CORBA::UShort run);
-    void run (::CORBA::UShort run);
-    //@}
-
-  private:
-    ::QCTQM_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_get_port_status_;
-    ::CCM_TwoQueriesStarter_var ciao_reader_start_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    ::CORBA::UShort iterations_;
-    ::CORBA::UShort keys_;
-
-    int current_min_iteration_;
-    int current_max_iteration_;
-
-    read_action_Generator *ticker_;
-
-    ::CORBA::ULong samples_expected_;
-    ::CORBA::ULong samples_received_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    ::CORBA::ULong test_all (::CORBA::UShort run);
-    ::CORBA::ULong get_all (::CORBA::UShort run);
-    void read_all (::CORBA::UShort run);
-    void check_iter (const QueryConditionTest & sample,
-                     ::CORBA::UShort run,
-                     ::CCM_DDS::ReadInfo * info = 0);
-    void check_filter (::CORBA::UShort run);
-    void set_filter (::CORBA::UShort run);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCTQM_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.idl
deleted file mode 100644
index 90894c16c64..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_QUERY_CONDITION_TEST_SENDER_IDL
-#define DDS_QUERY_CONDITION_TEST_SENDER_IDL
-
-#include "Connector/QCTQM_Test_Connector.idl"
-#include "Base/QCTQM_Starter.idl"
-
-module QCTQM_Test
-{
-  component Sender
-  {
-    port QCTQM_Test::QueryConditionTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    uses TwoQueriesStarter start_reader;
-    provides TwoQueriesRestarter restart_writer;
-
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.mpc
deleted file mode 100644
index 07f150ee5b1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.mpc
+++ /dev/null
@@ -1,153 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p QCTQM_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(QC_QCTQM_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += QC_QCTQM_Test_Connector_idl_gen QC_QCTQM_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 {
-    QCTQM_Test_Sender.idl
-  }
-}
-
-project(QC_QCTQM_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += QC_QCTQM_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 {
-    QCTQM_Test_SenderE.idl
-  }
-}
-
-project(QC_QCTQM_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += QC_QCTQM_Test_Sender_lem_gen QC_QCTQM_Test_Sender_stub \
-           QC_QCTQM_Test_Base_stub QC_QCTQM_Starter_stub
-  libs  += QC_QCTQM_Test_Base_stub Sender_stub QC_QCTQM_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    QCTQM_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQM_Test_SenderEC.inl
-  }
-}
-
-project(QC_QCTQM_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += QC_QCTQM_Test_Sender_idl_gen QC_QCTQM_Test_Base_stub \
-           QC_QCTQM_Test_Connector_stub QC_QCTQM_Starter_stub \
-           QC_QCTQM_Starter_lem_stub
-  libs  += QC_QCTQM_Test_Base_stub QC_QCTQM_Test_Connector_stub \
-           QC_QCTQM_Starter_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    QCTQM_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    QCTQM_Test_SenderC.inl
-  }
-}
-
-project(QC_QCTQM_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += QC_QCTQM_Test_Sender_lem_stub QC_QCTQM_Test_Sender_stub \
-             QC_QCTQM_Test_Connector_lem_stub QC_QCTQM_Test_Connector_stub \
-             QC_QCTQM_Starter_lem_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub QC_QCTQM_Test_Base_stub \
-             QC_QCTQM_Test_Connector_lem_stub QC_QCTQM_Test_Connector_stub \
-             QC_QCTQM_Starter_stub QC_QCTQM_Starter_lem_stub \
-             QC_QCTQM_Starter_lem_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    QCTQM_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(QC_QCTQM_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += QC_QCTQM_Test_Base_stub  QC_QCTQM_Test_Sender_lem_stub \
-                QC_QCTQM_Test_Connector_stub \
-                QC_QCTQM_Test_Connector_svnt QC_QCTQM_Test_Connector_lem_stub \
-                QC_QCTQM_Starter_stub QC_QCTQM_Starter_svnt \
-                QC_QCTQM_Starter_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub QC_QCTQM_Test_Base_stub \
-                QC_QCTQM_Test_Connector_stub QC_QCTQM_Test_Connector_svnt \
-                QC_QCTQM_Test_Connector_lem_stub QC_QCTQM_Starter_stub \
-                QC_QCTQM_Starter_svnt QC_QCTQM_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    QCTQM_Test_SenderS.cpp
-    QCTQM_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    QCTQM_Test_SenderS.h
-    QCTQM_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.cpp
deleted file mode 100644
index 214e6d60e30..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,348 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "QCTQM_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#define ITERATIONS 20
-
-
-namespace CIAO_QCTQM_Test_Sender_Impl
-{
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Sender_exec_i &callback)
-    : callback_ (callback)
-    , started_ (false)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (!this->started_ && status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        this->started_ = true;
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.get_started ();
-      }
-  }
-
-  /**
-   * WriteHandler
-   */
-
-  WriteHandler::WriteHandler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteHandler::handle_exception (ACE_HANDLE)
-  {
-    this->callback_.start ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: restart_writer_exec_i
-   */
-
-  restart_writer_exec_i::restart_writer_exec_i (
-        ::QCTQM_Test::CCM_Sender_Context_ptr ctx,
-        Sender_exec_i & callback)
-    : ciao_context_ (
-        ::QCTQM_Test::CCM_Sender_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  restart_writer_exec_i::~restart_writer_exec_i (void)
-  {
-  }
-
-  // Operations from ::TwoQueriesRestarter
-
-  void
-  restart_writer_exec_i::restart_write (void)
-  {
-    this->callback_.restart ();
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-  : keys_ (5)
-      , iterations_ (ITERATIONS)
-      , run_ (1)
-      , wh_ (0)
-
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    if (this->wh_)
-      {
-        delete this->wh_;
-      }
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::restart (void)
-  {
-    ++this->run_;
-    this->reactor ()->notify (this->wh_);
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    try
-      {
-        if (this->wh_)
-          {
-            delete this->wh_;
-            this->wh_ = 0;
-          }
-        ACE_NEW_THROW_EX (this->wh_,
-                          WriteHandler (*this),
-                          ::CORBA::NO_MEMORY ());
-        this->reactor ()->notify (this->wh_);
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: get_started : Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: get_started : Unknown exception caught\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    ::QCTQM_Test::QueryConditionTestConnector::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-    TwoQueriesStarter_var starter =
-      this->ciao_context_->get_connection_start_reader ();
-
-    if (! ::CORBA::is_nil (starter.in ()))
-      {
-        starter->set_reader_properties (this->keys_, this->iterations_);
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to start the reader\n")));
-        return;
-      }
-    for (CORBA::UShort iter_key = 1; iter_key < this->keys_ + 1; ++iter_key)
-      {
-        char key[7];
-        QueryConditionTest new_key;
-        ACE_OS::sprintf (key, "KEY_%d", iter_key);
-
-        new_key.symbol = CORBA::string_dup(key);
-        CORBA::UShort iter = ((this->run_ - 1) * this->iterations_) + 1;
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("Write key <%C> with iterations <%d> to <%d>\n"),
-                        key, iter, (iter + this->iterations_)));
-
-        while (iter < this->run_ * this->iterations_ + 1)
-          {
-            new_key.iteration = iter;
-            writer->write_one (new_key, ::DDS::HANDLE_NIL);
-             ++iter;
-          }
-      }
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("Sender call start read with run_ = <%u>\n"),
-                this->run_));
-
-    ACE_OS::sleep (2);
-    starter->start_read (this->run_);
-  }
-
-  // Component attributes and port operations.
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  ::CCM_TwoQueriesRestarter_ptr
-  Sender_exec_i::get_restart_writer (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_restart_writer_.in ()))
-      {
-        restart_writer_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          restart_writer_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_TwoQueriesRestarter::_nil ());
-
-          this->ciao_restart_writer_ = tmp;
-      }
-
-    return
-      ::CCM_TwoQueriesRestarter::_duplicate (
-        this->ciao_restart_writer_.in ());
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::QCTQM_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCTQM_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/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.h
deleted file mode 100644
index 2a991d94156..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender_exec.h
+++ /dev/null
@@ -1,196 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_QCTQM_TEST_SENDER_EXEC_VZMKKL_H_
-#define CIAO_QCTQM_TEST_SENDER_EXEC_VZMKKL_H_
-
-#include /**/ "ace/pre.h"
-
-#include "QCTQM_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_QCTQM_Test_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-    bool started_;
-  };
-
-  /**
-   * WriteHandler
-   */
-
-  class WriteHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteHandler (Sender_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: restart_writer_exec_i
-   */
-
-  class restart_writer_exec_i
-    : public virtual ::CCM_TwoQueriesRestarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    restart_writer_exec_i (
-      ::QCTQM_Test::CCM_Sender_Context_ptr ctx,
-      Sender_exec_i & callback);
-    virtual ~restart_writer_exec_i (void);
-
-    //@{
-    /** Operations and attributes from TwoQueriesRestarter. */
-
-    virtual
-    void restart_write (void);
-    //@}
-
-  private:
-    ::QCTQM_Test::CCM_Sender_Context_var ciao_context_;
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CCM_TwoQueriesRestarter_ptr
-    get_restart_writer (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void get_started (void);
-    void start (void);
-    void restart (void);
-
-    //@}
-
-  private:
-    ::QCTQM_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_TwoQueriesRestarter_var ciao_restart_writer_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    CORBA::UShort iterations_;
-    CORBA::UShort run_;
-    WriteHandler *wh_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_QCTQM_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/Plan.cdp
deleted file mode 100644
index 12808211107..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/Plan.cdp
+++ /dev/null
@@ -1,520 +0,0 @@
-<!--  -->
-<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>QCTQM_Test_Depl_1</label>
-  <UUID>QCTQM_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_QCTQM_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_QCTQM_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="QCTQM_Test_EventConnectorImplementation">
-    <name>QCTQM_Test_EventConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="QCTQM_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="QCTQM_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_QCTQM_Test_QueryConditionTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCTQM_Test_QueryConditionTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_QCTQM_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_QCTQM_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="QCTQM_Test_StateConnectorImplementation">
-    <name>QCTQM_Test_StateConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="QCTQM_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="QCTQM_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_QCTQM_Test_QueryConditionTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_QCTQM_Test_QueryConditionTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_QCTQM_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QC_QCTQM_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_QCTQM_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_QCTQM_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="QCTQM_Test_SenderConnectorInstance">
-    <name>QCTQM_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QCTQM_Test_EventConnectorImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QueryCondition_Library#QueryConditionProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCTQM_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="QCTQM_Test_EventConnector">
-    <name>QCTQM_Test_EventConnector</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QCTQM_Test_EventConnectorImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QueryCondition_Library#QueryConditionProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCTQM_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="QCTQM_Test_StateConnector">
-    <name>QCTQM_Test_StateConnector</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="QCTQM_Test_StateConnectorImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QueryCondition_Library#QueryConditionProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>QCTQM_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_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>read_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>read_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCTQM_Test_StateConnector" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>get_port_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCTQM_Test_EventConnector" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>get_port_fresh_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>get_port_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="QCTQM_Test_EventConnector" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="QCTQM_Test_SenderConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>reader_starter</name>
-    <internalEndpoint>
-      <portName>start_reader</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>reader_start</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>restart_writer</name>
-    <internalEndpoint>
-      <portName>writer_restart</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>restart_writer</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="QCTQM_Test_SenderConnectorInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </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="QCTQM_Test_Connector_ExecArtifact">
-    <name>QC_QCTQM_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>QC_QCTQM_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="QCTQM_Test_Connector_SvntArtifact">
-    <name>QC_QCTQM_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>QC_QCTQM_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="QCTQM_Test_Connector_StubArtifact">
-    <name>QC_QCTQM_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>QC_QCTQM_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/QueryCondition/TwoQueriesMany/descriptors/QueryCondition_Library.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/QueryCondition_Library.xml
deleted file mode 100644
index a422b34b272..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/QueryCondition_Library.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--  -->
-
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-  <qos_profile name="QueryConditionProfile">
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index b475d554b4d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="QueryCondition_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="QueryConditionProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/run_test.pl
deleted file mode 100755
index b87434bef7e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 60 seconds to allow task to complete\n";
-sleep (60);
-
-# 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 -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/.gitignore b/CIAO/connectors/dds4ccm/tests/Reader/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl
deleted file mode 100644
index 80dd04aac89..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @file Reader_Starter.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef READER_STARTER_IDL
-#define READER_STARTER_IDL
-
-#pragma ciao lem "Base/Reader_StarterE.idl"
-
-interface ReaderStarter
-{
-  void start_read ();
-  void read_no_data ();
-  void set_reader_properties (in unsigned short nr_keys,
-                              in unsigned short nr_iterations);
-};
-
-#endif /* SAMPLE_INFO_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc
deleted file mode 100644
index b14b7d49e69..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc
+++ /dev/null
@@ -1,110 +0,0 @@
-project(DDS_Reader_Starter_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after +=
-  idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
-              -Wb,stub_export_include=Reader_Starter_stub_export.h \
-              -Wb,skel_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,skel_export_include=Reader_Starter_svnt_export.h \
-              -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,svnt_export_include=Reader_Starter_svnt_export.h \
-              -Wb,exec_export_macro=READER_STARTER_EXEC_Export \
-              -Wb,exec_export_include=Reader_Starter_exec_export.h -I..
-
-  IDL_Files {
-    Reader_Starter.idl
-  }
-}
-
-project(DDS_Reader_Starter_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Reader_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \
-              -Wb,stub_export_include=Reader_Starter_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Reader_StarterE.idl
-  }
-}
-
-project(DDS_Reader_Starter_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Reader_Starter_lem_gen DDS_Reader_Starter_stub
-  libs  += Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Reader_Starter_lem_stub
-  dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterEC.cpp
-  }
-
-  Header_Files {
-    Reader_StarterEC.h
-    Reader_Starter_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_StarterEC.inl
-  }
-}
-
-project(DDS_Reader_Starter_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Reader_Starter_idl_gen
-  libs  +=
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Reader_Starter_stub
-  dynamicflags += READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterC.cpp
-  }
-
-  Header_Files {
-    Reader_StarterC.h
-    Reader_Starter_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_StarterC.inl
-  }
-}
-
-
-project(DDS_Reader_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_Reader_Starter_lem_stub DDS_Reader_Starter_stub
-  sharedname  = Reader_Starter_svnt
-  libs       += Reader_Starter_stub Reader_Starter_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += READER_STARTER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterS.cpp
-    Reader_Starter_svnt.cpp
-  }
-
-  Header_Files {
-    Reader_StarterS.h
-    Reader_Starter_svnt.h
-    Reader_Starter_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl
deleted file mode 100644
index 38fec9c5a26..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file Reader_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef READER_TEST_BASE_IDL
-#define READER_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/Reader_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/Reader_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "ReaderTest"
-#pragma DCPS_DATA_KEY "ReaderTest key"
-
-struct ReaderTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<ReaderTest> ReaderTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc
deleted file mode 100644
index 3132fa2a690..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc
+++ /dev/null
@@ -1,25 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -u DDS -d -o../lib Reader_Test_Base
-
-project(DDS_Reader_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_Reader_Test_Base_stub
-  dynamicflags += READER_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=READER_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=Reader_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Reader_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=READER_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Reader_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl
deleted file mode 100644
index 3dc092c453c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file Reader_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef READER_TEST_CONNECTOR_IDL_
-#define READER_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Reader_Test_Base.idl"
-
-#pragma ciao lem "Connector/Reader_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Reader_Test_BaseTypeSupport.idl"
-#endif
-
-module Reader_Test
-{
-  module ::CCM_DDS::Typed < ::ReaderTest, ::ReaderTestSeq> ReaderTestConnector;
-};
-
-#endif /* Reader_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
deleted file mode 100644
index a3c97e4c97b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Reader_Test_Base -l .. -o ../lib -u DDS Reader_Test_Connector"
-
-project(DDS_Reader_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_Reader_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Reader_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=READER_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Reader_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=READER_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Reader_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=READER_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Reader_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Reader_Test_Connector.idl
-  }
-}
-
-project(DDS_Reader_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_Reader_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=READER_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Reader_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Reader_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_Reader_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_Reader_Test_Connector_lem_gen DDS_Reader_Test_Connector_stub DDS_Reader_Test_Base_stub
-  libs  += DDS_Reader_Test_Base_stub DDS_Reader_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Reader_Test_Connector_lem_stub
-  dynamicflags += READER_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Reader_Test_ConnectorEC.h
-    Reader_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_Reader_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Reader_Test_Connector_idl_gen DDS_Reader_Test_Base_stub
-  libs  += DDS_Reader_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Reader_Test_Connector_stub
-  dynamicflags += READER_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Reader_Test_ConnectorC.h
-    Reader_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_Reader_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Connector_stub DDS_Reader_Test_Base_stub
-  sharedname = DDS_Reader_Test_Connector_exec
-  libs += DDS_Reader_Test_Connector_stub DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Base_stub DDS_Reader_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += READER_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Reader_Test_Connector_conn.h
-    Reader_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Reader_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Connector_exec DDS_Reader_Test_Connector_stub
-  sharedname  = DDS_Reader_Test_Connector_svnt
-  libs       += DDS_Reader_Test_Connector_stub \
-                DDS_Reader_Test_Connector_lem_stub  \
-                DDS_Reader_Test_Base_stub \
-                DDS_Reader_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += READER_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_Test_ConnectorS.cpp
-    Reader_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Reader_Test_ConnectorS.h
-    Reader_Test_Connector_svnt.h
-    Reader_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/README b/CIAO/connectors/dds4ccm/tests/Reader/README
deleted file mode 100644
index fb55be4e5c7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/README
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-This test tests the reader.
-
-The following methods of the reader are tested:
-
-* read_one
-* read_all
-* read_one_last
-* read_one_all
-
-First of all, the Sender writes a known number of samples to DDS.
-After that the Sender informs the Receiver which test is about
-to run and how many samples should be read from DDS. Before the
-Receiver starts reading, he must find out that all samples resides
-in DDS on the receiving side. He does that by calling read_last every
-time a DATA_ON_READERS_STATUS comes in on the ConnectorStatusListener.
-Once the very last sample is in DDS on the receiving side, the Receiver
-starts to read the samples. Afterwards he checks wether all samples are
-avaiable (thus are read correctly from DDS).
-
-The Receiver also test whether the correct exceptions are thrown.
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl
deleted file mode 100644
index c01b0c91d90..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Reader_Test_Connector.idl"
-#include "Base/Reader_Starter.idl"
-
-module Reader_Test
-{
-  component Receiver
-  {
-    port ReaderTestConnector::DDS_Listen info_out;
-
-    provides ReaderStarter reader_start;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc
deleted file mode 100644
index 3bba5085b7b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc
+++ /dev/null
@@ -1,155 +0,0 @@
-project(DDS_Reader_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_Reader_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 {
-    Reader_Test_Receiver.idl
-  }
-}
-
-project(DDS_Reader_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Reader_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 {
-    Reader_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_Reader_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Reader_Test_Receiver_lem_gen DDS_Reader_Test_Receiver_stub  \
-           DDS_Reader_Test_Connector_stub DDS_Reader_Test_Base_stub \
-           DDS_Reader_Starter_stub
-  libs  +=  Receiver_stub DDS_Reader_Test_Connector_stub \
-            DDS_Reader_Test_Base_stub Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Reader_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_Reader_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Reader_Test_Receiver_idl_gen  DDS_Reader_Test_Connector_stub \
-           DDS_Reader_Test_Base_stub DDS_Reader_Test_Connector_lem_gen \
-           DDS_Reader_Starter_stub DDS_Reader_Starter_lem_stub
-  libs  += DDS_Reader_Test_Connector_stub DDS_Reader_Test_Base_stub \
-           Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Reader_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_Reader_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_Reader_Test_Receiver_lem_stub DDS_Reader_Test_Receiver_stub \
-             DDS_Reader_Test_Base_stub DDS_Reader_Test_Connector_stub \
-             DDS_Reader_Test_Connector_lem_stub \
-             DDS_Reader_Starter_lem_stub DDS_Reader_Starter_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_Reader_Test_Base_stub \
-          DDS_Reader_Test_Connector_stub DDS_Reader_Test_Connector_lem_stub \
-          Reader_Starter_lem_stub Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Reader_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Reader_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_Reader_Test_Receiver_lem_stub DDS_Reader_Test_Base_stub \
-                  DDS_Reader_Test_Connector_stub DDS_Reader_Test_Connector_svnt \
-                  DDS_Reader_Test_Receiver_exec DDS_Reader_Test_Connector_lem_stub \
-                  DDS_Reader_Starter_stub \
-                  DDS_Reader_Starter_svnt DDS_Reader_Starter_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_Reader_Test_Base_stub \
-                DDS_Reader_Test_Connector_stub DDS_Reader_Test_Connector_svnt \
-                Receiver_exec DDS_Reader_Test_Connector_lem_stub \
-                Reader_Starter_stub Reader_Starter_svnt \
-                Reader_Starter_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_Test_ReceiverS.cpp
-    Reader_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Reader_Test_ReceiverS.h
-    Reader_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp
deleted file mode 100644
index 3816c2e5a09..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,816 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Reader_Test_Receiver_exec.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_unistd.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_Reader_Test_Receiver_Impl
-{
-  /**   * Read action generator
-   */
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Checking if last sample "
-                          "is available in DDS...\n"));
-    if (this->callback_.check_last ())
-      this->callback_.run ();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::Reader_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Reader_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::Reader_Test::ReaderTestConnector::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::ReaderTest & /* datum */,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::ReaderTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::Reader_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Reader_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: reader_start_exec_i
-   */
-
-  reader_start_exec_i::reader_start_exec_i (
-        ::Reader_Test::CCM_Receiver_Context_ptr ctx,
-        Receiver_exec_i &callback)
-    : ciao_context_ (
-        ::Reader_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  reader_start_exec_i::~reader_start_exec_i (void)
-  {
-  }
-
-  // Operations from ::ReaderStarter
-
-  void
-  reader_start_exec_i::start_read (void)
-  {
-    this->callback_.start_read ();
-  }
-
-  void
-  reader_start_exec_i::read_no_data (void)
-  {
-    this->callback_.read_no_data ();
-  }
-
-  void
-  reader_start_exec_i::set_reader_properties (::CORBA::UShort nr_keys,
-  ::CORBA::UShort nr_iterations)
-  {
-    this->callback_.keys (nr_keys);
-    this->callback_.iterations (nr_iterations);
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void) :
-    iterations_ (0),
-    keys_ (0),
-    has_run_ (false),
-    ticker_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  bool
-  Receiver_exec_i::check_last ()
-  {
-    ::Reader_Test::ReaderTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data();
-
-    try
-      {
-        if (! ::CORBA::is_nil (reader.in ()))
-          {
-            ReaderTest readertest_info;
-            ::CCM_DDS::ReadInfo readinfo;
-            char key[10];
-            ACE_OS::sprintf (key, "KEY_%d", this->keys_);
-            readertest_info.key = CORBA::string_dup (key);
-            reader->read_one_last (
-                    readertest_info,
-                    readinfo,
-                    ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last: "
-                                  "key <%C> - iteration <%d>\n",
-                                  readertest_info.key.in (),
-                                  readertest_info.iteration));
-            return readertest_info.iteration == this->iterations_;
-          }
-      }
-    catch (const ::CCM_DDS::InternalError &)
-      {
-      }
-    catch (const ::CCM_DDS::NonExistent &)
-      {
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: "
-                              "ERROR: Unexpected exception caught\n"));
-      }
-    return false;
-  }
-
-  // Supported operations and attributes.
-  void
-  Receiver_exec_i::read_one_last (bool test_handles)
-  {
-    ::Reader_Test::ReaderTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data();
-
-    try
-      {
-        for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-          {
-            ReaderTest readertest_info;
-            ::CCM_DDS::ReadInfo readinfo;
-            char key[10];
-            ACE_OS::sprintf (key, "KEY_%d", i);
-            readertest_info.key = CORBA::string_dup (key);
-            DDS::InstanceHandle_t hnd = test_handles
-                ? this->handles_[key]
-                : ::DDS::HANDLE_NIL;
-            reader->read_one_last (readertest_info, readinfo, hnd);
-            if (readertest_info.iteration == this->iterations_)
-              {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ONE LAST: ")
-                    ACE_TEXT ("last iteration received for <%C>: iteration <%u>\n"),
-                    readertest_info.key.in (),
-                    readertest_info.iteration));
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ONE LAST: ")
-                    ACE_TEXT ("Didn't receive last iteration for <%C>: ")
-                    ACE_TEXT ("expected <%u> - received <%u>\n"),
-                    readertest_info.key.in (),
-                    this->iterations_,
-                    readertest_info.iteration));
-              }
-          }
-      }
-    catch (const CCM_DDS::NonExistent& ex)
-      {
-        for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i)
-          {
-            ACE_DEBUG ((LM_ERROR, ACE_TEXT ("READ ONE LAST: ")
-                  ACE_TEXT ("caught expected exception: index <%u>\n"),
-                  ex.indexes[i]));
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ONE LAST: ")
-              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-              ex.error_code));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: READ ONE LAST:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::read_one_last : Exception caught\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::read_one_all (bool test_handles)
-  {
-    ::Reader_Test::ReaderTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data();
-
-    try
-      {
-        for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-          {
-            ReaderTest readertest_info;
-            ReaderTestSeq readertest_info_seq;
-            ::CCM_DDS::ReadInfoSeq readinfo_seq;
-            char key[10];
-            ACE_OS::sprintf (key, "KEY_%d", i);
-            readertest_info.key = CORBA::string_dup (key);
-            DDS::InstanceHandle_t hnd = test_handles
-                ? this->handles_[key]
-                : ::DDS::HANDLE_NIL;
-            reader->read_one_all (
-                    readertest_info,
-                    readertest_info_seq,
-                    readinfo_seq,
-                    hnd);
-
-            if (readertest_info_seq.length () != this->iterations_)
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ONE ALL: ")
-                    ACE_TEXT ("Didn't receive the expected number of ")
-                    ACE_TEXT ("samples for <%C>: expected <%u> - received <%u>\n"),
-                    key,
-                    this->iterations_,
-                    readertest_info_seq.length ()));
-              }
-            else
-              {
-                this->handles_[key] = readinfo_seq[0].instance_handle;
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ONE ALL: ")
-                    ACE_TEXT ("All iterations received for <%C>: number of iterations <%u>\n"),
-                    key,
-                    readertest_info_seq.length ()));
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ONE ALL: ")
-                    ACE_TEXT ("Handle created for <%C>: ")
-                    DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("\n"),
-                    key,
-                    DDS_INSTANCE_HANDLE_LOG(readinfo_seq[0].instance_handle)));
-              }
-          }
-      }
-    catch (const CCM_DDS::NonExistent& ex)
-      {
-        for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ONE ALL: ")
-                  ACE_TEXT ("caught expected exception: index <%u>\n"),
-                  ex.indexes[i]));
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        if (ex.error_code == 0)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ONE ALL: ")
-                  ACE_TEXT ("caught InternalError exception: handles differ\n")));
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ONE ALL: ")
-                  ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-                  ex.error_code));
-          }
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: READ ONE ALL: ");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::read_one_all : Exception caught\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::read_last (void)
-  {
-    ::Reader_Test::ReaderTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data();
-
-    try
-      {
-        ReaderTestSeq readertest_info_seq;
-        ::CCM_DDS::ReadInfoSeq readinfo_seq;
-        reader->read_last (readertest_info_seq, readinfo_seq);
-
-        if (readertest_info_seq.length () != this->keys_)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ LAST: ")
-                ACE_TEXT ("Didn't receive the expected number of ")
-                ACE_TEXT ("instances : expected <%u> - received <%u>\n"),
-                this->keys_,
-                readertest_info_seq.length ()));
-          }
-        for (CORBA::ULong it = 0; it < readertest_info_seq.length (); ++it)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ LAST : ")
-                ACE_TEXT ("last iteration received for <%C>: iteration <%u>\n"),
-                readertest_info_seq[it].key.in (),
-                readertest_info_seq[it].iteration));
-          }
-      }
-    catch (const CCM_DDS::NonExistent& ex)
-      {
-        for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ LAST: ")
-                  ACE_TEXT ("caught expected exception: index <%u>\n"),
-                  ex.indexes[i]));
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ LAST: ")
-              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-              ex.error_code));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: READ LAST: ");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::read_last : Exception caught\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::read_all (void)
-  {
-    ::Reader_Test::ReaderTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data();
-
-    try
-      {
-        ReaderTestSeq readertest_info_seq;
-        ::CCM_DDS::ReadInfoSeq readinfo_seq;
-        reader->read_all (readertest_info_seq, readinfo_seq);
-
-        CORBA::ULong const nr_samples = this->keys_ * this->iterations_;
-        if (readertest_info_seq.length () != nr_samples)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ")
-                ACE_TEXT ("Didn't receive the expected number of ")
-                ACE_TEXT ("samples : expected <%u> - received <%u>\n"),
-                nr_samples,
-                readertest_info_seq.length ()));
-          }
-        if (readertest_info_seq.length () > 0)
-          {
-            CORBA::UShort nr_keys_changed = 1;
-            CORBA::String_var last_key (readertest_info_seq[0].key.in ());
-            CORBA::UShort iterations = 0;
-            for (CORBA::ULong it = 0; it < readertest_info_seq.length (); ++it)
-              {
-                if (ACE_OS::strcmp (last_key, readertest_info_seq[it].key.in ()) != 0)
-                  {
-                    ACE_OS::strcpy (last_key, readertest_info_seq[it].key.in ());
-                    ++nr_keys_changed;
-                  }
-                // check readinfo struct.
-                if (::DDS::HANDLE_NIL == readinfo_seq[it].instance_handle)
-                  {
-                    ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ")
-                            ACE_TEXT ("received instance handle should be valid ")
-                            ACE_TEXT ("for keyed data: ")
-                            ACE_TEXT ("key <%C> - iteration <%u>\n"),
-                            readertest_info_seq[it].key.in (),
-                            readertest_info_seq[it].iteration));
-                  }
-                if (readinfo_seq[it].source_timestamp.sec == 0 &&
-                    readinfo_seq[it].source_timestamp.nanosec == 0)
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR: READ ALL: "
-                                        "source timestamp seems to be invalid (nil) "
-                                        "key <%C> - iteration <%d>\n",
-                                        readertest_info_seq[it].key.in (),
-                                        readertest_info_seq[it].iteration));
-                  }
-                ++iterations;
-              }
-            if (nr_keys_changed != this->keys_)
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ")
-                    ACE_TEXT ("Didn't receive the expected number of ")
-                    ACE_TEXT ("instances : expected <%u> - received <%u>\n"),
-                    this->keys_,
-                    nr_keys_changed));
-              }
-            if (iterations != (this->keys_ * this->iterations_))
-              {
-                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ")
-                    ACE_TEXT ("Didn't receive the expected number of ")
-                    ACE_TEXT ("samples : expected <%u> - received <%u>\n"),
-                    nr_samples,
-                    iterations));
-              }
-          }
-      }
-    catch (const CCM_DDS::NonExistent& ex)
-      {
-        for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ALL: ")
-                  ACE_TEXT ("caught expected exception: index <%u>\n"),
-                  ex.indexes[i]));
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ")
-              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-              ex.error_code));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: READ ALL: ");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::read_all : Exception caught\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::test_exception ()
-  {
-    // test exception handling
-    bool except_caught = false;
-    ::Reader_Test::ReaderTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data();
-
-    try
-      {
-        ReaderTest readertest_info;
-        readertest_info.key = CORBA::string_dup ("KEY_0");
-        ::CCM_DDS::ReadInfo readinfo;
-        reader->read_one_last (readertest_info, readinfo, ::DDS::HANDLE_NIL);
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR : Receiver_exec_i::test_exception: ")
-                  ACE_TEXT ("Wrong exception caught while reading non existent instance\n")));
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        except_caught = true;
-      }
-    if (!except_caught)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR : Receiver_exec_i::test_exception: ")
-                  ACE_TEXT ("no excep caught while reading non existent instance\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::test_exception_with_handles ()
-  {
-    // test exception handling
-    ::Reader_Test::ReaderTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data();
-
-    bool except_caught = false;
-    try
-      {
-        ReaderTest readertest_info;
-        readertest_info.key = CORBA::string_dup ("KEY_1");
-        ::CCM_DDS::ReadInfo readinfo;
-        DDS::InstanceHandle_t hnd = this->handles_["KEY_2"];
-        reader->read_one_last (readertest_info, readinfo, hnd);
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        except_caught = true;
-        ACE_ERROR ((LM_DEBUG, ACE_TEXT ("Receiver_exec_i::test_exception_with_handles: ")
-                  ACE_TEXT ("Expected exception caught while reading non existent instance\n")));
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR : Receiver_exec_i::test_exception_with_handles: ")
-                  ACE_TEXT ("Wrong exception caught while reading non existent instance\n")));
-      }
-    if (!except_caught)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR : Receiver_exec_i::test_exception_with_handles: ")
-                  ACE_TEXT ("no excep caught while reading non existent instance\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::read_no_data ()
-  {
-    ::Reader_Test::ReaderTestConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data();
-
-    try
-      {
-        ReaderTestSeq readertest_info_seq ;
-        ::CCM_DDS::ReadInfoSeq readinfo_seq;
-        reader->read_all (readertest_info_seq, readinfo_seq);
-
-        if (readertest_info_seq.length () > 0)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ NO DATA: ")
-                ACE_TEXT ("Didn't receive the expected number of ")
-                ACE_TEXT ("samples : expected <%u> - received <%u>\n"),
-                0,
-                readertest_info_seq.length ()));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ NO DATA: ")
-                ACE_TEXT ("No data available.\n")));
-          }
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ERROR: READ NO DATA: ")
-              ACE_TEXT ("Caught NonExistent exception")));
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ NO DATA: ")
-              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-              ex.error_code));
-      }
-    catch (const ::CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: READ NO DATA: ");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::read_no_data : Exception caught\n")));
-      }
-  }
-
-  void
-  Receiver_exec_i::run ()
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    delete this->ticker_;
-    this->ticker_ = 0;
-
-    this->has_run_ = true;
-    read_all ();
-    read_last ();
-    read_one_all ();
-    read_one_last ();
-    test_exception ();
-    //now test with collected handles
-    read_one_all (true);
-    read_one_last (true);
-    test_exception_with_handles ();
-  }
-
-  void
-  Receiver_exec_i::start_read ()
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      read_action_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-    if (this->reactor ()->schedule_timer (this->ticker_,
-                                          0,
-                                          ACE_Time_Value(1, 0),
-                                          ACE_Time_Value(1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
-      }
-  }
-
-  // Component attributes and port operations.
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Receiver_exec_i::keys (::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::Reader_Test::ReaderTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in ()),
-            ::Reader_Test::ReaderTestConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::Reader_Test::ReaderTestConnector::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  ::CCM_ReaderStarter_ptr
-  Receiver_exec_i::get_reader_start (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_reader_start_.in ()))
-      {
-        reader_start_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          reader_start_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_ReaderStarter::_nil ());
-
-          this->ciao_reader_start_ = tmp;
-      }
-
-    return
-      ::CCM_ReaderStarter::_duplicate (
-        this->ciao_reader_start_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Reader_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->ticker_)
-      {
-        ACE_ERROR ((LM_ERROR, "Still checking DDS upon exit\n"));
-        this->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-
-    if (!this->has_run_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: ")
-            ACE_TEXT ("Test did not run: Didn't receive ")
-            ACE_TEXT ("the expected number of samples\n")));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Reader_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/Reader/Receiver/Reader_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h
deleted file mode 100644
index 29eac6dee2b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h
+++ /dev/null
@@ -1,251 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_READER_TEST_RECEIVER_EXEC_G1FCGC_H_
-#define CIAO_READER_TEST_RECEIVER_EXEC_G1FCGC_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Reader_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_Reader_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-
-  /**
-   * Read Action Generator
-   */
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg);
-  private:
-    Receiver_exec_i &callback_;
-
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::Reader_Test::ReaderTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::Reader_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from Reader_Test::ReaderTestConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::ReaderTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::ReaderTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::Reader_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::Reader_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Reader_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: reader_start_exec_i
-   */
-
-  class reader_start_exec_i
-    : public virtual ::CCM_ReaderStarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    reader_start_exec_i (
-      ::Reader_Test::CCM_Receiver_Context_ptr ctx,
-      Receiver_exec_i & callback);
-    virtual ~reader_start_exec_i (void);
-
-    //@{
-    /** Operations and attributes from ReaderStarter. */
-
-    virtual
-    void start_read (void);
-
-    virtual
-    void read_no_data (void);
-
-    virtual
-    void set_reader_properties (::CORBA::UShort nr_keys,
-    ::CORBA::UShort nr_iterations);
-    //@}
-
-  private:
-    ::Reader_Test::CCM_Receiver_Context_var ciao_context_;
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::Reader_Test::ReaderTestConnector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CCM_ReaderStarter_ptr
-    get_reader_start (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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void read_no_data ();
-    void start_read ();
-    bool check_last ();
-    void run (void);
-
-    ::CORBA::UShort iterations (void);
-
-    void iterations (::CORBA::UShort iterations);
-
-    ::CORBA::UShort keys (void);
-
-    void keys (::CORBA::UShort keys);
-    //@}
-
-  private:
-    ::Reader_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::Reader_Test::ReaderTestConnector::CCM_Listener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    ::CCM_ReaderStarter_var ciao_reader_start_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    CORBA::UShort iterations_;
-    CORBA::UShort keys_;
-    CORBA::Boolean has_run_;
-
-    read_action_Generator *ticker_;
-
-    typedef std::map<ACE_CString, DDS::InstanceHandle_t> Handle_Table;
-    Handle_Table handles_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void read_all ();
-    void read_last ();
-    void read_one_all (bool test_handles = false);
-    void read_one_last (bool test_handles = false);
-    void test_exception ();
-    void test_exception_with_handles ();
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Reader_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl
deleted file mode 100644
index 17ffb36be5c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_READER_TEST_SENDER_IDL
-#define DDS_READER_TEST_SENDER_IDL
-
-#include "Connector/Reader_Test_Connector.idl"
-#include "Base/Reader_Starter.idl"
-
-module Reader_Test
-{
-  component Sender
-  {
-    port ReaderTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
-
-    uses ReaderStarter start_reader;
-
-    attribute unsigned short keys;
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc
deleted file mode 100644
index a9fc0641804..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc
+++ /dev/null
@@ -1,149 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Reader_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_Reader_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_Reader_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 {
-    Reader_Test_Sender.idl
-  }
-}
-
-project(DDS_Reader_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Reader_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 {
-    Reader_Test_SenderE.idl
-  }
-}
-
-project(DDS_Reader_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Reader_Test_Sender_lem_gen DDS_Reader_Test_Sender_stub \
-           DDS_Reader_Test_Base_stub DDS_Reader_Starter_stub
-  libs  += DDS_Reader_Test_Base_stub Sender_stub Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    Reader_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_Test_SenderEC.inl
-  }
-}
-
-project(DDS_Reader_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Reader_Test_Sender_idl_gen DDS_Reader_Test_Base_stub \
-           DDS_Reader_Test_Connector_stub DDS_Reader_Starter_stub \
-           DDS_Reader_Starter_lem_stub
-  libs  += DDS_Reader_Test_Base_stub DDS_Reader_Test_Connector_stub \
-           Reader_Starter_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    Reader_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_Test_SenderC.inl
-  }
-}
-
-project(DDS_Reader_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_Reader_Test_Sender_lem_stub DDS_Reader_Test_Sender_stub \
-             DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Connector_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub DDS_Reader_Test_Base_stub \
-             DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Connector_stub \
-             Reader_Starter_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Reader_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Reader_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_Reader_Test_Base_stub  DDS_Reader_Test_Sender_lem_stub \
-                DDS_Reader_Test_Connector_stub \
-                DDS_Reader_Test_Connector_svnt DDS_Reader_Test_Connector_lem_stub \
-                DDS_Reader_Starter_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub DDS_Reader_Test_Base_stub \
-                DDS_Reader_Test_Connector_stub DDS_Reader_Test_Connector_svnt \
-                DDS_Reader_Test_Connector_lem_stub Reader_Starter_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_Test_SenderS.cpp
-    Reader_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Reader_Test_SenderS.h
-    Reader_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp
deleted file mode 100644
index 5fa4dbac125..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Reader_Test_Sender_exec.h"
-
-namespace CIAO_Reader_Test_Sender_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_out_connector_status_exec_i
-   */
-
-  info_out_connector_status_exec_i::info_out_connector_status_exec_i (
-        ::Reader_Test::CCM_Sender_Context_ptr ctx,
-        Sender_exec_i &callback)
-    : ciao_context_ (
-        ::Reader_Test::CCM_Sender_Context::_duplicate (ctx))
-      , callback_ (callback)
-  {
-  }
-
-  info_out_connector_status_exec_i::~info_out_connector_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-
-  void
-  info_out_connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */,
-  const ::DDS::InconsistentTopicStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleRejectedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_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)
-    : keys_ (5)
-      , iterations_ (10)
-      , done_ (false)
-      , ccm_activated_ (false)
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  void
-  Sender_exec_i::start (void)
-  {
-    ::Reader_Test::ReaderTestConnector::Writer_var writer =
-      this->ciao_context_->get_connection_info_write_data ();
-    ReaderStarter_var starter =
-      this->ciao_context_->get_connection_start_reader ();
-
-    // Start can be called more than once...
-    if (!this->done_ && this->ccm_activated_)
-      {
-        this->done_ = true;
-        if (! ::CORBA::is_nil (starter.in ()))
-          {
-            starter->set_reader_properties (this->keys_, this->iterations_);
-            starter->read_no_data ();
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to start the sender\n")));
-            return;
-          }
-        for (CORBA::UShort iter_key = 1; iter_key < this->keys_ + 1; ++iter_key)
-          {
-            char key[7];
-            ReaderTest *new_key = new ReaderTest;
-            ACE_OS::sprintf (key, "KEY_%d", iter_key);
-            new_key->key = CORBA::string_dup(key);
-            for (CORBA::UShort iter = 1; iter < this->iterations_ + 1; ++iter)
-              {
-                new_key->iteration = iter;
-                writer->write_one (*new_key, ::DDS::HANDLE_NIL);
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written key <%C> with <%d>\n"),
-                            key, iter));
-              }
-            delete new_key;
-          }
-        starter->start_read ();
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_info_out_connector_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_connector_status_.in ()))
-      {
-        info_out_connector_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_connector_status_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_DDS::CCM_ConnectorStatusListener::_nil ());
-
-          this->ciao_info_out_connector_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate (
-        this->ciao_info_out_connector_status_.in ());
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Reader_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    this->ccm_activated_ = true;
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    if (!this->done_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender didn't receive a "
-                  "DDS::PUBLICATION_MATCHED_STATUS event!\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Reader_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/Reader/Sender/Reader_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h
deleted file mode 100644
index 0e900f1a7fb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h
+++ /dev/null
@@ -1,167 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_READER_TEST_SENDER_EXEC_NO0JUV_H_
-#define CIAO_READER_TEST_SENDER_EXEC_NO0JUV_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Reader_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_Reader_Test_Sender_Impl
-{
-
-  class Sender_exec_i;
-
-  /**
-   * Provider Executor Implementation Class: info_out_connector_status_exec_i
-   */
-
-  class info_out_connector_status_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_connector_status_exec_i (
-      ::Reader_Test::CCM_Sender_Context_ptr ctx,
-      Sender_exec_i &callback);
-    virtual ~info_out_connector_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-    const ::DDS::InconsistentTopicStatus & status);
-
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedIncompatibleQosStatus & status);
-
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleRejectedStatus & status);
-
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedDeadlineMissedStatus & status);
-
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedIncompatibleQosStatus & status);
-
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind status_kind);
-    //@}
-
-  private:
-    ::Reader_Test::CCM_Sender_Context_var ciao_context_;
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_info_out_connector_status (void);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start (void);
-    //@}
-
-  private:
-    ::Reader_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_info_out_connector_status_;
-
-    ::CORBA::UShort keys_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    bool done_;
-    bool ccm_activated_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Reader_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp
deleted file mode 100644
index 3b1136ca8c0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp
+++ /dev/null
@@ -1,389 +0,0 @@
-<!--  -->
-<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>Reader_Test_Depl_1</label>
-  <UUID>Reader_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_Reader_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_Reader_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="Reader_Test_ConnectorComponentImplementation">
-    <name>Reader_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Reader_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Reader_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_Reader_Test_ReaderTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Reader_Test_ReaderTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Reader_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Reader_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_Reader_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_Reader_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="Reader_Test_ConnectorComponentInstance">
-    <name>Reader_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Reader_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Reader_Library#ReaderProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Reader_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Reader_Test_ConnectorComponentInstance2">
-    <name>Reader_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Reader_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Reader_Library#ReaderProfile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Reader_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_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>50</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Reader_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_out_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Reader_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="Reader_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>reader_starter</name>
-    <internalEndpoint>
-      <portName>start_reader</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>reader_start</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="Reader_Test_Connector_ExecArtifact">
-    <name>Reader_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Reader_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Reader_Test_Connector_SvntArtifact">
-    <name>Reader_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Reader_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Reader_Test_Connector_StubArtifact">
-    <name>Reader_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Reader_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/Reader/descriptors/Reader_Library.xml b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Reader_Library.xml
deleted file mode 100644
index a92a127aa86..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Reader_Library.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="ReaderProfile">
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 62fcc57eeae..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="Reader_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="ReaderProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl
deleted file mode 100755
index c5b1964e047..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/README b/CIAO/connectors/dds4ccm/tests/ResetTopic/README
deleted file mode 100644
index e6e28715ebe..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/README
+++ /dev/null
@@ -1,32 +0,0 @@
-In the early days of the DDS4CCM specification a topic name was not changable.
-When it was set (doesn't matter if it was a late binded topic), the user was not
-allowed to change it, otherwise a NonChangeable exception was thrown.
-
-The requirement from the field dictates that a topic name should be changeable.
-When the topic name will be set a second time, the connector should shut down
-DDS and start it again, using the new topic name. The connector does not tear
-down the proxies. This means that the connector doesn't change on the outside.
-
-The ReadGet test has the following sequence:
-1. Sender starts writing samples for TopicI
-2. Sender informs the Receiver that samples has been written for TopicI
-3. Receiver sets this topic name on his connector (late binding), and starts to
-   collect the samples.
-4. Sender resets the topic name to TopicII and informs the receiver about this.
-5. Receiver resets the topic name on his connector and starts collecting the
-   samples belonging to TopicII.
-
-Both listeners tests (UpdateListen and WriteListen) have about the same sequence:
-1. Sender and Receiver start, writing and listening to the same topic.
-2. After 10 second, the perl script starts two small executables; one to inform
-   the receiver to switch to topic II and one to inform the sender to switch to
-   topic II. The executables are spawned in this order.
-3. Step one is repeated.
-4. Step two will be repeated.
-
-The ToEmpty test will initially start writing samples for TopicI. After a while,
-the topic name will be cleared. This means that the connector internally stops DDS.
-After another while, the sender will start writing samples again,
-but now for TopicII. This sequence repeats.
-
-TooLong will test whether an exception is thrown when an invalid topic name is applied.
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl
deleted file mode 100644
index e2c585fc01a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file RG_ResetTopic_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RG_RESETTOPIC_BASE_IDL
-#define RG_RESETTOPIC_BASE_IDL
-
-#pragma ndds typesupport "Base/RG_ResetTopic_BaseSupport.h"
-#pragma opendds typesupport "Base/RG_ResetTopic_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "RG_ResetTopicSample"
-#pragma DCPS_DATA_KEY "RG_ResetTopicSample key"
-
-struct RG_ResetTopicSample {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<RG_ResetTopicSample> RG_ResetTopicSampleSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.mpc
deleted file mode 100644
index 4a603838df6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (RG_ResetTopicBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = RG_ResetTopicBase_stub
-  dynamicflags += RG_RESETTOPIC_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=RG_RESETTOPIC_BASE_STUB_Export \
-              -Wb,stub_export_include=LateBinding_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    RG_ResetTopic_Base.idl
-  }
-
-  opendds_ts_flags += --export=RG_RESETTOPIC_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    RG_ResetTopic_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl
deleted file mode 100644
index b237220bed5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @file Reader_Starter.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef READER_STARTER_IDL
-#define READER_STARTER_IDL
-
-#pragma ciao lem "Base/Reader_StarterE.idl"
-
-interface ReaderStarter
-{
-  void start_read (in string topic_name);
-  void set_reader_properties (in unsigned short nr_keys,
-                              in unsigned short nr_iterations);
-};
-
-#endif /* READER_STARTER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc
deleted file mode 100644
index f557cee43cb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc
+++ /dev/null
@@ -1,110 +0,0 @@
-project(reader_starter_rt_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after +=
-  idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
-              -Wb,stub_export_include=reader_starter_rt_stub_export.h \
-              -Wb,skel_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,skel_export_include=reader_starter_rt_svnt_export.h \
-              -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,svnt_export_include=reader_starter_rt_svnt_export.h \
-              -Wb,exec_export_macro=READER_STARTER_EXEC_Export \
-              -Wb,exec_export_include=Reader_Starter_exec_export.h -I..
-
-  IDL_Files {
-    Reader_Starter.idl
-  }
-}
-
-project(reader_starter_rt_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += reader_starter_rt_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \
-              -Wb,stub_export_include=reader_starter_rt_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Reader_StarterE.idl
-  }
-}
-
-project(reader_starter_rt_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += reader_starter_rt_lem_gen reader_starter_rt_stub
-  libs  += reader_starter_rt_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = reader_starter_rt_lem_stub
-  dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterEC.cpp
-  }
-
-  Header_Files {
-    Reader_StarterEC.h
-    reader_starter_rt_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_StarterEC.inl
-  }
-}
-
-project(reader_starter_rt_stub) : ccm_stub, dds4ccm_base {
-  after += reader_starter_rt_idl_gen
-  libs  +=
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = reader_starter_rt_stub
-  dynamicflags += READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterC.cpp
-  }
-
-  Header_Files {
-    Reader_StarterC.h
-    reader_starter_rt_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_StarterC.inl
-  }
-}
-
-
-project(reader_starter_rt_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   reader_starter_rt_lem_stub reader_starter_rt_stub
-  sharedname  = reader_starter_rt_svnt
-  libs       += reader_starter_rt_stub reader_starter_rt_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += READER_STARTER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterS.cpp
-    Reader_Starter_svnt.cpp
-  }
-
-  Header_Files {
-    Reader_StarterS.h
-    Reader_Starter_svnt.h
-    reader_starter_rt_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl
deleted file mode 100644
index a7551c9de29..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file RG_ResetTopic_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RG_RESETTOPIC_CONNECTOR_IDL_
-#define RG_RESETTOPIC_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/RG_ResetTopic_Base.idl"
-
-#pragma ciao lem "Connector/RG_ResetTopic_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/RG_ResetTopic_BaseTypeSupport.idl"
-#endif
-
-module RG_ResetTopic
-{
-  module ::CCM_DDS::Typed < ::RG_ResetTopicSample, ::RG_ResetTopicSampleSeq> RG_ResetTopicSampleConnector;
-};
-
-#endif /* RG_ResetTopic_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc
deleted file mode 100644
index 8aac6031d88..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p RG_ResetTopicBase -l .. -o ../lib -u DDS RG_ResetTopic_Connector"
-
-project (RG_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen RG_ResetTopicBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RG_RESETTOPIC_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=LateBinding_Connector_stub_export.h \
-              -Wb,skel_export_macro=RG_RESETTOPIC_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=LateBinding_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=RG_RESETTOPIC_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=LateBinding_Connector_svnt_export.h \
-              -Wb,conn_export_macro=RG_RESETTOPIC_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=LateBinding_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    RG_ResetTopic_Connector.idl
-  }
-}
-
-project (RG_ResetTopicConnector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += RG_ResetTopicConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=RG_RESETTOPIC_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=RG_ResetTopic_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    RG_ResetTopic_ConnectorE.idl
-  }
-}
-
-project (RG_ResetTopicConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += RG_ResetTopicConnector_lem_gen RG_ResetTopicConnector_stub \
-           RG_ResetTopicBase_stub
-  libs  += RG_ResetTopicBase_stub RG_ResetTopicConnector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = RG_ResetTopicConnector_lem_stub
-  dynamicflags += RG_RESETTOPIC_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_ResetTopic_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    RG_ResetTopic_ConnectorEC.h
-    RG_ResetTopic_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    RG_ResetTopic_ConnectorEC.inl
-  }
-}
-
-project (RG_ResetTopicConnector_stub) : ccm_stub, dds4ccm_base {
-  after += RG_ResetTopicConnector_idl_gen RG_ResetTopicBase_stub
-  libs  += RG_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = RG_ResetTopicConnector_stub
-  dynamicflags += RG_RESETTOPIC_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_ResetTopic_ConnectorC.cpp
-  }
-
-  Header_Files {
-    RG_ResetTopic_ConnectorC.h
-    RG_ResetTopic_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    RG_ResetTopic_ConnectorC.inl
-  }
-}
-
-project (RG_ResetTopicConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += RG_ResetTopicConnector_lem_stub RG_ResetTopicConnector_stub \
-             RG_ResetTopicBase_stub
-  sharedname = RG_ResetTopicConnector_exec
-  libs += RG_ResetTopicConnector_stub RG_ResetTopicConnector_lem_stub \
-          RG_ResetTopicBase_stub RG_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RG_RESETTOPIC_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_ResetTopic_Connector_conn.cpp
-  }
-
-  Header_Files {
-    RG_ResetTopic_Connector_conn.h
-    RG_ResetTopic_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (RG_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += RG_ResetTopicConnector_lem_stub RG_ResetTopicConnector_exec \
-                RG_ResetTopicConnector_stub
-  sharedname  = RG_ResetTopicConnector_svnt
-  libs       += RG_ResetTopicConnector_stub \
-                RG_ResetTopicConnector_lem_stub  \
-                RG_ResetTopicBase_stub \
-                RG_ResetTopicConnector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RG_RESETTOPIC_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_ResetTopic_ConnectorS.cpp
-    RG_ResetTopic_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    RG_ResetTopic_ConnectorS.h
-    RG_ResetTopic_Connector_svnt.h
-    RG_ResetTopic_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.idl
deleted file mode 100644
index 4322dffca5d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/RG_ResetTopic_Connector.idl"
-#include "Base/Reader_Starter.idl"
-
-module RG_ResetTopic
-{
-  component Receiver
-  {
-    port RG_ResetTopicSampleConnector::DDS_Get info_get;
-    port RG_ResetTopicSampleConnector::DDS_Read info_read;
-
-    provides ReaderStarter start_reading;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc
deleted file mode 100644
index 2d24cf4f6a5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc
+++ /dev/null
@@ -1,155 +0,0 @@
-project (RG_ResetTopicReceiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += RG_ResetTopicConnector_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 {
-    RG_ResetTopic_Receiver.idl
-  }
-}
-
-project (RG_ResetTopicReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += RG_ResetTopicReceiver_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 {
-    RG_ResetTopic_ReceiverE.idl
-  }
-}
-
-project (RG_ResetTopicReceiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after +=  RG_ResetTopicReceiver_lem_gen RG_ResetTopicReceiver_stub  RG_ResetTopicConnector_stub \
-            RG_ResetTopicBase_stub reader_starter_rt_stub
-  libs  +=  Receiver_stub RG_ResetTopicConnector_stub RG_ResetTopicBase_stub \
-            reader_starter_rt_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_ResetTopic_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    RG_ResetTopic_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    RG_ResetTopic_ReceiverEC.inl
-  }
-}
-
-project (RG_ResetTopicReceiver_stub) : ccm_stub, dds4ccm_base {
-  after +=  RG_ResetTopicReceiver_idl_gen  RG_ResetTopicConnector_stub \
-            RG_ResetTopicBase_stub RG_ResetTopicConnector_lem_gen \
-            reader_starter_rt_stub reader_starter_rt_lem_stub
-  libs  +=  RG_ResetTopicConnector_stub RG_ResetTopicBase_stub \
-            reader_starter_rt_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_ResetTopic_ReceiverC.cpp
-  }
-
-  Header_Files {
-    RG_ResetTopic_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    RG_ResetTopic_ReceiverC.inl
-  }
-}
-
-project (RG_ResetTopicReceiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += RG_ResetTopicReceiver_lem_stub RG_ResetTopicReceiver_stub \
-             RG_ResetTopicBase_stub RG_ResetTopicConnector_stub \
-             RG_ResetTopicConnector_lem_stub \
-             reader_starter_rt_lem_stub reader_starter_rt_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub RG_ResetTopicBase_stub \
-          RG_ResetTopicConnector_stub RG_ResetTopicConnector_lem_stub \
-          reader_starter_rt_lem_stub reader_starter_rt_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_ResetTopic_Receiver_exec.cpp
-    RG_ResetTopic_Receiver_impl.cpp
-  }
-
-  Header_Files {
-    RG_ResetTopic_Receiver_exec.h
-    RG_ResetTopic_Receiver_impl.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (RG_ResetTopicReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   RG_ResetTopicReceiver_lem_stub RG_ResetTopicBase_stub \
-                  RG_ResetTopicConnector_stub RG_ResetTopicConnector_svnt \
-                  RG_ResetTopicReceiver_exec RG_ResetTopicConnector_lem_stub \
-                  reader_starter_rt_stub \
-                  reader_starter_rt_svnt reader_starter_rt_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub RG_ResetTopicBase_stub \
-                RG_ResetTopicConnector_stub RG_ResetTopicConnector_svnt \
-                Receiver_exec RG_ResetTopicConnector_lem_stub \
-                reader_starter_rt_stub reader_starter_rt_svnt \
-                reader_starter_rt_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_ResetTopic_ReceiverS.cpp
-    RG_ResetTopic_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    RG_ResetTopic_ReceiverS.h
-    RG_ResetTopic_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.cpp
deleted file mode 100644
index 885a5ef4cb0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.cpp
+++ /dev/null
@@ -1,281 +0,0 @@
-// -*- C++ -*-
-#include "RG_ResetTopic_Receiver_exec.h"
-#include "RG_ResetTopic_Receiver_impl.h"
-
-namespace CIAO_RG_ResetTopic_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_get_status_exec_i
-   */
-
-  info_get_status_exec_i::info_get_status_exec_i (
-        ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::RG_ResetTopic::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_get_status_exec_i::~info_get_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_get_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_get_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_read_status_exec_i
-   */
-
-  info_read_status_exec_i::info_read_status_exec_i (
-        ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::RG_ResetTopic::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_read_status_exec_i::~info_read_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_read_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_read_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: start_reading_exec_i
-   */
-
-  start_reading_exec_i::start_reading_exec_i (
-        ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx,
-        Receiver_exec_i &callback)
-    : ciao_context_ (
-        ::RG_ResetTopic::CCM_Receiver_Context::_duplicate (ctx))
-    , callback_ (callback)
-  {
-  }
-
-  start_reading_exec_i::~start_reading_exec_i (void)
-  {
-  }
-
-  // Operations from ::ReaderStarter
-
-  void
-  start_reading_exec_i::start_read (const char * topic_name)
-  {
-    this->callback_.start_read (topic_name);
-  }
-
-  void
-  start_reading_exec_i::set_reader_properties (::CORBA::UShort nr_keys,
-  ::CORBA::UShort nr_iterations)
-  {
-    this->callback_.keys (nr_keys);
-    this->callback_.iterations (nr_iterations);
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : iterations_ (10)
-    , keys_ (5)
-    , impl_(0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-    delete this->impl_;
-  }
-
-  // Supported operations and attributes.
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-    if (this->impl_)
-      {
-        this->impl_->iterations (iterations);
-      }
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Receiver_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-    if (this->impl_)
-      {
-        this->impl_->keys (keys);
-      }
-  }
-
-  void
-  Receiver_exec_i::start_read (const char * topic_name)
-  {
-    if (!this->impl_)
-      ACE_NEW_THROW_EX (this->impl_,
-                        RG_ResetTopic_Receiver_impl (
-                          this->ciao_context_.in (),
-                          this->iterations_,
-                          this->keys_),
-                        ::CORBA::INTERNAL ());
-    this->impl_->start (topic_name);
-  }
-
-  // Component attributes and port operations.
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_get_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_get_status_.in ()))
-      {
-        info_get_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_get_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_get_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_get_status_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_read_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_read_status_.in ()))
-      {
-        info_read_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_read_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_read_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_read_status_.in ());
-  }
-
-  ::CCM_ReaderStarter_ptr
-  Receiver_exec_i::get_start_reading (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_start_reading_.in ()))
-      {
-        start_reading_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          start_reading_exec_i (
-            this->ciao_context_.in (),
-            *this),
-            ::CCM_ReaderStarter::_nil ());
-
-          this->ciao_start_reading_ = tmp;
-      }
-
-    return
-      ::CCM_ReaderStarter::_duplicate (
-        this->ciao_start_reading_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::RG_ResetTopic::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_RG_ResetTopic_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/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.h
deleted file mode 100644
index c079a0b39af..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.h
+++ /dev/null
@@ -1,192 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_RG_RESETTOPIC_RECEIVER_EXEC_MMKH3G_H_
-#define CIAO_RG_RESETTOPIC_RECEIVER_EXEC_MMKH3G_H_
-
-#include /**/ "ace/pre.h"
-
-#include "RG_ResetTopic_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_RG_ResetTopic_Receiver_Impl
-{
-  class Receiver_exec_i;
-  class RG_ResetTopic_Receiver_impl;
-  /**
-   * Provider Executor Implementation Class: info_get1_status_exec_i
-   */
-
-  class info_get_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_get_status_exec_i (
-      ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_get_status_exec_i (void);
-
-    /** @name Operations and attributes from CCM_DDS::PortStatusListener */
-    //@{
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::RG_ResetTopic::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_read1_status_exec_i
-   */
-
-  class info_read_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_read_status_exec_i (
-      ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_read_status_exec_i (void);
-
-    /** @name Operations and attributes from CCM_DDS::PortStatusListener */
-    //@{
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::RG_ResetTopic::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: start_reading_exec_i
-   */
-
-  class start_reading_exec_i
-    : public virtual ::CCM_ReaderStarter,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    start_reading_exec_i (
-      ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx,
-      Receiver_exec_i &callback_);
-    virtual ~start_reading_exec_i (void);
-
-    /** @name Operations and attributes from ReaderStarter */
-    //@{
-
-    virtual
-    void start_read (const char * topic_name);
-
-    virtual
-    void set_reader_properties (::CORBA::UShort nr_keys,
-    ::CORBA::UShort nr_iterations);
-    //@}
-
-  private:
-    ::RG_ResetTopic::CCM_Receiver_Context_var ciao_context_;
-    Receiver_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    /** @name Supported operations and attributes. */
-    //@{
-
-    //@}
-
-    /** @name Component attributes and port operations. */
-    //@{
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_read_status (void);
-
-    virtual ::CCM_ReaderStarter_ptr
-    get_start_reading (void);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    /** @name 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);
-    //@}
-
-    /** @name User defined public operations. */
-    //@{
-    void
-    start_read (const char * topic_name);
-    //@}
-
-  private:
-    ::RG_ResetTopic::CCM_Receiver_Context_var ciao_context_;
-
-    /** @name Component attributes. */
-    //@{
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_get_status_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_read_status_;
-    ::CCM_ReaderStarter_var ciao_start_reading_;
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    /** @name User defined members. */
-    //@{
-    RG_ResetTopic_Receiver_impl *impl_;
-    //@}
-
-    /** @name User defined private operations. */
-    //@{
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_RG_ResetTopic_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.cpp
deleted file mode 100644
index 79686951697..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.cpp
+++ /dev/null
@@ -1,394 +0,0 @@
-#include "RG_ResetTopic_Receiver_impl.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_RG_ResetTopic_Receiver_Impl
-{
-
-  /**
-   * Check last
-   */
-  LastSampleChecker::LastSampleChecker (RG_ResetTopic_Receiver_impl &callback,
-                                        const ::CORBA::UShort &iterations)
-    : callback_ (callback)
-    , iterations_ (iterations)
-  {
-  }
-
-  LastSampleChecker::~LastSampleChecker ()
-  {
-  }
-
-  int
-  LastSampleChecker::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Checking if last sample "
-                          "is available in DDS...\n"));
-    if (this->callback_.check_last ())
-      this->callback_.start_read ();
-    return 0;
-  }
-
-  /**
-   * RG_ResetTopic_Receiver_impl
-   */
-  RG_ResetTopic_Receiver_impl::RG_ResetTopic_Receiver_impl (
-      ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx,
-      const ::CORBA::UShort & iterations,
-      const ::CORBA::UShort & keys)
-    : ciao_context_ (
-        ::RG_ResetTopic::CCM_Receiver_Context::_duplicate (ctx))
-    , iterations_ (iterations)
-    , keys_ (keys)
-    , expected_per_run_ (keys * iterations)
-    , checker_ (0)
-    , topic_name_("")
-  {
-  }
-
-  RG_ResetTopic_Receiver_impl::~RG_ResetTopic_Receiver_impl ()
-  {
-    delete this->checker_;
-  }
-
-  ACE_Reactor*
-  RG_ResetTopic_Receiver_impl::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  RG_ResetTopic_Receiver_impl::iterations (::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  void
-  RG_ResetTopic_Receiver_impl::keys (::CORBA::UShort keys)
-  {
-    this->keys_= keys;
-  }
-
-  bool
-  RG_ResetTopic_Receiver_impl::check_last (void)
-  {
-    ::RG_ResetTopic::RG_ResetTopicSampleConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_read_data ();
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - "
-                              "last iteration should be <%02d>\n",
-                              this->iterations_));
-        RG_ResetTopicSample datum;
-        ::CCM_DDS::ReadInfo readinfo;
-        char key[10];
-        ACE_OS::sprintf (key, "KEY_%d", this->keys_);
-        datum.key = CORBA::string_dup (key);
-        reader->read_one_last (
-                datum,
-                readinfo,
-                ::DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - "
-                              "last iteration <%02d> - <%02d>\n",
-                               datum.iteration,
-                               this->iterations_));
-        return datum.iteration >= this->iterations_;
-      }
-    catch (const ::CCM_DDS::InternalError &)
-      {
-        ACE_DEBUG ((LM_DEBUG, "INTERNAL ERROR\n"));
-      }
-    catch (const ::CCM_DDS::NonExistent &)
-      {
-        ACE_DEBUG ((LM_DEBUG, "NONEXISTENT\n"));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: "
-                              "ERROR: Unexpected exception caught\n"));
-      }
-    return false;
-  }
-
-  void
-  RG_ResetTopic_Receiver_impl::start (const char * topic_name)
-  {
-    this->topic_name_ = topic_name;
-    //only the first time...
-    if (!this->checker_)
-      this->test_exception ();
-    this->set_topic_name_reader (topic_name);
-
-    if (!this->checker_)
-      ACE_NEW_THROW_EX (this->checker_,
-                        LastSampleChecker (*this,
-                                          this->iterations_),
-                        ::CORBA::NO_MEMORY ());
-    if (this->reactor ()->schedule_timer (this->checker_,
-                                          0,
-                                          ACE_Time_Value (1, 0),
-                                          ACE_Time_Value (1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::schedule_timer - "
-                  "ERROR: Error while starting LastSampleChecker\n"));
-      }
-  }
-
-  void
-  RG_ResetTopic_Receiver_impl::start_read (void)
-  {
-    if (this->checker_)
-      {
-        this->reactor ()->cancel_timer (this->checker_);
-      }
-    this->start_reading ();
-    this->set_topic_name_getter (this->topic_name_.c_str());
-    this->start_getting ();
-  }
-
-  void
-  RG_ResetTopic_Receiver_impl::check_samples (
-    const char * test,
-    const RG_ResetTopicSampleSeq& samples,
-    const ::CORBA::UShort& expected)
-  {
-    bool error = samples.length () != expected;
-    if (ACE_OS::strcmp (test, "get") == 0)
-      {
-        error = !(samples.length () > 0);
-      }
-    if (error)
-      {
-        ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::check_samples - "
-                    "ERROR: Unexpected number of %C samples received: "
-                    "expected <%d> - received <%u>\n",
-                    test,
-                    expected,
-                    samples.length ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::check_samples - "
-                    "%C Samples found: <%u>\n",
-                    test,
-                    samples.length ()));
-      }
-    for (::CORBA::ULong i = 0;
-         i < samples.length ();
-         ++i)
-      {
-        ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::check_samples - "
-                    "Sample %C: sample <%d> - key <%C> - iteration <%d>\n",
-                    test,
-                    i,
-                    samples[i].key.in (),
-                    samples[i].iteration));
-      }
-  }
-
-  void
-  RG_ResetTopic_Receiver_impl::test_exception (void)
-  {
-    try
-      {
-        if (! ::CORBA::is_nil (this->ciao_context_.in ()))
-          {
-            ::RG_ResetTopic::RG_ResetTopicSampleConnector::Reader_var reader =
-              this->ciao_context_->get_connection_info_read_data ();
-            if (::CORBA::is_nil (reader.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::test_exception - "
-                            "ERROR: Unable to get reader interface from the "
-                            "CIAO context\n"));
-                return;
-              }
-
-            RG_ResetTopicSample sample;
-            ::CCM_DDS::ReadInfo readinfo;
-            sample.key = CORBA::string_dup ("KEY_1");
-            reader->read_one_last (sample,
-                                   readinfo,
-                                   ::DDS::HANDLE_NIL);
-            ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::test_exception - "
-                        "ERROR: No exception caught before topic name has been set\n"));
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::test_exception - "
-                        "ERROR: CIAO context seems to be NIL\n"));
-          }
-      }
-    catch (const ::CORBA::BAD_INV_ORDER &)
-      {
-        ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::test_exception - "
-                    "Expected BAD_INV_ORDER thrown.\n"));
-      }
-    catch (const CORBA::Exception &e)
-      {
-        e._tao_print_exception("RG_ResetTopic_Receiver_impl::test_exception - "
-                               "ERROR: Unexpected exception");
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::test_exception - "
-                    "ERROR: expected and unknown exception caught\n"));
-      }
-  }
-
-  void
-  RG_ResetTopic_Receiver_impl::start_reading (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::start_reading - "
-                "Start reading\n"));
-    ::RG_ResetTopic::RG_ResetTopicSampleConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_read_data ();
-    try
-      {
-        RG_ResetTopicSampleSeq samples;
-        ::CCM_DDS::ReadInfoSeq readinfo_seq;
-        reader->read_all (samples, readinfo_seq);
-
-        this->check_samples ("read", samples, this->expected_per_run_);
-      }
-    catch (const CORBA::Exception &e)
-      {
-        e._tao_print_exception("RG_ResetTopic_Receiver_impl::start_reading - "
-                               "ERROR: Unexpected exception");
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::start_reading - "
-                    "ERROR: Caught unknow exception\n"));
-      }
-  }
-
-  void
-  RG_ResetTopic_Receiver_impl::start_getting (void)
-  {
-    try
-      {
-        ::RG_ResetTopic::RG_ResetTopicSampleConnector::Getter_var getter =
-          this->ciao_context_->get_connection_info_get_fresh_data ();
-        if (::CORBA::is_nil (getter.in ()))
-          {
-            ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::start_getting - "
-                        "ERROR: Unable to get writer interface from the "
-                        "CIAO context\n"));
-            return;
-          }
-        DDS::Duration_t to;
-        to.sec = 1;
-        to.nanosec = 0;
-        getter->time_out (to);
-
-        RG_ResetTopicSampleSeq samples;
-        ::CCM_DDS::ReadInfoSeq readinfos;
-        getter->get_many (samples, readinfos);
-        this->check_samples ("get", samples);
-      }
-    catch (const CORBA::Exception &e)
-      {
-        e._tao_print_exception("RG_ResetTopic_Receiver_impl::start_getting - "
-                               "ERROR: Unexpected exception");
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::start_getting - "
-                    "ERROR: expected and unknown exception caught\n"));
-      }
-  }
-
-  void
-  RG_ResetTopic_Receiver_impl::set_topic_name_reader (const char * topic_name)
-  {
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::set_topic_name_reader - "
-                    "Setting topic name to <%C>\n", topic_name));
-        ::RG_ResetTopic::RG_ResetTopicSampleConnector::Reader_var reader =
-          this->ciao_context_->get_connection_info_read_data ();
-        if (::CORBA::is_nil (reader.in ()))
-            {
-              ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_reader - "
-                                    "Unable to get reader interface\n"));
-              throw ::CORBA::INTERNAL ();
-            }
-        ::CORBA::Object_var cmp = reader->_get_component ();
-        if (::CORBA::is_nil (cmp.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_reader - "
-                                  "Unable to get component interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        ::RG_ResetTopic::RG_ResetTopicSampleConnector::CCM_DDS_State_var conn =
-          ::RG_ResetTopic::RG_ResetTopicSampleConnector::CCM_DDS_State::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_reader - "
-                                  "Unable to narrow connector interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-
-        conn->topic_name (topic_name);
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_reader - "
-                    "Caught NonChangeable exception.\n"));
-      }
-  }
-
-  void
-  RG_ResetTopic_Receiver_impl::set_topic_name_getter (const char * topic_name)
-  {
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, "RG_ResetTopic_Receiver_impl::set_topic_name_getter - "
-                    "Setting topic name to <%C>\n", topic_name));
-        ::RG_ResetTopic::RG_ResetTopicSampleConnector::Getter_var getter =
-          this->ciao_context_->get_connection_info_get_fresh_data ();
-        if (::CORBA::is_nil (getter.in ()))
-            {
-              ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_getter - "
-                                    "Unable to get getter interface\n"));
-              throw ::CORBA::INTERNAL ();
-            }
-          ::CORBA::Object_var cmp = getter->_get_component ();
-          if (::CORBA::is_nil (cmp.in ()))
-            {
-              ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_getter - "
-                                    "Unable to get component interface\n"));
-              throw ::CORBA::INTERNAL ();
-            }
-        ::RG_ResetTopic::RG_ResetTopicSampleConnector::CCM_DDS_Event_var conn =
-          ::RG_ResetTopic::RG_ResetTopicSampleConnector::CCM_DDS_Event::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: RG_ResetTopic_Receiver_impl::set_topic_name_getter - "
-                                  "Unable to narrow connector interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        conn->topic_name (topic_name);
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "RG_ResetTopic_Receiver_impl::set_topic_name_getter - "
-                    "ERROR: Caught NonChangeable exception.\n"));
-      }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.h
deleted file mode 100644
index f60d7b058a0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.h
+++ /dev/null
@@ -1,75 +0,0 @@
-#ifndef RG_RESETTOPIC_RECEIVER_IMPL_H_
-#define RG_RESETTOPIC_RECEIVER_IMPL_H_
-
-#include "RG_ResetTopic_ReceiverEC.h"
-
-namespace CIAO_RG_ResetTopic_Receiver_Impl
-{
-  class RG_ResetTopic_Receiver_impl;
-
-  /**
-   * LastSampleChecker
-   */
-  class LastSampleChecker
-    : public ACE_Event_Handler
-  {
-  public:
-    LastSampleChecker (RG_ResetTopic_Receiver_impl &callback,
-                       const ::CORBA::UShort &iterations);
-
-    virtual ~LastSampleChecker (void);
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    RG_ResetTopic_Receiver_impl &callback_;
-    const ::CORBA::UShort iterations_;
-  };
-
-  /**
-   * RG_ResetTopic_Receiver_impl
-   */
-  class RG_ResetTopic_Receiver_impl
-  {
-  public:
-    RG_ResetTopic_Receiver_impl (
-      ::RG_ResetTopic::CCM_Receiver_Context_ptr ctx,
-      const ::CORBA::UShort & iterations,
-      const ::CORBA::UShort & keys);
-    ~RG_ResetTopic_Receiver_impl (void);
-
-    void start (const char * topic_name);
-    bool check_last (void);
-    void start_read (void);
-
-
-    void iterations (::CORBA::UShort iterations);
-    void keys (::CORBA::UShort keys);
-
-  private:
-    ::RG_ResetTopic::CCM_Receiver_Context_var ciao_context_;
-    ::CORBA::UShort iterations_;
-    ::CORBA::UShort keys_;
-    ::CORBA::UShort expected_per_run_;
-
-    LastSampleChecker * checker_;
-
-    ACE_CString topic_name_;
-
-    void set_topic_name_reader (const char * topic_name);
-    void set_topic_name_getter (const char * topic_name);
-
-    void start_reading (void);
-    void start_getting (void);
-    void test_exception (void);
-
-    void check_samples (
-      const char * test,
-      const RG_ResetTopicSampleSeq& samples,
-      const ::CORBA::UShort& expected=0);
-
-    ACE_Reactor* reactor (void);
-  };
-};
-
-#endif /* RG_RESETTOPIC_RECEIVER_IMPL_H_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl
deleted file mode 100644
index f9fdc5723f4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RG_RESETTOPIC_SENDER_IDL
-#define RG_RESETTOPIC_SENDER_IDL
-
-#include "Connector/RG_ResetTopic_Connector.idl"
-#include "Base/Reader_Starter.idl"
-
-module RG_ResetTopic
-{
-  component Sender
-  {
-    port RG_ResetTopicSampleConnector::DDS_Write  info_write;
-
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-
-    uses ReaderStarter reader_start;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc
deleted file mode 100644
index 1df6ea4d45d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc
+++ /dev/null
@@ -1,150 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p RG_ResetTopicBase -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project (RG_ResetTopicSender_idl_gen) : componentidldefaults, dds4ccm {
-  after += RG_ResetTopicConnector_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 {
-    RG_ResetTopic_Sender.idl
-  }
-}
-
-project (RG_ResetTopicSender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += RG_ResetTopicSender_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 {
-    RG_ResetTopic_SenderE.idl
-  }
-}
-
-project (RG_ResetTopicSender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += RG_ResetTopicSender_lem_gen RG_ResetTopicSender_stub \
-           RG_ResetTopicBase_stub reader_starter_rt_stub
-  libs  += RG_ResetTopicBase_stub Sender_stub reader_starter_rt_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_ResetTopic_SenderEC.cpp
-  }
-
-  Header_Files {
-    RG_ResetTopic_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    RG_ResetTopic_SenderEC.inl
-  }
-}
-
-project (RG_ResetTopicSender_stub) : ccm_stub, dds4ccm_base {
-  after += RG_ResetTopicSender_idl_gen RG_ResetTopicBase_stub \
-           RG_ResetTopicConnector_stub reader_starter_rt_stub \
-           reader_starter_rt_lem_stub
-  libs  += RG_ResetTopicBase_stub RG_ResetTopicConnector_stub \
-           reader_starter_rt_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_ResetTopic_SenderC.cpp
-  }
-
-  Header_Files {
-    RG_ResetTopic_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    RG_ResetTopic_SenderC.inl
-  }
-}
-
-project (RG_ResetTopicSender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += RG_ResetTopicSender_lem_stub RG_ResetTopicSender_stub \
-             RG_ResetTopicConnector_lem_stub RG_ResetTopicConnector_stub \
-             reader_starter_rt_svnt reader_starter_rt_lem_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub RG_ResetTopicBase_stub \
-          RG_ResetTopicConnector_lem_stub RG_ResetTopicConnector_stub \
-          reader_starter_rt_stub reader_starter_rt_svnt reader_starter_rt_lem_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_ResetTopic_Sender_exec.cpp
-  }
-
-  Header_Files {
-    RG_ResetTopic_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (RG_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += RG_ResetTopicBase_stub  RG_ResetTopicSender_lem_stub RG_ResetTopicConnector_stub \
-                RG_ResetTopicConnector_svnt RG_ResetTopicConnector_lem_stub \
-                reader_starter_rt_stub reader_starter_rt_lem_stub reader_starter_rt_svnt
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                RG_ResetTopicBase_stub RG_ResetTopicConnector_stub RG_ResetTopicConnector_svnt \
-                RG_ResetTopicConnector_lem_stub reader_starter_rt_stub \
-                reader_starter_rt_lem_stub reader_starter_rt_svnt
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RG_ResetTopic_SenderS.cpp
-    RG_ResetTopic_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    RG_ResetTopic_SenderS.h
-    RG_ResetTopic_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp
deleted file mode 100644
index d4a54cded17..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp
+++ /dev/null
@@ -1,256 +0,0 @@
-// -*- C++ -*-
-#include "RG_ResetTopic_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#define TOPIC_1 "ResetTopic1"
-#define TOPIC_2 "ResetTopic2"
-
-
-namespace CIAO_RG_ResetTopic_Sender_Impl
-{
-
-  /**
-   * Timeout_Handler
-   */
-
-  Timeout_Handler::Timeout_Handler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->callback_.start_write ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : iterations_ (0)
-    , keys_ (0)
-    , to_handler_ (0)
-    , topic_name_ (TOPIC_2)
-    , run_(0)
-    , start_key_ (1)
-    , start_iteration_ (1)
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::start_write (void)
-  {
-    try
-      {
-        if (++this->run_ > 4)
-          return;
-        if (ACE_OS::strcmp (this->topic_name_.c_str(), TOPIC_1) == 0)
-          this->topic_name_ = TOPIC_2;
-        else
-          this->topic_name_ = TOPIC_1;
-
-        ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_write - "
-                    "Setting topic name to <%C>\n", this->topic_name_.c_str()));
-
-        ::RG_ResetTopic::RG_ResetTopicSampleConnector::Writer_var writer =
-          this->ciao_context_->get_connection_info_write_data ();
-        if (::CORBA::is_nil (writer.in ()))
-            {
-              ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::start_write - "
-                                    "Unable to get writer interface\n"));
-              throw ::CORBA::INTERNAL ();
-            }
-          ::CORBA::Object_var cmp = writer->_get_component ();
-          if (::CORBA::is_nil (cmp.in ()))
-            {
-              ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::start_write - "
-                                    "Unable to get component interface\n"));
-              throw ::CORBA::INTERNAL ();
-            }
-        ::RG_ResetTopic::RG_ResetTopicSampleConnector::CCM_DDS_Event_var conn =
-          ::RG_ResetTopic::RG_ResetTopicSampleConnector::CCM_DDS_Event::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::start_write - "
-                                  "Unable to narrow connector interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-
-        conn->topic_name (this->topic_name_.c_str());
-
-        ::CORBA::UShort key = 0;
-        ::CORBA::UShort iter = 0;
-        for (key = this->start_key_; key < this->run_ * this->keys_ + 1; ++key)
-          {
-            RG_ResetTopicSample sample;
-            char tmp[7];
-            ACE_OS::sprintf (tmp, "KEY_%d", key);
-            sample.key = CORBA::string_dup(tmp);
-
-            for (iter = this->start_iteration_; iter < this->run_ * this->iterations_ + 1; ++iter)
-              {
-                sample.iteration = iter;
-                writer->write_one (sample, ::DDS::HANDLE_NIL);
-                ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - "
-                            "Sample written : key <%C> - iteration <%d>\n",
-                            tmp, iter));
-              }
-          }
-        this->start_key_ = key;
-        this->start_iteration_ = iter;
-        ACE_Time_Value tv (2, 0);
-        ACE_OS::sleep (tv);
-        ReaderStarter_var starter =
-          this->ciao_context_->get_connection_reader_start ();
-        if (!::CORBA::is_nil (starter.in ()))
-          {
-            ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - "
-                      "Inform the receiver that all samples were written\n"));
-            starter->set_reader_properties (this->start_key_ - 1, this->start_iteration_ - 1);
-
-            starter->start_read (this->topic_name_.c_str());
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - "
-                      "ERROR: unable to get connection to the ReaderStarter\n"));
-          }
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - "
-                              "ERROR: Caught NonChangeable exception.\n"));
-      }
-    catch (const ::CORBA::Exception & e)
-      {
-        e._tao_print_exception("Sender_exec_i::start_event_test - ERROR");
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - "
-                    "ERROR: Unexpected and unknown exception caught.\n"));
-      }
-  }
-
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::RG_ResetTopic::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-     ACE_NEW_THROW_EX (this->to_handler_,
-                       Timeout_Handler (*this),
-                       ::CORBA::INTERNAL ());
-     if (this->reactor ()->schedule_timer (
-                 this->to_handler_,
-                 0,
-                 ACE_Time_Value (1, 0),
-                 ACE_Time_Value (10, 0)) == -1)
-       {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                               ACE_TEXT ("Error scheduling timer")));
-       }
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->reactor()->cancel_timer(this->to_handler_);
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    delete this->to_handler_;
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_RG_ResetTopic_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/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.h
deleted file mode 100644
index 1c2bad99935..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.h
+++ /dev/null
@@ -1,137 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_RG_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_
-#define CIAO_RG_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_
-
-#include /**/ "ace/pre.h"
-
-#include "RG_ResetTopic_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_RG_ResetTopic_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * Timeout_Handler
-   */
-  class Timeout_Handler :
-    public ACE_Event_Handler
-  {
-  public:
-    Timeout_Handler (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 &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void start_write (void);
-    //@}
-
-  private:
-    ::RG_ResetTopic::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Timeout_Handler *to_handler_;
-    ACE_CString topic_name_;
-    ::CORBA::UShort run_;
-    ::CORBA::UShort start_key_;
-    ::CORBA::UShort start_iteration_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_RG_ResetTopic_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/Plan.cdp
deleted file mode 100644
index 4fb7f92d5af..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/Plan.cdp
+++ /dev/null
@@ -1,461 +0,0 @@
-<!--  -->
-<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>ResetTopic_Depl_1</label>
-  <UUID>ResetTopic_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_ResetTopic_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_ResetTopic_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="ResetTopic_EventConnectorImplementation">
-    <name>ResetTopic_EventConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="ResetTopic_Connector_ExecArtifact" />
-    <artifact xmi:idref="ResetTopic_Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_ResetTopic_RG_ResetTopicSampleConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_ResetTopic_RG_ResetTopicSampleConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>RG_ResetTopic_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>RG_ResetTopic_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ResetTopic_StateConnectorImplementation">
-    <name>ResetTopic_StateConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="ResetTopic_Connector_ExecArtifact" />
-    <artifact xmi:idref="ResetTopic_Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_ResetTopic_RG_ResetTopicSampleConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_ResetTopic_RG_ResetTopicSampleConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>RG_ResetTopic_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>RG_ResetTopic_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>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_ResetTopic_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_RG_ResetTopic_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>
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="ResetTopic_SenderEventConnectorInstance">
-    <name>ResetTopic_SenderEventConnectorInstance</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="ResetTopic_EventConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ResetTopic1</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ResetTopic_Library#ResetTopicProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ResetTopic_ReceiverEventConnectorInstance">
-    <name>ResetTopic_ReceiverEventConnectorInstance</name>
-    <node>ReceiverNode</node>
-    <source/>
-    <implementation xmi:idref="ResetTopic_EventConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string></string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ResetTopic_Library#ResetTopicProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ResetTopic_ReceiverStateConnectorInstance">
-    <name>ResetTopic_ReceiverStateConnectorInstance</name>
-    <node>ReceiverNode</node>
-    <source/>
-    <implementation xmi:idref="ResetTopic_StateConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string></string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ResetTopic_Library#ResetTopicProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>reader_starter</name>
-    <internalEndpoint>
-      <portName>reader_start</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>start_reading</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>reader_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_read_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ResetTopic_ReceiverStateConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>getter_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ResetTopic_ReceiverEventConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="ResetTopic_SenderEventConnectorInstance" />
-    </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="ResetTopic_Connector_ExecArtifact">
-    <name>RG_ResetTopic_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>RG_ResetTopicConnector_exec</location>
-  </artifact>
-  <artifact xmi:id="ResetTopic_Connector_SvntArtifact">
-    <name>RG_ResetTopic_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>RG_ResetTopicConnector_svnt</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/ResetTopic/ReadGet/descriptors/ResetTopic_Library.xml b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/ResetTopic_Library.xml
deleted file mode 100644
index 9bf40140294..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/ResetTopic_Library.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="ResetTopicProfile">
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-    </datawriter_qos>
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index e3268d2c621..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  -->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <qos_library name="ResetTopic_Library">
-    <qos_profile name="ResetTopicProfile" is_default_qos="false">
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/run_test.pl
deleted file mode 100755
index 87984594507..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 60 seconds to allow task to complete\n";
-sleep (60);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl
deleted file mode 100644
index 6d757cd12fd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file TE_ResetTopic_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef TE_RESETTOPIC_BASE_IDL
-#define TE_RESETTOPIC_BASE_IDL
-
-#pragma ndds typesupport "Base/TE_ResetTopic_BaseSupport.h"
-#pragma opendds typesupport "Base/TE_ResetTopic_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TE_ResetTopicTest"
-#pragma DCPS_DATA_KEY "TE_ResetTopicTest key"
-
-struct TE_ResetTopicTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TE_ResetTopicTest> TE_ResetTopicTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.mpc
deleted file mode 100644
index 61e2f2252cd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (TE_ResetTopicBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = TE_ResetTopicBase_stub
-  dynamicflags += TE_RESETTOPIC_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=TE_RESETTOPIC_BASE_STUB_Export \
-              -Wb,stub_export_include=ResetTopic_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    TE_ResetTopic_Base.idl
-  }
-
-  opendds_ts_flags += --export=TE_RESETTOPIC_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    TE_ResetTopic_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl
deleted file mode 100644
index c3fd7df6416..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file TE_ResetTopic_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef TE_RESETTOPIC_CONNECTOR_IDL_
-#define TE_RESETTOPIC_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/TE_ResetTopic_Base.idl"
-
-#pragma ciao lem "Connector/TE_ResetTopic_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/TE_ResetTopic_BaseTypeSupport.idl"
-#endif
-
-module TE_ResetTopic
-{
-  module ::CCM_DDS::Typed < ::TE_ResetTopicTest, ::TE_ResetTopicTestSeq> TE_ResetTopicTestConnector;
-};
-
-#endif /* TE_ResetTopic_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc
deleted file mode 100644
index dfbb50208a0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p TE_ResetTopicBase -l .. -o ../lib -u DDS TE_ResetTopic_Connector"
-
-project (TE_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen TE_ResetTopicBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=TE_RESETTOPIC_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=ResetTopic_Connector_stub_export.h \
-              -Wb,skel_export_macro=TE_RESETTOPIC_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=ResetTopic_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=TE_RESETTOPIC_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=ResetTopic_Connector_svnt_export.h \
-              -Wb,conn_export_macro=TE_RESETTOPIC_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=ResetTopic_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    TE_ResetTopic_Connector.idl
-  }
-}
-
-project (TE_ResetTopicConnector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += TE_ResetTopicConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=TE_RESETTOPIC_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=TE_ResetTopic_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    TE_ResetTopic_ConnectorE.idl
-  }
-}
-
-project (TE_ResetTopicConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += TE_ResetTopicConnector_lem_gen TE_ResetTopicConnector_stub \
-           TE_ResetTopicBase_stub
-  libs  += TE_ResetTopicBase_stub TE_ResetTopicConnector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = TE_ResetTopicConnector_lem_stub
-  dynamicflags += TE_RESETTOPIC_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TE_ResetTopic_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    TE_ResetTopic_ConnectorEC.h
-    TE_ResetTopic_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    TE_ResetTopic_ConnectorEC.inl
-  }
-}
-
-project (TE_ResetTopicConnector_stub) : ccm_stub, dds4ccm_base {
-  after += TE_ResetTopicConnector_idl_gen TE_ResetTopicBase_stub
-  libs  += TE_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = TE_ResetTopicConnector_stub
-  dynamicflags += TE_RESETTOPIC_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TE_ResetTopic_ConnectorC.cpp
-  }
-
-  Header_Files {
-    TE_ResetTopic_ConnectorC.h
-    TE_ResetTopic_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    TE_ResetTopic_ConnectorC.inl
-  }
-}
-
-project (TE_ResetTopicConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += TE_ResetTopicConnector_lem_stub TE_ResetTopicConnector_stub \
-             TE_ResetTopicBase_stub
-  sharedname = TE_ResetTopicConnector_exec
-  libs += TE_ResetTopicConnector_stub TE_ResetTopicConnector_lem_stub \
-          TE_ResetTopicBase_stub TE_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += TE_RESETTOPIC_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TE_ResetTopic_Connector_conn.cpp
-  }
-
-  Header_Files {
-    TE_ResetTopic_Connector_conn.h
-    TE_ResetTopic_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (TE_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += TE_ResetTopicConnector_lem_stub TE_ResetTopicConnector_exec \
-                TE_ResetTopicConnector_stub
-  sharedname  = TE_ResetTopicConnector_svnt
-  libs       += TE_ResetTopicConnector_stub \
-                TE_ResetTopicConnector_lem_stub  \
-                TE_ResetTopicBase_stub \
-                TE_ResetTopicConnector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += TE_RESETTOPIC_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TE_ResetTopic_ConnectorS.cpp
-    TE_ResetTopic_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    TE_ResetTopic_ConnectorS.h
-    TE_ResetTopic_Connector_svnt.h
-    TE_ResetTopic_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/SenderDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/SenderDriver.cpp
deleted file mode 100644
index fe3281faba3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/SenderDriver.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * @file SenderDriver.cpp
- *
- * @author Marcel Smit
- */
-
-
-#include "TE_ResetTopic_SenderC.h"
-#include "ace/streams.h"
-#include "ace/Get_Opt.h"
-
-const ACE_TCHAR *sender_ior = ACE_TEXT ("file://Sender.ior");
-const ACE_TCHAR *topic_name = ACE_TEXT ("");
-
-int
-parse_args (int argc, ACE_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("ek:n:"));
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    {
-      switch (c)
-        {
-          case 'k':
-            sender_ior = get_opts.opt_arg ();
-            break;
-
-          case 'n':
-            topic_name = get_opts.opt_arg ();
-            break;
-
-          case 'e':
-            topic_name = "";
-            break;
-
-          case '?':
-          default:
-            ACE_ERROR_RETURN ((LM_ERROR,
-                              "usage:  %s\n"
-                              "-k <Sender IOR> (default is file://Sender.ior)\n"
-                              "-n <new topic>\n"
-                              "-e <clearing topic name>\n"
-                              "\n",
-                              argv [0]),
-                              -1);
-        }
-    }
-
-  return 0;
-}
-
-
-int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
-{
-  try
-    {
-      // initialize the ORB
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv);
-      if (parse_args (argc, argv) != 0)
-        {
-          return -1;
-        }
-
-      // create the factory object reference,
-      CORBA::Object_var sender_obj =
-        orb->string_to_object (sender_ior);
-
-      // downcast the object reference to the appropriate type
-      ::TE_ResetTopic::Sender_var sender =
-        ::TE_ResetTopic::Sender::_narrow (sender_obj.in ());
-
-      if (CORBA::is_nil (sender.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                            "Unable to acquire 'Sender' objref\n"),
-                            -1);
-        }
-      sender->set_new_topic (topic_name);
-
-      orb->destroy ();
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("Who is the culprit in the SenderDriver?\n");
-      ACE_ERROR_RETURN ((LM_ERROR,
-                          "Uncaught CORBA exception\n"),
-                        1);
-    }
-  return 0;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl
deleted file mode 100644
index 91e45c7c88c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef TE_RESETTOPIC_SENDER_IDL
-#define TE_RESETTOPIC_SENDER_IDL
-
-#include "Connector/TE_ResetTopic_Connector.idl"
-
-module TE_ResetTopic
-{
-  interface ChangeTopicInterface
-  {
-    void set_new_topic (in string topic_name);
-  };
-
-  component Sender supports ChangeTopicInterface
-  {
-    port TE_ResetTopicTestConnector::DDS_Write  info_write;
-    port TE_ResetTopicTestConnector::DDS_Update info_update;
-
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc
deleted file mode 100644
index 4a4b30c044b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc
+++ /dev/null
@@ -1,164 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p TE_ResetTopicBase -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project (TE_ResetTopicSender_idl_gen) : componentidldefaults, dds4ccm {
-  after += TE_ResetTopicConnector_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 {
-    TE_ResetTopic_Sender.idl
-  }
-}
-
-project (TE_ResetTopicSender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += TE_ResetTopicSender_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 {
-    TE_ResetTopic_SenderE.idl
-  }
-}
-
-project (TE_ResetTopicSender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += TE_ResetTopicSender_lem_gen TE_ResetTopicSender_stub TE_ResetTopicBase_stub
-  libs  += TE_ResetTopicBase_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TE_ResetTopic_SenderEC.cpp
-  }
-
-  Header_Files {
-    TE_ResetTopic_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    TE_ResetTopic_SenderEC.inl
-  }
-}
-
-project (TE_ResetTopicSender_stub) : ccm_stub, dds4ccm_base {
-  after += TE_ResetTopicSender_idl_gen TE_ResetTopicBase_stub TE_ResetTopicConnector_stub
-  libs  += TE_ResetTopicBase_stub TE_ResetTopicConnector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TE_ResetTopic_SenderC.cpp
-  }
-
-  Header_Files {
-    TE_ResetTopic_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    TE_ResetTopic_SenderC.inl
-  }
-}
-
-project (TE_ResetTopicSender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += TE_ResetTopicSender_lem_stub TE_ResetTopicSender_stub \
-             TE_ResetTopicConnector_lem_stub TE_ResetTopicConnector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub TE_ResetTopicBase_stub \
-          TE_ResetTopicConnector_lem_stub TE_ResetTopicConnector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TE_ResetTopic_Sender_exec.cpp
-  }
-
-  Header_Files {
-    TE_ResetTopic_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (TE_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += TE_ResetTopicBase_stub  TE_ResetTopicSender_lem_stub TE_ResetTopicConnector_stub \
-                TE_ResetTopicConnector_svnt TE_ResetTopicConnector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                TE_ResetTopicBase_stub TE_ResetTopicConnector_stub TE_ResetTopicConnector_svnt TE_ResetTopicConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TE_ResetTopic_SenderS.cpp
-    TE_ResetTopic_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    TE_ResetTopic_SenderS.h
-    TE_ResetTopic_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-project (TE_ResetTopicSender_Driver) : ccm_stub, valuetype, dds4ccm_lem_stub {
-  exename = SenderDriver
-  after += TE_ResetTopicSender_stub TE_ResetTopicConnector_stub
-  libs  += Sender_stub TE_ResetTopicBase_stub TE_ResetTopicConnector_stub
-
-  includes += ..
-  libpaths += ../lib
-
-  exeout = ../lib
-  IDL_Files {
-  }
-
-  Source_Files {
-    SenderDriver.cpp
-  }
-
-  Header_Files {
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp
deleted file mode 100644
index c132f64a7ef..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp
+++ /dev/null
@@ -1,385 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "TE_ResetTopic_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_TE_ResetTopic_Sender_Impl
-{
-
-  /**
-   * Timeout_Handler
-   */
-
-  Timeout_Handler::Timeout_Handler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.start_event_test ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : iterations_ (0)
-    , keys_ (0)
-    , to_handler_ (0)
-    , topic_name_ ("TopicI")
-    , old_topic_name_ ("TopicI")
-    {
-     ACE_NEW_THROW_EX (this->to_handler_,
-                       Timeout_Handler (*this),
-                       ::CORBA::INTERNAL ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->to_handler_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void Sender_exec_i::set_new_topic (const char * topic_name)
-  {
-    ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_);
-
-    this->old_topic_name_ = this->topic_name_;
-    this->topic_name_ = topic_name;
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_new_topic - "
-              "New topic name set <%C>\n",
-              topic_name));
-  }
-
-  void
-  Sender_exec_i::create_samples (void)
-  {
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        TE_ResetTopicTest *new_key = new TE_ResetTopicTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->iteration = 0;
-        this->tests_[key] = new_key;
-
-        ::TE_ResetTopic::TE_ResetTopicTestConnector::Updater_var updater =
-          this->ciao_context_->get_connection_info_update_data();
-
-        updater->create_one (*new_key);
-        ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::create_samples - "
-                  "Sample <%C> created\n",
-                  key));
-      }
-  }
-
-  void
-  Sender_exec_i::set_topic_name (const char * topic_name)
-  {
-    if (ACE_OS::strcmp (topic_name, this->old_topic_name_.c_str()) != 0)
-      {
-        this->old_topic_name_ = topic_name;
-        this->set_topic_name_writer (topic_name);
-        this->set_topic_name_updater (topic_name);
-      }
-  }
-
-  void
-  Sender_exec_i::set_topic_name_writer (const char * topic_name)
-  {
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_writer - "
-                  "Setting topic to <%C>\n",
-                  topic_name));
-        ::TE_ResetTopic::TE_ResetTopicTestConnector:: Writer_var writer =
-          this->ciao_context_->get_connection_info_write_data ();
-        if (::CORBA::is_nil (writer.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                                  "Unable to get writer interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        ::CORBA::Object_var cmp = writer->_get_component ();
-        if (::CORBA::is_nil (cmp.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                                  "Unable to get component interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        ::TE_ResetTopic::TE_ResetTopicTestConnector::CCM_DDS_Event_var conn =
-          ::TE_ResetTopic::TE_ResetTopicTestConnector::CCM_DDS_Event::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                                  "Unable to narrow connector interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        {
-          ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_);
-          conn->topic_name (topic_name);
-        }
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                    "Caught NonChangeable exception.\n"));
-      }
-  }
-
-  void
-  Sender_exec_i::set_topic_name_updater (const char * topic_name)
-  {
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_updater - "
-                  "Setting topic to <%C>\n",
-                  topic_name));
-        ::TE_ResetTopic::TE_ResetTopicTestConnector:: Updater_var updater =
-          this->ciao_context_->get_connection_info_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                                  "Unable to get updater interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        ::CORBA::Object_var cmp = updater->_get_component ();
-        if (::CORBA::is_nil (cmp.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                                  "Unable to get component interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        ::TE_ResetTopic::TE_ResetTopicTestConnector::CCM_DDS_State_var conn =
-          ::TE_ResetTopic::TE_ResetTopicTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                                  "Unable to narrow connector interface\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        {
-          ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_);
-          conn->topic_name (topic_name);
-        }
-        this->create_samples ();
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                    "Caught NonChangeable exception.\n"));
-      }
-  }
-
-  void
-  Sender_exec_i::start_event_test (void)
-  {
-    // Set the topic name on the connector first. Therefor we need to
-    // get to the connector first.
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - Start\n"));
-
-    try
-      {
-        for (::CORBA::UShort key = 1; key < this->keys_ + 1; ++key)
-          {
-            TE_ResetTopicTest sample;
-            char tmp[7];
-            ACE_OS::sprintf (tmp, "KEY_%d", key);
-            sample.key = CORBA::string_dup(tmp);
-
-            for (::CORBA::UShort iter = 1; iter < this->iterations_ + 1; ++iter)
-              {
-                this->set_topic_name (this->topic_name_.c_str ());
-                ::TE_ResetTopic::TE_ResetTopicTestConnector:: Writer_var writer =
-                  this->ciao_context_->get_connection_info_write_data ();
-                sample.iteration = iter;
-                writer->write_one (sample, ::DDS::HANDLE_NIL);
-
-                ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - "
-                            "Sample for topic <%C> written : key <%C> - iteration <%d>\n",
-                            this->topic_name_.c_str (), tmp, iter));
-
-                ACE_Time_Value tv (0, 5000);
-                ACE_OS::sleep (tv);
-              }
-          }
-        for (Sample_Table::iterator iter = this->tests_.begin ();
-            iter != this->tests_.end ();
-            ++iter)
-          {
-            for (::CORBA::UShort i = 1; i < this->iterations_ + 1; ++i)
-              {
-                this->set_topic_name (this->topic_name_.c_str ());
-                ::TE_ResetTopic::TE_ResetTopicTestConnector:: Updater_var updater =
-                  this->ciao_context_->get_connection_info_update_data ();
-                iter->second->iteration = i;
-                updater->update_one (iter->second, ::DDS::HANDLE_NIL);
-
-                ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - "
-                            "Sample for topic <%C> updated : key <%C> - iteration <%d>\n",
-                            this->topic_name_.c_str (),
-                            iter->second->key.in (),
-                            i));
-
-                ACE_Time_Value tv (0, 5000);
-                ACE_OS::sleep (tv);
-              }
-          }
-      }
-    catch (const ::CORBA::BAD_INV_ORDER & ex)
-      {
-        if (this->topic_name_.empty())
-          ACE_DEBUG ((LM_DEBUG, "Expected BAD_INV_ORDER caught\n"));
-        else
-          ex._tao_print_exception("ERROR:");
-      }
-    catch (const ::CORBA::Exception & ex)
-      {
-        ex._tao_print_exception("ERROR:");
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - "
-                    "ERROR: Unexpected and unknown exception caught.\n"));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::TE_ResetTopic::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    this->create_samples ();
-    if (this->reactor ()->schedule_timer (
-                this->to_handler_,
-                0,
-                ACE_Time_Value (5, 0),
-                ACE_Time_Value (5, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->reactor()->cancel_timer(this->to_handler_);
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_TE_ResetTopic_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/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.h
deleted file mode 100644
index f7152f8cdb5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.h
+++ /dev/null
@@ -1,145 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_TE_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_
-#define CIAO_TE_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_
-
-#include /**/ "ace/pre.h"
-
-#include "TE_ResetTopic_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_TE_ResetTopic_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * Timeout_Handler
-   */
-  class Timeout_Handler :
-    public ACE_Event_Handler
-  {
-  public:
-    Timeout_Handler (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 &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-    virtual void set_new_topic (const char * topic_name);
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void set_topic_name (const char * topic_name);
-    void set_topic_name_writer (const char * topic_name);
-    void set_topic_name_updater (const char * topic_name);
-    void start_event_test (void);
-    //@}
-
-  private:
-    ::TE_ResetTopic::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Timeout_Handler *to_handler_;
-    ACE_CString topic_name_, old_topic_name_;
-
-    TAO_SYNCH_RECURSIVE_MUTEX topic_name_lock_;
-
-    typedef std::map<ACE_CString, TE_ResetTopicTest_var> Sample_Table;
-
-    Sample_Table tests_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void create_samples (void);
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_TE_ResetTopic_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/Plan.cdp
deleted file mode 100644
index 6c3375f91f0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/Plan.cdp
+++ /dev/null
@@ -1,338 +0,0 @@
-<!--  -->
-<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>ResetTopic_Depl_1</label>
-  <UUID>ResetTopic_Depl_1</UUID>
-
-  <implementation xmi:id="ResetTopic_EventConnectorImplementation">
-    <name>ResetTopic_EventConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="ResetTopic_Connector_ExecArtifact" />
-    <artifact xmi:idref="ResetTopic_Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TE_ResetTopic_TE_ResetTopicTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TE_ResetTopic_TE_ResetTopicTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TE_ResetTopic_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TE_ResetTopic_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ResetTopic_StateConnectorImplementation">
-    <name>ResetTopic_StateConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="ResetTopic_Connector_ExecArtifact" />
-    <artifact xmi:idref="ResetTopic_Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TE_ResetTopic_TE_ResetTopicTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TE_ResetTopic_TE_ResetTopicTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TE_ResetTopic_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TE_ResetTopic_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>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TE_ResetTopic_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TE_ResetTopic_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="ResetTopic_SenderEventConnectorInstance">
-    <name>ResetTopic_SenderEventConnectorInstance</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="ResetTopic_EventConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TopicI</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ResetTopic_SenderStateConnectorInstance">
-    <name>ResetTopic_SenderStateConnectorInstance</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="ResetTopic_StateConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TopicI</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>15</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="ResetTopic_SenderEventConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>updater_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ResetTopic_SenderStateConnectorInstance" />
-    </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="ResetTopic_Connector_ExecArtifact">
-    <name>TE_ResetTopic_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>TE_ResetTopicConnector_exec</location>
-  </artifact>
-  <artifact xmi:id="ResetTopic_Connector_SvntArtifact">
-    <name>TE_ResetTopic_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>TE_ResetTopicConnector_svnt</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/ResetTopic/ToEmpty/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/run_test.pl
deleted file mode 100755
index 54d573aae7b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/run_test.pl
+++ /dev/null
@@ -1,264 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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 = 1;
-@ports = ( 60001 );
-@iorbases = ( "SenderNode.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode" );
-
-# 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 10 seconds before clearing the topic name\n";
-sleep (10);
-
-$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-e");
-$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-if ($driver_status != 0) {
-    print STDERR "ERROR: unable to launch driver\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Sleeping 10 seconds before setting the topic name again\n";
-sleep (10);
-
-$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-n TopicIII");
-$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-if ($driver_status != 0) {
-    print STDERR "ERROR: unable to launch driver\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Sleeping 10 seconds before stopping\n";
-sleep (10);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl
deleted file mode 100644
index 03570b30e51..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file TL_ResetTopic_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef TL_RESETTOPIC_BASE_IDL
-#define TL_RESETTOPIC_BASE_IDL
-
-#pragma ndds typesupport "Base/TL_ResetTopic_BaseSupport.h"
-#pragma opendds typesupport "Base/TL_ResetTopic_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TL_ResetTopicTest"
-#pragma DCPS_DATA_KEY "TL_ResetTopicTest key"
-
-struct TL_ResetTopicTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TL_ResetTopicTest> TL_ResetTopicTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.mpc
deleted file mode 100644
index 39c3065fb40..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (TL_ResetTopicBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = TL_ResetTopicBase_stub
-  dynamicflags += TL_RESETTOPIC_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=TL_RESETTOPIC_BASE_STUB_Export \
-              -Wb,stub_export_include=ResetTopic_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    TL_ResetTopic_Base.idl
-  }
-
-  opendds_ts_flags += --export=TL_RESETTOPIC_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    TL_ResetTopic_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl
deleted file mode 100644
index aa04ebb5c4f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file TL_ResetTopic_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef TL_RESETTOPIC_CONNECTOR_IDL_
-#define TL_RESETTOPIC_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/TL_ResetTopic_Base.idl"
-
-#pragma ciao lem "Connector/TL_ResetTopic_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/TL_ResetTopic_BaseTypeSupport.idl"
-#endif
-
-module TL_ResetTopic
-{
-  module ::CCM_DDS::Typed < ::TL_ResetTopicTest, ::TL_ResetTopicTestSeq> TL_ResetTopicTestConnector;
-};
-
-#endif /* TL_ResetTopic_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc
deleted file mode 100644
index c8da3fd3e86..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p TL_ResetTopicBase -l .. -o ../lib -u DDS TL_ResetTopic_Connector"
-
-project (TL_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen TL_ResetTopicBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=TL_RESETTOPIC_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=ResetTopic_Connector_stub_export.h \
-              -Wb,skel_export_macro=TL_RESETTOPIC_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=ResetTopic_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=TL_RESETTOPIC_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=ResetTopic_Connector_svnt_export.h \
-              -Wb,conn_export_macro=TL_RESETTOPIC_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=ResetTopic_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    TL_ResetTopic_Connector.idl
-  }
-}
-
-project (TL_ResetTopicConnector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += TL_ResetTopicConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=TL_RESETTOPIC_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=TL_ResetTopic_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    TL_ResetTopic_ConnectorE.idl
-  }
-}
-
-project (TL_ResetTopicConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += TL_ResetTopicConnector_lem_gen TL_ResetTopicConnector_stub \
-           TL_ResetTopicBase_stub
-  libs  += TL_ResetTopicBase_stub TL_ResetTopicConnector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = TL_ResetTopicConnector_lem_stub
-  dynamicflags += TL_RESETTOPIC_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TL_ResetTopic_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    TL_ResetTopic_ConnectorEC.h
-    TL_ResetTopic_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    TL_ResetTopic_ConnectorEC.inl
-  }
-}
-
-project (TL_ResetTopicConnector_stub) : ccm_stub, dds4ccm_base {
-  after += TL_ResetTopicConnector_idl_gen TL_ResetTopicBase_stub
-  libs  += TL_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = TL_ResetTopicConnector_stub
-  dynamicflags += TL_RESETTOPIC_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TL_ResetTopic_ConnectorC.cpp
-  }
-
-  Header_Files {
-    TL_ResetTopic_ConnectorC.h
-    TL_ResetTopic_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    TL_ResetTopic_ConnectorC.inl
-  }
-}
-
-project (TL_ResetTopicConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += TL_ResetTopicConnector_lem_stub TL_ResetTopicConnector_stub \
-             TL_ResetTopicBase_stub
-  sharedname = TL_ResetTopicConnector_exec
-  libs += TL_ResetTopicConnector_stub TL_ResetTopicConnector_lem_stub \
-          TL_ResetTopicBase_stub TL_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += TL_RESETTOPIC_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TL_ResetTopic_Connector_conn.cpp
-  }
-
-  Header_Files {
-    TL_ResetTopic_Connector_conn.h
-    TL_ResetTopic_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (TL_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += TL_ResetTopicConnector_lem_stub TL_ResetTopicConnector_exec \
-                TL_ResetTopicConnector_stub
-  sharedname  = TL_ResetTopicConnector_svnt
-  libs       += TL_ResetTopicConnector_stub \
-                TL_ResetTopicConnector_lem_stub  \
-                TL_ResetTopicBase_stub \
-                TL_ResetTopicConnector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += TL_RESETTOPIC_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TL_ResetTopic_ConnectorS.cpp
-    TL_ResetTopic_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    TL_ResetTopic_ConnectorS.h
-    TL_ResetTopic_Connector_svnt.h
-    TL_ResetTopic_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/SenderDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/SenderDriver.cpp
deleted file mode 100644
index e60e2bb678c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/SenderDriver.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * @file SenderDriver.cpp
- *
- * @author Marcel Smit
- */
-
-
-#include "TL_ResetTopic_SenderC.h"
-#include "ace/streams.h"
-#include "ace/Get_Opt.h"
-
-const ACE_TCHAR *sender_ior = ACE_TEXT ("file://Sender.ior");
-const ACE_TCHAR *topic_name = ACE_TEXT ("");
-
-int
-parse_args (int argc, ACE_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("ek:n:"));
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    {
-      switch (c)
-        {
-          case 'k':
-            sender_ior = get_opts.opt_arg ();
-            break;
-
-          case 'n':
-            topic_name = get_opts.opt_arg ();
-            break;
-
-          case 'e':
-            topic_name = "";
-            break;
-
-          case '?':
-          default:
-            ACE_ERROR_RETURN ((LM_ERROR,
-                              "usage:  %s\n"
-                              "-k <Sender IOR> (default is file://Sender.ior)\n"
-                              "-n <new topic>\n"
-                              "-e <clearing topic name>\n"
-                              "\n",
-                              argv [0]),
-                              -1);
-        }
-    }
-
-  return 0;
-}
-
-
-int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
-{
-  try
-    {
-      // initialize the ORB
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv);
-      if (parse_args (argc, argv) != 0)
-        {
-          return -1;
-        }
-
-      // create the factory object reference,
-      CORBA::Object_var sender_obj =
-        orb->string_to_object (sender_ior);
-
-      // downcast the object reference to the appropriate type
-      ::TL_ResetTopic::Sender_var sender =
-        ::TL_ResetTopic::Sender::_narrow (sender_obj.in ());
-
-      if (CORBA::is_nil (sender.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                            "Unable to acquire 'Sender' objref\n"),
-                            -1);
-        }
-      sender->set_new_topic (topic_name);
-
-      orb->destroy ();
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("Who is the culprit in the SenderDriver?\n");
-      ACE_ERROR_RETURN ((LM_ERROR,
-                          "Uncaught CORBA exception\n"),
-                        1);
-    }
-  return 0;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl
deleted file mode 100644
index 0e5fe02ca5d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef TL_RESETTOPIC_SENDER_IDL
-#define TL_RESETTOPIC_SENDER_IDL
-
-#include "Connector/TL_ResetTopic_Connector.idl"
-
-module TL_ResetTopic
-{
-  interface ChangeTopicInterface
-  {
-    void set_new_topic (in string topic_name);
-  };
-
-  component Sender supports ChangeTopicInterface
-  {
-    port TL_ResetTopicTestConnector::DDS_Write  info_write;
-    port TL_ResetTopicTestConnector::DDS_Update info_update;
-
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc
deleted file mode 100644
index 8e2b8189b89..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc
+++ /dev/null
@@ -1,164 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p TL_ResetTopicBase -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project (TL_ResetTopicSender_idl_gen) : componentidldefaults, dds4ccm {
-  after += TL_ResetTopicConnector_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 {
-    TL_ResetTopic_Sender.idl
-  }
-}
-
-project (TL_ResetTopicSender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += TL_ResetTopicSender_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 {
-    TL_ResetTopic_SenderE.idl
-  }
-}
-
-project (TL_ResetTopicSender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += TL_ResetTopicSender_lem_gen TL_ResetTopicSender_stub TL_ResetTopicBase_stub
-  libs  += TL_ResetTopicBase_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TL_ResetTopic_SenderEC.cpp
-  }
-
-  Header_Files {
-    TL_ResetTopic_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    TL_ResetTopic_SenderEC.inl
-  }
-}
-
-project (TL_ResetTopicSender_stub) : ccm_stub, dds4ccm_base {
-  after += TL_ResetTopicSender_idl_gen TL_ResetTopicBase_stub TL_ResetTopicConnector_stub
-  libs  += TL_ResetTopicBase_stub TL_ResetTopicConnector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TL_ResetTopic_SenderC.cpp
-  }
-
-  Header_Files {
-    TL_ResetTopic_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    TL_ResetTopic_SenderC.inl
-  }
-}
-
-project (TL_ResetTopicSender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += TL_ResetTopicSender_lem_stub TL_ResetTopicSender_stub \
-             TL_ResetTopicConnector_lem_stub TL_ResetTopicConnector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub TL_ResetTopicBase_stub \
-          TL_ResetTopicConnector_lem_stub TL_ResetTopicConnector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TL_ResetTopic_Sender_exec.cpp
-  }
-
-  Header_Files {
-    TL_ResetTopic_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (TL_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += TL_ResetTopicBase_stub  TL_ResetTopicSender_lem_stub TL_ResetTopicConnector_stub \
-                TL_ResetTopicConnector_svnt TL_ResetTopicConnector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                TL_ResetTopicBase_stub TL_ResetTopicConnector_stub TL_ResetTopicConnector_svnt TL_ResetTopicConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TL_ResetTopic_SenderS.cpp
-    TL_ResetTopic_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    TL_ResetTopic_SenderS.h
-    TL_ResetTopic_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-project (TL_ResetTopicSender_Driver) : ccm_stub, valuetype, dds4ccm_lem_stub {
-  exename = SenderDriver
-  after += TL_ResetTopicSender_stub TL_ResetTopicConnector_stub
-  libs  += Sender_stub TL_ResetTopicBase_stub TL_ResetTopicConnector_stub
-
-  includes += ..
-  libpaths += ../lib
-
-  exeout = ../lib
-  IDL_Files {
-  }
-
-  Source_Files {
-    SenderDriver.cpp
-  }
-
-  Header_Files {
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.cpp
deleted file mode 100644
index 41f3ba0cdd9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.cpp
+++ /dev/null
@@ -1,426 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "TL_ResetTopic_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_TL_ResetTopic_Sender_Impl
-{
-
-  /**
-   * Timeout_Handler
-   */
-
-  Timeout_Handler::Timeout_Handler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.start_event_test ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : iterations_ (0)
-    , keys_ (0)
-    , to_handler_ (0)
-    , topic_name_ ("TopicI")
-    , old_topic_name_ ("TopicI")
-    {
-     ACE_NEW_THROW_EX (this->to_handler_,
-                       Timeout_Handler (*this),
-                       ::CORBA::INTERNAL ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->to_handler_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void Sender_exec_i::set_new_topic (const char * topic_name)
-  {
-    ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_);
-
-    this->old_topic_name_ = this->topic_name_;
-    this->topic_name_ = topic_name;
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_new_topic - "
-              "New topic name set <%C>\n",
-              topic_name));
-  }
-
-  void
-  Sender_exec_i::create_samples (void)
-  {
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        TL_ResetTopicTest *new_key = new TL_ResetTopicTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->iteration = 0;
-        this->tests_[key] = new_key;
-
-        ::TL_ResetTopic::TL_ResetTopicTestConnector::Updater_var updater =
-          this->ciao_context_->get_connection_info_update_data();
-
-        updater->create_one (*new_key);
-        ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::create_samples - "
-                  "Sample <%C> created\n",
-                  key));
-      }
-  }
-
-  bool
-  Sender_exec_i::set_topic_name (const char * topic_name)
-  {
-    if (ACE_OS::strcmp (topic_name, this->old_topic_name_.c_str()) != 0)
-      {
-        this->old_topic_name_ = topic_name;
-        bool ret = this->set_topic_name_writer (topic_name);
-        ret |= this->set_topic_name_updater (topic_name);
-        return ret;
-      }
-    if (ACE_OS::strlen (this->topic_name_.c_str()) > 256)
-      return false;
-    return true;
-  }
-
-  bool
-  Sender_exec_i::set_topic_name_writer (const char * topic_name)
-  {
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_writer - "
-                  "Setting topic to <%C>\n",
-                  topic_name));
-        ::TL_ResetTopic::TL_ResetTopicTestConnector:: Writer_var writer =
-          this->ciao_context_->get_connection_info_write_data ();
-        if (::CORBA::is_nil (writer.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                                  "Unable to get writer interface\n"));
-            return false;
-          }
-        ::CORBA::Object_var cmp = writer->_get_component ();
-        if (::CORBA::is_nil (cmp.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                                  "Unable to get component interface\n"));
-            return false;
-          }
-        ::TL_ResetTopic::TL_ResetTopicTestConnector::CCM_DDS_Event_var conn =
-          ::TL_ResetTopic::TL_ResetTopicTestConnector::CCM_DDS_Event::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                                  "Unable to narrow connector interface\n"));
-            return false;
-          }
-        {
-          ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_, false);
-          conn->topic_name (topic_name);
-        }
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                    "Caught NonChangeable exception.\n"));
-        return false;
-      }
-    catch (const ::CCM_DDS::InternalError &)
-      {
-        if (ACE_OS::strlen (topic_name) > 256)
-          {
-            ACE_DEBUG ((LM_ERROR, "Sender_exec_i::set_topic_name_writer - "
-                      "Expected InternalErr exception caught.\n"));
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                      "Caught InternalError exception.\n"));
-          }
-        return false;
-      }
-    return true;
-  }
-
-  bool
-  Sender_exec_i::set_topic_name_updater (const char * topic_name)
-  {
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_updater - "
-                  "Setting topic to <%C>\n",
-                  topic_name));
-        ::TL_ResetTopic::TL_ResetTopicTestConnector:: Updater_var updater =
-          this->ciao_context_->get_connection_info_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                                  "Unable to get updater interface\n"));
-            return false;
-          }
-        ::CORBA::Object_var cmp = updater->_get_component ();
-        if (::CORBA::is_nil (cmp.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                                  "Unable to get component interface\n"));
-            return false;
-          }
-        ::TL_ResetTopic::TL_ResetTopicTestConnector::CCM_DDS_State_var conn =
-          ::TL_ResetTopic::TL_ResetTopicTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-        if (::CORBA::is_nil (conn.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                                  "Unable to narrow connector interface\n"));
-            return false;
-          }
-        {
-          ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_, false);
-          conn->topic_name (topic_name);
-        }
-        this->create_samples ();
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                    "Caught NonChangeable exception.\n"));
-        return false;
-      }
-    catch (const ::CCM_DDS::InternalError &)
-      {
-        if (ACE_OS::strlen (topic_name) > 256)
-          {
-            ACE_DEBUG ((LM_ERROR, "Sender_exec_i::set_topic_name_updater - "
-                      "Expected InternalErr exception caught.\n"));
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                      "Caught InternalError exception.\n"));
-          }
-        return false;
-      }
-    return true;
-  }
-
-  void
-  Sender_exec_i::start_event_test (void)
-  {
-    // Set the topic name on the connector first. Therefor we need to
-    // get to the connector first.
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - Start\n"));
-
-    try
-      {
-        for (::CORBA::UShort key = 1; key < this->keys_ + 1; ++key)
-          {
-            TL_ResetTopicTest sample;
-            char tmp[7];
-            ACE_OS::sprintf (tmp, "KEY_%d", key);
-            sample.key = CORBA::string_dup(tmp);
-
-            for (::CORBA::UShort iter = 1; iter < this->iterations_ + 1; ++iter)
-              {
-                if (this->set_topic_name (this->topic_name_.c_str ()))
-                  {
-                    ::TL_ResetTopic::TL_ResetTopicTestConnector:: Writer_var writer =
-                      this->ciao_context_->get_connection_info_write_data ();
-                    sample.iteration = iter;
-
-                    writer->write_one (sample, ::DDS::HANDLE_NIL);
-
-                    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - "
-                                "Sample for topic <%C> written : key <%C> - iteration <%d>\n",
-                                this->topic_name_.c_str (), tmp, iter));
-                  }
-
-                ACE_Time_Value tv (0, 5000);
-                ACE_OS::sleep (tv);
-              }
-          }
-        for (Sample_Table::iterator iter = this->tests_.begin ();
-            iter != this->tests_.end ();
-            ++iter)
-          {
-            for (::CORBA::UShort i = 1; i < this->iterations_ + 1; ++i)
-              {
-                if (this->set_topic_name (this->topic_name_.c_str ()))
-                  {
-                    ::TL_ResetTopic::TL_ResetTopicTestConnector:: Updater_var updater =
-                      this->ciao_context_->get_connection_info_update_data ();
-                    iter->second->iteration = i;
-                    updater->update_one (iter->second, ::DDS::HANDLE_NIL);
-
-                    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - "
-                                "Sample for topic <%C> updated : key <%C> - iteration <%d>\n",
-                                this->topic_name_.c_str (),
-                                iter->second->key.in (),
-                                i));
-                  }
-
-                ACE_Time_Value tv (0, 5000);
-                ACE_OS::sleep (tv);
-              }
-          }
-      }
-    catch (const ::CORBA::BAD_INV_ORDER & ex)
-      {
-        if (this->topic_name_.empty())
-          ACE_DEBUG ((LM_DEBUG, "Expected BAD_INV_ORDER caught\n"));
-        else
-          ex._tao_print_exception("ERROR:");
-      }
-    catch (const ::CORBA::Exception & ex)
-      {
-        ex._tao_print_exception("ERROR:");
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - "
-                    "ERROR: Unexpected and unknown exception caught.\n"));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::TL_ResetTopic::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    this->create_samples ();
-    if (this->reactor ()->schedule_timer (
-                this->to_handler_,
-                0,
-                ACE_Time_Value (5, 0),
-                ACE_Time_Value (5, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->reactor()->cancel_timer(this->to_handler_);
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_TL_ResetTopic_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/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.h
deleted file mode 100644
index 7d738c58864..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.h
+++ /dev/null
@@ -1,145 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_TL_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_
-#define CIAO_TL_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_
-
-#include /**/ "ace/pre.h"
-
-#include "TL_ResetTopic_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_TL_ResetTopic_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * Timeout_Handler
-   */
-  class Timeout_Handler :
-    public ACE_Event_Handler
-  {
-  public:
-    Timeout_Handler (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 &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-    virtual void set_new_topic (const char * topic_name);
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    bool set_topic_name (const char * topic_name);
-    bool set_topic_name_writer (const char * topic_name);
-    bool set_topic_name_updater (const char * topic_name);
-    void start_event_test (void);
-    //@}
-
-  private:
-    ::TL_ResetTopic::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Timeout_Handler *to_handler_;
-    ACE_CString topic_name_, old_topic_name_;
-
-    TAO_SYNCH_RECURSIVE_MUTEX topic_name_lock_;
-
-    typedef std::map<ACE_CString, TL_ResetTopicTest_var> Sample_Table;
-
-    Sample_Table tests_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void create_samples (void);
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_TL_ResetTopic_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/Plan.cdp
deleted file mode 100644
index df3801d2d1e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/Plan.cdp
+++ /dev/null
@@ -1,338 +0,0 @@
-<!--  -->
-<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>ResetTopic_Depl_1</label>
-  <UUID>ResetTopic_Depl_1</UUID>
-
-  <implementation xmi:id="ResetTopic_EventConnectorImplementation">
-    <name>ResetTopic_EventConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="ResetTopic_Connector_ExecArtifact" />
-    <artifact xmi:idref="ResetTopic_Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TL_ResetTopic_TL_ResetTopicTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TL_ResetTopic_TL_ResetTopicTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TL_ResetTopic_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TL_ResetTopic_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ResetTopic_StateConnectorImplementation">
-    <name>ResetTopic_StateConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="ResetTopic_Connector_ExecArtifact" />
-    <artifact xmi:idref="ResetTopic_Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TL_ResetTopic_TL_ResetTopicTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TL_ResetTopic_TL_ResetTopicTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TL_ResetTopic_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TL_ResetTopic_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>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TL_ResetTopic_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TL_ResetTopic_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="ResetTopic_SenderEventConnectorInstance">
-    <name>ResetTopic_SenderEventConnectorInstance</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="ResetTopic_EventConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TopicI</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ResetTopic_SenderStateConnectorInstance">
-    <name>ResetTopic_SenderStateConnectorInstance</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="ResetTopic_StateConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TopicI</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>15</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="ResetTopic_SenderEventConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>updater_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ResetTopic_SenderStateConnectorInstance" />
-    </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="ResetTopic_Connector_ExecArtifact">
-    <name>TL_ResetTopic_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>TL_ResetTopicConnector_exec</location>
-  </artifact>
-  <artifact xmi:id="ResetTopic_Connector_SvntArtifact">
-    <name>TL_ResetTopic_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>TL_ResetTopicConnector_svnt</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/ResetTopic/TooLong/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/run_test.pl
deleted file mode 100755
index 4bc6525e238..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/run_test.pl
+++ /dev/null
@@ -1,264 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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 = 1;
-@ports = ( 60001 );
-@iorbases = ( "SenderNode.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode" );
-
-# 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 10 seconds before clearing the topic name\n";
-sleep (10);
-
-$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-e");
-$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-if ($driver_status != 0) {
-    print STDERR "ERROR: unable to launch driver\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Sleeping 10 seconds before setting the topic name again\n";
-sleep (10);
-
-$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-n ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789");
-$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-if ($driver_status != 0) {
-    print STDERR "ERROR: unable to launch driver\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Sleeping 30 seconds before stopping\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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl
deleted file mode 100644
index 03998e8d565..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file UL_ResetTopic_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef UL_RESETTOPIC_BASE_IDL
-#define UL_RESETTOPIC_BASE_IDL
-
-#pragma ndds typesupport "Base/UL_ResetTopic_BaseSupport.h"
-#pragma opendds typesupport "Base/UL_ResetTopic_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "UL_ResetTopicTest"
-#pragma DCPS_DATA_KEY "UL_ResetTopicTest key"
-
-struct UL_ResetTopicTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<UL_ResetTopicTest> UL_ResetTopicTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.mpc
deleted file mode 100644
index 7fb1ef387eb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (UL_ResetTopicBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = UL_ResetTopicBase_stub
-  dynamicflags += UL_RESETTOPIC_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=UL_RESETTOPIC_BASE_STUB_Export \
-              -Wb,stub_export_include=ResetTopic_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    UL_ResetTopic_Base.idl
-  }
-
-  opendds_ts_flags += --export=UL_RESETTOPIC_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    UL_ResetTopic_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl
deleted file mode 100644
index 0ecc3800915..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file UL_ResetTopic_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef UL_RESETTOPIC_CONNECTOR_IDL_
-#define UL_RESETTOPIC_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/UL_ResetTopic_Base.idl"
-
-#pragma ciao lem "Connector/UL_ResetTopic_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/UL_ResetTopic_BaseTypeSupport.idl"
-#endif
-
-module UL_ResetTopic
-{
-  module ::CCM_DDS::Typed < ::UL_ResetTopicTest, ::UL_ResetTopicTestSeq> UL_ResetTopicTestConnector;
-};
-
-#endif /* UL_ResetTopic_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc
deleted file mode 100644
index b6886bbcf53..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p UL_ResetTopicBase -l .. -o ../lib -u DDS UL_ResetTopic_Connector"
-
-project (UL_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen UL_ResetTopicBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=UL_RESETTOPIC_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=ResetTopic_Connector_stub_export.h \
-              -Wb,skel_export_macro=UL_RESETTOPIC_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=ResetTopic_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=UL_RESETTOPIC_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=ResetTopic_Connector_svnt_export.h \
-              -Wb,conn_export_macro=UL_RESETTOPIC_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=ResetTopic_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    UL_ResetTopic_Connector.idl
-  }
-}
-
-project (UL_ResetTopicConnector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += UL_ResetTopicConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=UL_RESETTOPIC_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=UL_ResetTopic_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    UL_ResetTopic_ConnectorE.idl
-  }
-}
-
-project (UL_ResetTopicConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += UL_ResetTopicConnector_lem_gen UL_ResetTopicConnector_stub \
-           UL_ResetTopicBase_stub
-  libs  += UL_ResetTopicBase_stub UL_ResetTopicConnector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = UL_ResetTopicConnector_lem_stub
-  dynamicflags += UL_RESETTOPIC_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UL_ResetTopic_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    UL_ResetTopic_ConnectorEC.h
-    UL_ResetTopic_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    UL_ResetTopic_ConnectorEC.inl
-  }
-}
-
-project (UL_ResetTopicConnector_stub) : ccm_stub, dds4ccm_base {
-  after += UL_ResetTopicConnector_idl_gen UL_ResetTopicBase_stub
-  libs  += UL_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = UL_ResetTopicConnector_stub
-  dynamicflags += UL_RESETTOPIC_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UL_ResetTopic_ConnectorC.cpp
-  }
-
-  Header_Files {
-    UL_ResetTopic_ConnectorC.h
-    UL_ResetTopic_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    UL_ResetTopic_ConnectorC.inl
-  }
-}
-
-project (UL_ResetTopicConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += UL_ResetTopicConnector_lem_stub UL_ResetTopicConnector_stub \
-             UL_ResetTopicBase_stub
-  sharedname = UL_ResetTopicConnector_exec
-  libs += UL_ResetTopicConnector_stub UL_ResetTopicConnector_lem_stub \
-          UL_ResetTopicBase_stub UL_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += UL_RESETTOPIC_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UL_ResetTopic_Connector_conn.cpp
-  }
-
-  Header_Files {
-    UL_ResetTopic_Connector_conn.h
-    UL_ResetTopic_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (UL_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += UL_ResetTopicConnector_lem_stub UL_ResetTopicConnector_exec \
-                UL_ResetTopicConnector_stub
-  sharedname  = UL_ResetTopicConnector_svnt
-  libs       += UL_ResetTopicConnector_stub \
-                UL_ResetTopicConnector_lem_stub  \
-                UL_ResetTopicBase_stub \
-                UL_ResetTopicConnector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += UL_RESETTOPIC_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UL_ResetTopic_ConnectorS.cpp
-    UL_ResetTopic_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    UL_ResetTopic_ConnectorS.h
-    UL_ResetTopic_Connector_svnt.h
-    UL_ResetTopic_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp
deleted file mode 100644
index a73c5ac6764..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * @file ReceiverDriver.cpp
- *
- * @author Marcel Smit
- */
-
-
-#include "UL_ResetTopic_ReceiverC.h"
-#include "ace/streams.h"
-#include "ace/Get_Opt.h"
-
-const ACE_TCHAR *receiver_ior = ACE_TEXT ("file://Receiver.ior");
-const ACE_TCHAR *topic_name = ACE_TEXT ("");
-
-int
-parse_args (int argc, ACE_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:n:"));
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    {
-      switch (c)
-        {
-          case 'k':
-            receiver_ior = get_opts.opt_arg ();
-            break;
-
-          case 'n':
-            topic_name = get_opts.opt_arg ();
-            break;
-
-          case '?':
-          default:
-            ACE_ERROR_RETURN ((LM_ERROR,
-                              "usage:  %s\n"
-                              "-k <Receiver IOR> (default is file://Receiver.ior)\n"
-                              "-n <new topic>\n"
-                              "\n",
-                              argv [0]),
-                              -1);
-        }
-    }
-
-  return 0;
-}
-
-
-int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
-{
-  try
-    {
-      // initialize the ORB
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv);
-      if (parse_args (argc, argv) != 0)
-        {
-          return -1;
-        }
-
-      // create the factory object reference,
-      CORBA::Object_var receiver_obj =
-        orb->string_to_object (receiver_ior);
-
-      // downcast the object reference to the appropriate type
-      ::UL_ResetTopic::Receiver_var receiver =
-        ::UL_ResetTopic::Receiver::_narrow (receiver_obj.in ());
-
-      if (CORBA::is_nil (receiver.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                            "Unable to acquire 'Receiver' objref\n"),
-                            -1);
-        }
-      receiver->set_new_topic (topic_name);
-
-      orb->destroy ();
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("Who is the culprit in the ReceiverDriver?\n");
-      ACE_ERROR_RETURN ((LM_ERROR,
-                          "Uncaught CORBA exception\n"),
-                        1);
-    }
-  return 0;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.idl
deleted file mode 100644
index 425e76bcf0c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/UL_ResetTopic_Connector.idl"
-
-module UL_ResetTopic
-{
-  interface ChangeTopicInterface
-  {
-    void set_new_topic (in string topic_name);
-  };
-
-  component Receiver supports ChangeTopicInterface
-  {
-    port UL_ResetTopicTestConnector::DDS_StateListen info_out_state;
-
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc
deleted file mode 100644
index 355adcd4f08..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc
+++ /dev/null
@@ -1,160 +0,0 @@
-project (UL_ResetTopicReceiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += UL_ResetTopicConnector_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 {
-    UL_ResetTopic_Receiver.idl
-  }
-}
-
-project (UL_ResetTopicReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += UL_ResetTopicReceiver_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 {
-    UL_ResetTopic_ReceiverE.idl
-  }
-}
-
-project (UL_ResetTopicReceiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += UL_ResetTopicReceiver_lem_gen UL_ResetTopicReceiver_stub  UL_ResetTopicConnector_stub UL_ResetTopicBase_stub
-  libs  +=  Receiver_stub UL_ResetTopicConnector_stub UL_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UL_ResetTopic_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    UL_ResetTopic_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    UL_ResetTopic_ReceiverEC.inl
-  }
-}
-
-project (UL_ResetTopicReceiver_stub) : ccm_stub, dds4ccm_base {
-  after += UL_ResetTopicReceiver_idl_gen  UL_ResetTopicConnector_stub UL_ResetTopicBase_stub UL_ResetTopicConnector_lem_gen
-  libs  += UL_ResetTopicConnector_stub UL_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UL_ResetTopic_ReceiverC.cpp
-  }
-
-  Header_Files {
-    UL_ResetTopic_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    UL_ResetTopic_ReceiverC.inl
-  }
-}
-
-project (UL_ResetTopicReceiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += UL_ResetTopicReceiver_lem_stub UL_ResetTopicReceiver_stub \
-             UL_ResetTopicBase_stub UL_ResetTopicConnector_stub \
-             UL_ResetTopicConnector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub UL_ResetTopicBase_stub \
-          UL_ResetTopicConnector_stub UL_ResetTopicConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UL_ResetTopic_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    UL_ResetTopic_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (UL_ResetTopicReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   UL_ResetTopicReceiver_lem_stub UL_ResetTopicBase_stub UL_ResetTopicConnector_stub UL_ResetTopicConnector_svnt UL_ResetTopicReceiver_exec UL_ResetTopicConnector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub UL_ResetTopicBase_stub UL_ResetTopicConnector_stub UL_ResetTopicConnector_svnt Receiver_exec UL_ResetTopicConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UL_ResetTopic_ReceiverS.cpp
-    UL_ResetTopic_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    UL_ResetTopic_ReceiverS.h
-    UL_ResetTopic_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-project (UL_ResetTopicReceiver_Driver) : ccm_stub, valuetype, dds4ccm_lem_stub {
-  exename = ReceiverDriver
-  after += UL_ResetTopicReceiver_stub UL_ResetTopicConnector_stub
-  libs  += Receiver_stub UL_ResetTopicBase_stub UL_ResetTopicConnector_stub
-
-  includes += ..
-  libpaths += ../lib
-
-  exeout = ../lib
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReceiverDriver.cpp
-  }
-
-  Header_Files {
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp
deleted file mode 100644
index 0bc5cdedc51..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp
+++ /dev/null
@@ -1,328 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.4
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "UL_ResetTopic_Receiver_exec.h"
-
-namespace CIAO_UL_ResetTopic_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_out_state_data_listener_exec_i
-   */
-
-  info_out_state_data_listener_exec_i::info_out_state_data_listener_exec_i (
-        ::UL_ResetTopic::CCM_Receiver_Context_ptr ctx,
-        Atomic_Boolean &samples_received)
-    : ciao_context_ (
-        ::UL_ResetTopic::CCM_Receiver_Context::_duplicate (ctx))
-    , samples_received_(samples_received)
-  {
-  }
-
-  info_out_state_data_listener_exec_i::~info_out_state_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::UL_ResetTopic::UL_ResetTopicTestConnector::StateListener
-
-  void
-  info_out_state_data_listener_exec_i::on_creation (
-    const ::UL_ResetTopicTest & datum,
-    const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ACE_DEBUG ((LM_DEBUG, "info_out_state_data_listener_exec_i::on_creation - "
-              "Sample <%C> created\n",
-              datum.key.in ()));
-  }
-
-  void
-  info_out_state_data_listener_exec_i::on_one_update (
-    const ::UL_ResetTopicTest & datum,
-    const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    this->samples_received_ = true;
-    ACE_DEBUG ((LM_DEBUG, "info_out_state_data_listener_exec_i::on_one_update - "
-              "Sample <%C> updated: <%u>\n",
-              datum.key.in (),
-              datum.iteration));
-  }
-
-  void
-  info_out_state_data_listener_exec_i::on_many_updates (
-    const ::UL_ResetTopicTestSeq & /* data */,
-    const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_state_data_listener_exec_i::on_deletion (
-    const ::UL_ResetTopicTest & /* datum */,
-    const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_state_status_exec_i
-   */
-
-  info_out_state_status_exec_i::info_out_state_status_exec_i (
-        ::UL_ResetTopic::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::UL_ResetTopic::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_state_status_exec_i::~info_out_state_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_state_status_exec_i::on_requested_deadline_missed (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_state_status_exec_i::on_sample_lost (
-    ::DDS::DataReader_ptr /* the_reader */,
-    const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : iterations_ (0)
-    , samples_received_(false)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  void
-  Receiver_exec_i::set_new_topic (::CORBA::Object_ptr cmp,
-                                  const char * topic_name)
-  {
-    if (::CORBA::is_nil (cmp))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_topic_name_writer - "
-                              "Unable to get component interface\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-    ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_DDS_State_var conn =
-      ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_DDS_State::_narrow (cmp);
-    if (::CORBA::is_nil (conn.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_topic_name_writer - "
-                              "Unable to narrow connector interface\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-    conn->topic_name (topic_name);
-
-//     ::CCM_DDS::DataListenerControl_var dlc =
-//       this->ciao_context_->get_connection_info_out_event_data_control ();
-//     dlc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_exec_i::set_new_topic (const char * topic_name)
-  {
-    // The ReceiverDriver invokes this method. Therefor first check wether
-    // samples were received during last run
-
-    if (this->samples_received_.value())
-      ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_new_topic - "
-                  "OK, samples received during last run\n"));
-    else
-      ACE_ERROR ((LM_ERROR, "Receiver_exec_i::set_new_topic - "
-                  "ERROR: No samples received during last run\n"));
-
-    this->samples_received_ = false;
-
-    ::CORBA::Object_var cmp;
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_new_topic - "
-                  "Setting topic to <%C>\n",
-                  topic_name));
-        //First listener
-        ::UL_ResetTopic::UL_ResetTopicTestConnector::Reader_var reader =
-          this->ciao_context_->get_connection_info_out_state_data();
-
-        if (::CORBA::is_nil (reader.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_new_topic - "
-                                  "ciao_info_out_event_data_listener_ seems nil\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        cmp = reader->_get_component ();
-        this->set_new_topic (cmp.in (), topic_name);
-
-        //next listener
-        if (::CORBA::is_nil (this->ciao_info_out_state_status_.in ()))
-          {
-            ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_new_topic - "
-                                  "ciao_info_out_event_status_ seems nil\n"));
-          }
-        else
-          {
-            cmp = this->ciao_info_out_state_status_->_get_component ();
-            this->set_new_topic (cmp.in (), topic_name);
-          }
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_topic_name_writer - "
-                    "Caught NonChangeable exception.\n"));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_StateListener_ptr
-  Receiver_exec_i::get_info_out_state_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_state_data_listener_.in ()))
-      {
-        info_out_state_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_state_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->samples_received_),
-            ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_StateListener::_nil ());
-
-          this->ciao_info_out_state_data_listener_ = tmp;
-      }
-
-    return
-      ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_StateListener::_duplicate (
-        this->ciao_info_out_state_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_state_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_state_status_.in ()))
-      {
-        info_out_state_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_state_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_state_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_state_status_.in ());
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::UL_ResetTopic::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    ::CCM_DDS::StateListenerControl_var dlc =
-      this->ciao_context_->get_connection_info_out_state_data_control ();
-    dlc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->samples_received_.value())
-      ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_remove - "
-                  "OK, samples received during last run\n"));
-    else
-      ACE_ERROR ((LM_ERROR, "Receiver_exec_i::ccm_remove - "
-                  "ERROR: No samples received during last run\n"));
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_UL_ResetTopic_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/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h
deleted file mode 100644
index 34eae95bef7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h
+++ /dev/null
@@ -1,197 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.4
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_UL_RESETTOPIC_RECEIVER_EXEC_WHDIFX_H_
-#define CIAO_UL_RESETTOPIC_RECEIVER_EXEC_WHDIFX_H_
-
-#include /**/ "ace/pre.h"
-
-#include "UL_ResetTopic_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_UL_ResetTopic_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean> Atomic_Boolean;
-
-  /**
-   * Provider Executor Implementation Class: info_out_state_data_listener_exec_i
-   */
-
-  class info_out_state_data_listener_exec_i
-    : public virtual ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_StateListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_state_data_listener_exec_i (
-      ::UL_ResetTopic::CCM_Receiver_Context_ptr ctx,
-      Atomic_Boolean &samples_received);
-    virtual ~info_out_state_data_listener_exec_i (void);
-
-    /** @name Operations and attributes from UL_ResetTopic::UL_ResetTopicTestConnector::StateListener */
-    //@{
-
-    virtual
-    void on_creation (
-      const ::UL_ResetTopicTest & datum,
-      const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_one_update (
-      const ::UL_ResetTopicTest & datum,
-      const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_updates (
-      const ::UL_ResetTopicTestSeq & data,
-      const ::CCM_DDS::ReadInfoSeq & infos);
-
-    virtual
-    void on_deletion (
-      const ::UL_ResetTopicTest & datum,
-      const ::CCM_DDS::ReadInfo & info);
-    //@}
-
-  private:
-    ::UL_ResetTopic::CCM_Receiver_Context_var ciao_context_;
-    Atomic_Boolean &samples_received_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_state_status_exec_i
-   */
-
-  class info_out_state_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_state_status_exec_i (
-      ::UL_ResetTopic::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_state_status_exec_i (void);
-
-    /** @name Operations and attributes from CCM_DDS::PortStatusListener */
-    //@{
-
-    virtual
-    void on_requested_deadline_missed (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::UL_ResetTopic::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    /** @name Supported operations and attributes. */
-    //@{
-
-    virtual void set_new_topic (
-      const char * topic_name);
-
-    //@}
-
-    /** @name Component attributes and port operations. */
-    //@{
-
-    virtual ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_StateListener_ptr
-    get_info_out_state_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_state_status (void);
-
-    virtual ::CORBA::UShort iterations (
-      void);
-
-    virtual void iterations (
-      ::CORBA::UShort iterations);
-    //@}
-
-    /** @name 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);
-    //@}
-
-    /** @name User defined public operations. */
-    //@{
-
-    //@}
-
-  private:
-    ::UL_ResetTopic::CCM_Receiver_Context_var ciao_context_;
-
-    /** @name Component attributes. */
-    //@{
-    ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_StateListener_var ciao_info_out_state_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_state_status_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    /** @name User defined members. */
-    //@{
-    Atomic_Boolean samples_received_;
-    //@}
-
-    /** @name User defined private operations. */
-    //@{
-    void set_new_topic (::CORBA::Object_ptr cmp,
-                        const char * topic_name);
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_UL_ResetTopic_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp
deleted file mode 100644
index 3002014b755..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * @file SenderDriver.cpp
- *
- * @author Marcel Smit
- */
-
-
-#include "UL_ResetTopic_SenderC.h"
-#include "ace/streams.h"
-#include "ace/Get_Opt.h"
-
-const ACE_TCHAR *sender_ior = ACE_TEXT ("file://Sender.ior");
-const ACE_TCHAR *topic_name = ACE_TEXT ("");
-
-int
-parse_args (int argc, ACE_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:n:"));
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    {
-      switch (c)
-        {
-          case 'k':
-            sender_ior = get_opts.opt_arg ();
-            break;
-
-          case 'n':
-            topic_name = get_opts.opt_arg ();
-            break;
-
-          case '?':
-          default:
-            ACE_ERROR_RETURN ((LM_ERROR,
-                              "usage:  %s\n"
-                              "-k <Sender IOR> (default is file://Sender.ior)\n"
-                              "-n <new topic>\n"
-                              "\n",
-                              argv [0]),
-                              -1);
-        }
-    }
-
-  return 0;
-}
-
-
-int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
-{
-  try
-    {
-      // initialize the ORB
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv);
-      if (parse_args (argc, argv) != 0)
-        {
-          return -1;
-        }
-
-      // create the factory object reference,
-      CORBA::Object_var sender_obj =
-        orb->string_to_object (sender_ior);
-
-      // downcast the object reference to the appropriate type
-      ::UL_ResetTopic::Sender_var sender =
-        ::UL_ResetTopic::Sender::_narrow (sender_obj.in ());
-
-      if (CORBA::is_nil (sender.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                            "Unable to acquire 'Sender' objref\n"),
-                            -1);
-        }
-      sender->set_new_topic (topic_name);
-
-      orb->destroy ();
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("Who is the culprit in the SenderDriver?\n");
-      ACE_ERROR_RETURN ((LM_ERROR,
-                          "Uncaught CORBA exception\n"),
-                        1);
-    }
-  return 0;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl
deleted file mode 100644
index 75d64b30c42..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef UL_RESETTOPIC_SENDER_IDL
-#define UL_RESETTOPIC_SENDER_IDL
-
-#include "Connector/UL_ResetTopic_Connector.idl"
-
-module UL_ResetTopic
-{
-  interface ChangeTopicInterface
-  {
-    void set_new_topic (in string topic_name);
-  };
-
-  component Sender supports ChangeTopicInterface
-  {
-    port UL_ResetTopicTestConnector::DDS_Update info_update;
-
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc
deleted file mode 100644
index 075fc8ad784..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc
+++ /dev/null
@@ -1,164 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p UL_ResetTopicBase -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project (UL_ResetTopicSender_idl_gen) : componentidldefaults, dds4ccm {
-  after += UL_ResetTopicConnector_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 {
-    UL_ResetTopic_Sender.idl
-  }
-}
-
-project (UL_ResetTopicSender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += UL_ResetTopicSender_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 {
-    UL_ResetTopic_SenderE.idl
-  }
-}
-
-project (UL_ResetTopicSender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += UL_ResetTopicSender_lem_gen UL_ResetTopicSender_stub UL_ResetTopicBase_stub
-  libs  += UL_ResetTopicBase_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UL_ResetTopic_SenderEC.cpp
-  }
-
-  Header_Files {
-    UL_ResetTopic_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    UL_ResetTopic_SenderEC.inl
-  }
-}
-
-project (UL_ResetTopicSender_stub) : ccm_stub, dds4ccm_base {
-  after += UL_ResetTopicSender_idl_gen UL_ResetTopicBase_stub UL_ResetTopicConnector_stub
-  libs  += UL_ResetTopicBase_stub UL_ResetTopicConnector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UL_ResetTopic_SenderC.cpp
-  }
-
-  Header_Files {
-    UL_ResetTopic_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    UL_ResetTopic_SenderC.inl
-  }
-}
-
-project (UL_ResetTopicSender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += UL_ResetTopicSender_lem_stub UL_ResetTopicSender_stub \
-             UL_ResetTopicConnector_lem_stub UL_ResetTopicConnector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub UL_ResetTopicBase_stub \
-          UL_ResetTopicConnector_lem_stub UL_ResetTopicConnector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UL_ResetTopic_Sender_exec.cpp
-  }
-
-  Header_Files {
-    UL_ResetTopic_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (UL_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += UL_ResetTopicBase_stub  UL_ResetTopicSender_lem_stub UL_ResetTopicConnector_stub \
-                UL_ResetTopicConnector_svnt UL_ResetTopicConnector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                UL_ResetTopicBase_stub UL_ResetTopicConnector_stub UL_ResetTopicConnector_svnt UL_ResetTopicConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UL_ResetTopic_SenderS.cpp
-    UL_ResetTopic_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    UL_ResetTopic_SenderS.h
-    UL_ResetTopic_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-project (UL_ResetTopicSender_Driver) : ccm_stub, valuetype, dds4ccm_lem_stub {
-  exename = SenderDriver
-  after += UL_ResetTopicSender_stub UL_ResetTopicConnector_stub
-  libs  += Sender_stub UL_ResetTopicBase_stub UL_ResetTopicConnector_stub
-
-  includes += ..
-  libpaths += ../lib
-
-  exeout = ../lib
-  IDL_Files {
-  }
-
-  Source_Files {
-    SenderDriver.cpp
-  }
-
-  Header_Files {
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.cpp
deleted file mode 100644
index f3fea603736..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.cpp
+++ /dev/null
@@ -1,333 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "UL_ResetTopic_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_UL_ResetTopic_Sender_Impl
-{
-
-  /**
-   * Timeout_Handler
-   */
-
-  Timeout_Handler::Timeout_Handler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.start_event_test ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : iterations_ (0)
-    , keys_ (0)
-    , to_handler_ (0)
-    , topic_name_ ("TopicI")
-    , old_topic_name_ ("TopicI")
-    {
-     ACE_NEW_THROW_EX (this->to_handler_,
-                       Timeout_Handler (*this),
-                       ::CORBA::INTERNAL ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->to_handler_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void Sender_exec_i::create_samples (void)
-  {
-    ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, _guard,
-                      this->keys_lock_);
-
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        UL_ResetTopicTest *new_key = new UL_ResetTopicTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->iteration = 0;
-        this->tests_[key] = new_key;
-
-        ::UL_ResetTopic::UL_ResetTopicTestConnector::Updater_var updater =
-          this->ciao_context_->get_connection_info_update_data();
-
-        updater->create_one (*new_key);
-        ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::create_samples - "
-                  "Sample <%C> created\n",
-                  key));
-      }
-    this->last_key_ = this->tests_.begin ();
-  }
-
-  void Sender_exec_i::set_new_topic (const char * topic_name)
-  {
-    ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_);
-
-    this->old_topic_name_ = this->topic_name_;
-    this->topic_name_ = topic_name;
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_new_topic - "
-              "New topic name set <%C>\n",
-              topic_name));
-  }
-
-  void
-  Sender_exec_i::set_topic_name_updater (const char * topic_name)
-  {
-    try
-      {
-        if (ACE_OS::strcmp (topic_name, this->old_topic_name_.c_str()) != 0)
-          {
-            ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_updater - "
-                      "Setting topic to <%C>\n",
-                      topic_name));
-            this->old_topic_name_ = topic_name;
-            ::UL_ResetTopic::UL_ResetTopicTestConnector:: Updater_var updater =
-              this->ciao_context_->get_connection_info_update_data ();
-            if (::CORBA::is_nil (updater.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                                      "Unable to get updater interface\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-            ::CORBA::Object_var cmp = updater->_get_component ();
-            if (::CORBA::is_nil (cmp.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                                      "Unable to get component interface\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-            ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_DDS_State_var conn =
-              ::UL_ResetTopic::UL_ResetTopicTestConnector::CCM_DDS_State::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - "
-                                      "Unable to narrow connector interface\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-            {
-              ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_);
-              conn->topic_name (topic_name);
-            }
-            this->create_samples ();
-          }
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                    "Caught NonChangeable exception.\n"));
-      }
-  }
-
-  void
-  Sender_exec_i::start_event_test (void)
-  {
-    // Set the topic name on the connector first. Therefor we need to
-    // get to the connector first.
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - Start\n"));
-    try
-      {
-        if (this->last_key_ != this->tests_.end ())
-          {
-            try
-              {
-                this->set_topic_name_updater (this->topic_name_.c_str ());
-                ::UL_ResetTopic::UL_ResetTopicTestConnector:: Updater_var updater =
-                  this->ciao_context_->get_connection_info_update_data ();
-
-                {
-                  ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->keys_lock_)
-                  ++this->last_key_->second->iteration;
-                  updater->update_one (this->last_key_->second, ::DDS::HANDLE_NIL);
-
-                  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updated key <%C> with <%d>\n"),
-                          this->last_key_->first.c_str (),
-                          this->last_key_->second->iteration));
-                }
-              }
-            catch (const CCM_DDS::InternalError& )
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Internal Error while writing KeyedTest info for <%C>.\n",
-                            this->last_key_->first.c_str ()));
-              }
-            {
-              ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->keys_lock_)
-              ++this->last_key_;
-            }
-          }
-        else
-          {
-            // Onto the next iteration
-            {
-              ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->keys_lock_)
-              this->last_key_ = this->tests_.begin ();
-              while (this->last_key_ != this->tests_.end ())
-                {
-                  if (this->last_key_->second->iteration == this->iterations_)
-                    {
-                      ++this->last_key_;
-                    }
-                  else
-                    {
-                      break;
-                    }
-                }
-            }
-          }
-      }
-    catch (const ::CORBA::Exception & ex)
-      {
-        ex._tao_print_exception("ERROR:");
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - "
-                    "ERROR: Unexpected and unknown exception caught.\n"));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::UL_ResetTopic::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    this->create_samples ();
-
-    if (this->reactor ()->schedule_timer (
-                this->to_handler_,
-                0,
-                ACE_Time_Value (2, 0),
-                ACE_Time_Value (0, 500000)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->reactor()->cancel_timer(this->to_handler_);
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_UL_ResetTopic_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/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.h
deleted file mode 100644
index ed846ae064d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.h
+++ /dev/null
@@ -1,146 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_UL_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_
-#define CIAO_UL_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_
-
-#include /**/ "ace/pre.h"
-
-#include "UL_ResetTopic_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_UL_ResetTopic_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * Timeout_Handler
-   */
-  class Timeout_Handler :
-    public ACE_Event_Handler
-  {
-  public:
-    Timeout_Handler (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 &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-    virtual void set_new_topic (const char * topic_name);
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void set_topic_name_updater (const char * topic_name);
-    void start_event_test (void);
-    //@}
-
-  private:
-    ::UL_ResetTopic::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Timeout_Handler *to_handler_;
-    ACE_CString topic_name_, old_topic_name_;
-
-    TAO_SYNCH_RECURSIVE_MUTEX topic_name_lock_;
-    TAO_SYNCH_RECURSIVE_MUTEX keys_lock_;
-
-    typedef std::map<ACE_CString, UL_ResetTopicTest_var> Sample_Table;
-
-    Sample_Table tests_;
-    Sample_Table::iterator last_key_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void create_samples (void);
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_UL_ResetTopic_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/Plan.cdp
deleted file mode 100644
index 0098998a7b1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/Plan.cdp
+++ /dev/null
@@ -1,407 +0,0 @@
-<!--  -->
-<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>ResetTopic_Depl_1</label>
-  <UUID>ResetTopic_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_UL_ResetTopic_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_UL_ResetTopic_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="ResetTopic_StateConnectorImplementation">
-    <name>ResetTopic_StateConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="ResetTopic_Connector_ExecArtifact" />
-    <artifact xmi:idref="ResetTopic_Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_UL_ResetTopic_UL_ResetTopicTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_UL_ResetTopic_UL_ResetTopicTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>UL_ResetTopic_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>UL_ResetTopic_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>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_UL_ResetTopic_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_UL_ResetTopic_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>
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ResetTopic_SenderStateConnectorInstance">
-    <name>ResetTopic_SenderStateConnectorInstance</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="ResetTopic_StateConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TopicI</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ResetTopic_ReceiverStateConnectorInstance">
-    <name>ResetTopic_ReceiverStateConnectorInstance</name>
-    <node>ReceiverNode</node>
-    <source/>
-    <implementation xmi:idref="ResetTopic_StateConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TopicI</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>15</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>state_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_state_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ResetTopic_ReceiverStateConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>state_reader_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_state_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ResetTopic_ReceiverStateConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>state_datacontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_state_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ResetTopic_ReceiverStateConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>updater_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ResetTopic_SenderStateConnectorInstance" />
-    </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="ResetTopic_Connector_ExecArtifact">
-    <name>UL_ResetTopic_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>UL_ResetTopicConnector_exec</location>
-  </artifact>
-  <artifact xmi:id="ResetTopic_Connector_SvntArtifact">
-    <name>UL_ResetTopic_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>UL_ResetTopicConnector_svnt</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/ResetTopic/UpdateListen/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/run_test.pl
deleted file mode 100755
index e5226a3129f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/run_test.pl
+++ /dev/null
@@ -1,280 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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 = ( "ReceiverNode.ior", "SenderNode.ior" );
-@iorfiles = 0;
-@nodenames = ( "ReceiverNode", "SenderNode" );
-
-# 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 10 seconds before changing topic name\n";
-sleep (10);
-
-$R = $tg_executor->CreateProcess ("../lib/ReceiverDriver", "-n TopicII");
-$driver_status = $R->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-if ($driver_status != 0) {
-    print STDERR "ERROR: unable to launch driver\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-n TopicII");
-$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-if ($driver_status != 0) {
-    print STDERR "ERROR: unable to launch driver\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Sleeping 10 seconds before changing topic name\n";
-sleep (10);
-
-$R = $tg_executor->CreateProcess ("../lib/ReceiverDriver", "-n TopicIII");
-$driver_status = $R->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-if ($driver_status != 0) {
-    print STDERR "ERROR: unable to launch driver\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-n TopicIII");
-$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-if ($driver_status != 0) {
-    print STDERR "ERROR: unable to launch driver\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Sleeping 10 seconds before stopping\n";
-sleep (10);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl
deleted file mode 100644
index 45311782947..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file WL_ResetTopic_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WL_RESETTOPIC_BASE_IDL
-#define WL_RESETTOPIC_BASE_IDL
-
-#pragma ndds typesupport "Base/WL_ResetTopic_BaseSupport.h"
-#pragma opendds typesupport "Base/WL_ResetTopic_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "WL_ResetTopicTest"
-#pragma DCPS_DATA_KEY "WL_ResetTopicTest key"
-
-struct WL_ResetTopicTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<WL_ResetTopicTest> WL_ResetTopicTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.mpc
deleted file mode 100644
index 6ab7e88772c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (WL_ResetTopicBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = WL_ResetTopicBase_stub
-  dynamicflags += WL_RESETTOPIC_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=WL_RESETTOPIC_BASE_STUB_Export \
-              -Wb,stub_export_include=ResetTopic_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    WL_ResetTopic_Base.idl
-  }
-
-  opendds_ts_flags += --export=WL_RESETTOPIC_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    WL_ResetTopic_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl
deleted file mode 100644
index 83381d74410..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file WL_ResetTopic_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WL_RESETTOPIC_CONNECTOR_IDL_
-#define WL_RESETTOPIC_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/WL_ResetTopic_Base.idl"
-
-#pragma ciao lem "Connector/WL_ResetTopic_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/WL_ResetTopic_BaseTypeSupport.idl"
-#endif
-
-module WL_ResetTopic
-{
-  module ::CCM_DDS::Typed < ::WL_ResetTopicTest, ::WL_ResetTopicTestSeq> WL_ResetTopicTestConnector;
-};
-
-#endif /* WL_ResetTopic_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc
deleted file mode 100644
index dfaa2301b8e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p WL_ResetTopicBase -l .. -o ../lib -u DDS WL_ResetTopic_Connector"
-
-project (WL_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen WL_ResetTopicBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=WL_RESETTOPIC_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=ResetTopic_Connector_stub_export.h \
-              -Wb,skel_export_macro=WL_RESETTOPIC_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=ResetTopic_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=WL_RESETTOPIC_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=ResetTopic_Connector_svnt_export.h \
-              -Wb,conn_export_macro=WL_RESETTOPIC_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=ResetTopic_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    WL_ResetTopic_Connector.idl
-  }
-}
-
-project (WL_ResetTopicConnector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += WL_ResetTopicConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=WL_RESETTOPIC_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=WL_ResetTopic_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    WL_ResetTopic_ConnectorE.idl
-  }
-}
-
-project (WL_ResetTopicConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += WL_ResetTopicConnector_lem_gen WL_ResetTopicConnector_stub \
-           WL_ResetTopicBase_stub
-  libs  += WL_ResetTopicBase_stub WL_ResetTopicConnector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = WL_ResetTopicConnector_lem_stub
-  dynamicflags += WL_RESETTOPIC_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WL_ResetTopic_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    WL_ResetTopic_ConnectorEC.h
-    WL_ResetTopic_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    WL_ResetTopic_ConnectorEC.inl
-  }
-}
-
-project (WL_ResetTopicConnector_stub) : ccm_stub, dds4ccm_base {
-  after += WL_ResetTopicConnector_idl_gen WL_ResetTopicBase_stub
-  libs  += WL_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = WL_ResetTopicConnector_stub
-  dynamicflags += WL_RESETTOPIC_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WL_ResetTopic_ConnectorC.cpp
-  }
-
-  Header_Files {
-    WL_ResetTopic_ConnectorC.h
-    WL_ResetTopic_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    WL_ResetTopic_ConnectorC.inl
-  }
-}
-
-project (WL_ResetTopicConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += WL_ResetTopicConnector_lem_stub WL_ResetTopicConnector_stub \
-             WL_ResetTopicBase_stub
-  sharedname = WL_ResetTopicConnector_exec
-  libs += WL_ResetTopicConnector_stub WL_ResetTopicConnector_lem_stub \
-          WL_ResetTopicBase_stub WL_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += WL_RESETTOPIC_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WL_ResetTopic_Connector_conn.cpp
-  }
-
-  Header_Files {
-    WL_ResetTopic_Connector_conn.h
-    WL_ResetTopic_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (WL_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += WL_ResetTopicConnector_lem_stub WL_ResetTopicConnector_exec \
-                WL_ResetTopicConnector_stub
-  sharedname  = WL_ResetTopicConnector_svnt
-  libs       += WL_ResetTopicConnector_stub \
-                WL_ResetTopicConnector_lem_stub  \
-                WL_ResetTopicBase_stub \
-                WL_ResetTopicConnector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += WL_RESETTOPIC_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WL_ResetTopic_ConnectorS.cpp
-    WL_ResetTopic_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    WL_ResetTopic_ConnectorS.h
-    WL_ResetTopic_Connector_svnt.h
-    WL_ResetTopic_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp
deleted file mode 100644
index de62aa77ca1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * @file ReceiverDriver.cpp
- *
- * @author Marcel Smit
- */
-
-
-#include "WL_ResetTopic_ReceiverC.h"
-#include "ace/streams.h"
-#include "ace/Get_Opt.h"
-
-const ACE_TCHAR *receiver_ior = ACE_TEXT ("file://Receiver.ior");
-const ACE_TCHAR *topic_name = ACE_TEXT ("");
-
-int
-parse_args (int argc, ACE_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:n:"));
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    {
-      switch (c)
-        {
-          case 'k':
-            receiver_ior = get_opts.opt_arg ();
-            break;
-
-          case 'n':
-            topic_name = get_opts.opt_arg ();
-            break;
-
-          case '?':
-          default:
-            ACE_ERROR_RETURN ((LM_ERROR,
-                              "usage:  %s\n"
-                              "-k <Receiver IOR> (default is file://Receiver.ior)\n"
-                              "-n <new topic>\n"
-                              "\n",
-                              argv [0]),
-                              -1);
-        }
-    }
-
-  return 0;
-}
-
-
-int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
-{
-  try
-    {
-      // initialize the ORB
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv);
-      if (parse_args (argc, argv) != 0)
-        {
-          return -1;
-        }
-
-      // create the factory object reference,
-      CORBA::Object_var receiver_obj =
-        orb->string_to_object (receiver_ior);
-
-      // downcast the object reference to the appropriate type
-      ::WL_ResetTopic::Receiver_var receiver =
-        ::WL_ResetTopic::Receiver::_narrow (receiver_obj.in ());
-
-      if (CORBA::is_nil (receiver.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                            "Unable to acquire 'Receiver' objref\n"),
-                            -1);
-        }
-      receiver->set_new_topic (topic_name);
-
-      orb->destroy ();
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("Who is the culprit in the ReceiverDriver?\n");
-      ACE_ERROR_RETURN ((LM_ERROR,
-                          "Uncaught CORBA exception\n"),
-                        1);
-    }
-  return 0;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.idl
deleted file mode 100644
index 0fe968e46ea..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/WL_ResetTopic_Connector.idl"
-
-module WL_ResetTopic
-{
-  interface ChangeTopicInterface
-  {
-    void set_new_topic (in string topic_name);
-  };
-
-  component Receiver supports ChangeTopicInterface
-  {
-    port WL_ResetTopicTestConnector::DDS_Listen info_out_event;
-
-    attribute unsigned short iterations;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc
deleted file mode 100644
index e23097f342f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc
+++ /dev/null
@@ -1,160 +0,0 @@
-project (WL_ResetTopicReceiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += WL_ResetTopicConnector_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 {
-    WL_ResetTopic_Receiver.idl
-  }
-}
-
-project (WL_ResetTopicReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += WL_ResetTopicReceiver_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 {
-    WL_ResetTopic_ReceiverE.idl
-  }
-}
-
-project (WL_ResetTopicReceiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += WL_ResetTopicReceiver_lem_gen WL_ResetTopicReceiver_stub  WL_ResetTopicConnector_stub WL_ResetTopicBase_stub
-  libs  +=  Receiver_stub WL_ResetTopicConnector_stub WL_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WL_ResetTopic_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    WL_ResetTopic_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    WL_ResetTopic_ReceiverEC.inl
-  }
-}
-
-project (WL_ResetTopicReceiver_stub) : ccm_stub, dds4ccm_base {
-  after += WL_ResetTopicReceiver_idl_gen  WL_ResetTopicConnector_stub WL_ResetTopicBase_stub WL_ResetTopicConnector_lem_gen
-  libs  += WL_ResetTopicConnector_stub WL_ResetTopicBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WL_ResetTopic_ReceiverC.cpp
-  }
-
-  Header_Files {
-    WL_ResetTopic_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    WL_ResetTopic_ReceiverC.inl
-  }
-}
-
-project (WL_ResetTopicReceiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += WL_ResetTopicReceiver_lem_stub WL_ResetTopicReceiver_stub \
-             WL_ResetTopicBase_stub WL_ResetTopicConnector_stub \
-             WL_ResetTopicConnector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub WL_ResetTopicBase_stub \
-          WL_ResetTopicConnector_stub WL_ResetTopicConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WL_ResetTopic_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    WL_ResetTopic_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (WL_ResetTopicReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   WL_ResetTopicReceiver_lem_stub WL_ResetTopicBase_stub WL_ResetTopicConnector_stub WL_ResetTopicConnector_svnt WL_ResetTopicReceiver_exec WL_ResetTopicConnector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub WL_ResetTopicBase_stub WL_ResetTopicConnector_stub WL_ResetTopicConnector_svnt Receiver_exec WL_ResetTopicConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WL_ResetTopic_ReceiverS.cpp
-    WL_ResetTopic_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    WL_ResetTopic_ReceiverS.h
-    WL_ResetTopic_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-project (WL_ResetTopicReceiver_Driver) : ccm_stub, valuetype, dds4ccm_lem_stub {
-  exename = ReceiverDriver
-  after += WL_ResetTopicReceiver_stub WL_ResetTopicConnector_stub
-  libs  += Receiver_stub WL_ResetTopicBase_stub WL_ResetTopicConnector_stub
-
-  includes += ..
-  libpaths += ../lib
-
-  exeout = ../lib
-  IDL_Files {
-  }
-
-  Source_Files {
-    ReceiverDriver.cpp
-  }
-
-  Header_Files {
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp
deleted file mode 100644
index 58eb1380560..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp
+++ /dev/null
@@ -1,307 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "WL_ResetTopic_Receiver_exec.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-namespace CIAO_WL_ResetTopic_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_out_event_data_listener_exec_i
-   */
-
-  info_out_event_data_listener_exec_i::info_out_event_data_listener_exec_i (
-        ::WL_ResetTopic::CCM_Receiver_Context_ptr ctx,
-        Atomic_Boolean &samples_received)
-    : ciao_context_ (
-        ::WL_ResetTopic::CCM_Receiver_Context::_duplicate (ctx))
-    , samples_received_(samples_received)
-  {
-  }
-
-  info_out_event_data_listener_exec_i::~info_out_event_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::WL_ResetTopic::WL_ResetTopicTestConnector::Listener
-
-  void
-  info_out_event_data_listener_exec_i::on_one_data (const ::WL_ResetTopicTest & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    this->samples_received_ = true;
-    ACE_DEBUG ((LM_ERROR, ACE_TEXT ("info_out_event_data_listener_exec_i::on_one_data - ")
-            ACE_TEXT ("received data for <%C> at %u\n"),
-            datum.key.in (),
-            datum.iteration));
-  }
-
-  void
-  info_out_event_data_listener_exec_i::on_many_data (const ::WL_ResetTopicTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    ACE_ERROR ((LM_ERROR, "info_out_event_data_listener_exec_i::on_many_data : "
-                          "Error: No callback to this method expected.\n"));
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_event_status_exec_i
-   */
-
-  info_out_event_status_exec_i::info_out_event_status_exec_i (
-        ::WL_ResetTopic::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::WL_ResetTopic::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_event_status_exec_i::~info_out_event_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_event_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_event_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : iterations_ (0)
-    , samples_received_(0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  void
-  Receiver_exec_i::set_new_topic (::CORBA::Object_ptr cmp,
-                                  const char * topic_name)
-  {
-    if (::CORBA::is_nil (cmp))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_topic_name_writer - "
-                              "Unable to get component interface\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-    ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_DDS_Event_var conn =
-      ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_DDS_Event::_narrow (cmp);
-    if (::CORBA::is_nil (conn.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_topic_name_writer - "
-                              "Unable to narrow connector interface\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-    conn->topic_name (topic_name);
-
-//     ::CCM_DDS::DataListenerControl_var dlc =
-//       this->ciao_context_->get_connection_info_out_event_data_control ();
-//     dlc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_exec_i::set_new_topic (const char * topic_name)
-  {
-
-    if (this->samples_received_.value())
-      ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_new_topic - "
-                  "OK, samples received during last run\n"));
-    else
-      ACE_ERROR ((LM_ERROR, "Receiver_exec_i::set_new_topic - "
-                  "ERROR: No samples received during last run\n"));
-
-    this->samples_received_ = false;
-
-    ::CORBA::Object_var cmp;
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_new_topic - "
-                  "Setting topic to <%C>\n",
-                  topic_name));
-        //First listener
-        ::WL_ResetTopic::WL_ResetTopicTestConnector::Reader_var reader =
-          this->ciao_context_->get_connection_info_out_event_data();
-
-        if (::CORBA::is_nil (reader.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_new_topic - "
-                                  "ciao_info_out_event_data_listener_ seems nil\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        cmp = reader->_get_component ();
-        this->set_new_topic (cmp.in (), topic_name);
-
-        //next listener
-        if (::CORBA::is_nil (this->ciao_info_out_event_status_.in ()))
-          {
-            ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_new_topic - "
-                                  "ciao_info_out_event_status_ seems nil\n"));
-          }
-        else
-          {
-            cmp = this->ciao_info_out_event_status_->_get_component ();
-            this->set_new_topic (cmp.in (), topic_name);
-          }
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::set_topic_name_writer - "
-                    "Caught NonChangeable exception.\n"));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_event_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_event_data_listener_.in ()))
-      {
-        info_out_event_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_event_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->samples_received_),
-            ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_out_event_data_listener_ = tmp;
-      }
-
-    return
-      ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_Listener::_duplicate (
-        this->ciao_info_out_event_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_event_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_event_status_.in ()))
-      {
-        info_out_event_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_event_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_event_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_event_status_.in ());
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::WL_ResetTopic::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::DataListenerControl_var dlc =
-      this->ciao_context_->get_connection_info_out_event_data_control ();
-    dlc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->samples_received_.value())
-      ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_remove - "
-                  "OK, samples received during last run\n"));
-    else
-      ACE_ERROR ((LM_ERROR, "Receiver_exec_i::ccm_remove - "
-                  "ERROR: No samples received during last run\n"));
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_WL_ResetTopic_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/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h
deleted file mode 100644
index c56d34e8355..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h
+++ /dev/null
@@ -1,179 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_WL_RESETTOPIC_RECEIVER_EXEC_KKU0OW_H_
-#define CIAO_WL_RESETTOPIC_RECEIVER_EXEC_KKU0OW_H_
-
-#include /**/ "ace/pre.h"
-
-#include "WL_ResetTopic_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_WL_ResetTopic_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean> Atomic_Boolean;
-
-  /**
-   * Provider Executor Implementation Class: info_out_event_data_listener_exec_i
-   */
-
-  class info_out_event_data_listener_exec_i
-    : public virtual ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_event_data_listener_exec_i (
-      ::WL_ResetTopic::CCM_Receiver_Context_ptr ctx,
-      Atomic_Boolean &samples_received);
-    virtual ~info_out_event_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from WL_ResetTopic::WL_ResetTopicTestConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::WL_ResetTopicTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::WL_ResetTopicTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::WL_ResetTopic::CCM_Receiver_Context_var ciao_context_;
-    Atomic_Boolean &samples_received_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_event_status_exec_i
-   */
-
-  class info_out_event_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_event_status_exec_i (
-      ::WL_ResetTopic::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_event_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::WL_ResetTopic::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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. */
-    virtual void set_new_topic (const char * topic_name);
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_Listener_ptr
-    get_info_out_event_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_event_status (void);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-
-    //@}
-
-  private:
-    ::WL_ResetTopic::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_Listener_var ciao_info_out_event_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_event_status_;
-
-    ::CORBA::UShort iterations_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Atomic_Boolean samples_received_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void set_new_topic (::CORBA::Object_ptr cmp,
-      const char * topic_name);
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_WL_ResetTopic_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp
deleted file mode 100644
index b55e57cb764..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * @file SenderDriver.cpp
- *
- * @author Marcel Smit
- */
-
-
-#include "WL_ResetTopic_SenderC.h"
-#include "ace/streams.h"
-#include "ace/Get_Opt.h"
-
-const ACE_TCHAR *sender_ior = ACE_TEXT ("file://Sender.ior");
-const ACE_TCHAR *topic_name = ACE_TEXT ("");
-
-int
-parse_args (int argc, ACE_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:n:"));
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    {
-      switch (c)
-        {
-          case 'k':
-            sender_ior = get_opts.opt_arg ();
-            break;
-
-          case 'n':
-            topic_name = get_opts.opt_arg ();
-            break;
-
-          case '?':
-          default:
-            ACE_ERROR_RETURN ((LM_ERROR,
-                              "usage:  %s\n"
-                              "-k <Sender IOR> (default is file://Sender.ior)\n"
-                              "-n <new topic>\n"
-                              "\n",
-                              argv [0]),
-                              -1);
-        }
-    }
-
-  return 0;
-}
-
-
-int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
-{
-  try
-    {
-      // initialize the ORB
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv);
-      if (parse_args (argc, argv) != 0)
-        {
-          return -1;
-        }
-
-      // create the factory object reference,
-      CORBA::Object_var sender_obj =
-        orb->string_to_object (sender_ior);
-
-      // downcast the object reference to the appropriate type
-      ::WL_ResetTopic::Sender_var sender =
-        ::WL_ResetTopic::Sender::_narrow (sender_obj.in ());
-
-      if (CORBA::is_nil (sender.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                            "Unable to acquire 'Sender' objref\n"),
-                            -1);
-        }
-      sender->set_new_topic (topic_name);
-
-      orb->destroy ();
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("Who is the culprit in the SenderDriver?\n");
-      ACE_ERROR_RETURN ((LM_ERROR,
-                          "Uncaught CORBA exception\n"),
-                        1);
-    }
-  return 0;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl
deleted file mode 100644
index 171dbbea554..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WL_RESETTOPIC_SENDER_IDL
-#define WL_RESETTOPIC_SENDER_IDL
-
-#include "Connector/WL_ResetTopic_Connector.idl"
-
-module WL_ResetTopic
-{
-  interface ChangeTopicInterface
-  {
-    void set_new_topic (in string topic_name);
-  };
-
-  component Sender supports ChangeTopicInterface
-  {
-    port WL_ResetTopicTestConnector::DDS_Write  info_write;
-
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc
deleted file mode 100644
index 717058be581..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc
+++ /dev/null
@@ -1,164 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p WL_ResetTopicBase -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project (WL_ResetTopicSender_idl_gen) : componentidldefaults, dds4ccm {
-  after += WL_ResetTopicConnector_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 {
-    WL_ResetTopic_Sender.idl
-  }
-}
-
-project (WL_ResetTopicSender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += WL_ResetTopicSender_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 {
-    WL_ResetTopic_SenderE.idl
-  }
-}
-
-project (WL_ResetTopicSender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += WL_ResetTopicSender_lem_gen WL_ResetTopicSender_stub WL_ResetTopicBase_stub
-  libs  += WL_ResetTopicBase_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WL_ResetTopic_SenderEC.cpp
-  }
-
-  Header_Files {
-    WL_ResetTopic_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    WL_ResetTopic_SenderEC.inl
-  }
-}
-
-project (WL_ResetTopicSender_stub) : ccm_stub, dds4ccm_base {
-  after += WL_ResetTopicSender_idl_gen WL_ResetTopicBase_stub WL_ResetTopicConnector_stub
-  libs  += WL_ResetTopicBase_stub WL_ResetTopicConnector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WL_ResetTopic_SenderC.cpp
-  }
-
-  Header_Files {
-    WL_ResetTopic_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    WL_ResetTopic_SenderC.inl
-  }
-}
-
-project (WL_ResetTopicSender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += WL_ResetTopicSender_lem_stub WL_ResetTopicSender_stub \
-             WL_ResetTopicConnector_lem_stub WL_ResetTopicConnector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub WL_ResetTopicBase_stub \
-          WL_ResetTopicConnector_lem_stub WL_ResetTopicConnector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WL_ResetTopic_Sender_exec.cpp
-  }
-
-  Header_Files {
-    WL_ResetTopic_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project (WL_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += WL_ResetTopicBase_stub  WL_ResetTopicSender_lem_stub WL_ResetTopicConnector_stub \
-                WL_ResetTopicConnector_svnt WL_ResetTopicConnector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                WL_ResetTopicBase_stub WL_ResetTopicConnector_stub WL_ResetTopicConnector_svnt WL_ResetTopicConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    WL_ResetTopic_SenderS.cpp
-    WL_ResetTopic_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    WL_ResetTopic_SenderS.h
-    WL_ResetTopic_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-project (WL_ResetTopicSender_Driver) : ccm_stub, valuetype, dds4ccm_lem_stub {
-  exename = SenderDriver
-  after += WL_ResetTopicSender_stub WL_ResetTopicConnector_stub
-  libs  += Sender_stub WL_ResetTopicBase_stub WL_ResetTopicConnector_stub
-
-  includes += ..
-  libpaths += ../lib
-
-  exeout = ../lib
-  IDL_Files {
-  }
-
-  Source_Files {
-    SenderDriver.cpp
-  }
-
-  Header_Files {
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.cpp
deleted file mode 100644
index 5e189c86fce..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.cpp
+++ /dev/null
@@ -1,281 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "WL_ResetTopic_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_WL_ResetTopic_Sender_Impl
-{
-
-  /**
-   * Timeout_Handler
-   */
-
-  Timeout_Handler::Timeout_Handler (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.start_event_test ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : iterations_ (0)
-    , keys_ (0)
-    , to_handler_ (0)
-    , topic_name_ ("TopicI")
-    , old_topic_name_ ("TopicI")
-    {
-     ACE_NEW_THROW_EX (this->to_handler_,
-                       Timeout_Handler (*this),
-                       ::CORBA::INTERNAL ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->to_handler_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void Sender_exec_i::set_new_topic (const char * topic_name)
-  {
-    ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_);
-
-    this->old_topic_name_ = this->topic_name_;
-    this->topic_name_ = topic_name;
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_new_topic - "
-              "New topic name set <%C>\n",
-              topic_name));
-  }
-
-  void
-  Sender_exec_i::set_topic_name_writer (const char * topic_name)
-  {
-    try
-      {
-        if (ACE_OS::strcmp (topic_name, this->old_topic_name_.c_str()) != 0)
-          {
-            ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_writer - "
-                      "Setting topic to <%C>\n",
-                      topic_name));
-            this->old_topic_name_ = topic_name;
-            ::WL_ResetTopic::WL_ResetTopicTestConnector:: Writer_var writer =
-              this->ciao_context_->get_connection_info_write_data ();
-            if (::CORBA::is_nil (writer.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                                      "Unable to get writer interface\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-            ::CORBA::Object_var cmp = writer->_get_component ();
-            if (::CORBA::is_nil (cmp.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                                      "Unable to get component interface\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-            ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_DDS_Event_var conn =
-              ::WL_ResetTopic::WL_ResetTopicTestConnector::CCM_DDS_Event::_narrow (cmp.in ());
-            if (::CORBA::is_nil (conn.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                                      "Unable to narrow connector interface\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-            {
-              ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->topic_name_lock_);
-              conn->topic_name (topic_name);
-            }
-          }
-      }
-    catch (const ::CCM_DDS::NonChangeable &)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - "
-                    "Caught NonChangeable exception.\n"));
-      }
-  }
-
-  void
-  Sender_exec_i::start_event_test (void)
-  {
-    // Set the topic name on the connector first. Therefor we need to
-    // get to the connector first.
-    ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - Start\n"));
-    try
-      {
-        for (::CORBA::UShort key = 1; key < this->keys_ + 1; ++key)
-          {
-            WL_ResetTopicTest sample;
-            char tmp[7];
-            ACE_OS::sprintf (tmp, "KEY_%d", key);
-            sample.key = CORBA::string_dup(tmp);
-
-            for (::CORBA::UShort iter = 1; iter < this->iterations_ + 1; ++iter)
-              {
-                this->set_topic_name_writer (this->topic_name_.c_str ());
-                ::WL_ResetTopic::WL_ResetTopicTestConnector:: Writer_var writer =
-                  this->ciao_context_->get_connection_info_write_data ();
-                sample.iteration = iter;
-                writer->write_one (sample, ::DDS::HANDLE_NIL);
-
-                ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start_event_test - "
-                            "Sample for topic <%C> written : key <%C> - iteration <%d>\n",
-                            this->topic_name_.c_str (), tmp, iter));
-
-                ACE_Time_Value tv (0, 50000);
-                ACE_OS::sleep (tv);
-              }
-          }
-      }
-    catch (const ::CORBA::Exception & ex)
-      {
-        ex._tao_print_exception("ERROR:");
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "Sender_exec_i::start_event_test - "
-                    "ERROR: Unexpected and unknown exception caught.\n"));
-      }
-  }
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::WL_ResetTopic::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    if (this->reactor ()->schedule_timer (
-                this->to_handler_,
-                0,
-                ACE_Time_Value (5, 0),
-                ACE_Time_Value (5, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->reactor()->cancel_timer(this->to_handler_);
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_WL_ResetTopic_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/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.h
deleted file mode 100644
index f7669e80f33..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.h
+++ /dev/null
@@ -1,137 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.2
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_WL_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_
-#define CIAO_WL_RESETTOPIC_SENDER_EXEC_YSJ9S8_H_
-
-#include /**/ "ace/pre.h"
-
-#include "WL_ResetTopic_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_WL_ResetTopic_Sender_Impl
-{
-  class Sender_exec_i;
-
-  /**
-   * Timeout_Handler
-   */
-  class Timeout_Handler :
-    public ACE_Event_Handler
-  {
-  public:
-    Timeout_Handler (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 &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-    virtual void set_new_topic (const char * topic_name);
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void set_topic_name_writer (const char * topic_name);
-    void start_event_test (void);
-    //@}
-
-  private:
-    ::WL_ResetTopic::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Timeout_Handler *to_handler_;
-    ACE_CString topic_name_, old_topic_name_;
-
-    TAO_SYNCH_RECURSIVE_MUTEX topic_name_lock_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_WL_ResetTopic_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/Plan.cdp
deleted file mode 100644
index 392974a1999..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/Plan.cdp
+++ /dev/null
@@ -1,407 +0,0 @@
-<!--  -->
-<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>ResetTopic_Depl_1</label>
-  <UUID>ResetTopic_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WL_ResetTopic_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WL_ResetTopic_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="ResetTopic_EventConnectorImplementation">
-    <name>ResetTopic_EventConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="ResetTopic_Connector_ExecArtifact" />
-    <artifact xmi:idref="ResetTopic_Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WL_ResetTopic_WL_ResetTopicTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WL_ResetTopic_WL_ResetTopicTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>WL_ResetTopic_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>WL_ResetTopic_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>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WL_ResetTopic_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_WL_ResetTopic_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>
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ResetTopic_SenderEventConnectorInstance">
-    <name>ResetTopic_SenderEventConnectorInstance</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="ResetTopic_EventConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TopicI</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ResetTopic_ReceiverEventConnectorInstance">
-    <name>ResetTopic_ReceiverEventConnectorInstance</name>
-    <node>ReceiverNode</node>
-    <source/>
-    <implementation xmi:idref="ResetTopic_EventConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TopicI</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>15</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>event_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_event_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="ResetTopic_ReceiverEventConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>event_reader_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_event_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ResetTopic_ReceiverEventConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>event_datacontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_event_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="ResetTopic_ReceiverEventConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="ResetTopic_SenderEventConnectorInstance" />
-    </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="ResetTopic_Connector_ExecArtifact">
-    <name>WL_ResetTopic_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>WL_ResetTopicConnector_exec</location>
-  </artifact>
-  <artifact xmi:id="ResetTopic_Connector_SvntArtifact">
-    <name>WL_ResetTopic_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>WL_ResetTopicConnector_svnt</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/ResetTopic/WriteListen/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/run_test.pl
deleted file mode 100755
index e5226a3129f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/run_test.pl
+++ /dev/null
@@ -1,280 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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 = ( "ReceiverNode.ior", "SenderNode.ior" );
-@iorfiles = 0;
-@nodenames = ( "ReceiverNode", "SenderNode" );
-
-# 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 10 seconds before changing topic name\n";
-sleep (10);
-
-$R = $tg_executor->CreateProcess ("../lib/ReceiverDriver", "-n TopicII");
-$driver_status = $R->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-if ($driver_status != 0) {
-    print STDERR "ERROR: unable to launch driver\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-n TopicII");
-$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-if ($driver_status != 0) {
-    print STDERR "ERROR: unable to launch driver\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Sleeping 10 seconds before changing topic name\n";
-sleep (10);
-
-$R = $tg_executor->CreateProcess ("../lib/ReceiverDriver", "-n TopicIII");
-$driver_status = $R->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-if ($driver_status != 0) {
-    print STDERR "ERROR: unable to launch driver\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$S = $tg_executor->CreateProcess ("../lib/SenderDriver", "-n TopicIII");
-$driver_status = $S->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-if ($driver_status != 0) {
-    print STDERR "ERROR: unable to launch driver\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Sleeping 10 seconds before stopping\n";
-sleep (10);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/.gitignore b/CIAO/connectors/dds4ccm/tests/SLDisabled/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl
deleted file mode 100644
index 61d37f5f4e4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file   SL_Disabled_Base.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef SL_DISABLED_BASE_IDL
-#define SL_DISABLED_BASE_IDL
-
-#pragma ndds typesupport "Base/SL_Disabled_BaseSupport.h"
-#pragma opendds typesupport "Base/SL_Disabled_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TestTopic"
-#pragma DCPS_DATA_KEY "TestTopic key"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopic> TestTopicSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc
deleted file mode 100644
index 4a1f4bb1c09..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_SL_Disabled_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_SL_Disabled_Base_stub
-  dynamicflags += SL_DISABLED_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=SL_DISABLED_BASE_STUB_Export \
-              -Wb,stub_export_include=SL_Disabled_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    SL_Disabled_Base.idl
-  }
-
-  opendds_ts_flags += --export=SL_DISABLED_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    SL_Disabled_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl
deleted file mode 100644
index 5db5f544e3e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file SL_Disabled_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef SL_DISABLED_CONNECTOR_IDL_
-#define SL_DISABLED_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/SL_Disabled_Base.idl"
-
-#pragma ciao lem "Connector/SL_Disabled_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/SL_Disabled_BaseTypeSupport.idl"
-#endif
-
-module SL_Disabled
-{
-  module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> SL_DisabledConnector;
-};
-
-#endif /* SL_Disabled_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
deleted file mode 100644
index a3d3a95c921..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SL_Disabled_Base -l .. -o ../lib -u DDS SL_Disabled_Connector"
-
-project(DDS_SL_OC_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_SL_Disabled_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SL_DISABLED_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=SL_Disabled_Connector_stub_export.h \
-              -Wb,skel_export_macro=SL_DISABLED_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=SL_Disabled_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=SL_DISABLED_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=SL_Disabled_Connector_svnt_export.h \
-              -Wb,conn_export_macro=SL_DISABLED_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=SL_Disabled_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    SL_Disabled_Connector.idl
-  }
-}
-
-project(DDS_SL_OC_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SL_OC_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=SL_DISABLED_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=SL_Disabled_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    SL_Disabled_ConnectorE.idl
-  }
-}
-
-project(DDS_SL_OC_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SL_OC_Connector_lem_gen DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Base_stub
-  libs  += DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_SL_OC_Connector_lem_stub
-  dynamicflags += SL_DISABLED_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_Disabled_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    SL_Disabled_ConnectorEC.h
-    SL_Disabled_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    SL_Disabled_ConnectorEC.inl
-  }
-}
-
-project(DDS_SL_Disabled_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SL_OC_Connector_idl_gen DDS_SL_Disabled_Base_stub
-  libs  += DDS_SL_Disabled_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_SL_Disabled_Connector_stub
-  dynamicflags += SL_DISABLED_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_Disabled_ConnectorC.cpp
-  }
-
-  Header_Files {
-    SL_Disabled_ConnectorC.h
-    SL_Disabled_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    SL_Disabled_ConnectorC.inl
-  }
-}
-
-project(DDS_SL_Disabled_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Base_stub
-  sharedname = DDS_SL_Disabled_Connector_exec
-  libs += DDS_SL_Disabled_Connector_stub DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SL_DISABLED_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_Disabled_Connector_conn.cpp
-  }
-
-  Header_Files {
-    SL_Disabled_Connector_conn.h
-    SL_Disabled_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SL_Disabled_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Connector_exec DDS_SL_Disabled_Connector_stub
-  sharedname  = DDS_SL_Disabled_Connector_svnt
-  libs       += DDS_SL_Disabled_Connector_stub \
-                DDS_SL_OC_Connector_lem_stub  \
-                DDS_SL_Disabled_Base_stub \
-                DDS_SL_Disabled_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SL_DISABLED_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_Disabled_ConnectorS.cpp
-    SL_Disabled_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    SL_Disabled_ConnectorS.h
-    SL_Disabled_Connector_svnt.h
-    SL_Disabled_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl
deleted file mode 100644
index 4863c6e2d01..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/SL_Disabled_Connector.idl"
-
-module SL_Disabled
-{
-  component Receiver
-  {
-    port SL_DisabledConnector::DDS_StateListen info_out;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc
deleted file mode 100644
index 18d20c311a0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_SL_Disabled_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SL_OC_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 {
-    SL_Disabled_Receiver.idl
-  }
-}
-
-project(DDS_SL_Disabled_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_SL_Disabled_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 {
-    SL_Disabled_ReceiverE.idl
-  }
-}
-
-project(DDS_SL_OC_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_SL_Disabled_Receiver_lem_gen DDS_SL_Disabled_Receiver_stub  DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Base_stub
-  libs  +=  Receiver_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_Disabled_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    SL_Disabled_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    SL_Disabled_ReceiverEC.inl
-  }
-}
-
-project(DDS_SL_Disabled_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SL_Disabled_Receiver_idl_gen  DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Base_stub DDS_SL_OC_Connector_lem_gen
-  libs  += DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_Disabled_ReceiverC.cpp
-  }
-
-  Header_Files {
-    SL_Disabled_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    SL_Disabled_ReceiverC.inl
-  }
-}
-
-project(DDS_SL_Disabled_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_SL_OC_Receiver_lem_stub DDS_SL_Disabled_Receiver_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub DDS_SL_OC_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub DDS_SL_OC_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_Disabled_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    SL_Disabled_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SL_Disabled_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_SL_OC_Receiver_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Connector_svnt DDS_SL_Disabled_Receiver_exec DDS_SL_OC_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Connector_svnt Receiver_exec DDS_SL_OC_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_Disabled_ReceiverS.cpp
-    SL_Disabled_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    SL_Disabled_ReceiverS.h
-    SL_Disabled_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp
deleted file mode 100644
index 0143a7785e9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp
+++ /dev/null
@@ -1,247 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "SL_Disabled_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#include "ace/OS_NS_time.h"
-#include "dds4ccm/impl/TimeUtilities.h"
-
-#define SAMPLES_EXPECTED 3
-
-namespace CIAO_SL_Disabled_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::SL_Disabled::CCM_Receiver_Context_ptr ctx,
-        Atomic_Long & no_operation)
-    : ciao_context_ (
-        ::SL_Disabled::CCM_Receiver_Context::_duplicate (ctx))
-      , no_operation_ (no_operation)
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::SL_Disabled::SL_DisabledConnector::StateListener
-
-  void
-  info_out_data_listener_exec_i::on_creation (const ::TestTopic & /* datum */,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ++this->no_operation_;
-  }
-
-  void
-  info_out_data_listener_exec_i::on_one_update (const ::TestTopic & /* datum */,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ++this->no_operation_;
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_updates (const ::TestTopicSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    ++this->no_operation_;
-  }
-
-  void
-  info_out_data_listener_exec_i::on_deletion (const ::TestTopic & /* datum */,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ++this->no_operation_;
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::SL_Disabled::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::SL_Disabled::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : no_operation_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  // Component attributes and port operations.
-
-  ::SL_Disabled::SL_DisabledConnector::CCM_StateListener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->no_operation_),
-            ::SL_Disabled::SL_DisabledConnector::CCM_StateListener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::SL_Disabled::SL_DisabledConnector::CCM_StateListener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::SL_Disabled::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::StateListenerControl_var lc =
-    this->ciao_context_->get_connection_info_out_data_control ();
-
-    if (::CORBA::is_nil (lc.in ()))
-      {
-         ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-
-    lc->mode (::CCM_DDS::NOT_ENABLED);
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->no_operation_.value () > 0)
-      {
-
-         ACE_ERROR ((LM_ERROR,
-                     ACE_TEXT ("ERROR: Received an unexpected ")
-                     ACE_TEXT (" operation. StateListener doesn't work in Receiver\n")
-                    ));
-      }
-
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("OK : Haven't received an  unexpected ")
-                    ACE_TEXT (" operation from StateListener in Receiver\n")
-                   ));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SL_Disabled_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/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h
deleted file mode 100644
index d6020151dea..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h
+++ /dev/null
@@ -1,181 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_SL_DISABLED_RECEIVER_EXEC_WIX3WI_H_
-#define CIAO_SL_DISABLED_RECEIVER_EXEC_WIX3WI_H_
-
-#include /**/ "ace/pre.h"
-
-#include "SL_Disabled_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_SL_Disabled_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Long > Atomic_Long;
-
-  class Receiver_exec_i;
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::SL_Disabled::SL_DisabledConnector::CCM_StateListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::SL_Disabled::CCM_Receiver_Context_ptr ctx,
-      Atomic_Long &);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from SL_Disabled::SL_DisabledConnector::StateListener. */
-
-    virtual
-    void on_creation (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_one_update (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_updates (const ::TestTopicSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-
-    virtual
-    void on_deletion (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-    //@}
-
-  private:
-    ::SL_Disabled::CCM_Receiver_Context_var ciao_context_;
-     Atomic_Long & no_operation_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::SL_Disabled::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::SL_Disabled::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::SL_Disabled::SL_DisabledConnector::CCM_StateListener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    //@}
-
-  private:
-    ::SL_Disabled::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::SL_Disabled::SL_DisabledConnector::CCM_StateListener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Atomic_Long no_operation_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SL_Disabled_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl
deleted file mode 100644
index 3bf7d29b082..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_SL_DISABLED_SENDER_IDL
-#define DDS_SL_DISABLED_SENDER_IDL
-
-#include "Connector/SL_Disabled_Connector.idl"
-
-module SL_Disabled
-{
-  component Sender
-  {
-    port SL_DisabledConnector::DDS_Update test_topic_update;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc
deleted file mode 100644
index 21c0c44ec43..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SL_Disabled_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_SL_Disabled_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_SL_OC_Connector_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 {
-    SL_Disabled_Sender.idl
-  }
-}
-
-project(DDS_SL_Disabled_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_SL_Disabled_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 {
-    SL_Disabled_SenderE.idl
-  }
-}
-
-project(DDS_SL_Disabled_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_SL_Disabled_Sender_lem_gen DDS_SL_Disabled_Sender_stub DDS_SL_Disabled_Base_stub
-  libs  += DDS_SL_Disabled_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_Disabled_SenderEC.cpp
-  }
-
-  Header_Files {
-    SL_Disabled_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    SL_Disabled_SenderEC.inl
-  }
-}
-
-project(DDS_SL_Disabled_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SL_Disabled_Sender_idl_gen DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub
-  libs  += DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_Disabled_SenderC.cpp
-  }
-
-  Header_Files {
-    SL_Disabled_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    SL_Disabled_SenderC.inl
-  }
-}
-
-project(DDS_SL_Disabled_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_SL_Disabled_Sender_lem_stub DDS_SL_Disabled_Sender_stub DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_OC_Connector_lem_stub  DDS_SL_Disabled_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_Disabled_Sender_exec.cpp
-  }
-
-  Header_Files {
-    SL_Disabled_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SL_Disabled_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_SL_Disabled_Base_stub  DDS_SL_Disabled_Sender_lem_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Connector_svnt DDS_SL_OC_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub  DDS_SL_Disabled_Connector_svnt DDS_SL_OC_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_Disabled_SenderS.cpp
-    SL_Disabled_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    SL_Disabled_SenderS.h
-    SL_Disabled_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp
deleted file mode 100644
index e783f301425..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp
+++ /dev/null
@@ -1,513 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "SL_Disabled_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_SL_Disabled_Sender_Impl
-{
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  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 /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.get_started ();
-      }
-  }
-
-  /**
-   * Write action 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;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : test_nr_(UPDATE_CREATE)
-      , test_ok_(true)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::create_one (void)
-  {
-    TestTopic i = this->topic_seq_one_[0];
-    try
-      {
-        ::SL_Disabled::SL_DisabledConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::create_one - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        updater->create_one(i);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SL_Disabled: create_one with instance key <%C>\n"),
-                   i.key.in()));
-      }
-    catch (const CCM_DDS::AlreadyCreated &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: AlreadyCreated with test updater create_one <%C>.\n"),
-                      i.key.in()));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while create_one for <%C>.\n"),
-                      i.key.in()));
-        return false;
-      }
-    return true;
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::update_one (void)
-  {
-    //update already created instance with handle nil
-    TestTopic i = this->topic_seq_one_[0];
-    try
-      {
-        ::SL_Disabled::SL_DisabledConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::update_one - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        updater->update_one(i, DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: update_one with already existing instance with DDS::HANDLE_NIL, key <%C>\n"),
-                      i.key.in()));
-      }
-    catch (const CCM_DDS::NonExistent &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater update_one <%C>.\n"),
-                       i.key.in()));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while update_one for <%C>.\n"),
-                        i.key.in()));
-        return false;
-      }
-    return true;
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::delete_one (void)
-  {
-    //delete registered instance with DDS::HANDLE_NIL
-    TestTopic i = this->topic_seq_one_[0];
-    try
-      {
-        ::SL_Disabled::SL_DisabledConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::delete_one - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: delete_one with registered instance with DDS::HANDLE_NIL, key <%C>\n"),
-                      i.key.in()));
-        updater->delete_one(i, DDS::HANDLE_NIL);
-      }
-    catch (const CCM_DDS::NonExistent &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater delete_one <%C>.\n"),
-                       i.key.in()));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while delete_one for <%C>.\n"),
-                        i.key.in()));
-        return false;
-      }
-      return true;
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::create_many (void)
-  {
-    //create many with no exception
-    try
-      {
-        ::SL_Disabled::SL_DisabledConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::create_many - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("create_many : <%u> samples\n"),
-                         this->topic_seq_many_.length ()));
-        updater->create_many (this->topic_seq_many_);
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater create_many\n")));
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                     ACE_TEXT ("in updater: create_many: index <%d> - retval <%d>\n"),
-                     ex.index, ex.error_code));
-
-      }
-    return true;
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::update_many (void)
-  {
-    try
-      {
-        ::SL_Disabled::SL_DisabledConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::update_many - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        updater->update_many (this->topic_seq_many_);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("update_many : written <%u> samples\n"),
-                   this->topic_seq_many_.length ()));
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater update_many.\n")));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                     ACE_TEXT ("with update_many: index <%d> - retval <%d>\n"),
-                     ex.index, ex.error_code));
-        return false;
-      }
-    return true;
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::delete_many (void)
-  {
-    try
-      {
-        ::SL_Disabled::SL_DisabledConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::delete_many - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_many : deleted <%u> samples\n"),
-                                          this->topic_seq_many_.length ()));
-        updater->delete_many (this->topic_seq_many_);
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater delete_many\n")));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                   ACE_TEXT ("with test updater delete_many: index <%d> - retval <%d>\n"),
-                   ex.index, ex.error_code));
-        return false;
-      }
-
-    return true;
-  }
-
-  void
-  Sender_exec_i::add_instances_of_topic (void)
-  {
-    CORBA::UShort total = 3;
-    this->topic_seq_one_.length (total);
-    //sequence for tests with .._one
-    for (int i = 1; i < (total + 1); i++)
-      {
-        char key[7];
-        TestTopic new_key;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key.key = CORBA::string_dup(key);
-        new_key.x = i;
-        this->topic_seq_one_[i-1] = new_key;
-      }
-    //sequence for tests with .._many
-    this->topic_seq_many_.length (total);
-    for (int i = 1; i < (total + 1); i++)
-      {
-        char key[7];
-        TestTopic new_key;
-        ACE_OS::sprintf (key, "many_%d", i);
-        new_key.key = CORBA::string_dup(key);
-        new_key.x = i;
-        this->topic_seq_many_[i-1] = new_key;
-      }
-  }
-
-  void
-  Sender_exec_i::tick (void)
-  {
-    if(this->test_ok_.value())
-     {
-       switch (this->test_nr_)
-         {
-          case UPDATE_CREATE:
-            this->test_ok_ = this->create_one();
-            if(this->test_ok_.value())
-              {
-                this->test_nr_ = UPDATE_ONE;
-              }
-            else
-              {
-                this->test_nr_ = END_TEST;
-              }
-            break;
-          case UPDATE_ONE:
-            this->test_ok_ = this->update_one();
-            this->test_nr_ = DELETE_ONE;
-            break;
-          case DELETE_ONE:
-            this->test_ok_ = this->delete_one();
-            this->test_nr_ = CREATE_MANY;
-            break;
-          case CREATE_MANY:
-            this->test_ok_ = this->create_many();
-            if(this->test_ok_.value())
-              {
-                this->test_nr_ = UPDATE_MANY;
-              }
-            else
-              {
-                this->test_nr_ = END_TEST;
-              }
-            this->test_nr_ = UPDATE_MANY;
-            break;
-          case UPDATE_MANY:
-            this->test_ok_ = this->update_many();
-            this->test_nr_ = DELETE_MANY;
-            break;
-          case DELETE_MANY:
-            this->test_ok_ = this->delete_many();
-            this->test_nr_ = END_TEST;
-            break;
-          default:
-            break;
-        }
-    }
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    this->add_instances_of_topic ();
-    this->start ();
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    long sec = 1L;
-    long const usec = 0L;
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (sec, usec),
-                ACE_Time_Value (sec, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                               ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-  }
-
-
-  // Component attributes and port operations.
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::SL_Disabled::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SL_Disabled_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/SLDisabled/Sender/SL_Disabled_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h
deleted file mode 100644
index b131f0fa51c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h
+++ /dev/null
@@ -1,185 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_SL_DISABLED_SENDER_EXEC_MPPP2N_H_
-#define CIAO_SL_DISABLED_SENDER_EXEC_MPPP2N_H_
-
-#include /**/ "ace/pre.h"
-
-#include "SL_Disabled_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_SL_Disabled_Sender_Impl
-{
-
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, ::CORBA::Boolean > Atomic_Boolean;
-
-  class Sender_exec_i;
-
-  enum UPDATER_TEST {
-    UPDATE_CREATE,
-    UPDATE_ONE,
-    DELETE_ONE,
-    CREATE_MANY,
-    UPDATE_MANY,
-    DELETE_MANY,
-    END_TEST
-  };
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Write action generator
-   */
-
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void tick (void);
-    void get_started (void);
-    //@}
-
-  private:
-    ::SL_Disabled::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    //@}
-
-    //@{
-    /** User defined members. */
-    pulse_Generator * ticker_;
-
-    UPDATER_TEST test_nr_;
-    Atomic_Boolean test_ok_;
-
-    TestTopicSeq topic_seq_one_;
-    TestTopicSeq topic_seq_many_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start (void);
-    void stop (void);
-    void add_instances_of_topic (void);
-
-    ::CORBA::Boolean create_one (void);
-    ::CORBA::Boolean update_one (void);
-    ::CORBA::Boolean delete_one (void);
-    ::CORBA::Boolean create_many (void);
-    ::CORBA::Boolean update_many (void);
-    ::CORBA::Boolean delete_many (void);
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SL_Disabled_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/Plan.cdp
deleted file mode 100644
index 6295f7a7efd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/Plan.cdp
+++ /dev/null
@@ -1,386 +0,0 @@
-<!--  -->
-<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>SL_Disabled_Depl_1</label>
-  <UUID>SL_Disabled_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_SL_Disabled_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SL_Disabled_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="SL_Disabled_ConnectorComponentImplementation">
-    <name>SL_Disabled_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="SL_Disabled_Connector_ExecArtifact" />
-    <artifact xmi:idref="SL_Disabled_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_SL_Disabled_SL_DisabledConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SL_Disabled_SL_DisabledConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SL_Disabled_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SL_Disabled_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_SL_Disabled_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SL_Disabled_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="SL_Disabled_ConnectorComponentInstance">
-    <name>SL_Disabled_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SL_Disabled_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SL_Disabled_ConnectorComponentInstance2">
-    <name>SL_Disabled_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SL_Disabled_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SL_Disabled_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_statelistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SL_Disabled_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SL_Disabled_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SL_Disabled_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>updater_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SL_Disabled_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SL_Disabled_ConnectorComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </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="SL_Disabled_Connector_ExecArtifact">
-    <name>SL_Disabled_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_SL_Disabled_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="SL_Disabled_Connector_SvntArtifact">
-    <name>SL_Disabled_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_SL_Disabled_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="SL_Disabled_Connector_StubArtifact">
-    <name>SL_Disabled_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_SL_Disabled_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/SLDisabled/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl
deleted file mode 100755
index 2b535b3e697..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 20 seconds to allow task to complete\n";
-sleep (20);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/.gitignore b/CIAO/connectors/dds4ccm/tests/SLManyByMany/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl
deleted file mode 100644
index 6723cc83f06..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file   SL_ManyByMany_Base.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef SL_MANYBYMANY_BASE_IDL
-#define SL_MANYBYMANY_BASE_IDL
-
-#pragma ndds typesupport "Base/SL_ManyByMany_BaseSupport.h"
-#pragma opendds typesupport "Base/SL_ManyByMany_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TestTopic"
-#pragma DCPS_DATA_KEY "TestTopic key"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopic> TestTopicSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc
deleted file mode 100644
index f530b760e3c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_SL_ManyByMany_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_SL_ManyByMany_Base_stub
-  dynamicflags += SL_MANYBYMANY_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=SL_MANYBYMANY_BASE_STUB_Export \
-              -Wb,stub_export_include=SL_ManyByMany_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    SL_ManyByMany_Base.idl
-  }
-
-  opendds_ts_flags += --export=SL_MANYBYMANY_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    SL_ManyByMany_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl
deleted file mode 100644
index a5204526af8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file SL_ManyByMany_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef SL_MANYBYMANY_CONNECTOR_IDL_
-#define SL_MANYBYMANY_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-#include "Base/SL_ManyByMany_Base.idl"
-
-#pragma ciao lem "Connector/SL_ManyByMany_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/SL_ManyByMany_BaseTypeSupport.idl"
-#endif
-
-module SL_ManyByMany
-{
-  module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> SLManyByManyConnector;
-};
-
-#endif /* SL_ManyByMany_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
deleted file mode 100644
index 78de5f326c2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SL_ManyByMany_Base -l .. -o ../lib -u DDS SL_ManyByMany_Connector"
-
-project(DDS_SL_MBM_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_SL_ManyByMany_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SL_MANYBYMANY_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=SL_ManyByMany_Connector_stub_export.h \
-              -Wb,skel_export_macro=SL_MANYBYMANY_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=SL_ManyByMany_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=SL_MANYBYMANY_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=SL_ManyByMany_Connector_svnt_export.h \
-              -Wb,conn_export_macro=SL_MANYBYMANY_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=SL_ManyByMany_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    SL_ManyByMany_Connector.idl
-  }
-}
-
-project(DDS_SL_MBM_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SL_MBM_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=SL_MANYBYMANY_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=SL_ManyByMany_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    SL_ManyByMany_ConnectorE.idl
-  }
-}
-
-project(DDS_SL_MBM_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SL_MBM_Connector_lem_gen DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Base_stub
-  libs  += DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_SL_MBM_Connector_lem_stub
-  dynamicflags += SL_MANYBYMANY_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_ManyByMany_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    SL_ManyByMany_ConnectorEC.h
-    SL_ManyByMany_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    SL_ManyByMany_ConnectorEC.inl
-  }
-}
-
-project(DDS_SL_ManyByMany_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SL_MBM_Connector_idl_gen DDS_SL_ManyByMany_Base_stub
-  libs  += DDS_SL_ManyByMany_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_SL_ManyByMany_Connector_stub
-  dynamicflags += SL_MANYBYMANY_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_ManyByMany_ConnectorC.cpp
-  }
-
-  Header_Files {
-    SL_ManyByMany_ConnectorC.h
-    SL_ManyByMany_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    SL_ManyByMany_ConnectorC.inl
-  }
-}
-
-project(DDS_SL_ManyByMany_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Base_stub
-  sharedname = DDS_SL_ManyByMany_Connector_exec
-  libs += DDS_SL_ManyByMany_Connector_stub DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SL_MANYBYMANY_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_ManyByMany_Connector_conn.cpp
-  }
-
-  Header_Files {
-    SL_ManyByMany_Connector_conn.h
-    SL_ManyByMany_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SL_ManyByMany_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Connector_exec DDS_SL_ManyByMany_Connector_stub
-  sharedname  = DDS_SL_ManyByMany_Connector_svnt
-  libs       += DDS_SL_ManyByMany_Connector_stub \
-                DDS_SL_MBM_Connector_lem_stub  \
-                DDS_SL_ManyByMany_Base_stub \
-                DDS_SL_ManyByMany_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SL_MANYBYMANY_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_ManyByMany_ConnectorS.cpp
-    SL_ManyByMany_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    SL_ManyByMany_ConnectorS.h
-    SL_ManyByMany_Connector_svnt.h
-    SL_ManyByMany_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/README b/CIAO/connectors/dds4ccm/tests/SLManyByMany/README
deleted file mode 100644
index 622b15df743..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/README
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-This is a test for the StateListener when the StateListenerControl is in the MANY_BY_MANY mode.
-
-The test uses the Updater to sent samples.
-With a create_one ( 1 sample) and create_many (3 samples) of the Updater,
-the on_creation must be triggered ( 4 times 1 sample).
-
-With a delete_one ( 1 sample) and a delete_many (3 samples) of the Updater,
- the on_deletion must betriggered( 4 times 1 sample).
-
-With update_one  ( 1 sample) and update_many (3 samples) of the Updater,
- the on_many_updates must ideal be triggered 2 times (1 and 3 samples),
-but it is possible through timing problems that the 3 samples are nor received at one time.
-
-Because of the MANY_BY_MANY mode, the on_one_update must not be triggered,
-even if the Updater does a update_one.
-
-In on_deletion, the returning dataum.key is tested . The key shouldn't be empty, but have a valid value
-because of the  <serialize_key_with_dispose> and <propagate_dispose_of_unregistered_instances> settings in the QoS .
-
-
-Beccause the StateListener performs a get, a read_all of a Reader shouldn't receive any samples
-after the Statelistener has received his triggers.
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.idl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.idl
deleted file mode 100644
index f80d7e5ab1c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/SL_ManyByMany_Connector.idl"
-
-module SL_ManyByMany
-{
-  component Receiver
-  {
-    port SLManyByManyConnector::DDS_StateListen info_out;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc
deleted file mode 100644
index 8b0fb7a0ef8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_SL_ManyByMany_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SL_MBM_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 {
-    SL_ManyByMany_Receiver.idl
-  }
-}
-
-project(DDS_SL_ManyByMany_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_SL_ManyByMany_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 {
-    SL_ManyByMany_ReceiverE.idl
-  }
-}
-
-project(DDS_SL_MBM_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_SL_ManyByMany_Receiver_lem_gen DDS_SL_ManyByMany_Receiver_stub  DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Base_stub
-  libs  +=  Receiver_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_ManyByMany_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    SL_ManyByMany_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    SL_ManyByMany_ReceiverEC.inl
-  }
-}
-
-project(DDS_SL_ManyByMany_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SL_ManyByMany_Receiver_idl_gen  DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Base_stub DDS_SL_MBM_Connector_lem_gen
-  libs  += DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_ManyByMany_ReceiverC.cpp
-  }
-
-  Header_Files {
-    SL_ManyByMany_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    SL_ManyByMany_ReceiverC.inl
-  }
-}
-
-project(DDS_SL_ManyByMany_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_SL_MBM_Receiver_lem_stub DDS_SL_ManyByMany_Receiver_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_MBM_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_MBM_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_ManyByMany_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    SL_ManyByMany_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SL_ManyByMany_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_SL_MBM_Receiver_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Connector_svnt DDS_SL_ManyByMany_Receiver_exec DDS_SL_MBM_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Connector_svnt Receiver_exec DDS_SL_MBM_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_ManyByMany_ReceiverS.cpp
-    SL_ManyByMany_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    SL_ManyByMany_ReceiverS.h
-    SL_ManyByMany_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp
deleted file mode 100644
index 938b46a013e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp
+++ /dev/null
@@ -1,612 +0,0 @@
-// -*- C++ -*-
-#include "SL_ManyByMany_Receiver_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#include "dds4ccm/impl/TimeUtilities.h"
-
-#define ON_CREATION_EXPECTED 4
-#define ON_MANY_EXPECTED 4
-#define ON_MANY_TRIGGERED 2
-#define ON_DELETION_EXPECTED 4
-#define ON_READER_EXPECTED 0
-
-namespace CIAO_SL_ManyByMany_Receiver_Impl
-{
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->pulse_callback_.read_all();
-    return 0;
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::SL_ManyByMany::CCM_Receiver_Context_ptr ctx,
-        Atomic_Long &no_operation,
-        Atomic_Long &on_creation,
-        Atomic_Long &on_many_update,
-        Atomic_Long &on_many_upd_trigger,
-        Atomic_Long &on_deletion,
-        Atomic_Bool &create_data,
-        Atomic_Bool &update_data,
-        Atomic_Long &samples_read)
-    : ciao_context_ (
-        ::SL_ManyByMany::CCM_Receiver_Context::_duplicate (ctx))
-      , no_operation_ (no_operation)
-      , on_creation_ (on_creation)
-      , on_many_update_ (on_many_update)
-      , on_many_upd_trigger_ (on_many_upd_trigger)
-      , on_deletion_ (on_deletion)
-      , create_data_ (create_data)
-      , update_data_ (update_data)
-      , samples_read_ (samples_read)
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::SL_ManyByMany::SLManyByManyConnector::StateListener
-
-  void
-  info_out_data_listener_exec_i::on_creation (const ::TestTopic & datum,
-  const ::CCM_DDS::ReadInfo & info)
-  {
-    ++this->on_creation_;
-    ACE_Time_Value tv;
-    tv <<= info.source_timestamp;
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("on_creation ReadInfo ")
-                          ACE_TEXT ("-> UTC date =%#T\n"),
-                          &tv));
-
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Statelistener:on_creation : ")
-                          ACE_TEXT ("Received datum for <%C> at %u\n"),
-                          datum.key.in (),
-                          datum.x));
-    // One of the data must have the key 'KEY_1' with x == 1
-    if (ACE_OS::strcmp (datum.key.in(), "KEY_1") == 0 && datum.x == 1L)
-      {
-        this->create_data_ = true;
-      }
-  }
-
-  void
-  info_out_data_listener_exec_i::on_one_update (const ::TestTopic & /* datum */,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ++this->no_operation_;
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_updates (const ::TestTopicSeq & data,
-  const ::CCM_DDS::ReadInfoSeq & infos)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("on_many_update triggered,")
-                          ACE_TEXT (" received sequence of ")
-                          ACE_TEXT ("<%u> samples\n"),
-                          infos.length()));
-    //number of times this is triggered
-    this->on_many_upd_trigger_ ++;
-
-    //number of total samples received
-    this->on_many_update_ += infos.length();
-    for(CORBA::ULong i = 0; i < infos.length(); ++i)
-      {
-        if (infos[i].instance_status != CCM_DDS::INSTANCE_UPDATED)
-          {
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("ERROR: did not receive the expected ")
-                        ACE_TEXT ("info.instance_status ")
-                        ACE_TEXT ("'CCM_DDS::INSTANCE_UPDATED' ")
-                        ACE_TEXT ("with operation 'on_many_updates' ")
-                        ACE_TEXT ("from StateListener in Receiver\n")
-                        ));
-
-          }
-        ACE_Time_Value tv;
-        tv <<= infos[i].source_timestamp;
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("on_many_updates ReadInfo ")
-                              ACE_TEXT ("-> UTC date =%#T\n"),
-                              &tv));
-      }
-    for (CORBA::ULong i = 0; i < data.length(); ++i)
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("on_many_updates info : Number <%d> :")
-                              ACE_TEXT (" received TestTopic_info ")
-                              ACE_TEXT ("for <%C> at %u\n"),
-                              i,
-                              data[i].key.in (),
-                              data[i].x));
-        // one of the data must have the key 'KEY_1' with x == 2
-        if (ACE_OS::strcmp(data[i].key,"KEY_1") == 0 && data[i].x == 2L)
-          {
-            this->update_data_ = true;
-          }
-       }
-
-    // When we have received all updates, check if there is
-    // something left in the cache
-    if(this->on_many_update_.value () == ON_MANY_EXPECTED)
-      {
-        try
-          {
-            SL_ManyByMany::SLManyByManyConnector::Reader_var reader =
-              this->ciao_context_->get_connection_info_out_data ();
-            if (::CORBA::is_nil (reader.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "info_out_data_listener_exec_i::on_many_updates - "
-                          "ERROR: Reader seems nil\n"));
-              }
-            ::TestTopicSeq seq;
-            ::CCM_DDS::ReadInfoSeq infos;
-            reader->read_all (seq, infos);
-            this->samples_read_ += seq.length ();
-
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("info_out_data_listener_exec_i::on_many_updates - ")
-                                  ACE_TEXT ("Read <%u> samples\n"),
-                                  seq.length ()));
-          }
-        catch (const CCM_DDS::InternalError& ex)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                        ACE_TEXT ("when using reader->read_all: index <%d> - retval <%d>\n"),
-                        ex.index, ex.error_code));
-          }
-      }
-  }
-
-  void
-  info_out_data_listener_exec_i::on_deletion (const ::TestTopic & datum,
-  const ::CCM_DDS::ReadInfo & info)
-  {
-    if (info.instance_status != CCM_DDS::INSTANCE_DELETED)
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("ERROR: did not receive the expected ")
-                    ACE_TEXT ("info.instance_status ")
-                    ACE_TEXT ("'CCM_DDS::INSTANCE_DELETED' with operation ")
-                    ACE_TEXT ("'on_deletion' from StateListener in Receiver\n")
-                   ));
-
-      }
-    else
-      {
-        // Because of the settings <serialize_key_with_dispose> and
-        // <propagate_dispose_of_unregistered_instances> in the QoS , we expect
-        // an existing datum.key
-        // Since these are RTI DDS specific QOS settings, we only need to test
-        // this in case RTI DDS
-#if (CIAO_DDS4CCM_NDDS==1)
-        if ((ACE_OS::strncmp (datum.key.in(), "KEY", 3) == 0  ) ||
-            (ACE_OS::strncmp (datum.key.in(), "many", 4) == 0  ))
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Statelistener:on_deletion : ")
-                        ACE_TEXT ("Received datum for <%C> \n"),
-                        datum.key.in ()));
-            ++this->on_deletion_;
-           }
-        else
-          {
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("ERROR Statelistener:on_deletion : did not ")
-                        ACE_TEXT ("receive the expected datum, received <%C>")
-                        ACE_TEXT (", expected <KEY_.> or <many_.>\n"),
-                        datum.key.in ()));
-          }
-#else
-        ++this->on_deletion_;
-        ACE_UNUSED_ARG (datum);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Statelistener:on_deletion : ")
-                    ACE_TEXT ("Received on_deletion event\n")));
-
-#endif
-      }
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::SL_ManyByMany::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::SL_ManyByMany::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : no_operation_ (0)
-      , on_creation_ (0)
-      , on_many_update_ (0)
-      , on_many_upd_trigger_ (0)
-      , on_deletion_ (0)
-      , create_data_ (false)
-      , update_data_ (false)
-      , reader_data_ (0)
-      , samples_read_ (0)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      read_action_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Receiver_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Receiver_exec_i::read_all (void)
-  {
-    ::SL_ManyByMany::SLManyByManyConnector::Reader_var reader =
-      this->ciao_context_->get_connection_info_out_data ();
-
-    if ( ::CORBA::is_nil (reader.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::read_all - "
-                  "Reader seems nil\n"));
-        return;
-      }
-    try
-      {
-       TestTopicSeq TestTopic_infos;
-        ::CCM_DDS::ReadInfoSeq readinfoseq;
-        reader->read_all (TestTopic_infos, readinfoseq);
-        this->reader_data_ += TestTopic_infos.length ();
-        for (CORBA::ULong i = 0; i < readinfoseq.length (); ++i)
-          {
-            ACE_Time_Value tv;
-            tv <<= readinfoseq[i].source_timestamp;
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ")
-                                  ACE_TEXT ("-> UTC date =%#T\n"),
-                                  &tv));
-          }
-        for (CORBA::ULong i = 0; i < TestTopic_infos.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL info : ")
-                        ACE_TEXT ("Number <%d> : received TestTopic_info for <%C> at %u\n"),
-                        i,
-                        TestTopic_infos[i].key.in (),
-                        TestTopic_infos[i].x));
-          }
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::read_all - "
-                  "internal error or no data\n"));
-      }
-  }
-  // Component attributes and port operations.
-
-  ::SL_ManyByMany::SLManyByManyConnector::CCM_StateListener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->no_operation_,
-            this->on_creation_,
-            this->on_many_update_,
-            this->on_many_upd_trigger_,
-            this->on_deletion_,
-            this->create_data_,
-            this->update_data_,
-            this->samples_read_),
-            ::SL_ManyByMany::SLManyByManyConnector::CCM_StateListener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::SL_ManyByMany::SLManyByManyConnector::CCM_StateListener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::SL_ManyByMany::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::StateListenerControl_var lc =
-    this->ciao_context_->get_connection_info_out_data_control ();
-
-    if (::CORBA::is_nil (lc.in ()))
-      {
-         ACE_ERROR ((LM_INFO, "Receiver_exec_i::ccm_activate - "
-                   "ERROR:  Listener control receptacle is null!\n"));
-        throw ::CORBA::INTERNAL ();
-      }
-
-    lc->mode (::CCM_DDS::MANY_BY_MANY);
-    if (this->reactor ()->schedule_timer (this->ticker_,
-                                          0,
-                                        ACE_Time_Value(18, 0),
-                                        ACE_Time_Value(1, 0)) == -1)
-   //                                        ACE_Time_Value(1, 0),
-   //                                        ACE_Time_Value(1, 0)) == -1)
-      {
-         ACE_ERROR ((LM_INFO, "Receiver_exec_i::ccm_activate - "
-                   "ERROR:  Unable to schedule timer!\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->no_operation_.value () > 0)
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did receive an unexpected ")
-                               ACE_TEXT ("operation 'on_one_update' from ")
-                               ACE_TEXT ("StateListener in Receiver\n")
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: did not receive an unexpected ")
-                               ACE_TEXT ("operation 'on_one_update' from ")
-                               ACE_TEXT ("StateListener in Receiver\n")
-                    ));
-      }
-
-    if (this->on_creation_.value () != ON_CREATION_EXPECTED)
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: didn't receive the expected ")
-                               ACE_TEXT ("number of 'on_creation' calls: ")
-                               ACE_TEXT ("expected <%d> - received <%d>\n"),
-                               ON_CREATION_EXPECTED,
-                               this->on_creation_.value ()
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: did receive the expected ")
-                               ACE_TEXT ("number of 'on_creation' calls: ")
-                               ACE_TEXT ("expected <%d> - received <%d>\n"),
-                               ON_CREATION_EXPECTED,
-                               this->on_creation_.value ()
-                    ));
-      }
-
-    if (!this->create_data_ .value ())
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: didn't receive the expected ")
-                               ACE_TEXT ("sample in 'on_creation' from ")
-                               ACE_TEXT ("StateListener in Receiver\n")
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: did receive the expected ")
-                               ACE_TEXT ("sample in 'on_creation' from ")
-                               ACE_TEXT ("StateListener in Receiver\n")
-                    ));
-      }
-
-    if(this->on_many_upd_trigger_.value  () < ON_MANY_TRIGGERED)
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: didn't trigger the expected ")
-                               ACE_TEXT ("number of 'on_many_update': ")
-                               ACE_TEXT ("expected minimum <%d> - received <%d>\n"),
-                               ON_MANY_TRIGGERED,
-                               this->on_many_upd_trigger_.value ()
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: did trigger the minimum expected ")
-                               ACE_TEXT ("number of 'on_many_update': ")
-                               ACE_TEXT ("expected <%d> - received <%d>\n"),
-                               ON_MANY_TRIGGERED,
-                               this->on_many_upd_trigger_.value ()
-                    ));
-      }
-    if(this->on_many_update_.value  () != ON_MANY_EXPECTED)
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: didn't receive the expected ")
-                               ACE_TEXT ("number of 'on_many_update' samples: ")
-                               ACE_TEXT ("expected <%d> - received <%d>\n"),
-                               ON_MANY_EXPECTED,
-                               this->on_many_update_.value ()
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: did receive the expected ")
-                               ACE_TEXT ("number of 'on_many_update' samples: ")
-                               ACE_TEXT ("expected <%d> - received <%d>, ")
-                               ACE_TEXT ("on_many_update triggered at <%d> times.\n"),
-                               ON_MANY_EXPECTED,
-                               this->on_many_update_.value (),
-                               ON_MANY_TRIGGERED
-                    ));
-      }
-
-    if (!this->update_data_.value ())
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR:didn't receive the expected ")
-                               ACE_TEXT (" data with 'on_many_updates' from ")
-                               ACE_TEXT ("StateListener in Receiver\n")
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: did receive the expected ")
-                               ACE_TEXT ("sample in 'on_many_updates' from ")
-                               ACE_TEXT ("StateListener in Receiver\n")
-                    ));
-      }
-
-    if (this->on_deletion_.value () != ON_DELETION_EXPECTED)
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: didn't receive the expected ")
-                               ACE_TEXT ("number of 'on_deletion' calls: ")
-                               ACE_TEXT ("expected <%d> - received <%d>\n"),
-                               ON_DELETION_EXPECTED,
-                               this->on_deletion_.value ()
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: did receive the expected ")
-                               ACE_TEXT ("number of 'on_deletion' calls: ")
-                               ACE_TEXT ("expected <%d> - received <%d>\n"),
-                               ON_DELETION_EXPECTED,
-                               this->on_deletion_.value ()
-                    ));
-      }
-
-    if (this->reader_data_.value () != ON_READER_EXPECTED)
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: didn't read the expected ")
-                               ACE_TEXT ("number of samples: ")
-                               ACE_TEXT ("expected <%d> - received <%d>\n"),
-                               ON_READER_EXPECTED,
-                               this->reader_data_.value ()
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: read the expected ")
-                               ACE_TEXT ("number of samples: ")
-                               ACE_TEXT ("expected <%d> - received <%d>\n"),
-                               ON_READER_EXPECTED,
-                               this->reader_data_.value ()
-                    ));
-      }
-    if (this->samples_read_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: read no samples\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: read <%u> samples\n"),
-                this->samples_read_.value ()));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SL_ManyByMany_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/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h
deleted file mode 100644
index 03cb9f7ed7e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h
+++ /dev/null
@@ -1,208 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_SL_MANYBYMANY_RECEIVER_EXEC_4U4QJF_H_
-#define CIAO_SL_MANYBYMANY_RECEIVER_EXEC_4U4QJF_H_
-
-#include /**/ "ace/pre.h"
-
-#include "SL_ManyByMany_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_SL_ManyByMany_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong > Atomic_Long;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Bool;
-
-  class Receiver_exec_i;
-
-  /**
-   * Read action generator
-   */
-
-  class read_action_Generator
-    : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Receiver_exec_i &callback);
-
-    ~read_action_Generator ();
-
-    /// Handle the timeout.
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-
-  private:
-    /// Maintains a handle that actually process the event
-    Receiver_exec_i &pulse_callback_;
-
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::SL_ManyByMany::SLManyByManyConnector::CCM_StateListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::SL_ManyByMany::CCM_Receiver_Context_ptr ctx,
-      Atomic_Long &no_operation,
-      Atomic_Long &on_creation,
-      Atomic_Long &on_many_update,
-      Atomic_Long &on_many_upd_trigger,
-      Atomic_Long &on_deletion,
-      Atomic_Bool &create_data,
-      Atomic_Bool &update_data,
-      Atomic_Long &samples_read);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from SL_ManyByMany::SLManyByManyConnector::StateListener. */
-
-    virtual
-    void on_creation (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_one_update (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_updates (const ::TestTopicSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-
-    virtual
-    void on_deletion (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-    //@}
-
-  private:
-    ::SL_ManyByMany::CCM_Receiver_Context_var ciao_context_;
-     Atomic_Long &no_operation_;
-     Atomic_Long &on_creation_;
-     Atomic_Long &on_many_update_;
-     Atomic_Long &on_many_upd_trigger_;
-     Atomic_Long &on_deletion_;
-     Atomic_Bool &create_data_;
-     Atomic_Bool &update_data_;
-     Atomic_Long &samples_read_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::SL_ManyByMany::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::SL_ManyByMany::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::SL_ManyByMany::SLManyByManyConnector::CCM_StateListener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void read_all(void);
-
-    //@}
-
-  private:
-    ::SL_ManyByMany::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::SL_ManyByMany::SLManyByManyConnector::CCM_StateListener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    read_action_Generator * ticker_;
-
-    Atomic_Long no_operation_;
-    Atomic_Long on_creation_;
-    Atomic_Long on_many_update_;
-    Atomic_Long on_many_upd_trigger_;
-    Atomic_Long on_deletion_;
-    Atomic_Bool create_data_;
-    Atomic_Bool update_data_;
-    Atomic_Long reader_data_;
-    Atomic_Long samples_read_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SL_ManyByMany_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl
deleted file mode 100644
index b823417508f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_SL_MANYBYMANY_SENDER_IDL
-#define DDS_SL_MANYBYMANY_SENDER_IDL
-
-#include "Connector/SL_ManyByMany_Connector.idl"
-
-module SL_ManyByMany
-{
-  component Sender
-  {
-     port ::SL_ManyByMany::SLManyByManyConnector::DDS_Update test_topic_update;
-     provides CCM_DDS::ConnectorStatusListener test_topic_connector_status;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc
deleted file mode 100644
index 4b24d1979fe..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SL_ManyByMany_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_SL_ManyByMany_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_SL_MBM_Connector_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 {
-    SL_ManyByMany_Sender.idl
-  }
-}
-
-project(DDS_SL_ManyByMany_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_SL_ManyByMany_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 {
-    SL_ManyByMany_SenderE.idl
-  }
-}
-
-project(DDS_SL_ManyByMany_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_SL_ManyByMany_Sender_lem_gen DDS_SL_ManyByMany_Sender_stub DDS_SL_ManyByMany_Base_stub
-  libs  += DDS_SL_ManyByMany_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_ManyByMany_SenderEC.cpp
-  }
-
-  Header_Files {
-    SL_ManyByMany_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    SL_ManyByMany_SenderEC.inl
-  }
-}
-
-project(DDS_SL_ManyByMany_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SL_ManyByMany_Sender_idl_gen DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub
-  libs  += DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_ManyByMany_SenderC.cpp
-  }
-
-  Header_Files {
-    SL_ManyByMany_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    SL_ManyByMany_SenderC.inl
-  }
-}
-
-project(DDS_SL_ManyByMany_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_SL_ManyByMany_Sender_lem_stub DDS_SL_ManyByMany_Sender_stub DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_MBM_Connector_lem_stub  DDS_SL_ManyByMany_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_ManyByMany_Sender_exec.cpp
-  }
-
-  Header_Files {
-    SL_ManyByMany_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SL_ManyByMany_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_SL_ManyByMany_Base_stub  DDS_SL_ManyByMany_Sender_lem_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Connector_svnt DDS_SL_MBM_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub  DDS_SL_ManyByMany_Connector_svnt DDS_SL_MBM_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_ManyByMany_SenderS.cpp
-    SL_ManyByMany_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    SL_ManyByMany_SenderS.h
-    SL_ManyByMany_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp
deleted file mode 100644
index 95900c0c10e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp
+++ /dev/null
@@ -1,544 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "SL_ManyByMany_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_SL_ManyByMany_Sender_Impl
-{
-  /**
-   * Write action generator
-   */
-  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-
-  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 /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  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_.get_started ();
-      }
-  }
-
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : test_nr_(UPDATE_CREATE)
-    , test_ok_(true)
-    , started_ (false)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_test_topic_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (*this);
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::create_one (void)
-  {
-    TestTopic i = this->topic_seq_one_[0];
-    try
-      {
-        ::SL_ManyByMany::SLManyByManyConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::create_one - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        updater->create_one (i);
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("SL_ManyByMany: create_one with instance key ")
-                    ACE_TEXT (" <%C>\n"),
-                    i.key.in ()));
-      }
-    catch (const CCM_DDS::AlreadyCreated &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: AlreadyCreated ")
-                  ACE_TEXT ("with test updater create_one <%C>.\n"),
-                  i.key.in ()));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Internal Error while create_one for <%C>.\n"),
-                    i.key.in ()));
-        return false;
-      }
-    return true;
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::update_one (void)
-  {
-    //update already created instance with handle nil
-    TestTopic i = this->topic_seq_one_[0];
-    try
-      {
-        ::SL_ManyByMany::SLManyByManyConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::update_one - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        i.x++;
-        updater->update_one (i, DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("Updater: update_one with already existing ")
-                    ACE_TEXT ("instance with DDS::HANDLE_NIL, key <%C>\n"),
-                    i.key.in ()));
-      }
-    catch (const CCM_DDS::NonExistent &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent ")
-                             ACE_TEXT ("with test updater update_one <%C>.\n"),
-                       i.key.in ()));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Internal Error while update_one for <%C>.\n"),
-                    i.key.in ()));
-        return false;
-      }
-    return true;
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::delete_one (void)
-  {
-    //delete registered instance with DDS::HANDLE_NIL
-    TestTopic i = this->topic_seq_one_[0];
-    try
-      {
-        ::SL_ManyByMany::SLManyByManyConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::delete_one - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: delete_one with registered ")
-                              ACE_TEXT ("instance with DDS::HANDLE_NIL, ")
-                              ACE_TEXT ("key <%C>\n"),
-                              i.key.in ()));
-        updater->delete_one(i, DDS::HANDLE_NIL);
-      }
-    catch (const CCM_DDS::NonExistent &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent ")
-                              ACE_TEXT ("with test updater delete_one <%C>.\n"),
-                              i.key.in ()));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Internal Error while delete_one for <%C>.\n"),
-                    i.key.in ()));
-        return false;
-      }
-      return true;
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::create_many (void)
-  {
-    //create many with no exception
-    try
-      {
-        ::SL_ManyByMany::SLManyByManyConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::create_many - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("create_many : <%u> samples\n"),
-                         this->topic_seq_many_.length ()));
-        updater->create_many (this->topic_seq_many_);
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: ")
-                  ACE_TEXT ("NonExistent with test updater create_many\n")));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                     ACE_TEXT ("in updater: create_many: index <%d> - retval <%d>\n"),
-                     ex.index, ex.error_code));
-         return false;
-
-      }
-    return true;
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::update_many (void)
-  {
-    try
-      {
-        ::SL_ManyByMany::SLManyByManyConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::update_many - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-       for(CORBA::ULong i = 0; i < this->topic_seq_many_.length(); i++)
-          {
-            this->topic_seq_many_[i].x= i+ 10;
-          }
-        updater->update_many (this->topic_seq_many_);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("update_many : written <%u> samples\n"),
-                   this->topic_seq_many_.length ()));
-        updater->is_coherent_write (false);
-
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater update_many.\n")));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                     ACE_TEXT ("with update_many: index <%d> - retval <%d>\n"),
-                     ex.index, ex.error_code));
-        return false;
-      }
-    return true;
-  }
-
-  ::CORBA::Boolean
-  Sender_exec_i::delete_many (void)
-  {
-    try
-      {
-        ::SL_ManyByMany::SLManyByManyConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::delete_many - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_many : deleted <%u> samples\n"),
-                                          this->topic_seq_many_.length ()));
-        updater->delete_many (this->topic_seq_many_);
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent ")
-                              ACE_TEXT ("with test updater delete_many\n")));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                              ACE_TEXT ("with test updater delete_many:")
-                              ACE_TEXT ("index <%d> - retval <%d>\n"),
-                              ex.index, ex.error_code));
-        return false;
-      }
-
-    return true;
-  }
-
-  void
-  Sender_exec_i::add_instances_of_topic (void)
-  {
-    CORBA::UShort total = 3;
-    this->topic_seq_one_.length (total);
-    //sequence for tests with .._one
-    for (int i = 1; i < (total + 1); i++)
-      {
-        char key[7];
-        TestTopic new_key;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key.key = CORBA::string_dup(key);
-        new_key.x = i;
-        this->topic_seq_one_[i-1] = new_key;
-      }
-    //sequence for tests with .._many
-    this->topic_seq_many_.length (total);
-    for (int i = 1; i < (total + 1); i++)
-      {
-        char key[7];
-        TestTopic new_key;
-        ACE_OS::sprintf (key, "many_%d", i);
-        new_key.key = CORBA::string_dup(key);
-        new_key.x = i;
-        this->topic_seq_many_[i-1] = new_key;
-      }
-  }
-
-  void
-  Sender_exec_i::tick (void)
-  {
-    if (this->test_ok_.value ())
-     {
-       switch (this->test_nr_)
-         {
-          case UPDATE_CREATE:
-            this->test_ok_ = this->create_one ();
-            if(this->test_ok_.value ())
-              {
-                this->test_nr_ = UPDATE_ONE;
-              }
-            else
-              {
-                this->test_nr_ = END_TEST;
-              }
-            break;
-          case UPDATE_ONE:
-            this->test_ok_ = this->update_one ();
-            this->test_nr_ = DELETE_ONE;
-            break;
-          case DELETE_ONE:
-            this->test_ok_ = this->delete_one ();
-            this->test_nr_ = CREATE_MANY;
-            break;
-          case CREATE_MANY:
-            this->test_ok_ = this->create_many ();
-            if(this->test_ok_.value ())
-              {
-                this->test_nr_ = UPDATE_MANY;
-              }
-            else
-              {
-                this->test_nr_ = END_TEST;
-              }
-            this->test_nr_ = UPDATE_MANY;
-            break;
-          case UPDATE_MANY:
-            this->test_ok_ = this->update_many ();
-            this->test_nr_ = DELETE_MANY;
-            break;
-          case DELETE_MANY:
-            this->test_ok_ = this->delete_many ();
-            this->test_nr_ = END_TEST;
-            break;
-          default:
-            break;
-        }
-    }
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    this->started_ = true;
-    this->add_instances_of_topic ();
-    this->start ();
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    long sec = 2L;
-    long const usec = 0L;
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (sec, usec),
-                ACE_Time_Value (sec, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-  }
-
-  // Component attributes and port operations.
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::SL_ManyByMany::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-
-    if (!this->started_)
-      {
-        ACE_ERROR ((LM_ERROR,
-          "Sender_exec_i::ccm_passivate - "
-          "ERROR: No publication matched received. "
-          "Test didn't run\n"));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SL_ManyByMany_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/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h
deleted file mode 100644
index 0c5b23f1ad4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h
+++ /dev/null
@@ -1,187 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_SL_MANYBYMANY_SENDER_EXEC_6XMS37_H_
-#define CIAO_SL_MANYBYMANY_SENDER_EXEC_6XMS37_H_
-
-#include /**/ "ace/pre.h"
-
-#include "SL_ManyByMany_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_SL_ManyByMany_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Sender_exec_i;
-
-  enum UPDATER_TEST {
-    UPDATE_CREATE,
-    UPDATE_ONE,
-    DELETE_ONE,
-    CREATE_MANY,
-    UPDATE_MANY,
-    DELETE_MANY,
-    END_TEST
-  };
-
-  /**
-   * Write action generator
-   */
-
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-
-  class ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_test_topic_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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void get_started (void);
-    void tick (void);
-    //@}
-
-  private:
-    ::SL_ManyByMany::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    //@}
-
-    //@{
-    /** User defined members. */
-    pulse_Generator * ticker_;
-
-    UPDATER_TEST test_nr_;
-    Atomic_Boolean test_ok_;
-
-    TestTopicSeq topic_seq_one_;
-    TestTopicSeq topic_seq_many_;
-
-    bool started_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start (void);
-    void stop (void);
-    void add_instances_of_topic (void);
-
-    ::CORBA::Boolean create_one (void);
-    ::CORBA::Boolean update_one (void);
-    ::CORBA::Boolean delete_one (void);
-    ::CORBA::Boolean create_many (void);
-    ::CORBA::Boolean update_many (void);
-    ::CORBA::Boolean delete_many (void);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SL_ManyByMany_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/Plan.cdp
deleted file mode 100644
index 8ec10347d57..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/Plan.cdp
+++ /dev/null
@@ -1,407 +0,0 @@
-<!--  -->
-<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>SL_ManyByMany_Depl_1</label>
-  <UUID>SL_ManyByMany_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_SL_ManyByMany_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SL_ManyByMany_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="SL_ManyByMany_ConnectorComponentImplementation">
-    <name>SL_ManyByMany_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="SL_ManyByMany_Connector_ExecArtifact" />
-    <artifact xmi:idref="SL_ManyByMany_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_SL_ManyByMany_SLManyByManyConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SL_ManyByMany_SLManyByManyConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SL_ManyByMany_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SL_ManyByMany_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_SL_ManyByMany_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SL_ManyByMany_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="SL_ManyByMany_ConnectorComponentInstance">
-    <name>SL_ManyByMany_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SL_ManyByMany_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SlMbM_Library#SlMbMProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SL_ManyByMany_ConnectorComponentInstance2">
-    <name>SL_ManyByMany_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SL_ManyByMany_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SlMbM_Library#SlMbMProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SL_ManyByMany_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_statelistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SL_ManyByMany_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SL_ManyByMany_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SL_ManyByMany_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>updater_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SL_ManyByMany_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>test_topic_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SL_ManyByMany_ConnectorComponentInstance" />
-    </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="SL_ManyByMany_Connector_ExecArtifact">
-    <name>SL_ManyByMany_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_SL_ManyByMany_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="SL_ManyByMany_Connector_SvntArtifact">
-    <name>SL_ManyByMany_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_SL_ManyByMany_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="SL_ManyByMany_Connector_StubArtifact">
-    <name>SL_ManyByMany_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_SL_ManyByMany_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/SLManyByMany/descriptors/SlMbM_Library.xml b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/SlMbM_Library.xml
deleted file mode 100644
index 2080a71ca1e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/SlMbM_Library.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="SlMbMProfile">
-    <!-- QoS used to configure the data writer created in the example code -->
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <resource_limits>
-        <max_instances>4</max_instances>
-        <initial_instances>4</initial_instances>
-        <max_samples>25</max_samples>
-        <initial_samples>10</initial_samples>
-        <max_samples_per_instance>5</max_samples_per_instance>
-      </resource_limits>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <resource_limits>
-        <max_instances>4</max_instances>
-        <initial_instances>4</initial_instances>
-        <max_samples>25</max_samples>
-        <initial_samples>10</initial_samples>
-        <max_samples_per_instance>5</max_samples_per_instance>
-      </resource_limits>
-    </datareader_qos>
-  </qos_profile>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index ab40e123e60..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="SlMbM_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="SlMbMProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-       <resource_limits>
-          <max_instances>4</max_instances>
-          <initial_instances>4</initial_instances>
-          <max_samples>25</max_samples>
-          <initial_samples>10</initial_samples>
-          <max_samples_per_instance>5</max_samples_per_instance>
-        </resource_limits>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-          <serialize_key_with_dispose>BOOLEAN_TRUE</serialize_key_with_dispose>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-       <resource_limits>
-          <max_instances>4</max_instances>
-          <initial_instances>4</initial_instances>
-          <max_samples>25</max_samples>
-          <initial_samples>10</initial_samples>
-          <max_samples_per_instance>5</max_samples_per_instance>
-        </resource_limits>
-        <protocol>
-          <propagate_dispose_of_unregistered_instances>BOOLEAN_TRUE</propagate_dispose_of_unregistered_instances>
-        </protocol>
-      </datareader_qos>
-     </qos_profile>
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl
deleted file mode 100755
index c5b1964e047..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/.gitignore b/CIAO/connectors/dds4ccm/tests/SLOneByOne/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl
deleted file mode 100644
index 551272ab7ec..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file   SL_OneByOne_Base.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef SL_ONEBYONE_BASE_IDL
-#define SL_ONEBYONE_BASE_IDL
-
-#pragma ndds typesupport "Base/SL_OneByOne_BaseSupport.h"
-#pragma opendds typesupport "Base/SL_OneByOne_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TestTopic"
-#pragma DCPS_DATA_KEY "TestTopic key"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopic> TestTopicSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc
deleted file mode 100644
index 2e9e3dc6f6c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_SL_OneByOne_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_SL_OneByOne_Base_stub
-  dynamicflags += SL_ONEBYONE_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=SL_ONEBYONE_BASE_STUB_Export \
-              -Wb,stub_export_include=SL_OneByOne_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    SL_OneByOne_Base.idl
-  }
-
-  opendds_ts_flags += --export=SL_ONEBYONE_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    SL_OneByOne_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
deleted file mode 100644
index b135115a86b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SL_OneByOne_Base -l .. -o ../lib -u DDS SL_OneByOne_Connector"
-
-project(DDS_SL_OBO_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_SL_OneByOne_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SL_ONEBYONE_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=SL_OneByOne_Connector_stub_export.h \
-              -Wb,skel_export_macro=SL_ONEBYONE_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=SL_OneByOne_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=SL_ONEBYONE_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=SL_OneByOne_Connector_svnt_export.h \
-              -Wb,conn_export_macro=SL_ONEBYONE_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=SL_OneByOne_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    SL_OneByOne_Connector.idl
-  }
-}
-
-project(DDS_SL_OBO_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SL_OBO_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=SL_ONEBYONE_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=SL_OneByOne_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    SL_OneByOne_ConnectorE.idl
-  }
-}
-
-project(DDS_SL_OBO_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SL_OBO_Connector_lem_gen DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Base_stub
-  libs  += DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_SL_OBO_Connector_lem_stub
-  dynamicflags += SL_ONEBYONE_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_OneByOne_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    SL_OneByOne_ConnectorEC.h
-    SL_OneByOne_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    SL_OneByOne_ConnectorEC.inl
-  }
-}
-
-project(DDS_SL_OneByOne_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SL_OBO_Connector_idl_gen DDS_SL_OneByOne_Base_stub
-  libs  += DDS_SL_OneByOne_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_SL_OneByOne_Connector_stub
-  dynamicflags += SL_ONEBYONE_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_OneByOne_ConnectorC.cpp
-  }
-
-  Header_Files {
-    SL_OneByOne_ConnectorC.h
-    SL_OneByOne_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    SL_OneByOne_ConnectorC.inl
-  }
-}
-
-project(DDS_SL_OneByOne_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Base_stub
-  sharedname = DDS_SL_OneByOne_Connector_exec
-  libs += DDS_SL_OneByOne_Connector_stub DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SL_ONEBYONE_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_OneByOne_Connector_conn.cpp
-  }
-
-  Header_Files {
-    SL_OneByOne_Connector_conn.h
-    SL_OneByOne_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SL_OneByOne_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Connector_exec DDS_SL_OneByOne_Connector_stub
-  sharedname  = DDS_SL_OneByOne_Connector_svnt
-  libs       += DDS_SL_OneByOne_Connector_stub \
-                DDS_SL_OBO_Connector_lem_stub  \
-                DDS_SL_OneByOne_Base_stub \
-                DDS_SL_OneByOne_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SL_ONEBYONE_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_OneByOne_ConnectorS.cpp
-    SL_OneByOne_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    SL_OneByOne_ConnectorS.h
-    SL_OneByOne_Connector_svnt.h
-    SL_OneByOne_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl
deleted file mode 100644
index 3c00070f29c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file SL_OneByOne_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef SL_ONEBYONE_CONNECTOR_IDL_
-#define SL_ONEBYONE_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/SL_OneByOne_Base.idl"
-
-#pragma ciao lem "Connector/SL_OneByOne_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/SL_OneByOne_BaseTypeSupport.idl"
-#endif
-
-module SL_OneByOne
-{
-  module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> SL_OneByOneConnector;
-};
-
-#endif /* SL_OneByOne_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.idl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.idl
deleted file mode 100644
index 60bb6a4d68d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/SL_OneByOne_Connector.idl"
-
-module SL_OneByOne
-{
-  component Receiver
-  {
-    port SL_OneByOneConnector::DDS_StateListen info_out;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc
deleted file mode 100644
index ca67a723ed7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_SL_OneByOne_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SL_OBO_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 {
-    SL_OneByOne_Receiver.idl
-  }
-}
-
-project(DDS_SL_OneByOne_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_SL_OneByOne_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 {
-    SL_OneByOne_ReceiverE.idl
-  }
-}
-
-project(DDS_SL_OBO_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_SL_OneByOne_Receiver_lem_gen DDS_SL_OneByOne_Receiver_stub  DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Base_stub
-  libs  +=  Receiver_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_OneByOne_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    SL_OneByOne_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    SL_OneByOne_ReceiverEC.inl
-  }
-}
-
-project(DDS_SL_OneByOne_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SL_OneByOne_Receiver_idl_gen  DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Base_stub DDS_SL_OBO_Connector_lem_gen
-  libs  += DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_OneByOne_ReceiverC.cpp
-  }
-
-  Header_Files {
-    SL_OneByOne_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    SL_OneByOne_ReceiverC.inl
-  }
-}
-
-project(DDS_SL_OneByOne_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_SL_OBO_Receiver_lem_stub DDS_SL_OneByOne_Receiver_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OBO_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OBO_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_OneByOne_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    SL_OneByOne_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SL_OneByOne_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_SL_OBO_Receiver_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Connector_svnt DDS_SL_OneByOne_Receiver_exec DDS_SL_OBO_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Connector_svnt Receiver_exec DDS_SL_OBO_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_OneByOne_ReceiverS.cpp
-    SL_OneByOne_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    SL_OneByOne_ReceiverS.h
-    SL_OneByOne_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp
deleted file mode 100644
index 76c657248b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp
+++ /dev/null
@@ -1,455 +0,0 @@
-// -*- C++ -*-
-#include "SL_OneByOne_Receiver_exec.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-#define ON_CREATION_EXPECTED 4
-#define ON_ONE_UPDATE_EXPECTED 4
-#define ON_DELETION_EXPECTED 4
-
-namespace CIAO_SL_OneByOne_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::SL_OneByOne::CCM_Receiver_Context_ptr ctx,
-        Atomic_Long &on_many_updates,
-        Atomic_Long &on_creation,
-        Atomic_Long &on_one_update,
-        Atomic_Long &on_deletion,
-        Atomic_Long &samples_read,
-        ACE_Thread_ID &thread_id)
-    : ciao_context_ (
-        ::SL_OneByOne::CCM_Receiver_Context::_duplicate (ctx))
-      , on_many_updates_ (on_many_updates)
-      , on_creation_ (on_creation)
-      , on_one_update_ (on_one_update)
-      , on_deletion_ (on_deletion)
-      , samples_read_ (samples_read)
-      , thread_id_  (thread_id)
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::SL_OneByOne::SL_OneByOneConnector::StateListener
-
-  void
-  info_out_data_listener_exec_i::on_creation (const ::TestTopic & datum,
-  const ::CCM_DDS::ReadInfo & info)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_ = t_id;
-    if (!datum.key.in() == 0 &&
-        info.instance_status == CCM_DDS::INSTANCE_CREATED)
-      {
-        ++this->on_creation_;
-      }
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("StateListener_exec_i::on_creation - ")
-                          ACE_TEXT ("Received sample: key <%C> - iteration <%d>\n"),
-                          datum.key.in (),
-                          datum.x));
-  }
-
-  void
-  info_out_data_listener_exec_i::on_one_update (const ::TestTopic & datum,
-  const ::CCM_DDS::ReadInfo & info)
-  {
-    if (info.instance_status != CCM_DDS::INSTANCE_UPDATED)
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("ERROR: did not receive the expected info.status ")
-                    ACE_TEXT ("'CCM_DDS::INSTANCE_UPDATED' ")
-                    ACE_TEXT ("with operation 'on_one_update' ")
-                    ACE_TEXT ("from StateListener in Receiver\n")));
-
-      }
-
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("StateListener_exec_i::on_one_update - ")
-                          ACE_TEXT ("Received sample: key <%C> - iteration <%d>\n"),
-                          datum.key.in (),
-                          datum.x));
-
-    if (!datum.key.in() == 0 &&
-        info.instance_status == CCM_DDS::INSTANCE_UPDATED)
-      {
-        ++this->on_one_update_;
-      }
-
-    // When we have received all updates, check if there is something
-    // left in the cache
-    if (this->on_one_update_.value () == ON_ONE_UPDATE_EXPECTED)
-      {
-        try
-          {
-            ::SL_OneByOne::SL_OneByOneConnector::Reader_var reader =
-              this->ciao_context_->get_connection_info_out_data ();
-            if (::CORBA::is_nil (reader.in ()))
-              {
-                ACE_ERROR ((LM_ERROR, "info_out_data_listener_exec_i::on_one_update - "
-                          "ERROR: Reader seems nil\n"));
-              }
-            ::TestTopicSeq seq;
-            ::CCM_DDS::ReadInfoSeq infos;
-            reader->read_all (seq, infos);
-            this->samples_read_ += seq.length ();
-
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("StateListener_exec_i::on_one_update - ")
-                                  ACE_TEXT ("Read <%u> samples\n"),
-                                  seq.length ()));
-          }
-        catch (const CCM_DDS::InternalError& ex)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                        ACE_TEXT ("when using reader->read_all: index <%d> - retval <%d>\n"),
-                        ex.index, ex.error_code));
-          }
-      }
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_updates (const ::TestTopicSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & infos)
-  {
-    this->on_many_updates_ += infos.length ();
-  }
-
-  void
-  info_out_data_listener_exec_i::on_deletion (const ::TestTopic & datum,
-  const ::CCM_DDS::ReadInfo & info)
-  {
-    if (info.instance_status != CCM_DDS::INSTANCE_DELETED)
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("ERROR: did not receive the expected info.status ")
-                    ACE_TEXT ("'CCM_DDS::INSTANCE_DELETED' ")
-                    ACE_TEXT ("with operation 'on_deletion' ")
-                    ACE_TEXT ("from StateListener in Receiver\n")));
-
-      }
-    else
-      {
-        // Because of the settings <serialize_key_with_dispose> and
-        // <propagate_dispose_of_unregistered_instances> in the QoS , we expect
-        // an existing datum.key
-        // Since these are RTI DDS specific QOS settings, we only need to test
-        // this in case RTI DDS
-#if (CIAO_DDS4CCM_NDDS==1)
-        if ((ACE_OS::strncmp (datum.key.in(), "KEY", 3) == 0  ) ||
-            (ACE_OS::strncmp (datum.key.in(), "many", 4) == 0  ))
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Statelistener:on_deletion : ")
-                        ACE_TEXT ("Received datum for <%C> \n"),
-                        datum.key.in ()));
-            ++this->on_deletion_;
-           }
-        else
-          {
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("ERROR Statelistener:on_deletion : did not ")
-                        ACE_TEXT ("receive the expected datum, received <%C>")
-                        ACE_TEXT (", expected <KEY_.> or <many_.>\n"),
-                        datum.key.in ()));
-          }
-#else
-        ACE_UNUSED_ARG (datum);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Statelistener:on_deletion : ")
-                    ACE_TEXT ("Received on_deletion event\n")));
-        ++this->on_deletion_;
-#endif
-      }
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::SL_OneByOne::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::SL_OneByOne::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : on_many_updates_ (0),
-      updater_data_ (0),
-      on_creation_ (0),
-      on_one_update_ (0),
-      on_deletion_ (0),
-      samples_read_ (0),
-      thread_id_listener_ (0, 0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::SL_OneByOne::SL_OneByOneConnector::CCM_StateListener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->on_many_updates_,
-            this->on_creation_,
-            this->on_one_update_,
-            this->on_deletion_,
-            this->samples_read_,
-            this->thread_id_listener_),
-          ::SL_OneByOne::SL_OneByOneConnector::CCM_StateListener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::SL_OneByOne::SL_OneByOneConnector::CCM_StateListener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::SL_OneByOne::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::StateListenerControl_var lc =
-    this->ciao_context_->get_connection_info_out_data_control ();
-
-    if (::CORBA::is_nil (lc.in ()))
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-    lc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->on_many_updates_.value () != 0)
-      {
-         ACE_ERROR ((LM_ERROR,
-                     ACE_TEXT ("ERROR: Received an unexpected ")
-                     ACE_TEXT ("number of samples on 'on_many_updates' ")
-                     ACE_TEXT ("expected <0> - received <%d>\n"),
-                     this->on_many_updates_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("OK: Received the expected ")
-                    ACE_TEXT ("number of samples on 'on_many_updates' ")
-                    ACE_TEXT ("expected <0> - received <%d>\n"),
-                    this->on_many_updates_.value ()));
-      }
-    if (this->on_creation_.value () != ON_CREATION_EXPECTED)
-      {
-         ACE_ERROR ((LM_ERROR,
-                     ACE_TEXT ("ERROR: didn't receive the expected ")
-                     ACE_TEXT (" number of samples on 'on_creation' ")
-                     ACE_TEXT ("expected <%d> - received <%d>\n"),
-                     ON_CREATION_EXPECTED,
-                     this->on_creation_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("OK: Received the expected ")
-                    ACE_TEXT ("number of samples on 'on_creation' ")
-                     ACE_TEXT ("expected <%d> - received <%d>\n"),
-                     ON_CREATION_EXPECTED,
-                     this->on_creation_.value ()));
-      }
-
-    if (this->on_one_update_.value () != ON_ONE_UPDATE_EXPECTED)
-      {
-         ACE_ERROR ((LM_ERROR,
-                     ACE_TEXT ("ERROR: didn't receive the expected ")
-                     ACE_TEXT (" number of samples on 'on_one_update' ")
-                     ACE_TEXT ("expected <%d> - received <%d>\n"),
-                     ON_ONE_UPDATE_EXPECTED,
-                     this->on_one_update_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("OK: Received the expected ")
-                    ACE_TEXT ("number of samples on 'on_one_update' ")
-                    ACE_TEXT ("expected <%d> - received <%d>\n"),
-                    ON_ONE_UPDATE_EXPECTED,
-                    this->on_one_update_.value ()));
-      }
-
-    if (this->on_deletion_.value () != ON_DELETION_EXPECTED)
-      {
-         ACE_ERROR ((LM_ERROR,
-                     ACE_TEXT ("ERROR: didn't receive the expected ")
-                     ACE_TEXT ("number of samples on 'on_deletion' ")
-                     ACE_TEXT ("expected <%d> - received <%d>\n"),
-                     ON_DELETION_EXPECTED,
-                     this->on_deletion_.value ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("OK: Received the expected ")
-                    ACE_TEXT ("number of samples on 'on_deletion' ")
-                    ACE_TEXT ("expected <%d> - received <%d>\n"),
-                    ON_DELETION_EXPECTED,
-                    this->on_deletion_.value ()));
-      }
-    if (this->samples_read_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: read no samples\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: read <%u> samples\n"),
-                this->samples_read_.value ()));
-      }
-
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_.to_string (list_buf);
-
-
-    if (this->thread_id_listener_.id () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for StatusListener not set!\n"));
-      }
-    #if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK: "
-                              "Thread switch for StatusListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                               "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread switch for StatusListener "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #else
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: StatusListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK: StatusListener: "
-                              "DDS seems to use its own thread for its callback: "
-                               "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    #endif
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SL_OneByOne_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/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h
deleted file mode 100644
index d86034c23bd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h
+++ /dev/null
@@ -1,179 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_SL_ONEBYONE_RECEIVER_EXEC_TKIVXN_H_
-#define CIAO_SL_ONEBYONE_RECEIVER_EXEC_TKIVXN_H_
-
-#include /**/ "ace/pre.h"
-
-#include "SL_OneByOne_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_SL_OneByOne_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong> Atomic_Long;
-
-  class Receiver_exec_i;
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::SL_OneByOne::SL_OneByOneConnector::CCM_StateListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::SL_OneByOne::CCM_Receiver_Context_ptr ctx,
-      Atomic_Long &,
-      Atomic_Long &,
-      Atomic_Long &,
-      Atomic_Long &,
-      Atomic_Long &,
-      ACE_Thread_ID &);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from SL_OneByOne::SL_OneByOneConnector::StateListener. */
-
-    virtual
-    void on_creation (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_one_update (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_updates (const ::TestTopicSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-
-    virtual
-    void on_deletion (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-    //@}
-
-  private:
-    ::SL_OneByOne::CCM_Receiver_Context_var ciao_context_;
-     Atomic_Long &on_many_updates_;
-     Atomic_Long &on_creation_;
-     Atomic_Long &on_one_update_;
-     Atomic_Long &on_deletion_;
-     Atomic_Long &samples_read_;
-     ACE_Thread_ID &thread_id_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::SL_OneByOne::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::SL_OneByOne::CCM_Receiver_Context_var ciao_context_;
-    Atomic_Long on_many_updates_;
-    Atomic_Long updater_data_;
-    Atomic_Long on_creation_;
-    Atomic_Long on_one_update_;
-    Atomic_Long on_deletion_;
-    ACE_Thread_ID thread_id_listener_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::SL_OneByOne::SL_OneByOneConnector::CCM_StateListener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-
-    //@}
-
-  private:
-    ::SL_OneByOne::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::SL_OneByOne::SL_OneByOneConnector::CCM_StateListener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Atomic_Long on_many_updates_;
-    Atomic_Long updater_data_;
-    Atomic_Long on_creation_;
-    Atomic_Long on_one_update_;
-    Atomic_Long on_deletion_;
-    Atomic_Long samples_read_;
-    ACE_Thread_ID thread_id_listener_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SL_OneByOne_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl
deleted file mode 100644
index 523b6d61086..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_SL_ONEBYONE_SENDER_IDL
-#define DDS_SL_ONEBYONE_SENDER_IDL
-
-#include "Connector/SL_OneByOne_Connector.idl"
-
-module SL_OneByOne
-{
-  component Sender
-  {
-     port SL_OneByOneConnector::DDS_Update test_topic_update;
-     provides CCM_DDS::ConnectorStatusListener test_topic_connector_status;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc
deleted file mode 100644
index e3710cc20e7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SL_OneByOne_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_SL_OneByOne_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_SL_OBO_Connector_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 {
-    SL_OneByOne_Sender.idl
-  }
-}
-
-project(DDS_SL_OneByOne_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_SL_OneByOne_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 {
-    SL_OneByOne_SenderE.idl
-  }
-}
-
-project(DDS_SL_OneByOne_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_SL_OneByOne_Sender_lem_gen DDS_SL_OneByOne_Sender_stub DDS_SL_OneByOne_Base_stub
-  libs  += DDS_SL_OneByOne_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_OneByOne_SenderEC.cpp
-  }
-
-  Header_Files {
-    SL_OneByOne_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    SL_OneByOne_SenderEC.inl
-  }
-}
-
-project(DDS_SL_OneByOne_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SL_OneByOne_Sender_idl_gen DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub
-  libs  += DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_OneByOne_SenderC.cpp
-  }
-
-  Header_Files {
-    SL_OneByOne_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    SL_OneByOne_SenderC.inl
-  }
-}
-
-project(DDS_SL_OneByOne_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_SL_OneByOne_Sender_lem_stub DDS_SL_OneByOne_Sender_stub DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OBO_Connector_lem_stub  DDS_SL_OneByOne_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_OneByOne_Sender_exec.cpp
-  }
-
-  Header_Files {
-    SL_OneByOne_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SL_OneByOne_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_SL_OneByOne_Base_stub  DDS_SL_OneByOne_Sender_lem_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Connector_svnt DDS_SL_OBO_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub  DDS_SL_OneByOne_Connector_svnt DDS_SL_OBO_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SL_OneByOne_SenderS.cpp
-    SL_OneByOne_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    SL_OneByOne_SenderS.h
-    SL_OneByOne_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp
deleted file mode 100644
index 408858409d7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp
+++ /dev/null
@@ -1,482 +0,0 @@
-// -*- C++ -*-
-#include "SL_OneByOne_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_SL_OneByOne_Sender_Impl
-{
-  /**
-   * Write action 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::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 /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  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)
-    : test_nr_(UPDATE_CREATE),
-      test_ok_(true)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_test_topic_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (*this);
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::create_one (void)
-  {
-    TestTopic i = this->topic_seq_one_[0];
-    try
-      {
-        ::SL_OneByOne::SL_OneByOneConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::create_one - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        updater->create_one (i);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SL_OneByOne: create_one with instance key <%C>\n"),
-                   i.key.in ()));
-      }
-    catch (const CCM_DDS::AlreadyCreated &)
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Unexpected exception: AlreadyCreated with test updater create_one <%C>.\n"),
-                      i.key.in ()));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Internal Error while create_one for <%C>.\n"),
-                      i.key.in ()));
-        return false;
-      }
-    return true;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::update_one (void)
-  {
-    //update already created instance with handle nil
-    TestTopic i = this->topic_seq_one_[0];
-    try
-      {
-        ::SL_OneByOne::SL_OneByOneConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::update_one - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        updater->update_one (i, DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: update_one with already existing instance with DDS::HANDLE_NIL, key <%C>\n"),
-                      i.key.in ()));
-      }
-    catch (const CCM_DDS::NonExistent &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater update_one <%C>.\n"),
-                       i.key.in ()));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while update_one for <%C>.\n"),
-                        i.key.in ()));
-        return false;
-      }
-    return true;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::delete_one (void)
-  {
-    //delete registered instance with DDS::HANDLE_NIL
-    TestTopic i = this->topic_seq_one_[0];
-    try
-      {
-        ::SL_OneByOne::SL_OneByOneConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::delete_one - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: delete_one with registered instance with DDS::HANDLE_NIL, key <%C>\n"),
-                      i.key.in ()));
-        updater->delete_one (i, DDS::HANDLE_NIL);
-      }
-    catch (const CCM_DDS::NonExistent &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater delete_one <%C>.\n"),
-                       i.key.in ()));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while delete_one for <%C>.\n"),
-                        i.key.in ()));
-        return false;
-      }
-    return true;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::create_many (void)
-  {
-    //create many with no exception
-    try
-      {
-        ::SL_OneByOne::SL_OneByOneConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::create_many - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("create_many : <%u> samples\n"),
-                         this->topic_seq_many_.length ()));
-        updater->create_many (this->topic_seq_many_);
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater create_many\n")));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                     ACE_TEXT ("in updater: create_many: index <%d> - retval <%d>\n"),
-                     ex.index, ex.error_code));
-         return false;
-
-      }
-    return true;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::update_many (void)
-  {
-    try
-      {
-        ::SL_OneByOne::SL_OneByOneConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::update_many - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        updater->update_many (this->topic_seq_many_);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("update_many : written <%u> samples\n"),
-                   this->topic_seq_many_.length ()));
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater update_many.\n")));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                     ACE_TEXT ("with update_many: index <%d> - retval <%d>\n"),
-                     ex.index, ex.error_code));
-        return false;
-      }
-    return true;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::delete_many (void)
-  {
-    try
-      {
-        ::SL_OneByOne::SL_OneByOneConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (::CORBA::is_nil (updater.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::delete_many - "
-                      "ERROR: Updater seems nil\n"));
-            return false;
-          }
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_many : deleted <%u> samples\n"),
-                                          this->topic_seq_many_.length ()));
-        updater->delete_many (this->topic_seq_many_);
-      }
-    catch (const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater delete_many\n")));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                   ACE_TEXT ("with test updater delete_many: index <%d> - retval <%d>\n"),
-                   ex.index, ex.error_code));
-        return false;
-      }
-
-    return true;
-  }
-
-  void
-  Sender_exec_i::add_instances_of_topic ()
-  {
-    CORBA::UShort total = 3;
-    this->topic_seq_one_.length (total);
-    //sequence for tests with .._one
-    for (int i = 1; i < (total + 1); i++)
-      {
-        char key[7];
-        TestTopic new_key;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key.key = CORBA::string_dup(key);
-        new_key.x = i;
-        this->topic_seq_one_[i-1] = new_key;
-      }
-    //sequence for tests with .._many
-    this->topic_seq_many_.length (total);
-    for (int i = 1; i < (total + 1); i++)
-      {
-        char key[7];
-        TestTopic new_key;
-        ACE_OS::sprintf (key, "many_%d", i);
-        new_key.key = CORBA::string_dup(key);
-        new_key.x = i;
-        this->topic_seq_many_[i-1] = new_key;
-      }
-  }
-
-  void
-  Sender_exec_i::tick ()
-  {
-    if(this->test_ok_.value())
-     {
-       switch (this->test_nr_)
-         {
-          case UPDATE_CREATE:
-            this->test_ok_ = this->create_one();
-            if(this->test_ok_.value())
-              {
-                this->test_nr_ = UPDATE_ONE;
-              }
-            else
-              {
-                this->test_nr_ = END_TEST;
-              }
-            break;
-          case UPDATE_ONE:
-            this->test_ok_ = this->update_one();
-            this->test_nr_ = DELETE_ONE;
-            break;
-          case DELETE_ONE:
-            this->test_ok_ = this->delete_one();
-            this->test_nr_ = CREATE_MANY;
-            break;
-          case CREATE_MANY:
-            this->test_ok_ = this->create_many();
-            if(this->test_ok_.value())
-              {
-                this->test_nr_ = UPDATE_MANY;
-              }
-            else
-              {
-                this->test_nr_ = END_TEST;
-              }
-            this->test_nr_ = UPDATE_MANY;
-            break;
-          case UPDATE_MANY:
-            this->test_ok_ = this->update_many();
-            this->test_nr_ = DELETE_MANY;
-            break;
-          case DELETE_MANY:
-            this->test_ok_ = this->delete_many();
-            this->test_nr_ = END_TEST;
-            break;
-          default:
-            break;
-        }
-    }
-  }
-  void
-  Sender_exec_i::start (void)
-  {
-    long sec = 1L;
-    long const usec = 0L;
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (sec, usec),
-                ACE_Time_Value (sec, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                               ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-  }
-
-
-  // Component attributes and port operations.
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::SL_OneByOne::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    this->add_instances_of_topic ();
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SL_OneByOne_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/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h
deleted file mode 100644
index 3fc8c6f80c7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h
+++ /dev/null
@@ -1,160 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_SL_ONEBYONE_SENDER_EXEC_FHYBU2_H_
-#define CIAO_SL_ONEBYONE_SENDER_EXEC_FHYBU2_H_
-
-#include /**/ "ace/pre.h"
-
-#include "SL_OneByOne_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_SL_OneByOne_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Sender_exec_i;
-
-  enum UPDATER_TEST {
-    UPDATE_CREATE,
-    UPDATE_ONE,
-    DELETE_ONE,
-    CREATE_MANY,
-    UPDATE_MANY,
-    DELETE_MANY,
-    END_TEST
-  };
-
-  /**
-   * Write action generator
-   */
-
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-    /**
-   * ConnectorStatusListener_exec_i
-   */
-
-  class ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_test_topic_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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void tick (void);
-    void start (void);
-    //@}
-
-  private:
-    ::SL_OneByOne::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    //@}
-
-    //@{
-    /** User defined members. */
-    pulse_Generator * ticker_;
-
-    UPDATER_TEST test_nr_;
-    Atomic_Boolean test_ok_;
-    TestTopicSeq topic_seq_one_;
-    TestTopicSeq topic_seq_many_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void stop (void);
-    void add_instances_of_topic (void);
-    CORBA::Boolean create_one (void);
-    CORBA::Boolean update_one (void);
-    CORBA::Boolean delete_one (void);
-    CORBA::Boolean create_many (void);
-    CORBA::Boolean update_many (void);
-    CORBA::Boolean delete_many (void);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SL_OneByOne_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/Plan.cdp
deleted file mode 100644
index fa41bb138c5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/Plan.cdp
+++ /dev/null
@@ -1,407 +0,0 @@
-<!--  -->
-<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>SL_OneByOne_Depl_1</label>
-  <UUID>SL_OneByOne_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_SL_OneByOne_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SL_OneByOne_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="SL_OneByOne_ConnectorComponentImplementation">
-    <name>SL_OneByOne_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="SL_OneByOne_Connector_ExecArtifact" />
-    <artifact xmi:idref="SL_OneByOne_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_SL_OneByOne_SL_OneByOneConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SL_OneByOne_SL_OneByOneConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SL_OneByOne_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SL_OneByOne_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_SL_OneByOne_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SL_OneByOne_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="SL_OneByOne_ConnectorComponentInstance">
-    <name>SL_OneByOne_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SL_OneByOne_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SlObO_Library#SlObOProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SL_OneByOne_ConnectorComponentInstance2">
-    <name>SL_OneByOne_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SL_OneByOne_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SlObO_Library#SlObOProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SL_OneByOne_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_statelistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SL_OneByOne_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SL_OneByOne_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SL_OneByOne_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>updater_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SL_OneByOne_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>test_topic_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SL_OneByOne_ConnectorComponentInstance" />
-    </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="SL_OneByOne_Connector_ExecArtifact">
-    <name>SL_OneByOne_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_SL_OneByOne_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="SL_OneByOne_Connector_SvntArtifact">
-    <name>SL_OneByOne_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_SL_OneByOne_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="SL_OneByOne_Connector_StubArtifact">
-    <name>SL_OneByOne_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_SL_OneByOne_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/SLOneByOne/descriptors/SlObO_Library.xml b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/SlObO_Library.xml
deleted file mode 100644
index cb7c60bad56..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/SlObO_Library.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="SlObOProfile">
-    <!-- QoS used to configure the data writer created in the example code -->
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <resource_limits>
-        <max_instances>4</max_instances>
-        <initial_instances>4</initial_instances>
-        <max_samples>25</max_samples>
-        <initial_samples>10</initial_samples>
-        <max_samples_per_instance>5</max_samples_per_instance>
-      </resource_limits>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <resource_limits>
-        <max_instances>4</max_instances>
-        <initial_instances>4</initial_instances>
-        <max_samples>25</max_samples>
-        <initial_samples>10</initial_samples>
-        <max_samples_per_instance>5</max_samples_per_instance>
-      </resource_limits>
-    </datareader_qos>
-  </qos_profile>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index f246058c89d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="SlObO_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="SlObOProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-       <resource_limits>
-          <max_instances>4</max_instances>
-          <initial_instances>4</initial_instances>
-          <max_samples>25</max_samples>
-          <initial_samples>10</initial_samples>
-          <max_samples_per_instance>5</max_samples_per_instance>
-        </resource_limits>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-          <serialize_key_with_dispose>BOOLEAN_TRUE</serialize_key_with_dispose>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-       <resource_limits>
-          <max_instances>4</max_instances>
-          <initial_instances>4</initial_instances>
-          <max_samples>25</max_samples>
-          <initial_samples>10</initial_samples>
-          <max_samples_per_instance>5</max_samples_per_instance>
-        </resource_limits>
-        <protocol>
-          <propagate_dispose_of_unregistered_instances>BOOLEAN_TRUE</propagate_dispose_of_unregistered_instances>
-        </protocol>
-      </datareader_qos>
-     </qos_profile>
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl
deleted file mode 100755
index e83fc426475..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", "-m 1 -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 20 seconds to allow task to complete\n";
-sleep (20);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/.gitignore b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl
deleted file mode 100644
index 05209b3e2a5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file SetConnectorAttribute_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef SETCONNECTORATTRIBUTE_BASE_IDL
-#define SETCONNECTORATTRIBUTE_BASE_IDL
-
-#pragma ndds typesupport "Base/SetConnectorAttribute_BaseSupport.h"
-#pragma opendds typesupport "Base/SetConnectorAttribute_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "SetConnectorAttributeTest"
-
-struct SetConnectorAttributeTest {
-  string key;
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<SetConnectorAttributeTest> SetConnectorAttributeTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc
deleted file mode 100644
index fff9c36f8b5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_SCABase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_SCABase_stub
-  dynamicflags += SETCONNECTORATTRIBUTE_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=SETCONNECTORATTRIBUTE_BASE_STUB_Export \
-              -Wb,stub_export_include=SetConnectorAttribute_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    SetConnectorAttribute_Base.idl
-  }
-
-  opendds_ts_flags += --export=SETCONNECTORATTRIBUTE_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    SetConnectorAttribute_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/.gitignore b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/.gitignore
deleted file mode 100644
index fb87effb565..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Component_exec_export.h
-/Component_lem_stub_export.h
-/Component_stub_export.h
-/Component_svnt_export.h
-/SetConnectorAttribute_ComponentE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl
deleted file mode 100644
index 1a8a3b78706..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @file SetConnectorAttribute_Component.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COMPONENT_IDL
-#define COMPONENT_IDL
-
-#include "Connector/SetConnectorAttribute_Connector.idl"
-
-module SetConnectorAttribute
-{
-  component SetConnectorAttributeComponent
-  {
-    port SetConnectorAttributeTestConnector::DDS_Write info_write;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc
deleted file mode 100644
index 9decee0420d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(SetAttribute_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SCAConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Component_stub_export.h \
-              -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Component_svnt_export.h \
-              -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Component_svnt_export.h \
-              -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Component_exec_export.h -I..
-
-  IDL_Files {
-    SetConnectorAttribute_Component.idl
-  }
-}
-
-project(SetAttribute_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += SetAttribute_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    SetConnectorAttribute_ComponentE.idl
-  }
-}
-
-project(SetAttribute_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += SetAttribute_Component_lem_gen SetAttribute_Component_stub  \
-           DDS_SCAConnector_stub DDS_SCABase_stub
-  libs  +=  Component_stub DDS_SCAConnector_stub \
-            DDS_SCABase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_lem_stub
-  dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SetConnectorAttribute_ComponentEC.cpp
-  }
-
-  Header_Files {
-    SetConnectorAttribute_ComponentEC.h
-    Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    SetAttribute_ComponentEC.inl
-  }
-}
-
-project(SetAttribute_Component_stub) : ccm_stub, dds4ccm_base {
-  after += SetAttribute_Component_idl_gen  DDS_SCAConnector_stub \
-           DDS_SCABase_stub DDS_SCAConnector_lem_gen
-  libs  += DDS_SCAConnector_stub DDS_SCABase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_stub
-  dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SetConnectorAttribute_ComponentC.cpp
-  }
-
-  Header_Files {
-    SetConnectorAttribute_ComponentC.h
-    Component_stub_export.h
-  }
-
-  Inline_Files {
-    SetConnectorAttribute_ComponentC.inl
-  }
-}
-
-project(SetAttribute_Component_exec) : ciao_executor, dds4ccm_impl {
-  after   += SetAttribute_Component_lem_stub SetAttribute_Component_stub \
-             DDS_SCABase_stub DDS_SCAConnector_stub \
-             DDS_SCAConnector_lem_stub
-  sharedname = Component_exec
-  libs += Component_stub Component_lem_stub DDS_SCABase_stub \
-          DDS_SCAConnector_stub DDS_SCAConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SetConnectorAttribute_Component_exec.cpp
-  }
-
-  Header_Files {
-    SetConnectorAttribute_Component_exec.h
-    Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(SetAttribute_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   SetAttribute_Component_lem_stub DDS_SCABase_stub \
-                  DDS_SCAConnector_stub DDS_SCAConnector_svnt \
-                  SetAttribute_Component_exec DDS_SCAConnector_lem_stub
-  sharedname  = Component_svnt
-  libs       += Component_stub Component_lem_stub DDS_SCABase_stub \
-                DDS_SCAConnector_stub DDS_SCAConnector_svnt \
-                Component_exec DDS_SCAConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SetConnectorAttribute_ComponentS.cpp
-    SetConnectorAttribute_Component_svnt.cpp
-  }
-
-  Header_Files {
-    SetConnectorAttribute_ComponentS.h
-    SetConnectorAttribute_Component_svnt.h
-    Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp
deleted file mode 100644
index 35a19a25c41..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-// -*- C++ -*-
-#include "SetConnectorAttribute_Component_exec.h"
-#include "Connector/SetConnectorAttribute_Connector_conn.h"
-
-#include "dds4ccm/impl/Utils.h"
-#if (CIAO_DDS4CCM_NDDS == 1)
-#include "dds4ccm/impl/ndds/DataWriter_T.h"
-#include "Base/SetConnectorAttribute_BaseSupport.h"
-#endif
-
-#define DOMAIN_ID_IN_DP 56
-#define TOPIC_NAME_IN_DP "SetConnectorAttribute"
-
-#define DW_MAX_BLOCKING_TIME_SEC 11
-#define DW_MAX_BLOCKING_TIME_NSEC 200
-
-namespace CIAO_SetConnectorAttribute_SetConnectorAttributeComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  Component_exec_i::Component_exec_i (void)
-  {
-  }
-
-  Component_exec_i::~Component_exec_i (void)
-  {
-  }
-
-  void
-  Component_exec_i::check_topic_name (DDSTopic * tp)
-  {
-#if (CIAO_DDS4CCM_NDDS == 1)
-    if (ACE_OS::strcmp (tp->get_name (), TOPIC_NAME_IN_DP) == 0)
-      {
-        ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_topic_name - "
-                              "Topic name set properly.\n"));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Component_exec_i::check_topic_name - "
-                              "Topic name not properly set: "
-                              "expected <%C> - retrieved <%C>\n",
-                              TOPIC_NAME_IN_DP,
-                              tp->get_name ()));
-      }
-#else
-    ACE_UNUSED_ARG (tp);
-#endif
-  }
-
-  void
-  Component_exec_i::check_domain_id (DDSPublisher * pub)
-  {
-#if (CIAO_DDS4CCM_NDDS == 1)
-    DDSDomainParticipant * part = pub->get_participant ();
-    if (part->get_domain_id () != DOMAIN_ID_IN_DP)
-      {
-        ACE_ERROR ((LM_ERROR, "Component_exec_i::check_domain_id - "
-                              "ERROR: Domain ID not set properly: "
-                              "expected <%u> - retrieved <%u>\n",
-                              DOMAIN_ID_IN_DP,
-                              part->get_domain_id ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Component_exec_i::check_domain_id - "
-                              "Domain ID set properly.\n"));
-      }
-#else
-    ACE_UNUSED_ARG (pub);
-#endif
-  }
-
-  void
-  Component_exec_i::check_attributes (DDSDataWriter * dw)
-  {
-#if (CIAO_DDS4CCM_NDDS == 1)
-    // Check topic name
-    DDSTopic * tp = dw->get_topic ();
-    if (!tp)
-      {
-        ACE_ERROR ((LM_ERROR, "Component_exec_i::check_attributes - "
-                              "Unable to retrieve topic.\n"));
-      }
-    else
-      {
-        this->check_topic_name (tp);
-      }
-    //check domain id
-    ::DDSPublisher * pub = dw->get_publisher ();
-    if (!pub)
-      {
-        ACE_ERROR ((LM_ERROR, "Component_exec_i::check_attributes - "
-                              "Unable to retrieve Publisher.\n"));
-      }
-    else
-      {
-        this->check_domain_id (pub);
-        this->check_profile (pub);
-      }
-#else
-    ACE_UNUSED_ARG (dw);
-#endif
-  }
-
-  void
-  Component_exec_i::check_profile (DDSPublisher * pub)
-  {
-#if (CIAO_DDS4CCM_NDDS == 1)
-    DDS_DataWriterQos dw_qos;
-    pub->get_default_datawriter_qos (dw_qos);
-    if (dw_qos.reliability.max_blocking_time.sec == DW_MAX_BLOCKING_TIME_SEC &&
-        dw_qos.reliability.max_blocking_time.nanosec == DW_MAX_BLOCKING_TIME_NSEC)
-      {
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "Component_exec_i::check_profile - "
-                              "ERROR: Profile not set properly: "
-                              "expected sec <%u> - retrieved sec <%u> and "
-                              "expected nanosec <%u> - retrieved nanosec <%u>\n",
-                              dw_qos.reliability.max_blocking_time.sec,
-                              DW_MAX_BLOCKING_TIME_SEC,
-                              dw_qos.reliability.max_blocking_time.nanosec,
-                              DW_MAX_BLOCKING_TIME_NSEC));
-      }
-#else
-    ACE_UNUSED_ARG (pub);
-#endif
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Component_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::SetConnectorAttribute::CCM_SetConnectorAttributeComponent_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Component_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_activate (void)
-  {
-#if (CIAO_DDS4CCM_NDDS == 1)
-    //check the settings on the connector
-    DDS::DataWriter_var dds_dw =
-      this->context_->get_connection_info_write_dds_entity ();
-
-    typedef ::CIAO::NDDS::DDS_DataWriter_Base DataWriter_type;
-    DataWriter_type * ccm_dds_dw = dynamic_cast <DataWriter_type*> (dds_dw.in ());
-    if (!ccm_dds_dw)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ERROR: Component_exec_i::ccm_activate - "
-                              "Unable to cast\n"));
-        return;
-      }
-    DDSDataWriter * dw = ccm_dds_dw->get_rti_entity ();
-    if (dw)
-      {
-        this->check_attributes (dw);
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Component_exec_i::ccm_activate - "
-                              "Unable to retrieve DDSDataWriter.\n"));
-      }
-#endif
-  }
-
-  void
-  Component_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SetConnectorAttribute_Component_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Component_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h
deleted file mode 100644
index 1b1cd59e460..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COMPONENT_EXEC_H_
-#define CIAO_COMPONENT_EXEC_H_
-
-#include "SetConnectorAttribute_ComponentEC.h"
-
-#include /**/ "Component_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-class DDSDataWriter;
-class DDSPublisher;
-class DDSTopic;
-
-namespace CIAO_SetConnectorAttribute_SetConnectorAttributeComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  class COMPONENT_EXEC_Export Component_exec_i
-    : public virtual SetConnectorAttributeComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Component_exec_i (void);
-    virtual ~Component_exec_i (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:
-    ::SetConnectorAttribute::CCM_SetConnectorAttributeComponent_Context_var context_;
-
-    void check_attributes (DDSDataWriter * dw);
-
-    void check_profile (DDSPublisher * pub);
-
-    void check_topic_name (DDSTopic * tp);
-
-    void check_domain_id (DDSPublisher * pub);
-
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_SetConnectorAttribute_Component_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl
deleted file mode 100644
index a478d5e2387..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file SetConnectorAttribute_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef SETCONNECTORATTRIBUTE_CONNECTOR_IDL_
-#define SETCONNECTORATTRIBUTE_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/SetConnectorAttribute_Base.idl"
-
-#pragma ciao lem "Connector/SetConnectorAttribute_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/SetConnectorAttribute_BaseTypeSupport.idl"
-#endif
-
-module SetConnectorAttribute
-{
-  module ::CCM_DDS::Typed
-    < ::SetConnectorAttributeTest, ::SetConnectorAttributeTestSeq>
-    SetConnectorAttributeTestConnector;
-};
-
-#endif /* SetConnectorAttribute_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
deleted file mode 100644
index 2fe6f6b22dd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SCABase -l .. -o ../lib -u DDS SetConnectorAttribute_Connector"
-
-project(DDS_SCAConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_SCABase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SETCONNECTORATTRIBUTE_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=SetConnectorAttribute_Connector_stub_export.h \
-              -Wb,skel_export_macro=SETCONNECTORATTRIBUTE_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=SetConnectorAttribute_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=SETCONNECTORATTRIBUTE_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=SetConnectorAttribute_Connector_svnt_export.h \
-              -Wb,conn_export_macro=SETCONNECTORATTRIBUTE_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=SetConnectorAttribute_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    SetConnectorAttribute_Connector.idl
-  }
-}
-
-project(DDS_SCAConnector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SCAConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=SETCONNECTORATTRIBUTE_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=SetConnectorAttribute_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    SetConnectorAttribute_ConnectorE.idl
-  }
-}
-
-project(DDS_SCAConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SCAConnector_lem_gen DDS_SCAConnector_stub DDS_SCABase_stub
-  libs  += DDS_SCABase_stub DDS_SCAConnector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_SCAConnector_lem_stub
-  dynamicflags += SETCONNECTORATTRIBUTE_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SetConnectorAttribute_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    SetConnectorAttribute_ConnectorEC.h
-    SetConnectorAttribute_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    SetConnectorAttribute_ConnectorEC.inl
-  }
-}
-
-project(DDS_SCAConnector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SCAConnector_idl_gen DDS_SCABase_stub
-  libs  += DDS_SCABase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_SCAConnector_stub
-  dynamicflags += SETCONNECTORATTRIBUTE_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SetConnectorAttribute_ConnectorC.cpp
-  }
-
-  Header_Files {
-    SetConnectorAttribute_ConnectorC.h
-    SetConnectorAttribute_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    SetConnectorAttribute_ConnectorC.inl
-  }
-}
-
-project(DDS_SCAConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SCAConnector_lem_stub DDS_SCAConnector_stub DDS_SCABase_stub
-  sharedname = DDS_SCAConnector_exec
-  libs += DDS_SCAConnector_stub DDS_SCAConnector_lem_stub DDS_SCABase_stub DDS_SCABase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SETCONNECTORATTRIBUTE_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SetConnectorAttribute_Connector_conn.cpp
-  }
-
-  Header_Files {
-    SetConnectorAttribute_Connector_conn.h
-    SetConnectorAttribute_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SCAConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SCAConnector_lem_stub DDS_SCAConnector_exec DDS_SCAConnector_stub
-  sharedname  = DDS_SCAConnector_svnt
-  libs       += DDS_SCAConnector_stub \
-                DDS_SCAConnector_lem_stub  \
-                DDS_SCABase_stub \
-                DDS_SCAConnector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SETCONNECTORATTRIBUTE_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SetConnectorAttribute_ConnectorS.cpp
-    SetConnectorAttribute_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    SetConnectorAttribute_ConnectorS.h
-    SetConnectorAttribute_Connector_svnt.h
-    SetConnectorAttribute_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/README b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/README
deleted file mode 100644
index ac5e8d56583..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/README
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-Tests whether the connector attribute are
-properly set by the D&C framework.
-The following connector attributes are defined in
-the deployment plan:
-  * key_fields
-  * domain_id
-  * qos_profile
-  * topic_name
-
-On ccm_activate in the connector, these values
-are checked.
-
-An error is reported for every mismatch.
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/Plan.cdp
deleted file mode 100644
index a71bb9d136f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/Plan.cdp
+++ /dev/null
@@ -1,209 +0,0 @@
-<!--  -->
-<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>SetConnectorAttributeAttribute_Depl_1</label>
-  <UUID>SetConnectorAttributeAttribute_Depl_1</UUID>
-
-  <implementation xmi:id="SetConnectorAttributeComponentImplementation">
-    <name>SetConnectorAttributeComponentmplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SetConnectorAttribute_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SetConnectorAttribute_SetConnectorAttributeComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="SetConnectorAttributeConnectorImplementation">
-    <name>SetConnectorAttributeConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="SetConnectorAttributeConnector_ExecArtifact" />
-    <artifact xmi:idref="SetConnectorAttributeConnector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SetConnectorAttribute_SetConnectorAttributeTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SetConnectorAttribute_SetConnectorAttributeTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SetConnectorAttributeConnector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SetConnectorAttributeConnector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="SetConnectorAttributeComponentInstance">
-    <name>SetConnectorAttributeComponentInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SetConnectorAttributeComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="SetConnectorAttributeConnectorInstance">
-    <name>SetConnectorAttributeConnectorInstance</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SetConnectorAttributeConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SetConnectorAttribute</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>domain_id</name>
-      <value>
-        <type>
-          <kind>tk_long</kind>
-        </type>
-        <value>
-          <long>56</long>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_write_dds_entity</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SetConnectorAttributeComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SetConnectorAttributeConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="SetConnectorAttributeConnector_ExecArtifact">
-    <name>SetConnectorAttributeConnector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_SCAConnector_exec</location>
-  </artifact>
-  <artifact xmi:id="SetConnectorAttributeConnector_SvntArtifact">
-    <name>SetConnectorAttributeConnector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_SCAConnector_svnt</location>
-  </artifact>
-  <artifact xmi:id="SetConnectorAttributeConnector_StubArtifact">
-    <name>SetConnectorAttributeConnector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_SCAConnector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl
deleted file mode 100755
index 445ce8b9d56..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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 = 1;
-@ports = ( 60001);
-@iorbases = ( "NodeApp1.ior" );
-@iorfiles = 0;
-@nodenames = ( "ComponentNode");
-
-# 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 5 seconds to allow task to complete\n";
-sleep (5);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl
deleted file mode 100644
index e40a2ddecf6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * @file Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef BASE_IDL
-#define BASE_IDL
-
-#pragma ndds typesupport "Base/BaseSupport.h"
-#pragma opendds typesupport "Base/BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "SharedDPTest1"
-#pragma DCPS_DATA_KEY "SharedDPTest1 key1"
-
-#pragma DCPS_DATA_TYPE "SharedDPTest2"
-#pragma DCPS_DATA_KEY "SharedDPTest2 key2"
-
-#pragma DCPS_DATA_TYPE "SharedDPTest3"
-#pragma DCPS_DATA_KEY "SharedDPTest3 key3"
-
-struct SharedDPTest1 {
-  string key1;
-  long iteration1;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<SharedDPTest1> SharedDPTest1Seq;
-#endif
-
-struct SharedDPTest2 {
-  string key2;
-  long iteration2;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<SharedDPTest2> SharedDPTest2Seq;
-#endif
-
-struct SharedDPTest3 {
-  string key3;
-  long iteration3;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<SharedDPTest3> SharedDPTest3Seq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc
deleted file mode 100644
index 5b485527e6a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_SharedDP_DDBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_SharedDP_DDBase_stub
-  dynamicflags += BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=BASE_STUB_Export \
-              -Wb,stub_export_include=Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Base.idl
-  }
-
-  opendds_ts_flags += --export=BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl
deleted file mode 100644
index b045aab8549..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_SHARED_DP_COMPONENT_IDL
-#define DDS_SHARED_DP_COMPONENT_IDL
-
-#include "Connector1/Connector1.idl"
-#include "Connector2/Connector2.idl"
-#include "Connector3/Connector3.idl"
-
-module SharedDP
-{
-  component SharedDPComponent
-  {
-    port SharedDP_Connector1::SharedDPTest1Connector::DDS_Write write1;
-    port SharedDP_Connector2::SharedDPTest2Connector::DDS_Write write2;
-    port SharedDP_Connector3::SharedDPTest3Connector::DDS_Write write3;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
deleted file mode 100644
index a46e26c1bab..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
+++ /dev/null
@@ -1,152 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SharedDPBase -l ../lib -o ../lib -c controller -u DDS Component"
-
-project(DDS_SharedDP_DDComponent_idl_gen) : componentidldefaults, dds4ccm {
-    after += DDS_SharedDP_Connector1_idl_gen DDS_SharedDP_Connector2_idl_gen \
-    DDS_SharedDP_Connector3_idl_gen
-    custom_only = 1
-    idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-    -Wb,stub_export_include=Component_stub_export.h \
-    -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-    -Wb,skel_export_include=Component_svnt_export.h \
-    -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-    -Wb,svnt_export_include=Component_svnt_export.h \
-    -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-    -Wb,exec_export_include=Component_exec_export.h \
-    -I ..
-
-    IDL_Files {
-        Component.idl
-    }
-}
-
-project(DDS_SharedDP_DDComponent_lem_gen) : ciaoidldefaults, dds4ccm {
-    after += DDS_SharedDP_DDComponent_idl_gen
-    custom_only = 1
-    idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-    -Wb,stub_export_include=Component_lem_stub_export.h \
-    -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-    IDL_Files {
-        ComponentE.idl
-    }
-}
-
-project(DDS_SharedDP_DDComponent_lem_stub) : ccm_svnt, dds4ccm_base {
-    after += DDS_SharedDP_DDComponent_lem_gen DDS_SharedDP_DDComponent_stub DDS_SharedDP_DDBase_stub
-    libs  += DDS_SharedDP_DDBase_stub Component_stub
-    libpaths += ../lib
-    libout = ../lib
-    includes += ..
-    sharedname = Component_lem_stub
-    dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-    IDL_Files {
-    }
-
-    Source_Files {
-        ComponentEC.cpp
-    }
-
-    Header_Files {
-        ComponentEC.h
-        Component_lem_stub_export.h
-    }
-
-    Inline_Files {
-        ComponentEC.inl
-    }
-}
-
-project(DDS_SharedDP_DDComponent_stub) : ccm_stub, dds4ccm_base {
-    after += DDS_SharedDP_DDComponent_idl_gen DDS_SharedDP_DDBase_stub \
-    DDS_SharedDP_Connector1_stub DDS_SharedDP_Connector2_stub DDS_SharedDP_Connector3_stub \
-    DDS_SharedDP_Connector1_lem_gen DDS_SharedDP_Connector2_lem_gen DDS_SharedDP_Connector3_lem_gen
-    libs  += DDS_SharedDP_DDBase_stub DDS_Connector1_stub DDS_Connector2_stub DDS_Connector3_stub
-    includes += ..
-    libpaths += ../lib
-    libout = ../lib
-    sharedname = Component_stub
-    dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-    IDL_Files {
-    }
-
-    Source_Files {
-        ComponentC.cpp
-    }
-
-    Header_Files {
-        ComponentC.h
-        Component_stub_export.h
-    }
-
-    Inline_Files {
-        ComponentC.inl
-    }
-}
-
-project(DDS_SharedDP_DDComponent_exec) : ciao_executor, dds4ccm_impl {
-    after   += DDS_SharedDP_DDComponent_lem_stub DDS_SharedDP_DDComponent_stub \
-    DDS_SharedDP_Connector1_lem_stub DDS_SharedDP_Connector1_stub \
-    DDS_SharedDP_Connector2_lem_stub DDS_SharedDP_Connector2_stub \
-    DDS_SharedDP_Connector3_lem_stub DDS_SharedDP_Connector3_stub
-    sharedname = Component_exec
-    libs += Component_stub Component_lem_stub DDS_SharedDP_DDBase_stub \
-    DDS_Connector1_lem_stub DDS_Connector1_stub \
-    DDS_Connector2_lem_stub DDS_Connector2_stub \
-    DDS_Connector3_lem_stub DDS_Connector3_stub
-    libpaths += ../lib
-    includes += ..
-    libout = ../lib
-    dynamicflags += COMPONENT_EXEC_BUILD_DLL
-
-    IDL_Files {
-    }
-
-    Source_Files {
-        Component_exec.cpp
-    }
-
-    Header_Files {
-        Component_exec.h
-        Component_exec_export.h
-    }
-
-    Inline_Files {
-    }
-}
-
-project(DDS_SharedDP_DDComponent_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-    after      += DDS_SharedDP_DDBase_stub  DDS_SharedDP_DDComponent_lem_stub \
-    DDS_SharedDP_Connector1_stub DDS_SharedDP_Connector1_svnt  DDS_SharedDP_Connector1_lem_stub \
-    DDS_SharedDP_Connector2_stub DDS_SharedDP_Connector2_svnt  DDS_SharedDP_Connector2_lem_stub \
-    DDS_SharedDP_Connector3_stub DDS_SharedDP_Connector3_svnt  DDS_SharedDP_Connector3_lem_stub
-    sharedname  = Component_svnt
-    libs       += Component_stub Component_lem_stub  \
-    DDS_SharedDP_DDBase_stub \
-    DDS_Connector1_stub DDS_Connector1_svnt DDS_Connector1_lem_stub \
-    DDS_Connector2_stub DDS_Connector2_svnt DDS_Connector2_lem_stub \
-    DDS_Connector3_stub DDS_Connector3_svnt DDS_Connector3_lem_stub
-    libpaths += ../lib
-    libout = ../lib
-    includes += ..
-    dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-    IDL_Files {
-    }
-
-    Source_Files {
-        ComponentS.cpp
-        Component_svnt.cpp
-    }
-
-    Header_Files {
-        ComponentS.h
-        Component_svnt.h
-        Component_svnt_export.h
-    }
-
-    Inline_Files {
-    }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp
deleted file mode 100644
index de9cd29dc28..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp
+++ /dev/null
@@ -1,317 +0,0 @@
-// -*- C++ -*-
-#include "Component_exec.h"
-#include "ace/Log_Msg.h"
-
-#include "Connector1/Connector1_conn.h"
-#include "Connector2/Connector2_conn.h"
-#include "Connector3/Connector3_conn.h"
-
-namespace CIAO_SharedDP_SharedDPComponent_Impl
-{
-  //============================================================
-  // Component Executor Implementation Class: Component_exec_i
-  //============================================================
-
-  Component_exec_i::Component_exec_i (void)
-    : dp1_hnd_ (DDS::HANDLE_NIL)
-    , dp2_hnd_ (DDS::HANDLE_NIL)
-    , dp3_hnd_ (DDS::HANDLE_NIL)
-    , dp1_ptr_ (DDS::DomainParticipant::_nil ())
-    , dp2_ptr_ (DDS::DomainParticipant::_nil ())
-    , dp3_ptr_ (DDS::DomainParticipant::_nil ())
-  {
-  }
-
-  Component_exec_i::~Component_exec_i (void)
-  {
-  }
-
-  void
-  Component_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::SharedDP::CCM_SharedDPComponent_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Component_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_activate (void)
-  {
-    try
-      {
-        ::DDS::DataWriter_var dw1 =
-          this->context_->get_connection_write1_dds_entity ();
-
-        if (::CORBA::is_nil (dw1.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Datawriter 1 connection is NIL.\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-
-        ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw1 =
-          dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw1.in ());
-
-        if (ccm_dw1)
-          {
-            ::DDS::DataWriter_var tmp = ccm_dw1->get_dds_entity ();
-            if (! ::CORBA::is_nil (tmp.in ()))
-              {
-                ::DDS::Publisher_var publisher = tmp->get_publisher ();
-
-                if (! ::CORBA::is_nil (publisher.in ()))
-                  {
-                    ::DDS::DomainParticipant_var dp = publisher->get_participant ();
-
-                    if (! ::CORBA::is_nil (publisher.in ()))
-                      {
-
-                        this->dp1_hnd_ = dp->get_instance_handle ();
-                        this->dp1_ptr_ = dp.ptr ();
-                      }
-                    else
-                      {
-                        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                    "Error getting DomainParticipant 1.\n"));
-                        throw ::CORBA::INTERNAL ();
-                      }
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                "Error getting Publisher 1.\n"));
-                    throw ::CORBA::INTERNAL ();
-                  }
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                            "Error getting DDS DataWriter 1.\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Error casting DataWriter 1 to CCM DataWriter 1\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer1\n"));
-      }
-
-    try
-      {
-        ::DDS::DataWriter_var dw2 =
-          this->context_->get_connection_write2_dds_entity ();
-
-        if (::CORBA::is_nil (dw2.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Datawriter 2 connection is NIL.\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-
-        ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw2 =
-          dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw2.in ());
-
-        if (ccm_dw2)
-          {
-            ::DDS::DataWriter_var tmp = ccm_dw2->get_dds_entity ();
-            if (! ::CORBA::is_nil (tmp.in ()))
-              {
-                ::DDS::Publisher_var publisher = tmp->get_publisher ();
-
-                if (! ::CORBA::is_nil (publisher.in ()))
-                  {
-                    ::DDS::DomainParticipant_var dp = publisher->get_participant ();
-
-                    if (! ::CORBA::is_nil (publisher.in ()))
-                      {
-
-                        this->dp2_hnd_ = dp->get_instance_handle ();
-                        this->dp2_ptr_ = dp.ptr ();
-                      }
-                    else
-                      {
-                        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                    "Error getting DomainParticipant 2.\n"));
-                        throw ::CORBA::INTERNAL ();
-                      }
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                "Error getting Publisher 2.\n"));
-                    throw ::CORBA::INTERNAL ();
-                  }
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                            "Error getting DDS DataWriter 2.\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Error casting DataWriter 2 to CCM DataWriter 2\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer2\n"));
-      }
-
-    try
-      {
-        ::DDS::DataWriter_var dw3 =
-          this->context_->get_connection_write3_dds_entity ();
-
-        if (::CORBA::is_nil (dw3.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Datawriter 3 connection is NIL.\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-
-        ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw3 =
-          dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw3.in ());
-
-        if (ccm_dw3)
-          {
-            ::DDS::DataWriter_var tmp = ccm_dw3->get_dds_entity ();
-            if (! ::CORBA::is_nil (tmp.in ()))
-              {
-                ::DDS::Publisher_var publisher = tmp->get_publisher ();
-
-                if (! ::CORBA::is_nil (publisher.in ()))
-                  {
-                    ::DDS::DomainParticipant_var dp = publisher->get_participant ();
-
-                    if (! ::CORBA::is_nil (publisher.in ()))
-                      {
-                        this->dp3_hnd_ = dp->get_instance_handle ();
-                        this->dp3_ptr_ = dp.ptr ();
-                      }
-                    else
-                      {
-                        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                    "Error getting DomainParticipant 3.\n"));
-                        throw ::CORBA::INTERNAL ();
-                      }
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                "Error getting Publisher 3.\n"));
-                    throw ::CORBA::INTERNAL ();
-                  }
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                            "Error getting DDS DataWriter 3.\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Error casting DataWriter 3 to CCM DataWriter 3\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer3\n"));
-      }
-  }
-
-  void
-  Component_exec_i::ccm_passivate (void)
-  {
-    if (this->dp1_hnd_ == DDS::HANDLE_NIL)
-      ACE_ERROR ((LM_ERROR, "ERROR: Handle of DomainParticipant for Connector 1 seems to be NIL\n"));
-    if (this->dp2_hnd_ == DDS::HANDLE_NIL)
-      ACE_ERROR ((LM_ERROR, "ERROR: Handle of DomainParticipant for Connector 2 seems to be NIL\n"));
-    if (this->dp3_hnd_ == DDS::HANDLE_NIL)
-      ACE_ERROR ((LM_ERROR, "ERROR: Handle of DomainParticipant for Connector 3 seems to be NIL\n"));
-
-    if ((this->dp1_hnd_ != this->dp2_hnd_)
-#if (CIAO_DDS4CCM_OPENDDS==1)
-        && (this->dp1_ptr_ != this->dp2_ptr_)
-#endif
-        )
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 2 don't seem to "
-                              "share the same DomainParticipant\n"));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK: Connector 1 and 2 seems to "
-                              "share the same DomainParticipant\n"));
-      }
-    if ((this->dp1_hnd_ == this->dp3_hnd_)
-#if (CIAO_DDS4CCM_OPENDDS==1)
-        && (this->dp1_ptr_ == this->dp3_ptr_)
-#endif
-       )
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 3 seem to "
-                              "share the same DomainParticipant\n"));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK: Connector 1 and 3 seems to "
-                              "share the same DomainParticipant\n"));
-      }
-
-    if ((this->dp2_hnd_ == this->dp3_hnd_)
-#if (CIAO_DDS4CCM_OPENDDS==1)
-        && (this->dp2_ptr_ == this->dp3_ptr_)
-#endif
-       )
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Connector 2 and 3 seem to "
-                              "share the same DomainParticipant\n"));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK: Connector 2 and 3 seems to "
-                              "share the same DomainParticipant\n"));
-      }
-  }
-
-  void
-  Component_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Component_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Component_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.h b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.h
deleted file mode 100644
index dfcc1d903e7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COMPONENT_EXEC_H_
-#define CIAO_COMPONENT_EXEC_H_
-
-
-#include "ComponentEC.h"
-
-#include /**/ "Component_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-class DDSDomainParticipant;
-
-namespace CIAO_SharedDP_SharedDPComponent_Impl
-{
-  class Component_exec_i
-    : public virtual SharedDPComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Component_exec_i (void);
-    virtual ~Component_exec_i (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);
-
-  private:
-    ::SharedDP::CCM_SharedDPComponent_Context_var context_;
-
-    ::DDS::InstanceHandle_t dp1_hnd_;
-    ::DDS::InstanceHandle_t dp2_hnd_;
-    ::DDS::InstanceHandle_t dp3_hnd_;
-    ::DDS::DomainParticipant_ptr dp1_ptr_;
-    ::DDS::DomainParticipant_ptr dp2_ptr_;
-    ::DDS::DomainParticipant_ptr dp3_ptr_;
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Component_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl
deleted file mode 100644
index 4afe620e7f1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file Connector1.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef SHARED_DP_CONNECTOR1_IDL_
-#define SHARED_DP_CONNECTOR1_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Base.idl"
-
-#pragma ciao lem "Connector1/Connector1E.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/BaseTypeSupport.idl"
-#endif
-
-module SharedDP_Connector1
-{
-  module ::CCM_DDS::Typed < ::SharedDPTest1, ::SharedDPTest1Seq> SharedDPTest1Connector;
-};
-
-
-
-#endif /* SHARED_DP_CONNECTOR1_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
deleted file mode 100644
index d1e19f07670..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
+++ /dev/null
@@ -1,140 +0,0 @@
-project(DDS_SharedDP_Connector1_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_SharedDP_DDBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR1_STUB_Export \
-              -Wb,stub_export_include=Connector1_stub_export.h \
-              -Wb,skel_export_macro=SHAREDDP_CONNECTOR1_SVNT_Export \
-              -Wb,skel_export_include=Connector1_svnt_export.h \
-              -Wb,svnt_export_macro=SHAREDDP_CONNECTOR1_SVNT_Export \
-              -Wb,svnt_export_include=Connector1_svnt_export.h \
-              -Wb,conn_export_macro=SHAREDDP_CONNECTOR1_CONN_Export \
-              -Wb,conn_export_include=Connector1_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Connector1.idl
-  }
-}
-
-project(DDS_SharedDP_Connector1_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SharedDP_Connector1_idl_gen
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR1_LEM_STUB_Export \
-              -Wb,stub_export_include=Connector1_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Connector1E.idl
-  }
-}
-
-project(DDS_SharedDP_Connector1_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SharedDP_Connector1_lem_gen DDS_SharedDP_Connector1_stub DDS_SharedDP_DDBase_stub
-  libs  += DDS_SharedDP_DDBase_stub DDS_Connector1_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector1_lem_stub
-  dynamicflags += SHAREDDP_CONNECTOR1_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector1EC.cpp
-  }
-
-  Header_Files {
-    Connector1EC.h
-    Connector1_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Connector1EC.inl
-  }
-}
-
-project(DDS_SharedDP_Connector1_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SharedDP_Connector1_idl_gen DDS_SharedDP_DDBase_stub
-  libs  += DDS_SharedDP_DDBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector1_stub
-  dynamicflags += SHAREDDP_CONNECTOR1_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector1C.cpp
-  }
-
-  Header_Files {
-    Connector1C.h
-    Connector1_stub_export.h
-  }
-
-  Inline_Files {
-    Connector1C.inl
-  }
-}
-
-project(DDS_SharedDP_Connector1_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SharedDP_Connector1_lem_stub DDS_SharedDP_Connector1_stub DDS_SharedDP_DDBase_stub
-  sharedname = DDS_Connector1_exec
-  libs += DDS_Connector1_stub DDS_Connector1_lem_stub DDS_SharedDP_DDBase_stub DDS_SharedDP_DDBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR1_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector1_conn.cpp
-  }
-
-  Header_Files {
-    Connector1_conn.h
-    Connector1_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SharedDP_Connector1_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SharedDP_Connector1_lem_stub DDS_SharedDP_Connector1_exec DDS_SharedDP_Connector1_stub
-  sharedname  = DDS_Connector1_svnt
-  libs       += DDS_Connector1_stub \
-                DDS_Connector1_lem_stub  \
-                DDS_SharedDP_DDBase_stub \
-                DDS_Connector1_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR1_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector1S.cpp
-    Connector1_svnt.cpp
-  }
-
-  Header_Files {
-    Connector1S.h
-    Connector1_svnt.h
-    Connector1_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl
deleted file mode 100644
index f38a634b931..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file Connector2.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef SHARED_DP_CONNECTOR2_IDL_
-#define SHARED_DP_CONNECTOR2_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Base.idl"
-
-#pragma ciao lem "Connector2/Connector2E.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/BaseTypeSupport.idl"
-#endif
-
-module SharedDP_Connector2
-{
-  module ::CCM_DDS::Typed < ::SharedDPTest2, ::SharedDPTest2Seq> SharedDPTest2Connector;
-};
-
-#endif /* SHARED_DP_CONNECTOR2_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
deleted file mode 100644
index f3cff4041ac..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
+++ /dev/null
@@ -1,140 +0,0 @@
-project(DDS_SharedDP_Connector2_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_SharedDP_DDBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR2_STUB_Export \
-              -Wb,stub_export_include=Connector2_stub_export.h \
-              -Wb,skel_export_macro=SHAREDDP_CONNECTOR2_SVNT_Export \
-              -Wb,skel_export_include=Connector2_svnt_export.h \
-              -Wb,svnt_export_macro=SHAREDDP_CONNECTOR2_SVNT_Export \
-              -Wb,svnt_export_include=Connector2_svnt_export.h \
-              -Wb,conn_export_macro=SHAREDDP_CONNECTOR2_CONN_Export \
-              -Wb,conn_export_include=Connector2_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Connector2.idl
-  }
-}
-
-project(DDS_SharedDP_Connector2_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SharedDP_Connector2_idl_gen
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR2_LEM_STUB_Export \
-              -Wb,stub_export_include=Connector2_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Connector2E.idl
-  }
-}
-
-project(DDS_SharedDP_Connector2_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SharedDP_Connector2_lem_gen DDS_SharedDP_Connector2_stub DDS_SharedDP_DDBase_stub
-  libs  += DDS_SharedDP_DDBase_stub DDS_Connector2_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector2_lem_stub
-  dynamicflags += SHAREDDP_CONNECTOR2_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector2EC.cpp
-  }
-
-  Header_Files {
-    Connector2EC.h
-    Connector2_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Connector2EC.inl
-  }
-}
-
-project(DDS_SharedDP_Connector2_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SharedDP_Connector2_idl_gen DDS_SharedDP_DDBase_stub
-  libs  += DDS_SharedDP_DDBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector2_stub
-  dynamicflags += SHAREDDP_CONNECTOR2_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector2C.cpp
-  }
-
-  Header_Files {
-    Connector2C.h
-    Connector2_stub_export.h
-  }
-
-  Inline_Files {
-    Connector2C.inl
-  }
-}
-
-project(DDS_SharedDP_Connector2_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SharedDP_Connector2_lem_stub DDS_SharedDP_Connector2_stub DDS_SharedDP_DDBase_stub
-  sharedname = DDS_Connector2_exec
-  libs += DDS_Connector2_stub DDS_Connector2_lem_stub DDS_SharedDP_DDBase_stub DDS_SharedDP_DDBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR2_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector2_conn.cpp
-  }
-
-  Header_Files {
-    Connector2_conn.h
-    Connector2_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SharedDP_Connector2_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SharedDP_Connector2_lem_stub DDS_SharedDP_Connector2_exec DDS_SharedDP_Connector2_stub
-  sharedname  = DDS_Connector2_svnt
-  libs       += DDS_Connector2_stub \
-                DDS_Connector2_lem_stub  \
-                DDS_SharedDP_DDBase_stub \
-                DDS_Connector2_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR2_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector2S.cpp
-    Connector2_svnt.cpp
-  }
-
-  Header_Files {
-    Connector2S.h
-    Connector2_svnt.h
-    Connector2_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl
deleted file mode 100644
index 19984701e26..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file Connector3.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef SHARED_DP_CONNECTOR3_IDL_
-#define SHARED_DP_CONNECTOR3_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Base.idl"
-
-#pragma ciao lem "Connector3/Connector3E.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/BaseTypeSupport.idl"
-#endif
-
-module SharedDP_Connector3
-{
-  module ::CCM_DDS::Typed < ::SharedDPTest3, ::SharedDPTest3Seq> SharedDPTest3Connector;
-};
-
-#endif /* SHARED_DP_CONNECTOR3_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
deleted file mode 100644
index 2edb65e3de2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
+++ /dev/null
@@ -1,140 +0,0 @@
-project(DDS_SharedDP_Connector3_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_SharedDP_DDBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR3_STUB_Export \
-              -Wb,stub_export_include=Connector3_stub_export.h \
-              -Wb,skel_export_macro=SHAREDDP_CONNECTOR3_SVNT_Export \
-              -Wb,skel_export_include=Connector3_svnt_export.h \
-              -Wb,svnt_export_macro=SHAREDDP_CONNECTOR3_SVNT_Export \
-              -Wb,svnt_export_include=Connector3_svnt_export.h \
-              -Wb,conn_export_macro=SHAREDDP_CONNECTOR3_CONN_Export \
-              -Wb,conn_export_include=Connector3_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Connector3.idl
-  }
-}
-
-project(DDS_SharedDP_Connector3_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SharedDP_Connector3_idl_gen
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR3_LEM_STUB_Export \
-              -Wb,stub_export_include=Connector3_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Connector3E.idl
-  }
-}
-
-project(DDS_SharedDP_Connector3_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SharedDP_Connector3_lem_gen DDS_SharedDP_Connector3_stub DDS_SharedDP_DDBase_stub
-  libs  += DDS_SharedDP_DDBase_stub DDS_Connector3_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector3_lem_stub
-  dynamicflags += SHAREDDP_CONNECTOR3_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector3EC.cpp
-  }
-
-  Header_Files {
-    Connector3EC.h
-    Connector3_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Connector3EC.inl
-  }
-}
-
-project(DDS_SharedDP_Connector3_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SharedDP_Connector3_idl_gen DDS_SharedDP_DDBase_stub
-  libs  += DDS_SharedDP_DDBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector3_stub
-  dynamicflags += SHAREDDP_CONNECTOR3_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector3C.cpp
-  }
-
-  Header_Files {
-    Connector3C.h
-    Connector3_stub_export.h
-  }
-
-  Inline_Files {
-    Connector3C.inl
-  }
-}
-
-project(DDS_SharedDP_Connector3_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SharedDP_Connector3_lem_stub DDS_SharedDP_Connector3_stub DDS_SharedDP_DDBase_stub
-  sharedname = DDS_Connector3_exec
-  libs += DDS_Connector3_stub DDS_Connector3_lem_stub DDS_SharedDP_DDBase_stub DDS_SharedDP_DDBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR3_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector3_conn.cpp
-  }
-
-  Header_Files {
-    Connector3_conn.h
-    Connector3_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SharedDP_Connector3_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SharedDP_Connector3_lem_stub DDS_SharedDP_Connector3_exec DDS_SharedDP_Connector3_stub
-  sharedname  = DDS_Connector3_svnt
-  libs       += DDS_Connector3_stub \
-                DDS_Connector3_lem_stub  \
-                DDS_SharedDP_DDBase_stub \
-                DDS_Connector3_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR3_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector3S.cpp
-    Connector3_svnt.cpp
-  }
-
-  Header_Files {
-    Connector3S.h
-    Connector3_svnt.h
-    Connector3_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp
deleted file mode 100644
index 03b9a8a9b3d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp
+++ /dev/null
@@ -1,445 +0,0 @@
-<!--  -->
-<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>SharedDPTest_Depl_1</label>
-  <UUID>SharedDPTest_Depl_1</UUID>
-
-  <implementation xmi:id="Connector1Implementation">
-    <name>Connector1Implementation</name>
-    <source/>
-    <artifact xmi:idref="Connector1_ExecArtifact" />
-    <artifact xmi:idref="Connector1_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_Connector1_SharedDPTest1Connector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_Connector1_SharedDPTest1Connector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector1_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector1_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Connector2Implementation">
-    <name>Connector2Implementation</name>
-    <source/>
-    <artifact xmi:idref="Connector2_ExecArtifact" />
-    <artifact xmi:idref="Connector2_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_Connector2_SharedDPTest2Connector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_Connector2_SharedDPTest2Connector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector2_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector2_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Connector3Implementation">
-    <name>Connector3Implementation</name>
-    <source/>
-    <artifact xmi:idref="Connector3_ExecArtifact" />
-    <artifact xmi:idref="Connector3_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_Connector3_SharedDPTest3Connector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_Connector3_SharedDPTest3Connector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector3_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector3_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_SharedDPComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="Connector1Instance">
-    <name>Connector1Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="Connector1Implementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SharedDP</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shared_Library#SharedProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Connector2Instance">
-    <name>Connector2Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="Connector2Implementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SharedDP2</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shared_Library#SharedProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Connector3Instance">
-    <name>Connector3Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="Connector3Implementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>StandaloneDP</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Standalone_Library#StandaloneProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ComponentInstance">
-    <name>Component</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>writer_connection1</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write1_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector1Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection2</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write2_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector2Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection3</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write3_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector3Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Connector1_ExecArtifact">
-    <name>DDS_Connector1_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector1_exec</location>
-  </artifact>
-  <artifact xmi:id="Connector1_SvntArtifact">
-    <name>DDS_Connector1_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector1_svnt</location>
-  </artifact>
-  <artifact xmi:id="Connector1_StubArtifact">
-    <name>DDS_Connector1_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector1_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Connector2_ExecArtifact">
-    <name>DDS_Connector2_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector2_exec</location>
-  </artifact>
-  <artifact xmi:id="Connector2_SvntArtifact">
-    <name>DDS_Connector2_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector2_svnt</location>
-  </artifact>
-  <artifact xmi:id="Connector2_StubArtifact">
-    <name>DDS_Connector2_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector2_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Connector3_ExecArtifact">
-    <name>DDS_Connector3_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector3_exec</location>
-  </artifact>
-  <artifact xmi:id="Connector3_SvntArtifact">
-    <name>DDS_Connector3_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector3_svnt</location>
-  </artifact>
-  <artifact xmi:id="Connector3_StubArtifact">
-    <name>DDS_Connector3_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector3_stub</location>
-  </artifact>
-
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Shared_Library.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Shared_Library.xml
deleted file mode 100644
index 5424a2e910a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Shared_Library.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="SharedProfile">
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-    </datawriter_qos>
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Standalone_Library.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Standalone_Library.xml
deleted file mode 100644
index 63e213c18d3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Standalone_Library.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="StandaloneProfile">
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-    </datawriter_qos>
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index f1018e84958..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <qos_library name="Shared_Library">
-    <qos_profile name="SharedProfile" is_default_qos="false">
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-  <qos_library name="Standalone_Library">
-    <qos_profile name="StandaloneProfile" is_default_qos="false">
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl
deleted file mode 100755
index c319b291048..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl
+++ /dev/null
@@ -1,237 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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 = 1;
-@ports = ( 60001 );
-@iorbases = ( "NodeApp1.ior" );
-@iorfiles = 0;
-@nodenames = ( "ComponentNode" );
-
-# 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 1 seconds to allow task to complete\n";
-sleep (1);
-
-# 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 -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$E->SpawnWaitKill (3 * $tg_executor->ProcessStartWaitInterval ());
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl
deleted file mode 100644
index 0f28a5b3e74..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * @file Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef BASE_IDL
-#define BASE_IDL
-
-#pragma ndds typesupport "Base/BaseSupport.h"
-#pragma opendds typesupport "Base/BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "SharedDPTest1"
-#pragma DCPS_DATA_KEY "SharedDPTest1 key1"
-
-#pragma DCPS_DATA_TYPE "SharedDPTest2"
-#pragma DCPS_DATA_KEY "SharedDPTest2 key2"
-
-#pragma DCPS_DATA_TYPE "SharedDPTest3"
-#pragma DCPS_DATA_KEY "SharedDPTest3 key3"
-
-struct SharedDPTest1 {
-  string key1;
-  long iteration1;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<SharedDPTest1> SharedDPTest1Seq;
-#endif
-
-struct SharedDPTest2 {
-  string key2;
-  long iteration2;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<SharedDPTest2> SharedDPTest2Seq;
-#endif
-
-struct SharedDPTest3 {
-  string key3;
-  long iteration3;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<SharedDPTest3> SharedDPTest3Seq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.mpc
deleted file mode 100644
index d67aff8cde6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (SharedDP_Diff_ID_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = SharedDP_Diff_ID_Base_stub
-  dynamicflags += BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=BASE_STUB_Export \
-              -Wb,stub_export_include=Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Base.idl
-  }
-
-  opendds_ts_flags += --export=BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.idl
deleted file mode 100644
index b045aab8549..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_SHARED_DP_COMPONENT_IDL
-#define DDS_SHARED_DP_COMPONENT_IDL
-
-#include "Connector1/Connector1.idl"
-#include "Connector2/Connector2.idl"
-#include "Connector3/Connector3.idl"
-
-module SharedDP
-{
-  component SharedDPComponent
-  {
-    port SharedDP_Connector1::SharedDPTest1Connector::DDS_Write write1;
-    port SharedDP_Connector2::SharedDPTest2Connector::DDS_Write write2;
-    port SharedDP_Connector3::SharedDPTest3Connector::DDS_Write write3;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.mpc
deleted file mode 100644
index e6a9418413f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.mpc
+++ /dev/null
@@ -1,152 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SharedDPBase -l ../lib -o ../lib -c controller -u DDS Component"
-
-project(SharedDP_Diff_ID_Component_idl_gen) : componentidldefaults, dds4ccm {
-    after += SharedDP_Diff_ID_Connector1_idl_gen SharedDP_Diff_ID_Connector2_idl_gen \
-    SharedDP_Diff_ID_Connector3_idl_gen
-    custom_only = 1
-    idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-    -Wb,stub_export_include=Component_stub_export.h \
-    -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-    -Wb,skel_export_include=Component_svnt_export.h \
-    -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-    -Wb,svnt_export_include=Component_svnt_export.h \
-    -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-    -Wb,exec_export_include=Component_exec_export.h \
-    -I ..
-
-    IDL_Files {
-        Component.idl
-    }
-}
-
-project(SharedDP_Diff_ID_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-    after += SharedDP_Diff_ID_Component_idl_gen
-    custom_only = 1
-    idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-    -Wb,stub_export_include=Component_lem_stub_export.h \
-    -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-    IDL_Files {
-        ComponentE.idl
-    }
-}
-
-project(SharedDP_Diff_ID_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-    after += SharedDP_Diff_ID_Component_lem_gen SharedDP_Diff_ID_Component_stub SharedDP_Diff_ID_Base_stub
-    libs  += SharedDP_Diff_ID_Base_stub Component_stub
-    libpaths += ../lib
-    libout = ../lib
-    includes += ..
-    sharedname = Component_lem_stub
-    dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-    IDL_Files {
-    }
-
-    Source_Files {
-        ComponentEC.cpp
-    }
-
-    Header_Files {
-        ComponentEC.h
-        Component_lem_stub_export.h
-    }
-
-    Inline_Files {
-        ComponentEC.inl
-    }
-}
-
-project(SharedDP_Diff_ID_Component_stub) : ccm_stub, dds4ccm_base {
-    after += SharedDP_Diff_ID_Component_idl_gen SharedDP_Diff_ID_Base_stub \
-    SharedDP_Diff_ID_Connector1_stub SharedDP_Diff_ID_Connector2_stub SharedDP_Diff_ID_Connector3_stub \
-    SharedDP_Diff_ID_Connector1_lem_gen SharedDP_Diff_ID_Connector2_lem_gen SharedDP_Diff_ID_Connector3_lem_gen
-    libs  += SharedDP_Diff_ID_Base_stub DDS_Connector1_stub DDS_Connector2_stub DDS_Connector3_stub
-    includes += ..
-    libpaths += ../lib
-    libout = ../lib
-    sharedname = Component_stub
-    dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-    IDL_Files {
-    }
-
-    Source_Files {
-        ComponentC.cpp
-    }
-
-    Header_Files {
-        ComponentC.h
-        Component_stub_export.h
-    }
-
-    Inline_Files {
-        ComponentC.inl
-    }
-}
-
-project(SharedDP_Diff_ID_Component_exec) : ciao_executor, dds4ccm_impl {
-    after   += SharedDP_Diff_ID_Component_lem_stub SharedDP_Diff_ID_Component_stub \
-    SharedDP_Diff_ID_Connector1_lem_stub SharedDP_Diff_ID_Connector1_stub \
-    SharedDP_Diff_ID_Connector2_lem_stub SharedDP_Diff_ID_Connector2_stub \
-    SharedDP_Diff_ID_Connector3_lem_stub SharedDP_Diff_ID_Connector3_stub
-    sharedname = Component_exec
-    libs += Component_stub Component_lem_stub SharedDP_Diff_ID_Base_stub \
-    DDS_Connector1_lem_stub DDS_Connector1_stub \
-    DDS_Connector2_lem_stub DDS_Connector2_stub \
-    DDS_Connector3_lem_stub DDS_Connector3_stub
-    libpaths += ../lib
-    includes += ..
-    libout = ../lib
-    dynamicflags += COMPONENT_EXEC_BUILD_DLL
-
-    IDL_Files {
-    }
-
-    Source_Files {
-        Component_exec.cpp
-    }
-
-    Header_Files {
-        Component_exec.h
-        Component_exec_export.h
-    }
-
-    Inline_Files {
-    }
-}
-
-project(SharedDP_Diff_ID_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-    after      += SharedDP_Diff_ID_Base_stub  SharedDP_Diff_ID_Component_lem_stub \
-    SharedDP_Diff_ID_Connector1_stub SharedDP_Diff_ID_Connector1_svnt  SharedDP_Diff_ID_Connector1_lem_stub \
-    SharedDP_Diff_ID_Connector2_stub SharedDP_Diff_ID_Connector2_svnt  SharedDP_Diff_ID_Connector2_lem_stub \
-    SharedDP_Diff_ID_Connector3_stub SharedDP_Diff_ID_Connector3_svnt  SharedDP_Diff_ID_Connector3_lem_stub
-    sharedname  = Component_svnt
-    libs       += Component_stub Component_lem_stub  \
-    SharedDP_Diff_ID_Base_stub \
-    DDS_Connector1_stub DDS_Connector1_svnt DDS_Connector1_lem_stub \
-    DDS_Connector2_stub DDS_Connector2_svnt DDS_Connector2_lem_stub \
-    DDS_Connector3_stub DDS_Connector3_svnt DDS_Connector3_lem_stub
-    libpaths += ../lib
-    libout = ../lib
-    includes += ..
-    dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-    IDL_Files {
-    }
-
-    Source_Files {
-        ComponentS.cpp
-        Component_svnt.cpp
-    }
-
-    Header_Files {
-        ComponentS.h
-        Component_svnt.h
-        Component_svnt_export.h
-    }
-
-    Inline_Files {
-    }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.cpp
deleted file mode 100644
index 8f4b7274dee..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.cpp
+++ /dev/null
@@ -1,316 +0,0 @@
-// -*- C++ -*-
-#include "Component_exec.h"
-#include "ace/Log_Msg.h"
-
-#include "Connector1/Connector1_conn.h"
-#include "Connector2/Connector2_conn.h"
-#include "Connector3/Connector3_conn.h"
-
-namespace CIAO_SharedDP_SharedDPComponent_Impl
-{
-  //============================================================
-  // Component Executor Implementation Class: Component_exec_i
-  //============================================================
-
-  Component_exec_i::Component_exec_i (void)
-    : dp1_hnd_ (DDS::HANDLE_NIL)
-    , dp2_hnd_ (DDS::HANDLE_NIL)
-    , dp3_hnd_ (DDS::HANDLE_NIL)
-    , dp1_ptr_ (DDS::DomainParticipant::_nil ())
-    , dp2_ptr_ (DDS::DomainParticipant::_nil ())
-    , dp3_ptr_ (DDS::DomainParticipant::_nil ())
-  {
-  }
-
-  Component_exec_i::~Component_exec_i (void)
-  {
-  }
-
-  void
-  Component_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::SharedDP::CCM_SharedDPComponent_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Component_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_activate (void)
-  {
-    try
-      {
-        ::DDS::DataWriter_var dw1 =
-          this->context_->get_connection_write1_dds_entity ();
-
-        if (::CORBA::is_nil (dw1.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Datawriter 1 connection is NIL.\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-
-        ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw1 =
-          dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw1.in ());
-
-        if (ccm_dw1)
-          {
-            ::DDS::DataWriter_var tmp = ccm_dw1->get_dds_entity ();
-            if (! ::CORBA::is_nil (tmp.in ()))
-              {
-                ::DDS::Publisher_var publisher = tmp->get_publisher ();
-
-                if (! ::CORBA::is_nil (publisher.in ()))
-                  {
-                    ::DDS::DomainParticipant_var dp = publisher->get_participant ();
-
-                    if (! ::CORBA::is_nil (publisher.in ()))
-                      {
-
-                        this->dp1_hnd_ = dp->get_instance_handle ();
-                        this->dp1_ptr_ = dp.ptr ();
-                      }
-                    else
-                      {
-                        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                    "Error getting DomainParticipant 1.\n"));
-                        throw ::CORBA::INTERNAL ();
-                      }
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                "Error getting Publisher 1.\n"));
-                    throw ::CORBA::INTERNAL ();
-                  }
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                            "Error getting DDS DataWriter 1.\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Error casting DataWriter 1 to CCM DataWriter 1\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer1\n"));
-      }
-
-    try
-      {
-        ::DDS::DataWriter_var dw2 =
-          this->context_->get_connection_write2_dds_entity ();
-
-        if (::CORBA::is_nil (dw2.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Datawriter 2 connection is NIL.\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-
-        ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw2 =
-          dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw2.in ());
-
-        if (ccm_dw2)
-          {
-            ::DDS::DataWriter_var tmp = ccm_dw2->get_dds_entity ();
-            if (! ::CORBA::is_nil (tmp.in ()))
-              {
-                ::DDS::Publisher_var publisher = tmp->get_publisher ();
-
-                if (! ::CORBA::is_nil (publisher.in ()))
-                  {
-                    ::DDS::DomainParticipant_var dp = publisher->get_participant ();
-
-                    if (! ::CORBA::is_nil (publisher.in ()))
-                      {
-
-                        this->dp2_hnd_ = dp->get_instance_handle ();
-                        this->dp2_ptr_ = dp.ptr ();
-                      }
-                    else
-                      {
-                        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                    "Error getting DomainParticipant 2.\n"));
-                        throw ::CORBA::INTERNAL ();
-                      }
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                "Error getting Publisher 2.\n"));
-                    throw ::CORBA::INTERNAL ();
-                  }
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                            "Error getting DDS DataWriter 2.\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Error casting DataWriter 2 to CCM DataWriter 2\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer2\n"));
-      }
-
-    try
-      {
-        ::DDS::DataWriter_var dw3 =
-          this->context_->get_connection_write3_dds_entity ();
-
-        if (::CORBA::is_nil (dw3.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Datawriter 3 connection is NIL.\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-
-        ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw3 =
-          dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw3.in ());
-
-        if (ccm_dw3)
-          {
-            ::DDS::DataWriter_var tmp = ccm_dw3->get_dds_entity ();
-            if (! ::CORBA::is_nil (tmp.in ()))
-              {
-                ::DDS::Publisher_var publisher = tmp->get_publisher ();
-
-                if (! ::CORBA::is_nil (publisher.in ()))
-                  {
-                    ::DDS::DomainParticipant_var dp = publisher->get_participant ();
-
-                    if (! ::CORBA::is_nil (publisher.in ()))
-                      {
-                        this->dp3_hnd_ = dp->get_instance_handle ();
-                        this->dp3_ptr_ = dp.ptr ();
-                      }
-                    else
-                      {
-                        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                    "Error getting DomainParticipant 3.\n"));
-                        throw ::CORBA::INTERNAL ();
-                      }
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                "Error getting Publisher 3.\n"));
-                    throw ::CORBA::INTERNAL ();
-                  }
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                            "Error getting DDS DataWriter 3.\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Error casting DataWriter 3 to CCM DataWriter 3\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer3\n"));
-      }
-  }
-
-  void
-  Component_exec_i::ccm_passivate (void)
-  {
-    if (this->dp1_hnd_ == DDS::HANDLE_NIL)
-      ACE_ERROR ((LM_ERROR, "ERROR: DomainParticipant for Connector 1 seems to be NIL\n"));
-    if (this->dp2_hnd_ == DDS::HANDLE_NIL)
-      ACE_ERROR ((LM_ERROR, "ERROR: DomainParticipant for Connector 2 seems to be NIL\n"));
-    if (this->dp3_hnd_ == DDS::HANDLE_NIL)
-      ACE_ERROR ((LM_ERROR, "ERROR: DomainParticipant for Connector 3 seems to be NIL\n"));
-  }
-
-  void
-  Component_exec_i::ccm_remove (void)
-  {
-    if ((this->dp1_hnd_ == this->dp2_hnd_)
-#if (CIAO_DDS4CCM_OPENDDS==1)
-        && (this->dp1_ptr_ == this->dp2_ptr_)
-#endif
-        )
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 2 seem to "
-                              "share the same DomainParticipant. Based on the domain_id the "
-                              "domain participants should be different\n"));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK: Connector 1 and 2 don't seems to "
-                              "share the same DomainParticipant\n"));
-      }
-    if ((this->dp1_hnd_ == this->dp3_hnd_)
-#if (CIAO_DDS4CCM_OPENDDS==1)
-        && (this->dp1_ptr_ == this->dp3_ptr_)
-#endif
-        )
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 3 seem to "
-                              "share the same DomainParticipant\n"));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK: Connector 1 and 3 don't seems to "
-                              "share the same DomainParticipant\n"));
-      }
-    if ((this->dp2_hnd_ == this->dp3_hnd_)
-#if (CIAO_DDS4CCM_OPENDDS==1)
-        && (this->dp2_ptr_ == this->dp3_ptr_)
-#endif
-        )
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Connector 2 and 3 seem to "
-                              "share the same DomainParticipant\n"));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK: Connector 2 and 3 don't seems to "
-                              "share the same DomainParticipant\n"));
-      }
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Component_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Component_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.h b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.h
deleted file mode 100644
index dfcc1d903e7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component_exec.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COMPONENT_EXEC_H_
-#define CIAO_COMPONENT_EXEC_H_
-
-
-#include "ComponentEC.h"
-
-#include /**/ "Component_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-class DDSDomainParticipant;
-
-namespace CIAO_SharedDP_SharedDPComponent_Impl
-{
-  class Component_exec_i
-    : public virtual SharedDPComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Component_exec_i (void);
-    virtual ~Component_exec_i (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);
-
-  private:
-    ::SharedDP::CCM_SharedDPComponent_Context_var context_;
-
-    ::DDS::InstanceHandle_t dp1_hnd_;
-    ::DDS::InstanceHandle_t dp2_hnd_;
-    ::DDS::InstanceHandle_t dp3_hnd_;
-    ::DDS::DomainParticipant_ptr dp1_ptr_;
-    ::DDS::DomainParticipant_ptr dp2_ptr_;
-    ::DDS::DomainParticipant_ptr dp3_ptr_;
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Component_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl
deleted file mode 100644
index 4afe620e7f1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file Connector1.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef SHARED_DP_CONNECTOR1_IDL_
-#define SHARED_DP_CONNECTOR1_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Base.idl"
-
-#pragma ciao lem "Connector1/Connector1E.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/BaseTypeSupport.idl"
-#endif
-
-module SharedDP_Connector1
-{
-  module ::CCM_DDS::Typed < ::SharedDPTest1, ::SharedDPTest1Seq> SharedDPTest1Connector;
-};
-
-
-
-#endif /* SHARED_DP_CONNECTOR1_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.mpc
deleted file mode 100644
index 15b4e4419bc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.mpc
+++ /dev/null
@@ -1,140 +0,0 @@
-project(SharedDP_Diff_ID_Connector1_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen SharedDP_Diff_ID_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR1_STUB_Export \
-              -Wb,stub_export_include=Connector1_stub_export.h \
-              -Wb,skel_export_macro=SHAREDDP_CONNECTOR1_SVNT_Export \
-              -Wb,skel_export_include=Connector1_svnt_export.h \
-              -Wb,svnt_export_macro=SHAREDDP_CONNECTOR1_SVNT_Export \
-              -Wb,svnt_export_include=Connector1_svnt_export.h \
-              -Wb,conn_export_macro=SHAREDDP_CONNECTOR1_CONN_Export \
-              -Wb,conn_export_include=Connector1_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Connector1.idl
-  }
-}
-
-project(SharedDP_Diff_ID_Connector1_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += SharedDP_Diff_ID_Connector1_idl_gen
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR1_LEM_STUB_Export \
-              -Wb,stub_export_include=Connector1_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Connector1E.idl
-  }
-}
-
-project(SharedDP_Diff_ID_Connector1_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += SharedDP_Diff_ID_Connector1_lem_gen SharedDP_Diff_ID_Connector1_stub SharedDP_Diff_ID_Base_stub
-  libs  += SharedDP_Diff_ID_Base_stub DDS_Connector1_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector1_lem_stub
-  dynamicflags += SHAREDDP_CONNECTOR1_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector1EC.cpp
-  }
-
-  Header_Files {
-    Connector1EC.h
-    Connector1_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Connector1EC.inl
-  }
-}
-
-project(SharedDP_Diff_ID_Connector1_stub) : ccm_stub, dds4ccm_base {
-  after += SharedDP_Diff_ID_Connector1_idl_gen SharedDP_Diff_ID_Base_stub
-  libs  += SharedDP_Diff_ID_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector1_stub
-  dynamicflags += SHAREDDP_CONNECTOR1_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector1C.cpp
-  }
-
-  Header_Files {
-    Connector1C.h
-    Connector1_stub_export.h
-  }
-
-  Inline_Files {
-    Connector1C.inl
-  }
-}
-
-project(SharedDP_Diff_ID_Connector1_exec) : ciao_executor, dds4ccm_impl {
-  after   += SharedDP_Diff_ID_Connector1_lem_stub SharedDP_Diff_ID_Connector1_stub SharedDP_Diff_ID_Base_stub
-  sharedname = DDS_Connector1_exec
-  libs += DDS_Connector1_stub DDS_Connector1_lem_stub SharedDP_Diff_ID_Base_stub SharedDP_Diff_ID_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR1_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector1_conn.cpp
-  }
-
-  Header_Files {
-    Connector1_conn.h
-    Connector1_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(SharedDP_Diff_ID_Connector1_svnt) : ciao_servant, dds4ccm_impl {
-  after      += SharedDP_Diff_ID_Connector1_lem_stub SharedDP_Diff_ID_Connector1_exec SharedDP_Diff_ID_Connector1_stub
-  sharedname  = DDS_Connector1_svnt
-  libs       += DDS_Connector1_stub \
-                DDS_Connector1_lem_stub  \
-                SharedDP_Diff_ID_Base_stub \
-                DDS_Connector1_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR1_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector1S.cpp
-    Connector1_svnt.cpp
-  }
-
-  Header_Files {
-    Connector1S.h
-    Connector1_svnt.h
-    Connector1_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl
deleted file mode 100644
index f38a634b931..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file Connector2.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef SHARED_DP_CONNECTOR2_IDL_
-#define SHARED_DP_CONNECTOR2_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Base.idl"
-
-#pragma ciao lem "Connector2/Connector2E.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/BaseTypeSupport.idl"
-#endif
-
-module SharedDP_Connector2
-{
-  module ::CCM_DDS::Typed < ::SharedDPTest2, ::SharedDPTest2Seq> SharedDPTest2Connector;
-};
-
-#endif /* SHARED_DP_CONNECTOR2_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.mpc
deleted file mode 100644
index b1059bca0ca..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.mpc
+++ /dev/null
@@ -1,140 +0,0 @@
-project(SharedDP_Diff_ID_Connector2_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen SharedDP_Diff_ID_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR2_STUB_Export \
-              -Wb,stub_export_include=Connector2_stub_export.h \
-              -Wb,skel_export_macro=SHAREDDP_CONNECTOR2_SVNT_Export \
-              -Wb,skel_export_include=Connector2_svnt_export.h \
-              -Wb,svnt_export_macro=SHAREDDP_CONNECTOR2_SVNT_Export \
-              -Wb,svnt_export_include=Connector2_svnt_export.h \
-              -Wb,conn_export_macro=SHAREDDP_CONNECTOR2_CONN_Export \
-              -Wb,conn_export_include=Connector2_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Connector2.idl
-  }
-}
-
-project(SharedDP_Diff_ID_Connector2_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += SharedDP_Diff_ID_Connector2_idl_gen
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR2_LEM_STUB_Export \
-              -Wb,stub_export_include=Connector2_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Connector2E.idl
-  }
-}
-
-project(SharedDP_Diff_ID_Connector2_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += SharedDP_Diff_ID_Connector2_lem_gen SharedDP_Diff_ID_Connector2_stub SharedDP_Diff_ID_Base_stub
-  libs  += SharedDP_Diff_ID_Base_stub DDS_Connector2_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector2_lem_stub
-  dynamicflags += SHAREDDP_CONNECTOR2_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector2EC.cpp
-  }
-
-  Header_Files {
-    Connector2EC.h
-    Connector2_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Connector2EC.inl
-  }
-}
-
-project(SharedDP_Diff_ID_Connector2_stub) : ccm_stub, dds4ccm_base {
-  after += SharedDP_Diff_ID_Connector2_idl_gen SharedDP_Diff_ID_Base_stub
-  libs  += SharedDP_Diff_ID_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector2_stub
-  dynamicflags += SHAREDDP_CONNECTOR2_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector2C.cpp
-  }
-
-  Header_Files {
-    Connector2C.h
-    Connector2_stub_export.h
-  }
-
-  Inline_Files {
-    Connector2C.inl
-  }
-}
-
-project(SharedDP_Diff_ID_Connector2_exec) : ciao_executor, dds4ccm_impl {
-  after   += SharedDP_Diff_ID_Connector2_lem_stub SharedDP_Diff_ID_Connector2_stub SharedDP_Diff_ID_Base_stub
-  sharedname = DDS_Connector2_exec
-  libs += DDS_Connector2_stub DDS_Connector2_lem_stub SharedDP_Diff_ID_Base_stub SharedDP_Diff_ID_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR2_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector2_conn.cpp
-  }
-
-  Header_Files {
-    Connector2_conn.h
-    Connector2_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(SharedDP_Diff_ID_Connector2_svnt) : ciao_servant, dds4ccm_impl {
-  after      += SharedDP_Diff_ID_Connector2_lem_stub SharedDP_Diff_ID_Connector2_exec SharedDP_Diff_ID_Connector2_stub
-  sharedname  = DDS_Connector2_svnt
-  libs       += DDS_Connector2_stub \
-                DDS_Connector2_lem_stub  \
-                SharedDP_Diff_ID_Base_stub \
-                DDS_Connector2_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR2_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector2S.cpp
-    Connector2_svnt.cpp
-  }
-
-  Header_Files {
-    Connector2S.h
-    Connector2_svnt.h
-    Connector2_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl
deleted file mode 100644
index 19984701e26..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file Connector3.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef SHARED_DP_CONNECTOR3_IDL_
-#define SHARED_DP_CONNECTOR3_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Base.idl"
-
-#pragma ciao lem "Connector3/Connector3E.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/BaseTypeSupport.idl"
-#endif
-
-module SharedDP_Connector3
-{
-  module ::CCM_DDS::Typed < ::SharedDPTest3, ::SharedDPTest3Seq> SharedDPTest3Connector;
-};
-
-#endif /* SHARED_DP_CONNECTOR3_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.mpc
deleted file mode 100644
index f5c705f13a6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.mpc
+++ /dev/null
@@ -1,140 +0,0 @@
-project(SharedDP_Diff_ID_Connector3_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen SharedDP_Diff_ID_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR3_STUB_Export \
-              -Wb,stub_export_include=Connector3_stub_export.h \
-              -Wb,skel_export_macro=SHAREDDP_CONNECTOR3_SVNT_Export \
-              -Wb,skel_export_include=Connector3_svnt_export.h \
-              -Wb,svnt_export_macro=SHAREDDP_CONNECTOR3_SVNT_Export \
-              -Wb,svnt_export_include=Connector3_svnt_export.h \
-              -Wb,conn_export_macro=SHAREDDP_CONNECTOR3_CONN_Export \
-              -Wb,conn_export_include=Connector3_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Connector3.idl
-  }
-}
-
-project(SharedDP_Diff_ID_Connector3_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += SharedDP_Diff_ID_Connector3_idl_gen
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR3_LEM_STUB_Export \
-              -Wb,stub_export_include=Connector3_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Connector3E.idl
-  }
-}
-
-project(SharedDP_Diff_ID_Connector3_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += SharedDP_Diff_ID_Connector3_lem_gen SharedDP_Diff_ID_Connector3_stub SharedDP_Diff_ID_Base_stub
-  libs  += SharedDP_Diff_ID_Base_stub DDS_Connector3_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector3_lem_stub
-  dynamicflags += SHAREDDP_CONNECTOR3_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector3EC.cpp
-  }
-
-  Header_Files {
-    Connector3EC.h
-    Connector3_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Connector3EC.inl
-  }
-}
-
-project(SharedDP_Diff_ID_Connector3_stub) : ccm_stub, dds4ccm_base {
-  after += SharedDP_Diff_ID_Connector3_idl_gen SharedDP_Diff_ID_Base_stub
-  libs  += SharedDP_Diff_ID_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector3_stub
-  dynamicflags += SHAREDDP_CONNECTOR3_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector3C.cpp
-  }
-
-  Header_Files {
-    Connector3C.h
-    Connector3_stub_export.h
-  }
-
-  Inline_Files {
-    Connector3C.inl
-  }
-}
-
-project(SharedDP_Diff_ID_Connector3_exec) : ciao_executor, dds4ccm_impl {
-  after   += SharedDP_Diff_ID_Connector3_lem_stub SharedDP_Diff_ID_Connector3_stub SharedDP_Diff_ID_Base_stub
-  sharedname = DDS_Connector3_exec
-  libs += DDS_Connector3_stub DDS_Connector3_lem_stub SharedDP_Diff_ID_Base_stub SharedDP_Diff_ID_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR3_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector3_conn.cpp
-  }
-
-  Header_Files {
-    Connector3_conn.h
-    Connector3_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(SharedDP_Diff_ID_Connector3_svnt) : ciao_servant, dds4ccm_impl {
-  after      += SharedDP_Diff_ID_Connector3_lem_stub SharedDP_Diff_ID_Connector3_exec SharedDP_Diff_ID_Connector3_stub
-  sharedname  = DDS_Connector3_svnt
-  libs       += DDS_Connector3_stub \
-                DDS_Connector3_lem_stub  \
-                SharedDP_Diff_ID_Base_stub \
-                DDS_Connector3_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR3_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector3S.cpp
-    Connector3_svnt.cpp
-  }
-
-  Header_Files {
-    Connector3S.h
-    Connector3_svnt.h
-    Connector3_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Plan.cdp
deleted file mode 100644
index 1a86d6da026..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Plan.cdp
+++ /dev/null
@@ -1,478 +0,0 @@
-<!--  -->
-<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>SharedDPTest_Depl_1</label>
-  <UUID>SharedDPTest_Depl_1</UUID>
-
-  <implementation xmi:id="Connector1Implementation">
-    <name>Connector1Implementation</name>
-    <source/>
-    <artifact xmi:idref="Connector1_ExecArtifact" />
-    <artifact xmi:idref="Connector1_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_Connector1_SharedDPTest1Connector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_Connector1_SharedDPTest1Connector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector1_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector1_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Connector2Implementation">
-    <name>Connector2Implementation</name>
-    <source/>
-    <artifact xmi:idref="Connector2_ExecArtifact" />
-    <artifact xmi:idref="Connector2_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_Connector2_SharedDPTest2Connector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_Connector2_SharedDPTest2Connector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector2_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector2_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Connector3Implementation">
-    <name>Connector3Implementation</name>
-    <source/>
-    <artifact xmi:idref="Connector3_ExecArtifact" />
-    <artifact xmi:idref="Connector3_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_Connector3_SharedDPTest3Connector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_Connector3_SharedDPTest3Connector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector3_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector3_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_SharedDPComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="Connector1Instance">
-    <name>Connector1Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="Connector1Implementation" />
-    <configProperty>
-      <name>domain_id</name>
-      <value>
-        <type>
-          <kind>tk_long</kind>
-        </type>
-        <value>
-          <long>97</long>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SharedDP</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shared_Library#SharedProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Connector2Instance">
-    <name>Connector2Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="Connector2Implementation" />
-    <configProperty>
-      <name>domain_id</name>
-      <value>
-        <type>
-          <kind>tk_long</kind>
-        </type>
-        <value>
-          <long>98</long>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SharedDP2</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shared_Library#SharedProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Connector3Instance">
-    <name>Connector3Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="Connector3Implementation" />
-    <configProperty>
-      <name>domain_id</name>
-      <value>
-        <type>
-          <kind>tk_long</kind>
-        </type>
-        <value>
-          <long>99</long>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SharedDP</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shared_Library#SharedProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ComponentInstance">
-    <name>Component</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>writer_connection1</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write1_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector1Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection2</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write2_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector2Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection3</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write3_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector3Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Connector1_ExecArtifact">
-    <name>DDS_Connector1_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector1_exec</location>
-  </artifact>
-  <artifact xmi:id="Connector1_SvntArtifact">
-    <name>DDS_Connector1_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector1_svnt</location>
-  </artifact>
-  <artifact xmi:id="Connector1_StubArtifact">
-    <name>DDS_Connector1_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector1_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Connector2_ExecArtifact">
-    <name>DDS_Connector2_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector2_exec</location>
-  </artifact>
-  <artifact xmi:id="Connector2_SvntArtifact">
-    <name>DDS_Connector2_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector2_svnt</location>
-  </artifact>
-  <artifact xmi:id="Connector2_StubArtifact">
-    <name>DDS_Connector2_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector2_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Connector3_ExecArtifact">
-    <name>DDS_Connector3_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector3_exec</location>
-  </artifact>
-  <artifact xmi:id="Connector3_SvntArtifact">
-    <name>DDS_Connector3_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector3_svnt</location>
-  </artifact>
-  <artifact xmi:id="Connector3_StubArtifact">
-    <name>DDS_Connector3_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector3_stub</location>
-  </artifact>
-
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Shared_Library.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Shared_Library.xml
deleted file mode 100644
index 5424a2e910a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Shared_Library.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="SharedProfile">
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-    </datawriter_qos>
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Standalone_Library.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Standalone_Library.xml
deleted file mode 100644
index 63e213c18d3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/Standalone_Library.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="StandaloneProfile">
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-    </datawriter_qos>
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index f1018e84958..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <qos_library name="Shared_Library">
-    <qos_profile name="SharedProfile" is_default_qos="false">
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-  <qos_library name="Standalone_Library">
-    <qos_profile name="StandaloneProfile" is_default_qos="false">
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/run_test.pl
deleted file mode 100755
index 91749ec0bf3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/run_test.pl
+++ /dev/null
@@ -1,241 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-
-BEGIN {
-    undef $ENV{'DDS4CCM_DEFAULT_DOMAIN_ID'};
-}
-
-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 = 1;
-@ports = ( 60001 );
-@iorbases = ( "NodeApp1.ior" );
-@iorfiles = 0;
-@nodenames = ( "ComponentNode" );
-
-# 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 1 seconds to allow task to complete\n";
-sleep (1);
-
-# 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 -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/README b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/README
deleted file mode 100644
index 6aaae0f6f81..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/README
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-To save resources, every subsequent connector with the same
-library name and profile name, should get the same domain-
-participant.
-
-There're three connectors. Two (Connector1 and Connector2)
-with the same library/profile name.
-One (Connector3) with a different library/profile name.
-
-The component checks the pointers of the domainparticipants.
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl
deleted file mode 100644
index b0c773f58de..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef BASE_IDL
-#define BASE_IDL
-
-#pragma ndds typesupport "Base/BaseSupport.h"
-#pragma opendds typesupport "Base/BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "SharedDPTest"
-#pragma DCPS_DATA_KEY "SharedDPTest key"
-
-struct SharedDPTest {
-  string key;
-  long iteration;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<SharedDPTest> SharedDPTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc
deleted file mode 100644
index 17ee2d5f8cc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_SharedDPBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_SharedDPBase_stub
-  dynamicflags += BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=BASE_STUB_Export \
-              -Wb,stub_export_include=Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Base.idl
-  }
-
-  opendds_ts_flags += --export=BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl
deleted file mode 100644
index a4023fa461c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_SHARED_DP_COMPONENT_IDL
-#define DDS_SHARED_DP_COMPONENT_IDL
-
-#include "Connector/Connector.idl"
-
-module SharedDP
-{
-  component SharedDPComponent
-  {
-    port SharedDPTestConnector::DDS_Write write1;
-    port SharedDPTestConnector::DDS_Write write2;
-    port SharedDPTestConnector::DDS_Write write3;
-    port SharedDPTestConnector::DDS_Write write4;
-
-    attribute boolean perform_test;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc
deleted file mode 100644
index ad292a53373..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc
+++ /dev/null
@@ -1,144 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SharedDPBase -l ../lib -o ../lib -c controller -u DDS Component"
-
-project(DDS_SharedDPComponent_idl_gen) : componentidldefaults, dds4ccm {
-    after += DDS_SharedDP_Connector_idl_gen
-    custom_only = 1
-    idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-    -Wb,stub_export_include=Component_stub_export.h \
-    -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-    -Wb,skel_export_include=Component_svnt_export.h \
-    -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-    -Wb,svnt_export_include=Component_svnt_export.h \
-    -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-    -Wb,exec_export_include=Component_exec_export.h \
-    -I ..
-
-    IDL_Files {
-        Component.idl
-    }
-}
-
-project(DDS_SharedDPComponent_lem_gen) : ciaoidldefaults, dds4ccm {
-    after += DDS_SharedDPComponent_idl_gen
-    custom_only = 1
-    idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-    -Wb,stub_export_include=Component_lem_stub_export.h \
-    -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-    IDL_Files {
-        ComponentE.idl
-    }
-}
-
-project(DDS_SharedDPComponent_lem_stub) : ccm_svnt, dds4ccm_base {
-    after += DDS_SharedDPComponent_lem_gen DDS_SharedDPComponent_stub DDS_SharedDPBase_stub
-    libs  += DDS_SharedDPBase_stub Component_stub
-    libpaths += ../lib
-    libout = ../lib
-    includes += ..
-    sharedname = Component_lem_stub
-    dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-    IDL_Files {
-    }
-
-    Source_Files {
-        ComponentEC.cpp
-    }
-
-    Header_Files {
-        ComponentEC.h
-        Component_lem_stub_export.h
-    }
-
-    Inline_Files {
-        ComponentEC.inl
-    }
-}
-
-project(DDS_SharedDPComponent_stub) : ccm_stub, dds4ccm_base {
-    after += DDS_SharedDPComponent_idl_gen DDS_SharedDPBase_stub \
-    DDS_SharedDP_Connector_lem_gen DDS_SharedDP_Connector_stub
-    libs  += DDS_SharedDPBase_stub DDS_Connector_stub
-    includes += ..
-    libpaths += ../lib
-    libout = ../lib
-    sharedname = Component_stub
-    dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-    IDL_Files {
-    }
-
-    Source_Files {
-        ComponentC.cpp
-    }
-
-    Header_Files {
-        ComponentC.h
-        Component_stub_export.h
-    }
-
-    Inline_Files {
-        ComponentC.inl
-    }
-}
-
-project(DDS_SharedDPComponent_exec) : ciao_executor,  dds4ccm_impl {
-    after   += DDS_SharedDPComponent_lem_stub DDS_SharedDPComponent_stub \
-    DDS_SharedDP_Connector_lem_stub DDS_SharedDP_Connector_stub
-    sharedname = Component_exec
-    libs += Component_stub Component_lem_stub DDS_SharedDPBase_stub \
-    DDS_Connector_lem_stub DDS_Connector_stub
-    libpaths += ../lib
-    includes += ..
-    libout = ../lib
-    dynamicflags += COMPONENT_EXEC_BUILD_DLL
-
-    IDL_Files {
-    }
-
-    Source_Files {
-        Component_exec.cpp
-    }
-
-    Header_Files {
-        Component_exec.h
-        Component_exec_export.h
-    }
-
-    Inline_Files {
-    }
-}
-
-
-project(DDS_SharedDPComponent_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-    after      += DDS_SharedDPBase_stub  DDS_SharedDPComponent_lem_stub \
-    DDS_SharedDP_Connector_stub DDS_SharedDP_Connector_svnt \
-    DDS_SharedDP_Connector_lem_stub
-    sharedname  = Component_svnt
-    libs       += Component_stub Component_lem_stub  \
-    DDS_SharedDPBase_stub \
-    DDS_Connector_stub DDS_Connector_svnt DDS_Connector_lem_stub
-    libpaths += ../lib
-    libout = ../lib
-    includes += ..
-    dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-    IDL_Files {
-    }
-
-    Source_Files {
-        ComponentS.cpp
-        Component_svnt.cpp
-    }
-
-    Header_Files {
-        ComponentS.h
-        Component_svnt.h
-        Component_svnt_export.h
-    }
-
-    Inline_Files {
-    }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp
deleted file mode 100644
index 2f5bcdd7492..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp
+++ /dev/null
@@ -1,586 +0,0 @@
-// -*- C++ -*-
-// Test whether Connector 1,2 and 3 are sharing the same DomainParticipant.
-// Connector 4 should have a different DomainParticipant.
-// Also test whether Connector 1 and 2 share the same topic.
-
-#include "Component_exec.h"
-#include "ace/Log_Msg.h"
-
-#include "Connector/Connector_conn.h"
-
-const char * tp_name_conn_1_ = "SharedDP";
-const char * tp_name_conn_2_ = "SharedDP";
-const char * tp_name_conn_3_ = "SharedDP1";
-const char * tp_name_conn_4_ = "StandaloneDP";
-
-namespace CIAO_SharedDP_SharedDPComponent_Impl
-{
-  //============================================================
-  // Component Executor Implementation Class: Component_exec_i
-  //============================================================
-
-  Component_exec_i::Component_exec_i (void)
-    : perform_test_ (false)
-    , dp1_hnd_ (DDS::HANDLE_NIL)
-    , dp2_hnd_ (DDS::HANDLE_NIL)
-    , dp3_hnd_ (DDS::HANDLE_NIL)
-    , dp4_hnd_ (DDS::HANDLE_NIL)
-    , dp1_ptr_ (DDS::DomainParticipant::_nil ())
-    , dp2_ptr_ (DDS::DomainParticipant::_nil ())
-    , dp3_ptr_ (DDS::DomainParticipant::_nil ())
-    , dp4_ptr_ (DDS::DomainParticipant::_nil ())
-    , tp1_hnd_ (DDS::HANDLE_NIL)
-    , tp2_hnd_ (DDS::HANDLE_NIL)
-    , tp3_hnd_ (DDS::HANDLE_NIL)
-    , tp4_hnd_ (DDS::HANDLE_NIL)
-    , tp1_ptr_ (DDS::Topic::_nil ())
-    , tp2_ptr_ (DDS::Topic::_nil ())
-    , tp3_ptr_ (DDS::Topic::_nil ())
-    , tp4_ptr_ (DDS::Topic::_nil ())
-  {
-  }
-
-  Component_exec_i::~Component_exec_i (void)
-  {
-  }
-
-  void
-  Component_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::SharedDP::CCM_SharedDPComponent_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Component_exec_i::configuration_complete (void)
-  {
-  }
-
-  CORBA::Boolean
-  Component_exec_i::perform_test (void)
-  {
-    return this->perform_test_;
-  }
-
-  void
-  Component_exec_i::perform_test (CORBA::Boolean perform_test)
-  {
-    this->perform_test_ = perform_test;
-  }
-
-  void
-  Component_exec_i::ccm_activate (void)
-  {
-    try
-      {
-        ::DDS::DataWriter_var dw1 =
-          this->context_->get_connection_write1_dds_entity ();
-
-        if (::CORBA::is_nil (dw1.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Datawriter 1 connection is NIL.\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw1 =
-          dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw1.in ());
-
-        if (ccm_dw1)
-          {
-            ::DDS::DataWriter_var tmp = ccm_dw1->get_dds_entity ();
-            if (! ::CORBA::is_nil (tmp.in ()))
-              {
-                ::DDS::Publisher_var publisher = tmp->get_publisher ();
-
-                if (! ::CORBA::is_nil (publisher.in ()))
-                  {
-                    ::DDS::DomainParticipant_var dp = publisher->get_participant ();
-
-                    if (! ::CORBA::is_nil (publisher.in ()))
-                      {
-
-                        this->dp1_hnd_ = dp->get_instance_handle ();
-                        this->dp1_ptr_ = dp.ptr();
-
-                        ::DDS::TopicDescription_var tpd = dp->lookup_topicdescription (tp_name_conn_1_);
-
-                        if (! ::CORBA::is_nil (tpd.in ()))
-                          {
-                            ::DDS::Topic_var topic = ::DDS::Topic::_narrow (tpd.in ());
-                            if (! ::CORBA::is_nil (topic.in ()))
-                              {
-                                this->tp1_hnd_ = topic->get_instance_handle ();
-                                this->tp1_ptr_ = topic.ptr ();
-                              }
-                            else
-                              {
-                                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                            "Error narrowing TopicDescription 1 to Topic 1.\n"));
-                                throw ::CORBA::INTERNAL ();
-                              }
-                          }
-                        else
-                          {
-                            ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                        "Error getting TopicDescription 1.\n"));
-                            throw ::CORBA::INTERNAL ();
-                          }
-                      }
-                    else
-                      {
-                        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                    "Error getting DomainParticipant 1.\n"));
-                        throw ::CORBA::INTERNAL ();
-                      }
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                "Error getting Publisher 1.\n"));
-                    throw ::CORBA::INTERNAL ();
-                  }
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                            "Error getting DDS DataWriter 1.\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Error casting DataWriter 1 to CCM DataWriter 1\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer1\n"));
-      }
-
-    try
-      {
-        ::DDS::DataWriter_var dw2 =
-          this->context_->get_connection_write2_dds_entity ();
-
-        if (::CORBA::is_nil (dw2.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Datawriter 2 connection is NIL.\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-        ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw2 =
-          dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw2.in ());
-
-        if (ccm_dw2)
-          {
-            ::DDS::DataWriter_var tmp = ccm_dw2->get_dds_entity ();
-            if (! ::CORBA::is_nil (tmp.in ()))
-              {
-                ::DDS::Publisher_var publisher = tmp->get_publisher ();
-
-                if (! ::CORBA::is_nil (publisher.in ()))
-                  {
-                    ::DDS::DomainParticipant_var dp = publisher->get_participant ();
-
-                    if (! ::CORBA::is_nil (publisher.in ()))
-                      {
-
-                        this->dp2_hnd_ = dp->get_instance_handle ();
-                        this->dp2_ptr_ = dp.ptr();
-
-                        ::DDS::TopicDescription_var tpd = dp->lookup_topicdescription (tp_name_conn_2_);
-
-                        if (! ::CORBA::is_nil (tpd.in ()))
-                          {
-                            ::DDS::Topic_var topic = ::DDS::Topic::_narrow (tpd.in ());
-                            if (! ::CORBA::is_nil (topic.in ()))
-                              {
-                                this->tp2_hnd_ = topic->get_instance_handle ();
-                                this->tp2_ptr_ = topic.ptr ();
-                              }
-                            else
-                              {
-                                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                            "Error narrowing TopicDescription 2 to Topic 2.\n"));
-                                throw ::CORBA::INTERNAL ();
-                              }
-                          }
-                        else
-                          {
-                            ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                        "Error getting TopicDescription 2.\n"));
-                            throw ::CORBA::INTERNAL ();
-                          }
-                      }
-                    else
-                      {
-                        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                    "Error getting DomainParticipant 2.\n"));
-                        throw ::CORBA::INTERNAL ();
-                      }
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                "Error getting Publisher 2.\n"));
-                    throw ::CORBA::INTERNAL ();
-                  }
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                            "Error getting DDS DataWriter 2.\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Error casting DataWriter 2 to CCM DataWriter 2\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer2\n"));
-      }
-
-    try
-      {
-        ::DDS::DataWriter_var dw3 =
-          this->context_->get_connection_write3_dds_entity ();
-
-        if (::CORBA::is_nil (dw3.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Datawriter 3 connection is NIL.\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-
-        ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw3 =
-          dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw3.in ());
-
-        if (ccm_dw3)
-          {
-            ::DDS::DataWriter_var tmp = ccm_dw3->get_dds_entity ();
-            if (! ::CORBA::is_nil (tmp.in ()))
-              {
-                ::DDS::Publisher_var publisher = tmp->get_publisher ();
-
-                if (! ::CORBA::is_nil (publisher.in ()))
-                  {
-                    ::DDS::DomainParticipant_var dp = publisher->get_participant ();
-
-                    if (! ::CORBA::is_nil (publisher.in ()))
-                      {
-
-                        this->dp3_hnd_ = dp->get_instance_handle ();
-                        this->dp3_ptr_ = dp.ptr();
-
-                        ::DDS::TopicDescription_var tpd = dp->lookup_topicdescription (tp_name_conn_3_);
-
-                        if (! ::CORBA::is_nil (tpd.in ()))
-                          {
-                            ::DDS::Topic_var topic = ::DDS::Topic::_narrow (tpd.in ());
-                            if (! ::CORBA::is_nil (topic.in ()))
-                              {
-                                this->tp3_hnd_ = topic->get_instance_handle ();
-                                this->tp3_ptr_ = topic.ptr ();
-                              }
-                            else
-                              {
-                                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                            "Error narrowing TopicDescription 3 to Topic 3.\n"));
-                                throw ::CORBA::INTERNAL ();
-                              }
-                          }
-                        else
-                          {
-                            ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                        "Error getting TopicDescription 3.\n"));
-                            throw ::CORBA::INTERNAL ();
-                          }
-                      }
-                    else
-                      {
-                        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                    "Error getting DomainParticipant 3.\n"));
-                        throw ::CORBA::INTERNAL ();
-                      }
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                "Error getting Publisher 3.\n"));
-                    throw ::CORBA::INTERNAL ();
-                  }
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                            "Error getting DDS DataWriter 3.\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Error casting DataWriter 3 to CCM DataWriter 3\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer3\n"));
-      }
-    try
-      {
-        ::DDS::DataWriter_var dw4 =
-          this->context_->get_connection_write4_dds_entity ();
-
-        if (::CORBA::is_nil (dw4.in ()))
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Datawriter 4 connection is NIL.\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-
-        ::CIAO::DDS4CCM::CCM_DataWriter * ccm_dw4 =
-          dynamic_cast < ::CIAO::DDS4CCM::CCM_DataWriter * > (dw4.in ());
-
-        if (ccm_dw4)
-          {
-            ::DDS::DataWriter_var tmp = ccm_dw4->get_dds_entity ();
-            if (! ::CORBA::is_nil (tmp.in ()))
-              {
-                ::DDS::Publisher_var publisher = tmp->get_publisher ();
-
-                if (! ::CORBA::is_nil (publisher.in ()))
-                  {
-                    ::DDS::DomainParticipant_var dp = publisher->get_participant ();
-
-                    if (! ::CORBA::is_nil (publisher.in ()))
-                      {
-
-                        this->dp4_hnd_ = dp->get_instance_handle ();
-                        this->dp4_ptr_ = dp.ptr();
-
-                        if (this->perform_test_)
-                          {
-
-                            ::DDS::TopicDescription_var tpd = dp->lookup_topicdescription (tp_name_conn_4_);
-
-                            if (! ::CORBA::is_nil (tpd.in ()))
-                              {
-                                ::DDS::Topic_var topic = ::DDS::Topic::_narrow (tpd.in ());
-                                if (! ::CORBA::is_nil (topic.in ()))
-                                  {
-                                    this->tp4_hnd_ = topic->get_instance_handle ();
-                                    this->tp4_ptr_ = topic.ptr ();
-                                  }
-                                else
-                                  {
-                                    ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                                "Error narrowing TopicDescription 4 to Topic 4.\n"));
-                                    throw ::CORBA::INTERNAL ();
-                                  }
-                              }
-                            else
-                              {
-                                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                            "Error getting TopicDescription 4.\n"));
-                                throw ::CORBA::INTERNAL ();
-                              }
-                          }
-                      }
-                    else
-                      {
-                        ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                    "Error getting DomainParticipant 4.\n"));
-                        throw ::CORBA::INTERNAL ();
-                      }
-                  }
-                else
-                  {
-                    ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                                "Error getting Publisher 4.\n"));
-                    throw ::CORBA::INTERNAL ();
-                  }
-              }
-            else
-              {
-                ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - "
-                            "Error getting DDS DataWriter 4.\n"));
-                throw ::CORBA::INTERNAL ();
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - "
-                        "Error casting DataWriter 4 to CCM DataWriter 4\n"));
-            throw ::CORBA::INTERNAL ();
-          }
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer4\n"));
-      }
-  }
-
-  void
-  Component_exec_i::ccm_passivate (void)
-  {
-    if (this->perform_test_)
-      {
-        if (this->dp1_hnd_ == DDS::HANDLE_NIL)
-          ACE_ERROR ((LM_ERROR, "ERROR: Handle for DomainParticipant for Connector 1 seems to be NIL\n"));
-        if (this->dp2_hnd_ == DDS::HANDLE_NIL)
-          ACE_ERROR ((LM_ERROR, "ERROR: Handle for DomainParticipant for Connector 2 seems to be NIL\n"));
-        if (this->dp3_hnd_ == DDS::HANDLE_NIL)
-          ACE_ERROR ((LM_ERROR, "ERROR: Handle for DomainParticipant for Connector 3 seems to be NIL\n"));
-        if (this->dp4_hnd_ == DDS::HANDLE_NIL)
-          ACE_ERROR ((LM_ERROR, "ERROR: Handle for DomainParticipant for Connector 4 seems to be NIL\n"));
-
-        if (this->tp1_hnd_ == DDS::HANDLE_NIL)
-          ACE_ERROR ((LM_ERROR, "ERROR: Handle for Topic for Connector 1 seems to be NIL\n"));
-        if (this->tp2_hnd_ == DDS::HANDLE_NIL)
-          ACE_ERROR ((LM_ERROR, "ERROR: Handle for Topic for Connector 2 seems to be NIL\n"));
-        if (this->tp3_hnd_ == DDS::HANDLE_NIL)
-          ACE_ERROR ((LM_ERROR, "ERROR: Handle for Topic for Connector 3 seems to be NIL\n"));
-        if (this->tp4_hnd_ == DDS::HANDLE_NIL)
-          ACE_ERROR ((LM_ERROR, "ERROR: Handle for Topic for Connector 4 seems to be NIL\n"));
-
-        //check shared DomainParticipants
-        if ((this->dp1_hnd_ != this->dp2_hnd_)
-#if (CIAO_DDS4CCM_OPENDDS==1)
-            && (this->dp1_ptr_ == this->dp2_ptr_)
-#endif
-            )
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 2 don't seem to "
-                                  "share the same DomainParticipant\n"));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, "OK: Connector 1 and 2 seems to "
-                                  "share the same DomainParticipant\n"));
-          }
-        if ((this->dp1_hnd_ == this->dp4_hnd_)
-#if (CIAO_DDS4CCM_OPENDDS==1)
-            && (this->dp1_ptr_ == this->dp4_ptr_)
-#endif
-            )
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 4 seem to "
-                                  "share the same DomainParticipant\n"));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, "OK: Connector 1 and 4 seems to "
-                                  "share the same DomainParticipant\n"));
-          }
-        if ((this->dp2_hnd_ == this->dp4_hnd_)
-#if (CIAO_DDS4CCM_OPENDDS==1)
-            && (this->dp2_ptr_ == this->dp4_ptr_)
-#endif
-            )
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Connector 2 and 4 seem to "
-                                  "share the same DomainParticipant\n"));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, "OK: Connector 2 and 4 seems to "
-                                  "share the same DomainParticipant\n"));
-          }
-        if ((this->dp3_hnd_ == this->dp4_hnd_)
-#if (CIAO_DDS4CCM_OPENDDS==1)
-            && (this->dp3_ptr_ == this->dp4_ptr_)
-#endif
-            )
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Connector 3 and 4 seem to "
-                                  "share the same DomainParticipant\n"));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, "OK: Connector 3 and 4 seems to "
-                                  "share the same DomainParticipant\n"));
-          }
-
-        //check shared Topics
-        if ((this->tp1_hnd_ != this->tp2_hnd_)
-#if (CIAO_DDS4CCM_OPENDDS==1)
-            && (this->tp1_ptr_ == this->tp2_ptr_)
-#endif
-            )
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 2 don't seem to "
-                                  "share the same Topic\n"));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, "OK: Connector 1 and 2 seems to "
-                                  "share the same Topic\n"));
-          }
-        if ((this->tp1_hnd_ == this->tp3_hnd_)
-#if (CIAO_DDS4CCM_OPENDDS==1)
-            && (this->tp1_ptr_ == this->tp3_ptr_)
-#endif
-            )
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 3 seem to "
-                                  "share the same Topic\n"));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, "OK: Connector 1 and 3 seems to "
-                                  "share the same Topic\n"));
-          }
-        if ((this->tp1_hnd_ == this->tp4_hnd_)
-#if (CIAO_DDS4CCM_OPENDDS==1)
-            && (this->tp1_ptr_ == this->tp4_ptr_)
-#endif
-            )
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 4 seem to "
-                                  "share the same Topic\n"));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, "OK: Connector 1 and 4 seems to "
-                                  "share the same Topic\n"));
-          }
-      }
-  }
-
-  void
-  Component_exec_i::ccm_remove (void)
-  {
-    if (!this->perform_test_)
-      {
-        ACE_DEBUG ((LM_DEBUG, "Don't test this component. It's used for compilation errors.\n"));
-      }
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Component_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Component_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h
deleted file mode 100644
index a7df9676a94..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COMPONENT_EXEC_H_
-#define CIAO_COMPONENT_EXEC_H_
-
-
-#include "ComponentEC.h"
-
-#include /**/ "Component_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-class DDSDomainParticipant;
-class DDSTopic;
-
-namespace CIAO_SharedDP_SharedDPComponent_Impl
-{
-  class Component_exec_i
-    : public virtual SharedDPComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Component_exec_i (void);
-    virtual ~Component_exec_i (void);
-
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    CORBA::Boolean perform_test (void);
-    void perform_test (CORBA::Boolean perform_test);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::SharedDP::CCM_SharedDPComponent_Context_var context_;
-
-    CORBA::Boolean perform_test_;
-
-    ::DDS::InstanceHandle_t dp1_hnd_;
-    ::DDS::InstanceHandle_t dp2_hnd_;
-    ::DDS::InstanceHandle_t dp3_hnd_;
-    ::DDS::InstanceHandle_t dp4_hnd_;
-    ::DDS::DomainParticipant_ptr dp1_ptr_;
-    ::DDS::DomainParticipant_ptr dp2_ptr_;
-    ::DDS::DomainParticipant_ptr dp3_ptr_;
-    ::DDS::DomainParticipant_ptr dp4_ptr_;
-
-    ::DDS::InstanceHandle_t tp1_hnd_;
-    ::DDS::InstanceHandle_t tp2_hnd_;
-    ::DDS::InstanceHandle_t tp3_hnd_;
-    ::DDS::InstanceHandle_t tp4_hnd_;
-    ::DDS::Topic_ptr tp1_ptr_;
-    ::DDS::Topic_ptr tp2_ptr_;
-    ::DDS::Topic_ptr tp3_ptr_;
-    ::DDS::Topic_ptr tp4_ptr_;
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Component_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl
deleted file mode 100644
index 8de1b7b7406..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef SHARED_DP_CONNECTOR_IDL_
-#define SHARED_DP_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Base.idl"
-
-#pragma ciao lem "Connector/ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/BaseTypeSupport.idl"
-#endif
-
-module SharedDP
-{
-  module ::CCM_DDS::Typed < ::SharedDPTest, ::SharedDPTestSeq> SharedDPTestConnector;
-};
-
-#endif /* SHARED_DP_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
deleted file mode 100644
index 796bc84afab..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-project(DDS_SharedDP_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_SharedDPBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Connector_stub_export.h \
-              -Wb,skel_export_macro=SHAREDDP_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Connector_svnt_export.h \
-              -Wb,svnt_export_macro=SHAREDDP_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Connector_svnt_export.h \
-              -Wb,conn_export_macro=SHAREDDP_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Connector.idl
-  }
-}
-
-project(DDS_SharedDP_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SharedDP_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    ConnectorE.idl
-  }
-}
-
-project(DDS_SharedDP_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SharedDP_Connector_lem_gen DDS_SharedDP_Connector_stub DDS_SharedDPBase_stub
-  libs  += DDS_SharedDPBase_stub DDS_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector_lem_stub
-  dynamicflags += SHAREDDP_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ConnectorEC.cpp
-  }
-
-  Header_Files {
-    ConnectorEC.h
-    Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    ConnectorEC.inl
-  }
-}
-
-project(DDS_SharedDP_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SharedDP_Connector_idl_gen DDS_SharedDPBase_stub
-  libs  += DDS_SharedDPBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector_stub
-  dynamicflags += SHAREDDP_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ConnectorC.cpp
-  }
-
-  Header_Files {
-    ConnectorC.h
-    Connector_stub_export.h
-  }
-
-  Inline_Files {
-    ConnectorC.inl
-  }
-}
-
-project(DDS_SharedDP_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SharedDP_Connector_lem_stub DDS_SharedDP_Connector_stub DDS_SharedDPBase_stub
-  sharedname = DDS_Connector_exec
-  libs += DDS_Connector_stub DDS_Connector_lem_stub DDS_SharedDPBase_stub DDS_SharedDPBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector_conn.cpp
-  }
-
-  Header_Files {
-    Connector_conn.h
-    Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SharedDP_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SharedDP_Connector_lem_stub DDS_SharedDP_Connector_exec DDS_SharedDP_Connector_stub
-  sharedname  = DDS_Connector_svnt
-  libs       += DDS_Connector_stub \
-                DDS_Connector_lem_stub  \
-                DDS_SharedDPBase_stub \
-                DDS_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SHAREDDP_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ConnectorS.cpp
-    Connector_svnt.cpp
-  }
-
-  Header_Files {
-    ConnectorS.h
-    Connector_svnt.h
-    Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/DefaultQoS.cdp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/DefaultQoS.cdp
deleted file mode 100644
index 2da2dc43a17..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/DefaultQoS.cdp
+++ /dev/null
@@ -1,321 +0,0 @@
-<!--  -->
-<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>SharedDPTest_Depl</label>
-  <UUID>SharedDPTest_Depl</UUID>
-
-  <implementation xmi:id="ConnectorImplementation">
-    <name>ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="Connector_ExecArtifact" />
-    <artifact xmi:idref="Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_SharedDPTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_SharedDPTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_SharedDPComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="Connector1Instance">
-    <name>Connector1Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SharedDP</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Connector2Instance">
-    <name>Connector2Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SharedDP</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Connector3Instance">
-    <name>Connector3Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SharedDP1</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Connector4Instance">
-    <name>Connector4Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>StandaloneDP</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Standalone_Library#StandaloneProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ComponentInstance">
-    <name>Component</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>writer_connection1</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write1_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector1Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection2</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write2_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector2Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection3</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write3_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector3Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection4</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write4_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector4Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Connector_ExecArtifact">
-    <name>DDS_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Connector_SvntArtifact">
-    <name>DDS_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Connector_StubArtifact">
-    <name>DDS_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector_stub</location>
-  </artifact>
-
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp
deleted file mode 100644
index a05085cb5c7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp
+++ /dev/null
@@ -1,496 +0,0 @@
-<!--  -->
-<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>SharedDPTest_Depl</label>
-  <UUID>SharedDPTest_Depl</UUID>
-
-  <implementation xmi:id="ConnectorImplementation">
-    <name>ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="Connector_ExecArtifact" />
-    <artifact xmi:idref="Connector_SvntArtifact" />
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_SharedDPTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_SharedDPTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>DDS_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_SharedDP_SharedDPComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <!-- This connector is used to detect run_time errors,
-       not for functional testing.-->
-  <instance xmi:id="Connector0Instance">
-    <name>Connector0Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SharedDP</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shared_Library#SharedProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Connector1Instance">
-    <name>Connector1Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SharedDP</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shared_Library#SharedProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Connector2Instance">
-    <name>Connector2Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SharedDP</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shared_Library#SharedProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Connector3Instance">
-    <name>Connector3Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SharedDP1</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shared_Library#SharedProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Connector4Instance">
-    <name>Connector4Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>StandaloneDP</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Standalone_Library#StandaloneProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ComponentInstance">
-    <name>Component</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>perform_test</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- This component is used to detect run_time errors,
-       not for functional testing.-->
-  <instance xmi:id="Component0Instance">
-    <name>Component0</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-    <configProperty>
-      <name>perform_test</name>
-      <value>
-        <type>
-          <kind>tk_boolean</kind>
-        </type>
-        <value>
-          <boolean>false</boolean>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>writer_connection01</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write1_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Component0Instance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector0Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection02</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write2_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Component0Instance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector0Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection03</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write3_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Component0Instance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector0Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection04</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write4_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Component0Instance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector0Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection1</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write1_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector1Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection2</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write2_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector2Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection3</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write3_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector3Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection4</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write4_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector4Instance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-  <artifact xmi:id="Component_StubArtifact">
-    <name>Component_stub</name>
-    <source/>
-    <node/>
-    <location>Component_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Connector_ExecArtifact">
-    <name>DDS_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Connector_SvntArtifact">
-    <name>DDS_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Connector_StubArtifact">
-    <name>DDS_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Connector_stub</location>
-  </artifact>
-
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Shared_Library.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Shared_Library.xml
deleted file mode 100644
index 5424a2e910a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Shared_Library.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="SharedProfile">
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-    </datawriter_qos>
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Standalone_Library.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Standalone_Library.xml
deleted file mode 100644
index 63e213c18d3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Standalone_Library.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="StandaloneProfile">
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-    </datawriter_qos>
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_LAST_HISTORY_QOS</kind>
-        <depth>20</depth>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index f1018e84958..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <qos_library name="Shared_Library">
-    <qos_profile name="SharedProfile" is_default_qos="false">
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-  <qos_library name="Standalone_Library">
-    <qos_profile name="StandaloneProfile" is_default_qos="false">
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl
deleted file mode 100755
index da0f21d086e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl
+++ /dev/null
@@ -1,244 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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 = 1;
-@ports = ( 60001 );
-@iorbases = ( "NodeApp1.ior" );
-@iorfiles = 0;
-@nodenames = ( "ComponentNode" );
-
-# 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 1 seconds to allow task to complete\n";
-sleep (1);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl
deleted file mode 100755
index f92d7ff050d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test_default_qos.pl
+++ /dev/null
@@ -1,244 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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 = 1;
-@ports = ( 60001 );
-@iorbases = ( "NodeApp1.ior" );
-@iorfiles = 0;
-@nodenames = ( "ComponentNode" );
-
-# 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 = "DefaultQoS.cdp";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 10 seconds to allow task to complete\n";
-sleep (10);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/.gitignore b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl
deleted file mode 100644
index 2bf9df0aa8a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file State_Connection_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef STATE_CONNECTION_TEST_BASE_IDL
-#define STATE_CONNECTION_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/State_Connection_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/State_Connection_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "State_ConnectionTest"
-#pragma DCPS_DATA_KEY "State_ConnectionTest key"
-
-struct State_ConnectionTest {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<State_ConnectionTest> State_ConnectionTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc
deleted file mode 100644
index 41b42c4fa91..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_SCT_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_SCT_Base_stub
-  dynamicflags += STATE_CONNECTION_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=STATE_CONNECTION_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=State_Connection_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    State_Connection_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=STATE_CONNECTION_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    State_Connection_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl
deleted file mode 100644
index 5193d1a639b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file State_Connection_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef KEYED_TEST_CONNECTOR_IDL_
-#define KEYED_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/State_Connection_Test_Base.idl"
-
-#pragma ciao lem "Connector/State_Connection_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/State_Connection_Test_BaseTypeSupport.idl"
-#endif
-
-module State_Connection_Test
-{
-  module ::CCM_DDS::Typed < ::State_ConnectionTest, ::State_ConnectionTestSeq> State_ConnectionTestConnector;
-};
-
-#endif /* State_Connection_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
deleted file mode 100644
index 66c6ad49e7a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SCT_Base -l .. -o ../lib -u DDS State_Connection_Test_Connector"
-
-project(DDS_SCT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_SCT_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=STATE_CONNECTION_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=State_Connection_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=STATE_CONNECTION_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=State_Connection_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=STATE_CONNECTION_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=State_Connection_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=STATE_CONNECTION_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=State_Connection_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    State_Connection_Test_Connector.idl
-  }
-}
-
-project(DDS_SCT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SCT_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=STATE_CONNECTION_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=State_Connection_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    State_Connection_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_SCT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SCT_Connector_lem_gen DDS_SCT_Connector_stub DDS_SCT_Base_stub
-  libs  += DDS_SCT_Base_stub DDS_SCT_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_SCT_Connector_lem_stub
-  dynamicflags += STATE_CONNECTION_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_Connection_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    State_Connection_Test_ConnectorEC.h
-    State_Connection_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    State_Connection_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_SCT_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SCT_Connector_idl_gen DDS_SCT_Base_stub
-  libs  += DDS_SCT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_SCT_Connector_stub
-  dynamicflags += STATE_CONNECTION_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_Connection_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    State_Connection_Test_ConnectorC.h
-    State_Connection_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    State_Connection_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_SCT_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SCT_Connector_lem_stub DDS_SCT_Connector_stub DDS_SCT_Base_stub
-  sharedname = DDS_SCT_Connector_exec
-  libs += DDS_SCT_Connector_stub DDS_SCT_Connector_lem_stub DDS_SCT_Base_stub DDS_SCT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += STATE_CONNECTION_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_Connection_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    State_Connection_Test_Connector_conn.h
-    State_Connection_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SCT_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SCT_Connector_lem_stub DDS_SCT_Connector_exec DDS_SCT_Connector_stub
-  sharedname  = DDS_SCT_Connector_svnt
-  libs       += DDS_SCT_Connector_stub \
-                DDS_SCT_Connector_lem_stub  \
-                DDS_SCT_Base_stub \
-                DDS_SCT_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += STATE_CONNECTION_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_Connection_Test_ConnectorS.cpp
-    State_Connection_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    State_Connection_Test_ConnectorS.h
-    State_Connection_Test_Connector_svnt.h
-    State_Connection_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/README b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/README
deleted file mode 100644
index c51b76151fb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/README
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-This test tests all possible connections between
-a Sender and a DDS State connector and a Receiver and a
-DDS State connector.
-The Sender requests the following connections:
-  * An updater
-  * A DDS updater
-
-The Receiver expects the following listeners to be created:
-  * A DataListenerControl for the DDS_Listen port
-  * A 'normal' listener for the DDS_Listen port
-  * A StateListener for the DDS_StateListen port
-  * A PortStatusListener for the DDS_Get port
-  * A PortStatusListener for the DDS_Read port
-  * A PortStatusListener for the DDS_Listen port
-  * A PortStatusListener for the DDS_StateLisen port
-
-The Receiver requests the following connections:
-  * A reader for the DDS_Read port
-  * A DDS reader for the DDS_Read port
-  * A reader for the DDS_Get port
-  * A getter for the DDS_Get port
-  * A DDS reader for the DDS_Read port
-  * A reader for the DDS_Listen port
-  * A DataControlListener for the DDS_Listen port
-  * A DDS reader for the DDS_Listen port
-  * A reader for the DDS_StateListen port
-  * A StateListener for the DDS_StateListen port
-  * A DDS reader for the DDS_StateListen port
-
-This test tests every single connection and reports an error when
-a connections couldn't be esthablished.
-
-No actual read/write/listen operations are performed.
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/.gitignore
deleted file mode 100644
index ef8daae3a9e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
-/State_Connection_Test_ReceiverE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl
deleted file mode 100644
index 794d300cd01..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/State_Connection_Test_Connector.idl"
-
-module State_Connection_Test
-{
-  component Receiver
-  {
-    port State_ConnectionTestConnector::DDS_Read info_read;
-    port State_ConnectionTestConnector::DDS_Get info_get;
-    port State_ConnectionTestConnector::DDS_Listen info_listen;
-    port State_ConnectionTestConnector::DDS_StateListen info_statelisten;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc
deleted file mode 100644
index b814225cca5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc
+++ /dev/null
@@ -1,135 +0,0 @@
-project(DDS_SCT_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_SCT_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 {
-    State_Connection_Test_Receiver.idl
-  }
-}
-
-project(DDS_SCT_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_SCT_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 {
-    State_Connection_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_SCT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_SCT_Receiver_lem_gen DDS_SCT_Receiver_stub  DDS_SCT_Connector_stub DDS_SCT_Base_stub
-  libs  +=  Receiver_stub DDS_SCT_Connector_stub DDS_SCT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_Connection_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    State_Connection_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    State_Connection_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_SCT_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SCT_Receiver_idl_gen  DDS_SCT_Connector_stub DDS_SCT_Base_stub DDS_SCT_Connector_lem_gen
-  libs  += DDS_SCT_Connector_stub DDS_SCT_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_Connection_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    State_Connection_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    State_Connection_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_SCT_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_SCT_Receiver_lem_stub DDS_SCT_Receiver_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_lem_stub 
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_Connection_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    State_Connection_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SCT_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_SCT_Receiver_lem_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_svnt DDS_SCT_Receiver_exec DDS_SCT_Connector_lem_stub 
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_svnt Receiver_exec DDS_SCT_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_Connection_Test_ReceiverS.cpp
-    State_Connection_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    State_Connection_Test_ReceiverS.h
-    State_Connection_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp
deleted file mode 100644
index 9600a7f9bf2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,374 +0,0 @@
-// -*- C++ -*-
-#include "State_Connection_Test_Receiver_exec.h"
-#include "ace/Log_Msg.h"
-
-
-namespace CIAO_State_Connection_Test_Receiver_Impl
-{
-  //============================================================
-  // Component Executor Implementation Class: Receiver_exec_i
-  //============================================================
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : //DDS_Read
-      reader_data_ok_ (false),
-      reader_dds_entity_ok_ (false),
-      reader_filter_config_ok_ (false),
-      //DDS_Get
-      getter_data_ok_ (false),
-      getter_fresh_data_ok_ (false),
-      getter_dds_entity_ok_ (false),
-      getter_filter_config_ok_ (false),
-      //DDS_Listen
-      listen_data_ok_ (false),
-      listen_data_control_ok_ (false),
-      listen_dds_entity_ok_ (false),
-      listen_filter_config_ok_ (false),
-      //DDS_StateListen
-      statelisten_data_ok_ (false),
-      statelisten_data_control_ok_ (false),
-      statelisten_dds_entity_ok_ (false),
-      statelisten_filter_config_ok_ (false),
-      //Provides for DDS_Read
-      reader_port_status_created_ (false),
-      //Provides for DDS_Get
-      getter_port_status_created_ (false),
-      //Provides for DDS_Listen
-      listen_data_listener_created_ (false),
-      listen_port_status_created_ (false),
-      //Provides for DDS_StateListen
-      statelisten_data_listener_created_ (false),
-      statelisten_port_status_created_ (false)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_read_status (void)
-  {
-    this->reader_port_status_created_ = true;
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  //Provides for DDS_Get
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_get_status (void)
-  {
-    this->getter_port_status_created_ = true;
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  //Provides for DDS_Listen
-  ::State_Connection_Test::State_ConnectionTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_listen_data_listener ()
-  {
-    this->listen_data_listener_created_ = true;
-    return ::State_Connection_Test
-             ::State_ConnectionTestConnector
-             ::CCM_Listener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_listen_status (void)
-  {
-    this->listen_port_status_created_ = true;
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  //Provides for DDS_StateListen
-  ::State_Connection_Test::State_ConnectionTestConnector::CCM_StateListener_ptr
-  Receiver_exec_i::get_info_statelisten_data_listener (void)
-  {
-    this->statelisten_data_listener_created_ = true;
-    return ::State_Connection_Test
-             ::State_ConnectionTestConnector
-             ::CCM_StateListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_statelisten_status (void)
-  {
-    this->statelisten_port_status_created_ = true;
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::State_Connection_Test::CCM_Receiver_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    //DDS_Read
-    ::State_Connection_Test::State_ConnectionTestConnector::Reader_var reader_data =
-      this->context_->get_connection_info_read_data ();
-    this->reader_data_ok_ = ! ::CORBA::is_nil (reader_data);
-
-    ::DDS::DataReader_var reader_dds_entity =
-      this->context_->get_connection_info_read_dds_entity ();
-    this->reader_dds_entity_ok_ = ! ::CORBA::is_nil (reader_dds_entity);
-    ::CCM_DDS::ContentFilterSetting_var reader_filter_config =
-      this->context_->get_connection_info_read_filter_config ();
-    this->reader_filter_config_ok_ = ! ::CORBA::is_nil (reader_filter_config);
-
-    //DDS_Get
-    ::State_Connection_Test::State_ConnectionTestConnector::Reader_var getter_data =
-      this->context_->get_connection_info_get_data ();
-    this->getter_data_ok_ = ! ::CORBA::is_nil (getter_data);
-    ::State_Connection_Test::State_ConnectionTestConnector::Getter_var getter_fresh_data =
-      this->context_->get_connection_info_get_fresh_data ();
-    this->getter_fresh_data_ok_ = ! ::CORBA::is_nil (getter_fresh_data);
-    ::DDS::DataReader_var getter_dds_entity =
-      this->context_->get_connection_info_get_dds_entity ();
-    this->getter_dds_entity_ok_ = ! ::CORBA::is_nil (getter_dds_entity);
-    ::CCM_DDS::ContentFilterSetting_var getter_filter_config =
-      this->context_->get_connection_info_get_filter_config ();
-    this->getter_filter_config_ok_ = ! ::CORBA::is_nil (getter_filter_config);
-
-    //DDS_Listen
-    ::State_Connection_Test::State_ConnectionTestConnector::Reader_var listen_data =
-      this->context_->get_connection_info_listen_data ();
-    this->listen_data_ok_ = ! ::CORBA::is_nil (listen_data);
-    ::CCM_DDS::DataListenerControl_var  listen_data_control =
-      this->context_->get_connection_info_listen_data_control ();
-    this->listen_data_control_ok_ = ! ::CORBA::is_nil (listen_data_control);
-    ::DDS::DataReader_var listen_dds_entity =
-      this->context_->get_connection_info_listen_dds_entity ();
-    this->listen_dds_entity_ok_ = ! ::CORBA::is_nil (listen_dds_entity);
-    ::CCM_DDS::ContentFilterSetting_var listen_filter_config =
-      this->context_->get_connection_info_listen_filter_config ();
-    this->listen_filter_config_ok_ = ! ::CORBA::is_nil (listen_filter_config);
-
-    //DDS_StateListen
-    ::State_Connection_Test::State_ConnectionTestConnector::Reader_var statelisten_data =
-      this->context_->get_connection_info_statelisten_data ();
-    this->statelisten_data_ok_ = ! ::CORBA::is_nil (statelisten_data);
-    ::CCM_DDS::StateListenerControl_var statelisten_data_control =
-      this->context_->get_connection_info_statelisten_data_control ();
-    this->statelisten_data_control_ok_ = ! ::CORBA::is_nil (statelisten_data_control);
-    ::DDS::DataReader_var statelisten_dds_entity =
-      this->context_->get_connection_info_statelisten_dds_entity ();
-    this->statelisten_dds_entity_ok_ = ! ::CORBA::is_nil (statelisten_dds_entity);
-    ::CCM_DDS::ContentFilterSetting_var statelisten_filter_config =
-      this->context_->get_connection_info_statelisten_filter_config ();
-    this->statelisten_filter_config_ok_ = ! ::CORBA::is_nil (statelisten_filter_config);
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    //DDS_Read
-    if (!this->reader_data_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get reader of DDS_Read failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get reader of DDS_Read passed\n")));
-      }
-    if (!this->reader_dds_entity_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get DDS reader of DDS_Read failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get DDS reader of DDS_Read passed\n")));
-      }
-    if (!this->reader_filter_config_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get filter config of DDS_Read failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get filter config of DDS_Read passed\n")));
-      }
-    //DDS_Get
-    if (!this->getter_data_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get reader of DDS_Get failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get reader of DDS_Get passed\n")));
-      }
-
-    if (!this->getter_fresh_data_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get getter of DDS_Get failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get getter of DDS_Get passed\n")));
-      }
-    if (!this->getter_dds_entity_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get DDS reader of DDS_Get failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get DDS reader of DDS_Get passed\n")));
-      }
-    if (!this->getter_filter_config_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get filter config of DDS_Get failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get filter config of DDS_Get passed\n")));
-      }
-    //DDS_Listen
-    if (!this->listen_data_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get reader of DDS_Listen failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get reader of DDS_Listen passed\n")));
-      }
-    if (!this->listen_data_control_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get data control of DDS_Listen failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get data control of DDS_Listen passed\n")));
-      }
-    if (!this->listen_dds_entity_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get DDS reader of DDS_Listen failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get DDS reader of DDS_Listen passed\n")));
-      }
-    if (!this->listen_filter_config_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get filter config of DDS_Listen failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get filter config of DDS_Listen passed\n")));
-      }
-    //DDS_StateListen
-    if (!this->statelisten_data_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get reader of DDS_StateListen failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get reader of DDS_StateListen passed\n")));
-      }
-    if (!this->statelisten_data_control_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get data control of DDS_StateListen failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get data control of DDS_StateListen passed\n")));
-      }
-    if (!this->statelisten_dds_entity_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get DDS reader of DDS_StateListen failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get DDS reader of DDS_StateListen passed\n")));
-      }
-    if (!this->statelisten_filter_config_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get filter config of DDS_StateListen failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : Get filter config of DDS_StateListen passed\n")));
-      }
-    //Provides for DDS_Read
-    if (!this->reader_port_status_created_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : PortStatusListener of DDS_Read not created\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : PortStatusListener of DDS_Read was created\n")));
-      }
-    //Provides for DDS_Get
-    if (!this->getter_port_status_created_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : PortStatusListener of DDS_Get not created\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : PortStatusListener of DDS_Get was created\n")));
-      }
-    //Provides for DDS_Listen
-    if (!this->listen_data_listener_created_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : DataListener of DDS_Listen not created\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : DataListener of DDS_Listen was created\n")));
-      }
-    if (!this->listen_port_status_created_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : PortStatusListener of DDS_Listen not created\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : PortStatusListener of DDS_Listen was created\n")));
-      }
-    //Provides for DDS_StateListen
-    if (!this->statelisten_data_listener_created_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : DataListener of DDS_StateListen not created\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : DataListener of DDS_StateListen was created\n")));
-      }
-    if (!this->statelisten_port_status_created_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : PortStatusListener of DDS_StateListen not created\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Receiver : PortStatusListener of DDS_StateListen was created\n")));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_State_Connection_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/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h
deleted file mode 100644
index d4a731ebfce..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.h
+++ /dev/null
@@ -1,112 +0,0 @@
-// -*- C++ -*-
-#ifndef STATE_CONNECTION_RECEIVER_EXEC_H_
-#define STATE_CONNECTION_RECEIVER_EXEC_H_
-
-#include "State_Connection_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"
-
-
-
-namespace CIAO_State_Connection_Test_Receiver_Impl
-{
-  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);
-
-    // Port operations.
-    //Provides for DDS_Read
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_read_status (void);
-
-    //Provides for DDS_Get
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_status (void);
-
-    //Provides for DDS_Listen
-    virtual ::State_Connection_Test
-            ::State_ConnectionTestConnector
-            ::CCM_Listener_ptr
-    get_info_listen_data_listener ();
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_listen_status (void);
-
-    //Provides for DDS_StateListen
-    virtual ::State_Connection_Test
-            ::State_ConnectionTestConnector
-            ::CCM_StateListener_ptr
-    get_info_statelisten_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_statelisten_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:
-    ::State_Connection_Test::CCM_Receiver_Context_var context_;
-
-    //DDS_Read
-    bool reader_data_ok_;
-    bool reader_dds_entity_ok_;
-    bool reader_filter_config_ok_;
-
-    //DDS_Get
-    bool getter_data_ok_;
-    bool getter_fresh_data_ok_;
-    bool getter_dds_entity_ok_;
-    bool getter_filter_config_ok_;
-
-    //DDS_Listen
-    bool listen_data_ok_;
-    bool listen_data_control_ok_;
-    bool listen_dds_entity_ok_;
-    bool listen_filter_config_ok_;
-
-    //DDS_StateListen
-    bool statelisten_data_ok_;
-    bool statelisten_data_control_ok_;
-    bool statelisten_dds_entity_ok_;
-    bool statelisten_filter_config_ok_;
-
-    //Provides for DDS_Read
-    bool reader_port_status_created_;
-
-    //Provides for DDS_Get
-    bool getter_port_status_created_;
-
-    //Provides for DDS_Listen
-    bool listen_data_listener_created_;
-    bool listen_port_status_created_;
-
-    //Provides for DDS_StateListen
-    bool statelisten_data_listener_created_;
-    bool statelisten_port_status_created_;
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_State_Connection_Test_Receiver_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/.gitignore
deleted file mode 100644
index f4e05f574a0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
-/State_Connection_Test_SenderE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl
deleted file mode 100644
index c340f79e086..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_STATE_CONNECTION_TEST_SENDER_IDL
-#define DDS_STATE_CONNECTION_TEST_SENDER_IDL
-
-#include "Connector/State_Connection_Test_Connector.idl"
-
-module State_Connection_Test
-{
-  component Sender
-  {
-    port State_ConnectionTestConnector::DDS_Update info_update;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc
deleted file mode 100644
index bb2842d2a97..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_SCT_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_SCT_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_SCT_Connector_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 {
-    State_Connection_Test_Sender.idl
-  }
-}
-
-project(DDS_SCT_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_SCT_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 {
-    State_Connection_Test_SenderE.idl
-  }
-}
-
-project(DDS_SCT_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_SCT_Sender_lem_gen DDS_SCT_Sender_stub DDS_SCT_Base_stub
-  libs  += DDS_SCT_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_Connection_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    State_Connection_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    State_Connection_Test_SenderEC.inl
-  }
-}
-
-project(DDS_SCT_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_SCT_Sender_idl_gen DDS_SCT_Base_stub DDS_SCT_Connector_stub
-  libs  += DDS_SCT_Base_stub DDS_SCT_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_Connection_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    State_Connection_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    State_Connection_Test_SenderC.inl
-  }
-}
-
-project(DDS_SCT_Sender_exec) : ciao_executor, dds4ccm_base {
-  after   += DDS_SCT_Sender_lem_stub DDS_SCT_Sender_stub DDS_SCT_Connector_lem_stub DDS_SCT_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_SCT_Base_stub DDS_SCT_Connector_lem_stub DDS_SCT_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_Connection_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    State_Connection_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_SCT_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_SCT_Base_stub  DDS_SCT_Sender_lem_stub DDS_SCT_Connector_stub DDS_SCT_Connector_svnt  DDS_SCT_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_svnt DDS_SCT_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    State_Connection_Test_SenderS.cpp
-    State_Connection_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    State_Connection_Test_SenderS.h
-    State_Connection_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp
deleted file mode 100644
index 51c54ac5dad..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-// -*- C++ -*-
-#include "State_Connection_Test_Sender_exec.h"
-#include "ace/Guard_T.h"
-#include "ace/Log_Msg.h"
-
-
-
-namespace CIAO_State_Connection_Test_Sender_Impl
-{
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-
-  Sender_exec_i::Sender_exec_i (void)
-    : updater_ok_ (false),
-      updater_dds_datawriter_ok_ (false)
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  void
-  Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::State_Connection_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    ::State_Connection_Test::State_ConnectionTestConnector::Updater_var updater =
-        this->context_->get_connection_info_update_data ();
-    if (! ::CORBA::is_nil (updater.in ()))
-      {
-        this->updater_ok_ = true;
-      }
-    ::DDS::DataWriter_var  updater_dds_datawriter =
-        this->context_->get_connection_info_update_dds_entity ();
-    if (! ::CORBA::is_nil (updater_dds_datawriter.in ()))
-      {
-        this->updater_dds_datawriter_ok_ = true;
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    if (!this->updater_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender : get updater failed\n")));
-      }
-    else
-      {
-        ACE_ERROR ((LM_DEBUG, ACE_TEXT ("Sender : Get updater passed\n")));
-      }
-    if (!this->updater_dds_datawriter_ok_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender : Get dds writer for DDS_Updater failed\n")));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender : Get dds writer for DDS_Updater passed\n")));
-      }
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_State_Connection_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/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.h
deleted file mode 100644
index 69d50c4c5d7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// -*- C++ -*-
-#ifndef STATE_CONNECTION_SENDER_EXEC_H_
-#define STATE_CONNECTION_SENDER_EXEC_H_
-
-#include "State_Connection_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_State_Connection_Test_Sender_Impl
-{
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (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);
-
-  private:
-    ::State_Connection_Test::CCM_Sender_Context_var context_;
-
-    bool updater_ok_;
-    bool updater_dds_datawriter_ok_;
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_State_Connection_Test_Sender_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp
deleted file mode 100644
index f9b124f4260..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp
+++ /dev/null
@@ -1,721 +0,0 @@
-<!--  -->
-<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>State_Connection_Test_Depl_1</label>
-  <UUID>State_Connection_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_State_Connection_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_State_Connection_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="State_Connection_Test_ConnectorComponentImplementation">
-    <name>State_Connection_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="State_Connection_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="State_Connection_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_State_Connection_Test_State_ConnectionTestConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_State_Connection_Test_State_ConnectionTestConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_Connection_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_Connection_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_State_Connection_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_State_Connection_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="State_Connection_Test_ConnectorComponentInstance">
-    <name>State_Connection_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="State_Connection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_Connection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="State_Connection_Test_ConnectorComponentInstance2">
-    <name>State_Connection_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="State_Connection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>State_Connection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <!-- SENDER COMPONENT CONNECTIONS -->
-  <connection>
-    <name>update_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>update_dds_entity</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_update_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!-- RECEIVER COMPONENT CONNECTIONS -->
-  <!--   DDS_Get port -->
-  <connection>
-    <name>get_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>get_fresh_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>get_dds_entity_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>get_filter_config_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <!--   DDS_Get mirrorport -->
-  <connection>
-    <name>get_status_mirrorport</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_get_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_observer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <!--   DDS_Read port -->
-  <connection>
-    <name>read_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_read_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>read_dds_entity_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_read_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>read_filter_config_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_read_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <!--   DDS_Read mirrorport -->
-  <connection>
-    <name>read_status_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_read_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>passive_observer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <!--   DDS_Listen port -->
-  <connection>
-    <name>listen_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>listen_data_control_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>listen_dds_entity_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>listen_filter_config_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <!--   DDS_Listen mirrorport -->
-  <connection>
-    <name>listen_data_listener_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>listen_status_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <!--   DDS_StateListen port -->
-  <connection>
-    <name>statelisten_data_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>statelisten_data_control_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>statelisten_dds_entity_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>statelisten_filter_config_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_filter_config</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_filter_config</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <!--   DDS_Listen mirrorport -->
-  <connection>
-    <name>statelisten_data_listener_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>statelisten_status_port</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_statelisten_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="State_Connection_Test_ConnectorComponentInstance2" />
-    </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="State_Connection_Test_Connector_ExecArtifact">
-    <name>State_Connection_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_SCT_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="State_Connection_Test_Connector_SvntArtifact">
-    <name>State_Connection_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_SCT_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="State_Connection_Test_Connector_StubArtifact">
-    <name>State_Connection_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_SCT_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/State_Connection_Test/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl
deleted file mode 100755
index 174721086cd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 10 seconds to allow task to complete\n";
-sleep (10);
-
-# 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 -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/TimeConversion/.gitignore b/CIAO/connectors/dds4ccm/tests/TimeConversion/.gitignore
deleted file mode 100644
index e7dd623f96a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TimeConversion/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/TimeConversion
diff --git a/CIAO/connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc b/CIAO/connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc
deleted file mode 100644
index bdddf653517..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc
+++ /dev/null
@@ -1,7 +0,0 @@
-project(DDS_TimeConversion) : taoexe, dds4ccm_base {
-  includes += $(CIAO_ROOT)
-  exename = TimeConversion
-  Source_Files {
-    time_conversion.cpp
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/TimeConversion/run_test.pl b/CIAO/connectors/dds4ccm/tests/TimeConversion/run_test.pl
deleted file mode 100755
index c8901833b9c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TimeConversion/run_test.pl
+++ /dev/null
@@ -1,27 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::TestTarget;
-
-my $program = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
-
-$PROG = $program->CreateProcess ("TimeConversion", "");
-$program_status = $PROG->SpawnWaitKill ($program->ProcessStartWaitInterval());
-
-if ($program_status != 0) {
-    print STDERR "ERROR: TimeConversion returned $program_status\n";
-    exit 1;
-}
-
-$exit_status = $PROG->WaitKill ($program->ProcessStopWaitInterval());
-
-if ($exit_status != 0) {
-    print STDERR "ERROR: TimeConversion returned $server_status\n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp b/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp
deleted file mode 100644
index be4218bfc2c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-#include "dds4ccm/impl/TimeUtilities.h"
-#include "ace/OS_NS_sys_time.h"
-
-int
-ACE_TMAIN(int , ACE_TCHAR **)
-{
-  try
-    {
-      ::DDS::Time_t dds_time;
-      ACE_Time_Value ace_time = ACE_OS::gettimeofday ();
-
-      dds_time <<= ace_time;
-      if (dds_time.sec != ace_time.sec ())
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR : TimeConversion - Conversion from "
-                                "ACE_Time_Value to DDS::Time_t "
-                                "seconds expected <%u> - seconds found <%u>\n",
-                                ace_time.sec (), dds_time.sec));
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "TimeConversion - Conversion from "
-                                "ACE_Time_Value to DDS::Time_t "
-                                "regarding seconds succeeded\n"));
-        }
-      if (dds_time.nanosec / 1000 != static_cast <CORBA::ULong>(ace_time.usec ()))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR : TimeConversion - Conversion from "
-                                "ACE_Time_Value to DDS::Time_t "
-                                "micro seconds expected <%u> - micro seconds found <%u>\n",
-                                ace_time.usec (), dds_time.nanosec/1000));
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "TimeConversion - Conversion from "
-                                "ACE_Time_Value to DDS::Time_t "
-                                "regarding micro seconds succeeded\n"));
-        }
-
-      ::DDS::Time_t dds_now;
-      ACE_Time_Value ace_now = ACE_OS::gettimeofday ();
-      dds_now <<= ace_now;
-      //create real nanoseconds.
-      dds_now.nanosec = 1234567890;
-      ace_time <<= dds_now;
-
-      if (ace_time.sec () != dds_now.sec)
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR : TimeConversion - Conversion from "
-                                "DDS::Time_t to ACE_Time_Value "
-                                "seconds expected <%u> - seconds found <%u>\n",
-                                dds_now.sec, ace_time.sec ()));
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "TimeConversion - Conversion from "
-                                "DDS::Time_t to ACE_Time_Value "
-                                "regarding seconds succeeded\n"));
-        }
-      // The resolution of an ACE_Time_Value is less than the resolution of a
-      // DDS::Time_T. Therefor don't multiply ace_time.usec by 1000 but devide
-      // dds_time.nanosec by 1000.
-      if (static_cast<CORBA::ULong>(ace_time.usec ()) != dds_now.nanosec/1000)
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR : TimeConversion - Conversion from "
-                                "DDS::Time_t to ACE_Time_Value "
-                                "nano seconds expected <%u> - nano seconds found <%u>\n",
-                                dds_now.nanosec/1000, ace_time.usec ()));
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "TimeConversion - Conversion from "
-                                "DDS::Time_t to ACE_Time_Value "
-                                "regarding nano seconds succeeded\n"));
-        }
-    }
-  catch (const ::CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("Exception caught:");
-      return 1;
-    }
-
-  return 0;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl
deleted file mode 100644
index 836bd2dc353..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file TopicName_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef TOPICNAME_TEST_BASE_IDL
-#define TOPICNAME_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/TopicName_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/TopicName_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TopicNameTest"
-#pragma DCPS_DATA_KEY "TopicNameTest symbol"
-
-struct TopicNameTest {
-  string symbol; //@key
-  long x;
-  long y;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TopicNameTest> TopicNameTestSeq;
-#endif
-
-#endif /* TOPICNAME_TEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.mpc
deleted file mode 100644
index 4fc0879f9f7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (TopicName_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = TopicName_Test_Base_stub
-  dynamicflags += TOPICNAME_EVENT_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=TOPICNAME_EVENT_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=TopicName_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    TopicName_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=TOPICNAME_EVENT_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    TopicName_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.idl
deleted file mode 100644
index 06c92dda676..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COMPONENT_IDL
-#define COMPONENT_IDL
-
-#include "Connector/TopicName_Test_Connector.idl"
-
-module TopicName_Test
-{
-  component TopicNameTestComponent
-  {
-    port TopicNameTestConnector::DDS_Write info_write;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.mpc
deleted file mode 100644
index 5a9be8f05a4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(TopicName_Test_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += TopicName_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Component_stub_export.h \
-              -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Component_svnt_export.h \
-              -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Component_svnt_export.h \
-              -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Component_exec_export.h -I..
-
-  IDL_Files {
-    TopicName_Test_Component.idl
-  }
-}
-
-project(TopicName_Test_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += TopicName_Test_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    TopicName_Test_ComponentE.idl
-  }
-}
-
-project(TopicName_Test_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += TopicName_Test_Component_lem_gen TopicName_Test_Component_stub  \
-           TopicName_Test_Connector_stub TopicName_Test_Base_stub
-  libs  +=  Component_stub TopicName_Test_Connector_stub \
-            TopicName_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_lem_stub
-  dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TopicName_Test_ComponentEC.cpp
-  }
-
-  Header_Files {
-    TopicName_Test_ComponentEC.h
-    Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    TopicName_Test_ComponentEC.inl
-  }
-}
-
-project(TopicName_Test_Component_stub) : ccm_stub, dds4ccm_base {
-  after += TopicName_Test_Component_idl_gen  TopicName_Test_Connector_stub \
-           TopicName_Test_Base_stub TopicName_Test_Connector_lem_gen
-  libs  += TopicName_Test_Connector_stub TopicName_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_stub
-  dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TopicName_Test_ComponentC.cpp
-  }
-
-  Header_Files {
-    TopicName_Test_ComponentC.h
-    Component_stub_export.h
-  }
-
-  Inline_Files {
-    TopicName_Test_ComponentC.inl
-  }
-}
-
-project(TopicName_Test_Component_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += TopicName_Test_Component_lem_stub TopicName_Test_Component_stub \
-             TopicName_Test_Base_stub TopicName_Test_Connector_stub \
-             TopicName_Test_Connector_lem_stub
-  sharedname = Component_exec
-  libs += Component_stub Component_lem_stub TopicName_Test_Base_stub \
-          TopicName_Test_Connector_stub TopicName_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TopicName_Test_Component_exec.cpp
-  }
-
-  Header_Files {
-    TopicName_Test_Component_exec.h
-    Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(TopicName_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   TopicName_Test_Component_lem_stub TopicName_Test_Base_stub \
-                  TopicName_Test_Connector_stub TopicName_Test_Connector_svnt \
-                  TopicName_Test_Component_exec TopicName_Test_Connector_lem_stub
-  sharedname  = Component_svnt
-  libs       += Component_stub Component_lem_stub TopicName_Test_Base_stub \
-                TopicName_Test_Connector_stub TopicName_Test_Connector_svnt \
-                Component_exec TopicName_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TopicName_Test_ComponentS.cpp
-    TopicName_Test_Component_svnt.cpp
-  }
-
-  Header_Files {
-    TopicName_Test_ComponentS.h
-    TopicName_Test_Component_svnt.h
-    Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component_exec.cpp
deleted file mode 100644
index ad22e8c9db6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component_exec.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// -*- C++ -*-
-#include "TopicName_Test_Component_exec.h"
-
-namespace CIAO_TopicName_Test_TopicNameTestComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  Component_exec_i::Component_exec_i (void)
-  {
-  }
-
-  Component_exec_i::~Component_exec_i (void)
-  {
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Component_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::TopicName_Test::CCM_TopicNameTestComponent_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Component_exec_i::configuration_complete (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Component_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_TopicName_Test_TopicNameTestComponent_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Component_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component_exec.h
deleted file mode 100644
index d89956045a0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component_exec.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_COMPONENT_EXEC_H_
-#define CIAO_COMPONENT_EXEC_H_
-
-#include "TopicName_Test_ComponentEC.h"
-
-#include /**/ "Component_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_TopicName_Test_TopicNameTestComponent_Impl
-{
-  //============================================================
-  // Component_exec_i
-  //============================================================
-  class COMPONENT_EXEC_Export Component_exec_i
-    : public virtual TopicNameTestComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Component_exec_i (void);
-    virtual ~Component_exec_i (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:
-    ::TopicName_Test::CCM_TopicNameTestComponent_Context_var context_;
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_TopicName_Test_TopicNameTestComponent_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl
deleted file mode 100644
index 5eff93b266e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file TopicName_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef TOPICNAME_EVENT_TEST_CONNECTOR_IDL_
-#define TOPICNAME_EVENT_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/TopicName_Test_Base.idl"
-
-#pragma ciao lem "Connector/TopicName_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/TopicName_Test_BaseTypeSupport.idl"
-#endif
-
-module ::CCM_DDS::Typed < ::TopicNameTest, ::TopicNameTestSeq> TopicNameTestConnector;
-
-#endif /* TOPICNAME_EVENT_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc
deleted file mode 100644
index 7856bf5cb00..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p TopicName_Test_Base -l .. -o ../lib -u DDS TopicName_Test_Connector"
-
-project(TopicName_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen TopicName_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=TOPICNAME_EVENT_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=TopicName_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=TOPICNAME_EVENT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=TopicName_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=TOPICNAME_EVENT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=TopicName_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=TOPICNAME_EVENT_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=TopicName_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    TopicName_Test_Connector.idl
-  }
-}
-
-project(TopicName_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += TopicName_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=TOPICNAME_EVENT_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=TopicName_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    TopicName_Test_ConnectorE.idl
-  }
-}
-
-project(TopicName_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += TopicName_Test_Connector_lem_gen TopicName_Test_Connector_stub TopicName_Test_Base_stub
-  libs  += TopicName_Test_Base_stub TopicName_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = TopicName_Test_Connector_lem_stub
-  dynamicflags += TOPICNAME_EVENT_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TopicName_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    TopicName_Test_ConnectorEC.h
-    TopicName_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    TopicName_Test_ConnectorEC.inl
-  }
-}
-
-project(TopicName_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += TopicName_Test_Connector_idl_gen TopicName_Test_Base_stub
-  libs  += TopicName_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = TopicName_Test_Connector_stub
-  dynamicflags += TOPICNAME_EVENT_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TopicName_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    TopicName_Test_ConnectorC.h
-    TopicName_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    TopicName_Test_ConnectorC.inl
-  }
-}
-
-project(TopicName_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += TopicName_Test_Connector_lem_stub TopicName_Test_Connector_stub TopicName_Test_Base_stub
-  sharedname = TopicName_Test_Connector_exec
-  libs += TopicName_Test_Connector_stub TopicName_Test_Connector_lem_stub TopicName_Test_Base_stub TopicName_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += TOPICNAME_EVENT_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TopicName_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    TopicName_Test_Connector_conn.h
-    TopicName_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(TopicName_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += TopicName_Test_Connector_lem_stub TopicName_Test_Connector_exec TopicName_Test_Connector_stub
-  sharedname  = TopicName_Test_Connector_svnt
-  libs       += TopicName_Test_Connector_stub \
-                TopicName_Test_Connector_lem_stub  \
-                TopicName_Test_Base_stub \
-                TopicName_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += TOPICNAME_EVENT_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TopicName_Test_ConnectorS.cpp
-    TopicName_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    TopicName_Test_ConnectorS.h
-    TopicName_Test_Connector_svnt.h
-    TopicName_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/TooLong.cdp b/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/TooLong.cdp
deleted file mode 100644
index 523de92374b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/TooLong.cdp
+++ /dev/null
@@ -1,191 +0,0 @@
-<!--  -->
-<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>TopicNameEventTest_Depl</label>
-  <UUID>TopicNameEventTest_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TopicName_Test_TopicNameTestComponent_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TopicName_Test_TopicNameTestComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="TopicName_Test_ConnectorImplementation">
-    <name>TopicName_Test_ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="TopicName_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="TopicName_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_TopicNameTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TopicNameTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TopicName_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TopicName_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ComponentInstance">
-    <name>Component</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="TopicName_Test_ConnectorInstance">
-    <name>TopicName_Test_Connector</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="TopicName_Test_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789ABCEDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>write_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TopicName_Test_ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-
-  <artifact xmi:id="TopicName_Test_Connector_ExecArtifact">
-    <name>TopicName_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>TopicName_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="TopicName_Test_Connector_SvntArtifact">
-    <name>TopicName_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>TopicName_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="TopicName_Test_Connector_StubArtifact">
-    <name>TopicName_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>TopicName_Test_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/run_test.pl
deleted file mode 100755
index 76a52f3bea5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/run_test.pl
+++ /dev/null
@@ -1,231 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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 = 1;
-@ports = ( 60001 );
-@iorbases = ( "NodeApp1.ior" );
-@iorfiles = 0;
-@nodenames = ( "ComponentNode" );
-
-# 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;
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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 node daemon\n";
-
-        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-        $DEAMONS[$i]->Spawn ();
-
-        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;
-}
-
-if ($#ARGV == -1) {
-    opendir(DIR, ".");
-    @files = grep(/\.cdp$/,readdir(DIR));
-    closedir(DIR);
-}
-else {
-    @files = @ARGV;
-}
-
-create_targets ();
-init_ior_files ();
-
-foreach $file (@files) {
-    print "*********** Starting test for deployment $file ***********\n";
-
-    print STDERR "Starting Naming Service\n";
-
-    $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-    $NS->Spawn ();
-
-    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 daemons\n";
-        kill_open_processes ();
-        exit 1;
-    }
-
-    $daemons_running = 1;
-
-    # Invoke execution manager.
-    print "Invoking execution manager\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";
-
-open (OLDOUT, ">&STDOUT");
-open (STDOUT, ">" . File::Spec->devnull());
-open (OLDERR, ">&STDERR");
-open (STDERR, ">&STDOUT");
-
-    $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                      "-x $file -k file://$ior_emfile");
-    $pl_status = $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ());
-
-open (STDOUT, ">&OLDOUT");
-open (STDERR, ">&OLDERR");
-
-    if ($pl_status == 0) {
-        print STDERR "ERROR: plan_launcher didn't return errors.\n";
-
-        print "Sleeping 5 seconds to allow task to complete\n";
-        sleep (5);
-
-        print "Teardown the application\n";
-        $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                          "-k file://$ior_emfile -x $file -s");
-        $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ());
-        print "Executor finished.\n";
-    }
-    else {
-        print "OK. plan_launcher returned an expected value.\n";
-    }
-    delete_ior_files ();
-    kill_open_processes ();
-}
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/.gitignore b/CIAO/connectors/dds4ccm/tests/TwoTopics/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/.gitignore
deleted file mode 100644
index 95522399761..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/TwoTopics_Base.cxx
-/TwoTopics_Base.h
-/TwoTopics_BasePlugin.cxx
-/TwoTopics_BasePlugin.h
-/TwoTopics_BaseSupport.cxx
-/TwoTopics_BaseSupport.h
-/TwoTopics_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl
deleted file mode 100644
index 3e182f08d90..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @file TwoTopics_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef TWOTOPICS_BASE_IDL
-#define TWOTOPICS_BASE_IDL
-
-#pragma ndds typesupport "Base/TwoTopics_BaseSupport.h"
-#pragma opendds typesupport "Base/TwoTopics_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "HelloTopic"
-#pragma DCPS_DATA_KEY "HelloTopic hello"
-
-struct HelloTopic {
-  string hello; //@key
-  long iteration;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<HelloTopic> HelloTopicSeq;
-#endif
-
-#pragma DCPS_DATA_TYPE "GoodbyeTopic"
-#pragma DCPS_DATA_KEY "GoodbyeTopic goodbye"
-
-struct GoodbyeTopic {
-  string goodbye; //@key
-  long iteration;
-};
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<GoodbyeTopic> GoodbyeTopicSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc
deleted file mode 100644
index 06e4dace8ab..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_TwoTopics_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_TwoTopics_Base_stub
-  dynamicflags += TWOTOPICS_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=TWOTOPICS_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=TwoTopics_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    TwoTopics_Base.idl
-  }
-
-  opendds_ts_flags += --export=TWOTOPICS_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    TwoTopics_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/.gitignore
deleted file mode 100644
index 1586c6072eb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/TwoTopics_ConnectorE.idl
-/TwoTopics_Connector_conn.cpp
-/TwoTopics_Connector_conn.h
-/TwoTopics_Connector_conn_export.h
-/TwoTopics_Connector_lem_stub_export.h
-/TwoTopics_Connector_stub_export.h
-/TwoTopics_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl
deleted file mode 100644
index 493f113abb8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @file TwoTopics_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef TWOTOPICS_CONNECTOR_IDL_
-#define TWOTOPICS_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/TwoTopics_Base.idl"
-
-#pragma ciao lem "Connector/TwoTopics_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/TwoTopics_BaseTypeSupport.idl"
-#endif
-
-module TT_Connector
-{
-  module ::CCM_DDS::Typed < HelloTopic, HelloTopicSeq> HelloConnector;
-  module ::CCM_DDS::Typed < GoodbyeTopic, GoodbyeTopicSeq> GoodbyeConnector;
-};
-
-#endif /* TWOTOPICS_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc
deleted file mode 100644
index 1f9f23770fc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_TwoTopics_Base -l .. -o ../lib -u DDS TwoTopics_Connector"
-
-project(DDS_TwoTopics_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_TwoTopics_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=TWOTOPICS_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=TwoTopics_Connector_stub_export.h \
-              -Wb,skel_export_macro=TWOTOPICS_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=TwoTopics_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=TWOTOPICS_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=TwoTopics_Connector_svnt_export.h \
-              -Wb,conn_export_macro=TWOTOPICS_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=TwoTopics_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    TwoTopics_Connector.idl
-  }
-}
-
-project(DDS_TwoTopics_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_TwoTopics_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=TWOTOPICS_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=TwoTopics_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    TwoTopics_ConnectorE.idl
-  }
-}
-
-project(DDS_TwoTopics_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_TwoTopics_Connector_lem_gen DDS_TwoTopics_Connector_stub DDS_TwoTopics_Base_stub
-  libs  += DDS_TwoTopics_Base_stub DDS_TwoTopics_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_TwoTopics_Connector_lem_stub
-  dynamicflags += TWOTOPICS_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TwoTopics_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    TwoTopics_ConnectorEC.h
-    TwoTopics_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    TwoTopics_ConnectorEC.inl
-  }
-}
-
-project(DDS_TwoTopics_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_TwoTopics_Connector_idl_gen DDS_TwoTopics_Base_stub
-  libs  += DDS_TwoTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_TwoTopics_Connector_stub
-  dynamicflags += TWOTOPICS_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TwoTopics_ConnectorC.cpp
-  }
-
-  Header_Files {
-    TwoTopics_ConnectorC.h
-    TwoTopics_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    TwoTopics_ConnectorC.inl
-  }
-}
-
-project(DDS_TwoTopics_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_TwoTopics_Connector_lem_stub DDS_TwoTopics_Connector_stub DDS_TwoTopics_Base_stub
-  sharedname = DDS_TwoTopics_Connector_exec
-  libs += DDS_TwoTopics_Connector_stub DDS_TwoTopics_Connector_lem_stub DDS_TwoTopics_Base_stub DDS_TwoTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += TWOTOPICS_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TwoTopics_Connector_conn.cpp
-  }
-
-  Header_Files {
-    TwoTopics_Connector_conn.h
-    TwoTopics_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_TwoTopics_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_TwoTopics_Connector_lem_stub DDS_TwoTopics_Connector_exec DDS_TwoTopics_Connector_stub
-  sharedname  = DDS_TwoTopics_Connector_svnt
-  libs       += DDS_TwoTopics_Connector_stub \
-                DDS_TwoTopics_Connector_lem_stub  \
-                DDS_TwoTopics_Base_stub \
-                DDS_TwoTopics_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += TWOTOPICS_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TwoTopics_ConnectorS.cpp
-    TwoTopics_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    TwoTopics_ConnectorS.h
-    TwoTopics_Connector_svnt.h
-    TwoTopics_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/.gitignore b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl
deleted file mode 100644
index 665e3346f76..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * @file Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef CONNECTOR_IDL_
-#define CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-#include "Hello/HelloGoodbye.idl"
-#include "Goodbye/HelloGoodbye.idl"
-
-#pragma ciao lem "Connector/ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Hello/HelloGoodbyeTypeSupport.idl"
-# include "Goodbye/HelloGoodbyeTypeSupport.idl"
-#endif
-
-module Hello
-{
-  // Hello connector
-  module ::CCM_DDS::Typed < HelloGoodbye, HelloGoodbyeSeq> HelloConnector;
-};
-
-module Goodbye
-{
-  // Goodbye connector
-  module ::CCM_DDS::Typed < HelloGoodbye, HelloGoodbyeSeq> GoodbyeConnector;
-};
-
-module HelloGoodbye
-{
-  // Hello connector
-  module ::CCM_DDS::Typed < ::Hello::HelloGoodbye, ::Hello::HelloGoodbyeSeq> HelloConnector;
-
-  // Goodbye connector
-  module ::CCM_DDS::Typed < ::Goodbye::HelloGoodbye, ::Goodbye::HelloGoodbyeSeq> GoodbyeConnector;
-};
-
-// Hello connector
-module ::CCM_DDS::Typed < ::Hello::HelloGoodbye, ::Hello::HelloGoodbyeSeq> HelloConnector;
-
-// Goodbye connector
-module ::CCM_DDS::Typed < ::Goodbye::HelloGoodbye, ::Goodbye::HelloGoodbyeSeq> GoodbyeConnector;
-
-#endif /* CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc
deleted file mode 100644
index 1e547bc965b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-project(DDS_TTDN_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_Hello_Namespace_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=TWOTOPICSDIFFERENTNS_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Connector_stub_export.h \
-              -Wb,skel_export_macro=TWOTOPICSDIFFERENTNS_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Connector_svnt_export.h \
-              -Wb,svnt_export_macro=TWOTOPICSDIFFERENTNS_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Connector_svnt_export.h \
-              -Wb,conn_export_macro=TWOTOPICSDIFFERENTNS_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Connector.idl
-  }
-}
-
-project(DDS_TTDN_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_TTDN_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=TWOTOPICSDIFFERENTNS_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    ConnectorE.idl
-  }
-}
-
-project(DDS_TTDN_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_TTDN_Connector_lem_gen DDS_TTDN_Connector_stub \
-           DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub
-  libs  += DDS_Connector_stub \
-           DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector_lem_stub
-  dynamicflags += TWOTOPICSDIFFERENTNS_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ConnectorEC.cpp
-  }
-
-  Header_Files {
-    ConnectorEC.h
-    Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    ConnectorEC.inl
-  }
-}
-
-project(DDS_TTDN_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_TTDN_Connector_idl_gen \
-           DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub
-  libs  += DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector_stub
-  dynamicflags += TWOTOPICSDIFFERENTNS_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ConnectorC.cpp
-  }
-
-  Header_Files {
-    ConnectorC.h
-    Connector_stub_export.h
-  }
-
-  Inline_Files {
-    ConnectorC.inl
-  }
-}
-
-project(DDS_TTDN_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after += DDS_TTDN_Connector_lem_stub DDS_TTDN_Connector_stub \
-           DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub
-  libs  += DDS_Connector_stub DDS_Connector_lem_stub \
-           DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub
-  sharedname = DDS_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += TWOTOPICSDIFFERENTNS_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector_conn.cpp
-  }
-
-  Header_Files {
-    Connector_conn.h
-    Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_TTDN_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_TTDN_Connector_lem_stub DDS_TTDN_Connector_exec \
-                DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub \
-                DDS_TTDN_Connector_stub
-  libs       += DDS_Connector_stub \
-                DDS_Connector_lem_stub  \
-                DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub \
-                DDS_Connector_exec
-  sharedname  = DDS_Connector_svnt
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += TWOTOPICSDIFFERENTNS_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ConnectorS.cpp
-    Connector_svnt.cpp
-  }
-
-  Header_Files {
-    ConnectorS.h
-    Connector_svnt.h
-    Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/.gitignore b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/.gitignore
deleted file mode 100644
index b33d6bb17e2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Goodbye_stub_export.h
-/HelloGoodbye.cxx
-/HelloGoodbye.h
-/HelloGoodbyePlugin.cxx
-/HelloGoodbyePlugin.h
-/HelloGoodbyeSupport.cxx
-/HelloGoodbyeSupport.h
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl
deleted file mode 100644
index 80e27a75c0a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @file HelloGoodbye.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef GOODBYE_IDL_
-#define GOODBYE_IDL_
-
-#pragma ndds typesupport "Goodbye/HelloGoodbyeSupport.h"
-#pragma opendds typesupport "Goodbye/HelloGoodbyeTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "Goodbye::HelloGoodbye"
-#pragma DCPS_DATA_KEY "Goodbye::HelloGoodbye goodbye"
-
-module Goodbye
-{
-  struct HelloGoodbye {
-    string goodbye;  //@key
-    long iteration;
-  };
-  #if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<HelloGoodbye> HelloGoodbyeSeq;
-#endif
-};
-
-#endif /* GOODBYE_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc
deleted file mode 100644
index 77f20e7d0c9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_Goodbye_Namespace_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_Goodbye_Namespace_Base_stub
-  dynamicflags += GOODBYE_NAMESPACE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=GOODBYE_NAMESPACE_STUB_Export \
-              -Wb,stub_export_include=Goodbye_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    HelloGoodbye.idl
-  }
-
-  opendds_ts_flags += --export=GOODBYE_NAMESPACE_STUB_Export
-
-  DDSGenerator_Files {
-    HelloGoodbye.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/.gitignore b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/.gitignore
deleted file mode 100644
index 6c770338040..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/HelloGoodbye.cxx
-/HelloGoodbye.h
-/HelloGoodbyePlugin.cxx
-/HelloGoodbyePlugin.h
-/HelloGoodbyeSupport.cxx
-/HelloGoodbyeSupport.h
-/Hello_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl
deleted file mode 100644
index d18f059326d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file HelloGoodbye.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef HELLO_IDL_
-#define HELLO_IDL_
-
-#pragma ndds typesupport "Hello/HelloGoodbyeSupport.h"
-#pragma opendds typesupport "Hello/HelloGoodbyeTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "Hello::HelloGoodbye"
-#pragma DCPS_DATA_KEY "Hello::HelloGoodbye hello"
-
-module Hello
-{
-  struct HelloGoodbye {
-    string hello;  //@key
-    long iteration;
-  };
-  #if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<HelloGoodbye> HelloGoodbyeSeq;
-#endif
-};
-
-
-#endif /* HELLO_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc
deleted file mode 100644
index ac23ad4c2ee..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_Hello_Namespace_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_Hello_Namespace_Base_stub
-  dynamicflags += HELLO_NAMESPACE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=HELLO_NAMESPACE_STUB_Export \
-              -Wb,stub_export_include=Hello_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    HelloGoodbye.idl
-  }
-
-  opendds_ts_flags += --export=HELLO_NAMESPACE_STUB_Export
-
-  DDSGenerator_Files {
-    HelloGoodbye.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/TypeSupport/TypeSupport.mpc b/CIAO/connectors/dds4ccm/tests/TypeSupport/TypeSupport.mpc
deleted file mode 100644
index a193af51005..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TypeSupport/TypeSupport.mpc
+++ /dev/null
@@ -1,8 +0,0 @@
-project(DDS_TypeSupport_Test) : taoexe, typecode, dds4ccm_base {
-  includes += $(CIAO_ROOT)
-  exename = typesupport_test
-
-  Source_Files {
-    main.cpp
-  }
-}
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/TypeSupport/main.cpp b/CIAO/connectors/dds4ccm/tests/TypeSupport/main.cpp
deleted file mode 100644
index 7128ce31414..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TypeSupport/main.cpp
+++ /dev/null
@@ -1,297 +0,0 @@
-#include "ace/OS_main.h"
-#include "ace/Log_Msg.h"
-#include "ace/Env_Value_T.h"
-
-#if (CIAO_DDS4CCM_NDDS == 1)
-
-#include "dds4ccm/impl/ndds/TypeSupport.h"
-#include "dds4ccm/impl/ndds/DomainParticipant.h"
-#include "dds4ccm/impl/ndds/DomainParticipantFactory.h"
-
-typedef ::CIAO::NDDS::DDS_DomainParticipantFactory_i
-    DomainParticipantFactory;
-
-class TestTypeFactory : public ::CIAO::NDDS::DDS_TypeFactory_i
-{
-  virtual DDS::DataWriter_ptr create_datawriter (DDSDataWriter* ,
-                                                  ::DDS::DomainParticipant_ptr ,
-                                                  ::DDS::Publisher_ptr )
-  {
-    return ::DDS::DataWriter::_nil ();
-  }
-
-  virtual DDS::DataReader_ptr create_datareader (DDSDataReader* ,
-                                                  ::DDS::DomainParticipant_ptr ,
-                                                  ::DDS::Subscriber_ptr )
-  {
-    return ::DDS::DataReader::_nil ();
-  }
-};
-#endif
-
-int
-ACE_TMAIN (int , ACE_TCHAR **)
-{
-#if (CIAO_DDS4CCM_NDDS == 1)
-  // first turn on or off tracing
-  ACE_Env_Value<int> trace (ACE_TEXT("DDS4CCM_TRACE_ENABLE"), 0);
-  if (trace)
-    {
-      DDS4CCM_ENABLE_TRACE ();
-    }
-  else
-    {
-      DDS4CCM_DISABLE_TRACE ();
-    }
-  DDS4CCM_debug_level = 0;
-
-  int ret = 0;
-
-  try
-    {
-      int domain_id = 0;
-      ACE_Env_Value<int> id (ACE_TEXT("DDS4CCM_DEFAULT_DOMAIN_ID"), domain_id);
-      domain_id = id;
-
-      DomainParticipantFactory pf;
-
-      ::DDS::DomainParticipantQos qos;
-      ::DDS::DomainParticipant_var dp1 = pf.create_participant (
-                                            domain_id,
-                                            qos,
-                                            ::DDS::DomainParticipantListener::_nil (),
-                                            0);
-
-      ::DDS::DomainParticipant_var dp2  = pf.create_participant (
-                                            domain_id,
-                                            qos,
-                                            ::DDS::DomainParticipantListener::_nil (),
-                                            0);
-
-      const char * type1 = "DataType1";
-      const char * type2 = "DataType2";
-      const char * type3 = "DataType3";
-
-      TestTypeFactory * f1 = 0;
-      TestTypeFactory * f2 = 0;
-      TestTypeFactory * f3 = 0;
-
-      ACE_NEW_THROW_EX (f1,
-                        TestTypeFactory (),
-                        ::CORBA::NO_MEMORY ());
-      ACE_NEW_THROW_EX (f2,
-                        TestTypeFactory (),
-                        ::CORBA::NO_MEMORY ());
-      ACE_NEW_THROW_EX (f3,
-                        TestTypeFactory (),
-                        ::CORBA::NO_MEMORY ());
-
-      /// Register type 1 with f1
-      if (::CIAO::NDDS::DDS_TypeSupport_i::register_type(dp1.in(), type1, f1))
-        {
-          ACE_DEBUG ((LM_DEBUG, "OK - Type <%C> and Factory <%@> for DP1 successfully registered\n",
-                    type1, f1));
-        }
-      else
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR - Type <%C> and Factory <%@> for DP1 could not be registered\n",
-                    type1, f1));
-          ++ret;
-        }
-      /// DP1 should now contain one type-factory combination
-
-      /// Register the same factory again
-      if (::CIAO::NDDS::DDS_TypeSupport_i::register_type(dp1.in(), type1, f1))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR - Type <%C> and Factory <%@> for DP1 could be registered\n",
-                    type1, f1));
-          ++ret;
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "OK - Type <%C> and Factory <%@> for DP1 could not be registered\n",
-                    type1, f1));
-        }
-      /// DP1 should now contain one type-factory combination
-
-      /// Register the same factory again but with another name
-      if (::CIAO::NDDS::DDS_TypeSupport_i::register_type(dp1.in(), type2, f1))
-        {
-          ACE_DEBUG ((LM_DEBUG, "OK - Type <%C> and Factory <%@> for DP1 could be registered\n",
-                    type2, f1));
-        }
-      else
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR - Type <%C> and Factory <%@> for DP1 could not be registered\n",
-                    type2, f1));
-          ++ret;
-        }
-      /// DP1 should now contain two type-factory combinations
-
-      /// Register the same type with another factory
-      if (::CIAO::NDDS::DDS_TypeSupport_i::register_type(dp1.in(), type2, f2))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR - Type <%C>  and Factory <%@> for DP1 could be registered\n",
-                    type2, f2));
-          ++ret;
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "OK - Type <%C> and Factory <%@> for DP1 could not be registered\n",
-                    type2, f2));
-        }
-      /// DP1 should now contain two type-factory combinations
-
-      /// Just register type 3 with f3
-      if (::CIAO::NDDS::DDS_TypeSupport_i::register_type(dp1.in(), type3, f3))
-        {
-          ACE_DEBUG ((LM_DEBUG, "OK - Type <%C> and Factory <%@> for DP1 successfully registered\n",
-                    type3, f3));
-        }
-      else
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR - Type <%C> and Factory <%@> for DP1 could not be registered\n",
-                    type3, f3));
-          ++ret;
-        }
-      /// DP1 should now contain three type-factory combinations
-
-      /// Unregister an unused factory by using an unused domain participant
-      bool tmp = ::CIAO::NDDS::DDS_TypeSupport_i::unregister_type(dp2.in(), type1);
-
-      if (tmp)
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR - Unregistered type <%C> for DP2 could be unregistered\n",
-                    type1));
-          ++ret;
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "OK - Unregistered type <%C> for DP2 could not be unregistered\n",
-                    type1));
-        }
-
-      /// Unregister a registered type by using a used domain participant
-      tmp = ::CIAO::NDDS::DDS_TypeSupport_i::unregister_type(dp1.in(), type1);
-
-      if (tmp)
-        {
-          ACE_DEBUG ((LM_DEBUG, "OK - Unregistered type <%C> for DP1 could be unregistered\n",
-                    type1));
-        }
-      else
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR - Unregistered type <%C> for DP1 could not be unregistered\n",
-                    type1));
-          ++ret;
-        }
-      /// DP1 should now contain two type-factory combinations
-
-      /// Unregister the same type and domain participant again
-      tmp = ::CIAO::NDDS::DDS_TypeSupport_i::unregister_type(dp1.in(), type1);
-
-      if (tmp)
-        {
-          ACE_DEBUG ((LM_DEBUG, "OK - Unregistered type <%C> for DP1 could be unregistered\n",
-                    type1));
-        }
-      else
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR - Unregistered type <%C> for DP1 could not be unregistered\n",
-                    type1));
-          ++ret;
-        }
-      /// DP1 should now contain two type-factory combinations
-
-      /// Call Close on TypeSupport. This should remove the last remaining entries.
-      ::CIAO::NDDS::DDS_TypeSupport_i::close();
-
-      /// Unregister the type and domain participant which should be removed by 'close'
-      tmp = ::CIAO::NDDS::DDS_TypeSupport_i::unregister_type(dp1.in(), type2);
-
-      if (tmp)
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR - Deleted type <%C> for DP1 could be unregistered\n",
-                    type2));
-          ++ret;
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "OK - Deleted type <%C> for DP1 could not be unregistered\n",
-                    type2));
-        }
-
-      /// Unregister the type and domain participant which should be removed by 'close'
-      tmp = ::CIAO::NDDS::DDS_TypeSupport_i::unregister_type(dp1.in(), type3);
-
-      if (tmp)
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR - Deleted type <%C> for DP1 could be unregistered\n",
-                    type3));
-          ++ret;
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "OK - Deleted type <%C> for DP1 could not be unregistered\n",
-                    type3));
-        }
-
-      /// Since we've invoked ::close f3 has been deleted. Therefor we need to create it again.
-      ACE_NEW_THROW_EX (f3,
-                        TestTypeFactory (),
-                        ::CORBA::NO_MEMORY ());
-
-
-      /// We should now be able to register type 3 again
-      if (::CIAO::NDDS::DDS_TypeSupport_i::register_type(dp1.in(), type3, f3))
-        {
-          ACE_DEBUG ((LM_DEBUG, "OK - Type <%C> and Factory <%@> for DP1 successfully registered\n",
-                    type3, f3));
-        }
-      else
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR - Type <%C> and Factory <%@> for DP1 could not be registered\n",
-                    type3, f3));
-          ++ret;
-        }
-      /// DP1 should now contain one type-factory combination
-
-      /// Call Close on TypeSupport. This should remove the last remaining entries.
-     ::CIAO::NDDS::DDS_TypeSupport_i::close();
-
-      /// No need to delete f1, f2, and f3 since ::close will delete them.
-      pf.delete_participant(dp1);
-      pf.delete_participant(dp2);
-
-#if (CIAO_DDS4CCM_NDDS==1)
-      DDSDomainParticipantFactory::finalize_instance ();
-#endif
-
-    }
-  catch (const ::CORBA::Exception& e)
-    {
-      e._tao_print_exception ("ACE_TMAIN - Caught unexpected "
-                              "CORBA exception\n");
-      return 1;
-    }
-  catch (...)
-    {
-      ACE_ERROR ((LM_ERROR, "ACE_TMAIN - ERROR: Caught unexpected "
-                            "exception\n"));
-      return 1;
-    }
-  if (ret == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "Test passed !\n"));
-    }
-  else
-    {
-      ACE_ERROR ((LM_ERROR, "%d errors found during test. \n",
-                  ret));
-    }
-  return ret;
-#else
-  ACE_DEBUG ((LM_DEBUG, "NDDS only test\n"));
-  return 0;
-#endif
-}
diff --git a/CIAO/connectors/dds4ccm/tests/TypeSupport/run_test.pl b/CIAO/connectors/dds4ccm/tests/TypeSupport/run_test.pl
deleted file mode 100755
index 07573f42369..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TypeSupport/run_test.pl
+++ /dev/null
@@ -1,27 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::TestTarget;
-
-my $program = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
-
-$PROG = $program->CreateProcess ("typesupport_test", "");
-$program_status = $PROG->SpawnWaitKill ($program->ProcessStartWaitInterval());
-
-if ($program_status != 0) {
-    print STDERR "ERROR: typesupport_test returned $program_status\n";
-    exit 1;
-}
-
-$exit_status = $PROG->WaitKill ($program->ProcessStopWaitInterval());
-
-if ($exit_status != 0) {
-    print STDERR "ERROR: typesupport_test returned $server_status\n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/.gitignore b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl
deleted file mode 100644
index 42a3dad6ae0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file Unkeyed_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef UNKEYED_TEST_BASE_IDL
-#define UNKEYED_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/Unkeyed_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/Unkeyed_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "UnkeyedTest"
-
-struct UnkeyedTest {
-  string key;
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<UnkeyedTest> UnkeyedTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc
deleted file mode 100644
index a82c8c37555..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_Unkeyed_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_Unkeyed_Test_Base_stub
-  dynamicflags += UNKEYED_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=UNKEYED_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=Unkeyed_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Unkeyed_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=UNKEYED_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Unkeyed_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/.gitignore
deleted file mode 100644
index 1d95bf64721..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/Unkeyed_Test_ConnectorE.idl
-/Unkeyed_Test_Connector_conn.cpp
-/Unkeyed_Test_Connector_conn.h
-/Unkeyed_Test_Connector_conn_export.h
-/Unkeyed_Test_Connector_lem_stub_export.h
-/Unkeyed_Test_Connector_stub_export.h
-/Unkeyed_Test_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl
deleted file mode 100644
index 807df77e543..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file Unkeyed_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef UNKEYED_TEST_CONNECTOR_IDL_
-#define UNKEYED_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Unkeyed_Test_Base.idl"
-
-#pragma ciao lem "Connector/Unkeyed_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Unkeyed_Test_BaseTypeSupport.idl"
-#endif
-
-module Unkeyed_Test
-{
-  module ::CCM_DDS::Typed < ::UnkeyedTest, ::UnkeyedTestSeq> UnkeyedTestConnector;
-};
-
-#endif /* Unkeyed_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
deleted file mode 100644
index 3a7a7dc1310..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Unkeyed_Test_Base -l .. -o ../lib -u DDS Unkeyed_Test_Connector"
-
-project(DDS_Unkeyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_Unkeyed_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=UNKEYED_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Unkeyed_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=UNKEYED_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Unkeyed_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=UNKEYED_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Unkeyed_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=UNKEYED_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Unkeyed_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Unkeyed_Test_Connector.idl
-  }
-}
-
-project(DDS_Unkeyed_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_Unkeyed_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=UNKEYED_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Unkeyed_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Unkeyed_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_Unkeyed_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_Unkeyed_Test_Connector_lem_gen DDS_Unkeyed_Test_Connector_stub \
-           DDS_Unkeyed_Test_Base_stub
-  libs  += DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Unkeyed_Test_Connector_lem_stub
-  dynamicflags += UNKEYED_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Unkeyed_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Unkeyed_Test_ConnectorEC.h
-    Unkeyed_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Unkeyed_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_Unkeyed_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Unkeyed_Test_Connector_idl_gen DDS_Unkeyed_Test_Base_stub
-  libs  += DDS_Unkeyed_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Unkeyed_Test_Connector_stub
-  dynamicflags += UNKEYED_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Unkeyed_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Unkeyed_Test_ConnectorC.h
-    Unkeyed_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Unkeyed_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_Unkeyed_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_Unkeyed_Test_Connector_lem_stub DDS_Unkeyed_Test_Connector_stub \
-             DDS_Unkeyed_Test_Base_stub
-  sharedname = DDS_Unkeyed_Test_Connector_exec
-  libs += DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_lem_stub \
-          DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += UNKEYED_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Unkeyed_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Unkeyed_Test_Connector_conn.h
-    Unkeyed_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Unkeyed_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_Unkeyed_Test_Connector_lem_stub DDS_Unkeyed_Test_Connector_exec \
-                DDS_Unkeyed_Test_Connector_stub
-  sharedname  = DDS_Unkeyed_Test_Connector_svnt
-  libs       += DDS_Unkeyed_Test_Connector_stub \
-                DDS_Unkeyed_Test_Connector_lem_stub  \
-                DDS_Unkeyed_Test_Base_stub \
-                DDS_Unkeyed_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += UNKEYED_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Unkeyed_Test_ConnectorS.cpp
-    Unkeyed_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Unkeyed_Test_ConnectorS.h
-    Unkeyed_Test_Connector_svnt.h
-    Unkeyed_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/README b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/README
deleted file mode 100644
index 8a26966f186..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/README
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-UnkeyedSamples consists of a Sender and a Receiver.
-The Sender writes samples unkeyed; the Receiver should
-receive the same number of samples. An error is printed
-when this isn't the case.
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/.gitignore
deleted file mode 100644
index 4829caba63b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
-/Unkeyed_Test_ReceiverE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl
deleted file mode 100644
index 45c30460219..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Unkeyed_Test_Connector.idl"
-
-module Unkeyed_Test
-{
-  component Receiver
-  {
-    port UnkeyedTestConnector::DDS_Listen info_out;
-    provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc
deleted file mode 100644
index 8afc8d0bf79..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_Unkeyed_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_Unkeyed_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 {
-    Unkeyed_Test_Receiver.idl
-  }
-}
-
-project(DDS_Unkeyed_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Unkeyed_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 {
-    Unkeyed_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_Unkeyed_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Unkeyed_Test_Receiver_lem_gen DDS_Unkeyed_Test_Receiver_stub  DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Base_stub
-  libs  +=  Receiver_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Unkeyed_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Unkeyed_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Unkeyed_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_Unkeyed_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Unkeyed_Test_Receiver_idl_gen  DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_lem_gen
-  libs  += DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Unkeyed_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Unkeyed_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Unkeyed_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_Unkeyed_Test_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_Unkeyed_Test_Receiver_lem_stub DDS_Unkeyed_Test_Receiver_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Unkeyed_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Unkeyed_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Unkeyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_Unkeyed_Test_Receiver_lem_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_svnt DDS_Unkeyed_Test_Receiver_exec DDS_Unkeyed_Test_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_svnt Receiver_exec DDS_Unkeyed_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Unkeyed_Test_ReceiverS.cpp
-    Unkeyed_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Unkeyed_Test_ReceiverS.h
-    Unkeyed_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp
deleted file mode 100644
index e5c788e651b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,370 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Unkeyed_Test_Receiver_exec.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_Unkeyed_Test_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::Unkeyed_Test::CCM_Receiver_Context_ptr ctx,
-        Atomic_ULong &received)
-    : ciao_context_ (
-        ::Unkeyed_Test::CCM_Receiver_Context::_duplicate (ctx))
-      , received_ (received)
-      , handle_ (DDS::HANDLE_NIL)
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::Unkeyed_Test::UnkeyedTestConnector::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::UnkeyedTest & datum,
-  const ::CCM_DDS::ReadInfo & info)
-  {
-    // From the first sample store the instance handle, the handle should be
-    // nil (RTI DDS) or stay the same (OpenDDS)
-    if (this->received_ == 0)
-      {
-        this->handle_ = info.instance_handle;
-      }
-    ++this->received_;
-
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("UnkeyedTest_Listener: ")
-            ACE_TEXT ("received keyed_test_info for <%C> at iteration <%u> for handle ")
-            DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER
-            ACE_TEXT ("\n"),
-            datum.key.in (),
-            datum.iteration,
-            DDS_INSTANCE_HANDLE_LOG (info.instance_handle)));
-    if ((info.instance_handle != ::DDS::HANDLE_NIL) &&
-        (this->handle_.value () != info.instance_handle))
-      {
-        ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("ERROR: UnkeyedTest_Listener::on_one_data: ")
-                ACE_TEXT ("received instance handle ")
-                DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER
-                ACE_TEXT (" should be nil or stay the same ")
-                ACE_TEXT ("for unkeyed data ")
-                ACE_TEXT ("key <%C> - iteration <%u>\n"),
-                DDS_INSTANCE_HANDLE_LOG (info.instance_handle),
-                datum.key.in (),
-                datum.iteration));
-      }
-    if (info.source_timestamp.sec == 0 &&
-        info.source_timestamp.nanosec == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: UnkeyedTest_Listener::on_one_data: "
-                            "source timestamp seems to be invalid (nil) "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.iteration));
-      }
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::UnkeyedTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::Unkeyed_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Unkeyed_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_connector_status_exec_i
-   */
-
-  info_out_connector_status_exec_i::info_out_connector_status_exec_i (
-        ::Unkeyed_Test::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Unkeyed_Test::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_connector_status_exec_i::~info_out_connector_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-
-  void
-  info_out_connector_status_exec_i::on_inconsistent_topic (::DDS::Topic_ptr /* the_topic */,
-  const ::DDS::InconsistentTopicStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_requested_incompatible_qos (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_sample_rejected (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleRejectedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_deadline_missed (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_offered_incompatible_qos (::DDS::DataWriter_ptr /* the_writer */,
-  const ::DDS::OfferedIncompatibleQosStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_connector_status_exec_i::on_unexpected_status (::DDS::Entity_ptr /* the_entity */,
-  ::DDS::StatusKind /* status_kind */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : iterations_ (10)
-      , keys_ (3)
-      , received_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::Unkeyed_Test::UnkeyedTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->received_),
-            ::Unkeyed_Test::UnkeyedTestConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::Unkeyed_Test::UnkeyedTestConnector::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Receiver_exec_i::get_info_out_connector_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_connector_status_.in ()))
-      {
-        info_out_connector_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_connector_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_ConnectorStatusListener::_nil ());
-
-          this->ciao_info_out_connector_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_ConnectorStatusListener::_duplicate (
-        this->ciao_info_out_connector_status_.in ());
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Receiver_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Unkeyed_Test::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::DataListenerControl_var lc =
-      this->ciao_context_->get_connection_info_out_data_control ();
-
-    if (::CORBA::is_nil (lc.in ()))
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-
-    lc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    ::CORBA::ULong expected = this->keys_ * this->iterations_;
-    ACE_DEBUG ((LM_INFO, "Receiver_exec_i summary: received <%u>\n",
-                this->received_.value ()));
-
-    if (this->received_.value () != expected)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::ccm_remove - "
-                  "ERROR: Unexpected number of samples received: "
-                  "expected <%u> - received <%u>\n",
-                  expected,
-                  this->received_.value ()));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Unkeyed_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/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h
deleted file mode 100644
index f238945030d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h
+++ /dev/null
@@ -1,234 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_UNKEYED_TEST_RECEIVER_EXEC_SACODV_H_
-#define CIAO_UNKEYED_TEST_RECEIVER_EXEC_SACODV_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Unkeyed_Test_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_Unkeyed_Test_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong > Atomic_ULong;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, DDS::InstanceHandle_t > Atomic_Handle;
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::Unkeyed_Test::UnkeyedTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::Unkeyed_Test::CCM_Receiver_Context_ptr ctx,
-      Atomic_ULong &);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from Unkeyed_Test::UnkeyedTestConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::UnkeyedTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::UnkeyedTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::Unkeyed_Test::CCM_Receiver_Context_var ciao_context_;
-    Atomic_ULong &received_;
-    Atomic_Handle handle_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::Unkeyed_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Unkeyed_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_connector_status_exec_i
-   */
-
-  class info_out_connector_status_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_connector_status_exec_i (
-      ::Unkeyed_Test::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_connector_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-    const ::DDS::InconsistentTopicStatus & status);
-
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedIncompatibleQosStatus & status);
-
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleRejectedStatus & status);
-
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedDeadlineMissedStatus & status);
-
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-    const ::DDS::OfferedIncompatibleQosStatus & status);
-
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind status_kind);
-    //@}
-
-  private:
-    ::Unkeyed_Test::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::Unkeyed_Test::UnkeyedTestConnector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_info_out_connector_status (void);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-
-    //@}
-
-  private:
-    ::Unkeyed_Test::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::Unkeyed_Test::UnkeyedTestConnector::CCM_Listener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    ::CCM_DDS::CCM_ConnectorStatusListener_var ciao_info_out_connector_status_;
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Atomic_ULong received_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Unkeyed_Test_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/.gitignore
deleted file mode 100644
index d02ac4819e3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
-/Unkeyed_Test_SenderE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl
deleted file mode 100644
index aa31f073a0f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_KEYED_TEST_SENDER_IDL
-#define DDS_KEYED_TEST_SENDER_IDL
-
-#include "Connector/Unkeyed_Test_Connector.idl"
-
-module Unkeyed_Test
-{
-  component Sender
-  {
-    port UnkeyedTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener test_topic_connector_status;
-    attribute unsigned short rate;
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc
deleted file mode 100644
index 413980d9e47..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Unkeyed_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_Unkeyed_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_Unkeyed_Test_Connector_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 {
-    Unkeyed_Test_Sender.idl
-  }
-}
-
-project(DDS_Unkeyed_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Unkeyed_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 {
-    Unkeyed_Test_SenderE.idl
-  }
-}
-
-project(DDS_Unkeyed_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Unkeyed_Test_Sender_lem_gen DDS_Unkeyed_Test_Sender_stub DDS_Unkeyed_Test_Base_stub
-  libs  += DDS_Unkeyed_Test_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Unkeyed_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    Unkeyed_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Unkeyed_Test_SenderEC.inl
-  }
-}
-
-project(DDS_Unkeyed_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Unkeyed_Test_Sender_idl_gen DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub
-  libs  += DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Unkeyed_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    Unkeyed_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Unkeyed_Test_SenderC.inl
-  }
-}
-
-project(DDS_Unkeyed_Test_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_Unkeyed_Test_Sender_lem_stub DDS_Unkeyed_Test_Sender_stub DDS_Unkeyed_Test_Connector_lem_stub DDS_Unkeyed_Test_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_lem_stub DDS_Unkeyed_Test_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Unkeyed_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Unkeyed_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Unkeyed_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_Unkeyed_Test_Base_stub  DDS_Unkeyed_Test_Sender_lem_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_svnt  DDS_Unkeyed_Test_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_svnt DDS_Unkeyed_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Unkeyed_Test_SenderS.cpp
-    Unkeyed_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Unkeyed_Test_SenderS.h
-    Unkeyed_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp
deleted file mode 100644
index fd7ac4b155e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,324 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Unkeyed_Test_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_Unkeyed_Test_Sender_Impl
-{
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  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 /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  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 ();
-      }
-  }
-
-  /**
-   * Write action 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;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : rate_ (1)
-      , iterations_ (10)
-      , keys_ (3)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  Sender_exec_i::tick ()
-  {
-    ::Unkeyed_Test::UnkeyedTestConnector::Writer_var writer
-      = this->ciao_context_->get_connection_info_write_data ();
-
-    if (this->last_key != this->ktests_.end ())
-      {
-        try
-          {
-            ++this->last_key->second->iteration;
-            writer->write_one (this->last_key->second, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written key <%C> with <%d>\n"),
-                    this->last_key->first.c_str (),
-                    this->last_key->second->iteration));
-          }
-        catch (const CCM_DDS::NonExistent& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Key info for <%C> not updated: <%C> didn't exist.\n"),
-                        this->last_key->first.c_str (), this->last_key->first.c_str ()));
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error while updating key info for <%C>.\n"),
-                        this->last_key->first.c_str ()));
-          }
-        ++this->last_key;
-      }
-    else
-      {
-        // onto the next iteration
-        this->last_key = this->ktests_.begin ();
-        while (this->last_key != this->ktests_.end ())
-          {
-            if (this->last_key->second->iteration == this->iterations_)
-              {
-                //next key
-                ++this->last_key;
-              }
-            else
-              {
-                break;
-              }
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    // Calculate the interval time
-    long const usec = 1000000 / this->rate_;
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (0, usec),
-                ACE_Time_Value (0, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-  }
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::rate (void)
-  {
-    return this->rate_;
-  }
-
-  void
-  Sender_exec_i::rate (
-    const ::CORBA::UShort rate)
-  {
-    this->rate_ = rate;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_test_topic_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (*this);
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Unkeyed_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        UnkeyedTest *new_key = new UnkeyedTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->iteration = 0;
-
-        this->ktests_[key] = new_key;
-      }
-     this->last_key = this->ktests_.begin ();
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Unkeyed_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/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h
deleted file mode 100644
index ef9ae64ec62..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h
+++ /dev/null
@@ -1,184 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_UNKEYED_TEST_SENDER_EXEC_ENQT0J_H_
-#define CIAO_UNKEYED_TEST_SENDER_EXEC_ENQT0J_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Unkeyed_Test_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_Unkeyed_Test_Sender_Impl
-{
-
-  class Sender_exec_i;
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Write action generator
-   */
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-
-    virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg);
-
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-
-    virtual ::CORBA::UShort rate (void);
-
-    virtual void rate (::CORBA::UShort rate);
-
-    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_test_topic_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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void tick (void);
-    void start (void);
-    //@}
-
-  private:
-    ::Unkeyed_Test::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort rate_;
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    pulse_Generator * ticker_;
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, UnkeyedTest_var> Unkeyed_Test_Table;
-    Unkeyed_Test_Table ktests_;
-    Unkeyed_Test_Table::iterator last_key;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void stop (void);
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Unkeyed_Test_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp
deleted file mode 100644
index 6c5731e08f8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp
+++ /dev/null
@@ -1,424 +0,0 @@
-<!--  -->
-<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>Unkeyed_Test_Depl_1</label>
-  <UUID>Unkeyed_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_Unkeyed_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_Unkeyed_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="Unkeyed_Test_ConnectorComponentImplementation">
-    <name>Unkeyed_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Unkeyed_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Unkeyed_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_Unkeyed_Test_UnkeyedTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Unkeyed_Test_UnkeyedTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Unkeyed_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Unkeyed_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_Unkeyed_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_Unkeyed_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" />
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>3</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Unkeyed_Test_ConnectorComponentInstance">
-    <name>Unkeyed_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Unkeyed_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Unkeyed_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Unkeyed_Test_ConnectorComponentInstance2">
-    <name>Unkeyed_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Unkeyed_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Unkeyed_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>1</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>3</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_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="Unkeyed_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>_datacontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_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="Unkeyed_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_out_connector_status_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Unkeyed_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="Unkeyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>test_topic_connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Unkeyed_Test_ConnectorComponentInstance" />
-    </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="Unkeyed_Test_Connector_ExecArtifact">
-    <name>Unkeyed_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Unkeyed_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Unkeyed_Test_Connector_SvntArtifact">
-    <name>Unkeyed_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Unkeyed_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Unkeyed_Test_Connector_StubArtifact">
-    <name>Unkeyed_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Unkeyed_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/UnkeyedSamples/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl
deleted file mode 100755
index 87984594507..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 60 seconds to allow task to complete\n";
-sleep (60);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/.gitignore b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl
deleted file mode 100644
index 1b569f4b6d0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @file Writer_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WRITER_BASE_IDL
-#define WRITER_BASE_IDL
-
-#pragma ndds typesupport "Base/Writer_BaseSupport.h"
-#pragma opendds typesupport "Base/Writer_BaseTypeSupportImpl.h"
-
-typedef sequence<octet> OctetSeq;
-
-#pragma DCPS_DATA_TYPE "WriterTest"
-
-struct WriterTest {
-  string key;
-  long iteration;
-  OctetSeq data;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<WriterTest> WriterTestSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc
deleted file mode 100644
index 7805092c82a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_UnkeyedWriterBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_UnkeyedWriterBase_stub
-  dynamicflags += WRITER_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=WRITER_BASE_STUB_Export \
-              -Wb,stub_export_include=Writer_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Writer_Base.idl
-  }
-
-  opendds_ts_flags += --export=WRITER_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Writer_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl
deleted file mode 100644
index 5969c7d1176..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file Writer_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef WRITER_CONNECTOR_IDL_
-#define WRITER_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Writer_Base.idl"
-
-#pragma ciao lem "Connector/Writer_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Writer_BaseTypeSupport.idl"
-#endif
-
-module Writer
-{
-  module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTestConnector;
-};
-
-#endif /* Writer_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
deleted file mode 100644
index c4fe5d76d38..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_UnkeyedWriterBase -l .. -o ../lib -u DDS Writer_Connector"
-
-project(DDS_UnkeyedWriterConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_UnkeyedWriterBase_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Writer_Connector_stub_export.h \
-              -Wb,skel_export_macro=WRITER_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Writer_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=WRITER_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Writer_Connector_svnt_export.h \
-              -Wb,conn_export_macro=WRITER_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Writer_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Writer_Connector.idl
-  }
-}
-
-project(DDS_UnkeyedWriterConnector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_UnkeyedWriterConnector_idl_gen
-  idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Writer_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Writer_ConnectorE.idl
-  }
-}
-
-project(DDS_UnkeyedWriterConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_UnkeyedWriterConnector_lem_gen DDS_UnkeyedWriterConnector_stub \
-           DDS_UnkeyedWriterBase_stub
-  libs  += DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_UnkeyedWriterConnector_lem_stub
-  dynamicflags += WRITER_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Writer_ConnectorEC.h
-    Writer_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ConnectorEC.inl
-  }
-}
-
-project(DDS_UnkeyedWriterConnector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_UnkeyedWriterConnector_idl_gen DDS_UnkeyedWriterBase_stub
-  libs  += DDS_UnkeyedWriterBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_UnkeyedWriterConnector_stub
-  dynamicflags += WRITER_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Writer_ConnectorC.h
-    Writer_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ConnectorC.inl
-  }
-}
-
-project(DDS_UnkeyedWriterConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_UnkeyedWriterConnector_lem_stub DDS_UnkeyedWriterConnector_stub \
-             DDS_UnkeyedWriterBase_stub
-  sharedname = DDS_UnkeyedWriterConnector_exec
-  libs += DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_lem_stub \
-          DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += WRITER_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Writer_Connector_conn.h
-    Writer_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_UnkeyedWriterConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_UnkeyedWriterConnector_lem_stub DDS_UnkeyedWriterConnector_exec \
-                DDS_UnkeyedWriterConnector_stub
-  sharedname  = DDS_UnkeyedWriterConnector_svnt
-  libs       += DDS_UnkeyedWriterConnector_stub \
-                DDS_UnkeyedWriterConnector_lem_stub  \
-                DDS_UnkeyedWriterBase_stub \
-                DDS_UnkeyedWriterConnector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += WRITER_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ConnectorS.cpp
-    Writer_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Writer_ConnectorS.h
-    Writer_Connector_svnt.h
-    Writer_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl
deleted file mode 100644
index 2d720fba655..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @file
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Writer_Connector.idl"
-
-module Writer
-{
-  component Receiver
-  {
-    port WriterTestConnector::DDS_Listen info_out;
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc
deleted file mode 100644
index 92d6d3c513d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_UnkeyedWriterReceiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_UnkeyedWriterConnector_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 {
-    Writer_Receiver.idl
-  }
-}
-
-project(DDS_UnkeyedWriterReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_UnkeyedWriterReceiver_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 {
-    Writer_ReceiverE.idl
-  }
-}
-
-project(DDS_UnkeyedWriterReceiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_UnkeyedWriterReceiver_lem_gen DDS_UnkeyedWriterReceiver_stub  DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterBase_stub
-  libs  +=  Receiver_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Writer_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ReceiverEC.inl
-  }
-}
-
-project(DDS_UnkeyedWriterReceiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_UnkeyedWriterReceiver_idl_gen  DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_lem_gen
-  libs  += DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterBase_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Writer_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_ReceiverC.inl
-  }
-}
-
-project(DDS_UnkeyedWriterReceiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_UnkeyedWriterReceiver_lem_stub DDS_UnkeyedWriterReceiver_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Writer_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_UnkeyedWriterReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_UnkeyedWriterReceiver_lem_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_svnt DDS_UnkeyedWriterReceiver_exec DDS_UnkeyedWriterConnector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_svnt Receiver_exec DDS_UnkeyedWriterConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_ReceiverS.cpp
-    Writer_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Writer_ReceiverS.h
-    Writer_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp
deleted file mode 100644
index dd94ab6a7d9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp
+++ /dev/null
@@ -1,267 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Writer_Receiver_exec.h"
-
-namespace CIAO_Writer_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::Writer::CCM_Receiver_Context_ptr ctx,
-        const ::CORBA::UShort iterations,
-        Atomic_ULong &samples_received)
-    : ciao_context_ (
-        ::Writer::CCM_Receiver_Context::_duplicate (ctx))
-      , iterations_ (iterations)
-      , samples_received_ (samples_received)
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::Writer::WriterTestConnector::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::WriterTest & datum,
-  const ::CCM_DDS::ReadInfo & /* info */)
-  {
-    ++this->samples_received_;
-    ACE_DEBUG ((LM_ERROR, ACE_TEXT ("WriterTest_Listener::on_one_data ")
-            ACE_TEXT ("received writer info for <%C> at %u\n"),
-            datum.key.in (),
-            datum.iteration));
-    if (datum.iteration > this->iterations_)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: received iteration ")
-                        ACE_TEXT ("greater than expected : ")
-                        ACE_TEXT ("expected <%u> - received <%u>\n"),
-                        this->iterations_, datum.iteration));
-      }
-    if (datum.iteration == 0)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: received iteration ")
-                        ACE_TEXT ("is zero\n")));
-      }
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::WriterTestSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("WriterTest_Listener: ")
-            ACE_TEXT ("on_many_data has been called.\n")));
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::Writer::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Writer::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : iterations_ (10)
-      , keys_ (5)
-      , samples_received_ (0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::Writer::WriterTestConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->iterations () * this->keys (),
-            this->samples_received_),
-            ::Writer::WriterTestConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::Writer::WriterTestConnector::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Receiver_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Receiver_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Receiver_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Writer::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::DataListenerControl_var lc =
-    this->ciao_context_->get_connection_info_out_data_control ();
-
-    if (::CORBA::is_nil (lc.in ()))
-      {
-        ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
-        throw ::CORBA::INTERNAL ();
-      }
-    lc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (this->samples_received_ != 2 * this->keys_ * this->iterations_)
-      {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::ccm_remove - "
-                  "ERROR: Did not receive the expected number of samples: "
-                  "expected <%u> - received <%u>\n",
-                  2 * this->keys_ * this->iterations_,
-                  this->samples_received_.value ()));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_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/UnkeyedWriter/Receiver/Writer_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h
deleted file mode 100644
index 263b91d30cc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h
+++ /dev/null
@@ -1,185 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_WRITER_RECEIVER_EXEC_00RRKG_H_
-#define CIAO_WRITER_RECEIVER_EXEC_00RRKG_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Writer_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_Writer_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong> Atomic_ULong;
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::Writer::WriterTestConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::Writer::CCM_Receiver_Context_ptr ctx,
-      const ::CORBA::UShort iterations,
-      Atomic_ULong &samples_received);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from Writer::WriterTestConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::WriterTest & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::WriterTestSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::Writer::CCM_Receiver_Context_var ciao_context_;
-    const ::CORBA::UShort iterations_;
-    Atomic_ULong &samples_received_;
-
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::Writer::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Writer::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::Writer::WriterTestConnector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-
-    //@}
-
-  private:
-    ::Writer::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::Writer::WriterTestConnector::CCM_Listener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    Atomic_ULong samples_received_;
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl
deleted file mode 100644
index 64984e084f9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef DDS_KEYED_TEST_SENDER_IDL
-#define DDS_KEYED_TEST_SENDER_IDL
-
-#include "Connector/Writer_Connector.idl"
-
-module Writer
-{
-  component Sender
-  {
-    port WriterTestConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-
-    attribute unsigned short rate;
-    attribute unsigned short iterations;
-    attribute unsigned short keys;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc
deleted file mode 100644
index 34c6a6563d3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_UnkeyedWriterBase -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_UnkeyedWriterSender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_UnkeyedWriterConnector_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 {
-    Writer_Sender.idl
-  }
-}
-
-project(DDS_UnkeyedWriterSender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_UnkeyedWriterSender_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 {
-    Writer_SenderE.idl
-  }
-}
-
-project(DDS_UnkeyedWriterSender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_UnkeyedWriterSender_lem_gen DDS_UnkeyedWriterSender_stub DDS_UnkeyedWriterBase_stub
-  libs  += DDS_UnkeyedWriterBase_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_SenderEC.cpp
-  }
-
-  Header_Files {
-    Writer_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_SenderEC.inl
-  }
-}
-
-project(DDS_UnkeyedWriterSender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_UnkeyedWriterSender_idl_gen DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub
-  libs  += DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_SenderC.cpp
-  }
-
-  Header_Files {
-    Writer_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Writer_SenderC.inl
-  }
-}
-
-project(DDS_UnkeyedWriterSender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_UnkeyedWriterSender_lem_stub DDS_UnkeyedWriterSender_stub DDS_UnkeyedWriterConnector_lem_stub DDS_UnkeyedWriterConnector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_lem_stub DDS_UnkeyedWriterConnector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Writer_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_UnkeyedWriterSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_UnkeyedWriterBase_stub  DDS_UnkeyedWriterSender_lem_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_svnt  DDS_UnkeyedWriterConnector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_svnt DDS_UnkeyedWriterConnector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Writer_SenderS.cpp
-    Writer_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Writer_SenderS.h
-    Writer_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp
deleted file mode 100644
index 0b7d48b8c3a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp
+++ /dev/null
@@ -1,465 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Writer_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_Writer_Sender_Impl
-{
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-
-  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 /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.get_started ();
-      }
-  }
-
-  /**
-   * 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;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : rate_ (1)
-      , iterations_ (15)
-      , keys_ (5)
-      , assignment_ (WRITE_UNKEYED)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  void
-  Sender_exec_i::reset_iterations ()
-  {
-    for (Writer_Table::iterator i = this->ktests_.begin ();
-         i != this->ktests_.end ();
-         ++i)
-      {
-        i->second->iteration = 0;
-      }
-  }
-
-  void
-  Sender_exec_i::start_new_assignment (WRITER_ASSIGNMENT assignment)
-  {
-    this->last_key = this->ktests_.begin ();
-    this->assignment_ = assignment;
-    reset_iterations ();
-  }
-
-  void
-  Sender_exec_i::write_unkeyed ()
-  {
-    if (this->last_key != this->ktests_.end ())
-      {
-        try
-          {
-            ::Writer::WriterTestConnector::Writer_var writer =
-              this->ciao_context_->get_connection_info_write_data ();
-
-            ++this->last_key->second->iteration;
-            OctetSeq_var reply_mesg = new OctetSeq (1);
-            reply_mesg->length (1);
-            this->last_key->second->data = reply_mesg;
-            writer->write_one (this->last_key->second, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written keyed <%C> - iteration <%d>\n"),
-                    this->last_key->first.c_str (),
-                    this->last_key->second->iteration));
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                        ACE_TEXT ("while updating writer info for <%C>.\n"),
-                          this->last_key->first.c_str ()));
-          }
-        ++this->last_key;
-      }
-    else
-      {
-        //onto the next iteration
-        this->last_key = this->ktests_.begin ();
-        while (this->last_key != this->ktests_.end ())
-          {
-            if (this->last_key->second->iteration == this->iterations_)
-              {
-                //next key
-                ++this->last_key;
-              }
-            else
-              {
-                break;
-              }
-          }
-        if (this->last_key == this->ktests_.end ())
-          {
-            start_new_assignment (WRITE_MULTI);
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::write_many ()
-  {
-    CORBA::ULong nr_samples = this->keys_ * this->iterations_;
-    WriterTestSeq write_many_no_excep;
-    write_many_no_excep.length (nr_samples);
-    //write with no exception
-    for (CORBA::ULong i = 1; i < nr_samples + 1; ++i)
-      {
-        WriterTest new_key;
-        new_key.key = CORBA::string_dup("KEY_1");
-        new_key.iteration = i;
-        OctetSeq_var reply_mesg = new OctetSeq (1);
-        reply_mesg->length (1);
-        new_key.data = reply_mesg;
-        write_many_no_excep[i-1] = new_key;
-      }
-    try
-      {
-        ::Writer::WriterTestConnector::Writer_var writer =
-          this->ciao_context_->get_connection_info_write_data ();
-
-        writer->write_many (write_many_no_excep);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("write_many : written <%u> samples\n"),
-              write_many_no_excep.length ()));
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_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));
-      }
-    start_new_assignment (TEST_EXCEPTION);
-  }
-
-  void
-  Sender_exec_i::test_exception ()
-  {
-    if (this->last_key != this->ktests_.end ())
-      {
-        try
-          {
-            ::Writer::WriterTestConnector::Writer_var writer =
-              this->ciao_context_->get_connection_info_write_data ();
-
-            ++this->last_key->second->iteration;
-            long const length = 100000;
-            OctetSeq_var reply_mesg = new OctetSeq (length);
-            reply_mesg->length (length);
-            this->last_key->second->data = reply_mesg;
-            writer->write_one (this->last_key->second, ::DDS::HANDLE_NIL);
-#if (CIAO_DDS4CCM_NDDS==1)
-            // Sending large amount of data fails with RTI DDS
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: No InternalError ")
-                        ACE_TEXT ("caught while writing a large amount of data.\n")));
-#endif
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::test_exception: ")
-                        ACE_TEXT ("OK: Expected InternalErr received\n")));
-          }
-        ++this->last_key;
-      }
-    else
-      {
-        //onto the next iteration
-        this->last_key = this->ktests_.begin ();
-        while (this->last_key != this->ktests_.end ())
-          {
-            if (this->last_key->second->iteration == this->iterations_)
-              {
-                //next key
-                ++this->last_key;
-              }
-            else
-              {
-                break;
-              }
-          }
-      }
-    if (this->last_key == this->ktests_.end ())
-      {
-        start_new_assignment (WRITE_NONE);
-      }
-  }
-
-  void
-  Sender_exec_i::tick ()
-  {
-    switch (this->assignment_)
-      {
-        case WRITE_UNKEYED:
-          write_unkeyed ();
-          break;
-        case WRITE_MULTI:
-          write_many ();
-          break;
-        case TEST_EXCEPTION:
-          test_exception ();
-          break;
-        default:
-          break;
-      }
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        WriterTest *new_key = new WriterTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->iteration = 1;
-
-        this->ktests_[key] = new_key;
-      }
-   this->start ();
-   this->last_key = this->ktests_.begin ();
-   reset_iterations ();
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    // calculate the interval time
-    long const usec = 1000000 / this->rate_;
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (0, usec),
-                ACE_Time_Value (0, usec)) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                             ACE_TEXT ("Error scheduling timer")));
-    }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-  }
-
-  // Component attributes and port operations.
-
-  ::CORBA::UShort
-  Sender_exec_i::rate (void)
-  {
-    return this->rate_;
-  }
-
-  void
-  Sender_exec_i::rate (
-    const ::CORBA::UShort rate)
-  {
-    this->rate_ = rate;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (
-    const ::CORBA::UShort iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (
-    const ::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Writer::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    /* Your code here. */
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_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/UnkeyedWriter/Sender/Writer_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h
deleted file mode 100644
index 33d61634ba2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h
+++ /dev/null
@@ -1,199 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_WRITER_SENDER_EXEC_ZEYVOW_H_
-#define CIAO_WRITER_SENDER_EXEC_ZEYVOW_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Writer_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-#include <map>
-
-namespace CIAO_Writer_Sender_Impl
-{
-  class Sender_exec_i;
-
-  enum WRITER_ASSIGNMENT {
-    WRITE_NONE,
-    WRITE_UNKEYED,
-    WRITE_MULTI,
-    TEST_EXCEPTION
-  };
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Pulse Generator
-   */
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CORBA::UShort rate (void);
-
-    virtual void rate (::CORBA::UShort rate);
-
-    virtual ::CORBA::UShort iterations (void);
-
-    virtual void iterations (::CORBA::UShort iterations);
-
-    virtual ::CORBA::UShort keys (void);
-
-    virtual void keys (::CORBA::UShort keys);
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void tick (void);
-    void get_started (void);
-    //@}
-
-  private:
-    ::Writer::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-
-    ::CORBA::UShort rate_;
-
-    ::CORBA::UShort iterations_;
-
-    ::CORBA::UShort keys_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    pulse_Generator * ticker_;
-
-    WRITER_ASSIGNMENT assignment_;
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, WriterTest_var> Writer_Table;
-    Writer_Table ktests_;
-
-    Writer_Table::iterator last_key;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start (void);
-    void stop (void);
-
-    void reset_iterations ();
-    void start_new_assignment (
-        WRITER_ASSIGNMENT assignment);
-    void write_unkeyed ();
-    void write_many ();
-    void test_exception ();
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Writer_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp
deleted file mode 100644
index be1f4f951d4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp
+++ /dev/null
@@ -1,430 +0,0 @@
-<!--  -->
-<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>UnkeyedWriter_Depl_1</label>
-  <UUID>UnkeyedWriter_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_Writer_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Writer_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="Writer_ConnectorComponentImplementation">
-    <name>Writer_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Writer_Connector_ExecArtifact" />
-    <artifact xmi:idref="Writer_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_Writer_WriterTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Writer_WriterTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Writer_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Writer_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_Writer_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Writer_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" />
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <!-- should be equal to iterations in
-               Sender component -->
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <!-- should be equal to keys in
-               Sender component -->
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Writer_ConnectorComponentInstance">
-    <name>Writer_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Writer_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>UnkeyedWriter</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-    <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>UnkeyedWriter_Library#UnkeyedWriterProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Writer_ConnectorComponentInstance2">
-    <name>Writer_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Writer_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>UnkeyedWriter</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>UnkeyedWriter_Library#UnkeyedWriterProfile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>15</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>5</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>_listener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_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="Writer_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>_datacontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_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="Writer_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="Writer_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Writer_ConnectorComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </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="Writer_Connector_ExecArtifact">
-    <name>Writer_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_UnkeyedWriterConnector_exec</location>
-  </artifact>
-  <artifact xmi:id="Writer_Connector_SvntArtifact">
-    <name>Writer_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_UnkeyedWriterConnector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Writer_Connector_StubArtifact">
-    <name>Writer_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_UnkeyedWriterConnector_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/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 64605acaa45..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<!--
-
-Description
-XML QoS Profile
-
-The QoS configuration of the DDS entities in the generated example is
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the environment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="UnkeyedWriter_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="UnkeyedWriterProfile" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/UnkeyedWriter_Library.xml b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/UnkeyedWriter_Library.xml
deleted file mode 100644
index ef8ae685b98..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/UnkeyedWriter_Library.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--  -->
-
-<dds xmlns="http://www.omg.org/dds"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://www.omg.org/dds dds_qos.xsd">
-
-  <qos_profile name="UnkeyedWriterProfile">
-    <!-- QoS used to configure the data writer created in the example code -->
-    <datawriter_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-        <max_blocking_time>
-          <sec>10</sec>
-          <nanosec>0</nanosec>
-        </max_blocking_time>
-      </reliability>
-      <durability>
-        <kind>TRANSIENT_DURABILITY_QOS</kind>
-      </durability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-    </datawriter_qos>
-    <!-- QoS used to configure the data reader created in the example code -->
-    <datareader_qos>
-      <reliability>
-        <kind>RELIABLE_RELIABILITY_QOS</kind>
-      </reliability>
-      <history>
-        <kind>KEEP_ALL_HISTORY_QOS</kind>
-      </history>
-      <durability>
-        <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-      </durability>
-    </datareader_qos>
-  </qos_profile>
-</dds>
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl
deleted file mode 100755
index 0667f786cde..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 60 seconds to allow task to complete\n";
-sleep (70);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/.gitignore b/CIAO/connectors/dds4ccm/tests/Updater/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl
deleted file mode 100644
index e22773564d7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file Updater_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef UPDATER_BASE_IDL
-#define UPDATER_BASE_IDL
-
-#pragma ndds typesupport "Base/Updater_BaseSupport.h"
-#pragma opendds typesupport "Base/Updater_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "TestTopic"
-#pragma DCPS_DATA_KEY "TestTopic key"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopic> TestTopicSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc
deleted file mode 100644
index bc2dbfa7185..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (DDS_Updater_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = DDS_Updater_Base_stub
-  dynamicflags += UPDATER_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=UPDATER_BASE_STUB_Export \
-              -Wb,stub_export_include=Updater_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    Updater_Base.idl
-  }
-
-  opendds_ts_flags += --export=UPDATER_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Updater_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl
deleted file mode 100644
index 16452237af8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file Updater_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef UPDATER_CONNECTOR_IDL_
-#define UPDATER_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/Updater_Base.idl"
-
-#pragma ciao lem "Connector/Updater_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/Updater_BaseTypeSupport.idl"
-#endif
-
-module Updater
-{
-  module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> UpdaterConnector;
-};
-
-#endif /* UPDATER_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
deleted file mode 100644
index 825b96d2719..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Updater_Base -l .. -o ../lib -u DDS Updater_Connector"
-
-project(DDS_UPDATER_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_Updater_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=UPDATER_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Updater_Connector_stub_export.h \
-              -Wb,skel_export_macro=UPDATER_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Updater_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=UPDATER_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Updater_Connector_svnt_export.h \
-              -Wb,conn_export_macro=UPDATER_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Updater_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Updater_Connector.idl
-  }
-}
-
-project(DDS_UPDATER_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_UPDATER_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=UPDATER_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Updater_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    Updater_ConnectorE.idl
-  }
-}
-
-project(DDS_UPDATER_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_UPDATER_Connector_lem_gen DDS_Updater_Connector_stub DDS_Updater_Base_stub
-  libs  += DDS_Updater_Base_stub DDS_Updater_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_UPDATER_Connector_lem_stub
-  dynamicflags += UPDATER_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Updater_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Updater_ConnectorEC.h
-    Updater_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Updater_ConnectorEC.inl
-  }
-}
-
-project(DDS_Updater_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_UPDATER_Connector_idl_gen DDS_Updater_Base_stub
-  libs  += DDS_Updater_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Updater_Connector_stub
-  dynamicflags += UPDATER_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Updater_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Updater_ConnectorC.h
-    Updater_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Updater_ConnectorC.inl
-  }
-}
-
-project(DDS_Updater_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_UPDATER_Connector_lem_stub DDS_Updater_Connector_stub DDS_Updater_Base_stub
-  sharedname = DDS_Updater_Connector_exec
-  libs += DDS_Updater_Connector_stub DDS_UPDATER_Connector_lem_stub DDS_Updater_Base_stub DDS_Updater_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += UPDATER_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Updater_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Updater_Connector_conn.h
-    Updater_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Updater_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_UPDATER_Connector_lem_stub DDS_Updater_Connector_exec DDS_Updater_Connector_stub
-  sharedname  = DDS_Updater_Connector_svnt
-  libs       += DDS_Updater_Connector_stub \
-                DDS_UPDATER_Connector_lem_stub  \
-                DDS_Updater_Base_stub \
-                DDS_Updater_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += UPDATER_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Updater_ConnectorS.cpp
-    Updater_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Updater_ConnectorS.h
-    Updater_Connector_svnt.h
-    Updater_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl
deleted file mode 100644
index 36538eada05..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Updater_Connector.idl"
-
-module Updater
-{
-  component Receiver
-  {
-    port UpdaterConnector::DDS_Listen info_out;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc
deleted file mode 100644
index ee8c5815437..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc
+++ /dev/null
@@ -1,136 +0,0 @@
-project(DDS_Updater_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_UPDATER_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 {
-    Updater_Receiver.idl
-  }
-}
-
-project(DDS_Updater_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Updater_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 {
-    Updater_ReceiverE.idl
-  }
-}
-
-project(DDS_UPDATER_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Updater_Receiver_lem_gen DDS_Updater_Receiver_stub  DDS_Updater_Connector_stub DDS_Updater_Base_stub
-  libs  +=  Receiver_stub DDS_Updater_Connector_stub DDS_Updater_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Updater_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Updater_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Updater_ReceiverEC.inl
-  }
-}
-
-project(DDS_Updater_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Updater_Receiver_idl_gen  DDS_Updater_Connector_stub DDS_Updater_Base_stub DDS_UPDATER_Connector_lem_gen
-  libs  += DDS_Updater_Connector_stub DDS_Updater_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Updater_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Updater_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Updater_ReceiverC.inl
-  }
-}
-
-project(DDS_Updater_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_UPDATER_Receiver_lem_stub DDS_Updater_Receiver_stub DDS_Updater_Base_stub DDS_Updater_Connector_stub DDS_UPDATER_Connector_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_Updater_Base_stub DDS_Updater_Connector_stub DDS_UPDATER_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Updater_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Updater_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Updater_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   DDS_UPDATER_Receiver_lem_stub DDS_Updater_Base_stub DDS_Updater_Connector_stub DDS_Updater_Connector_svnt DDS_Updater_Receiver_exec DDS_UPDATER_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_Updater_Base_stub DDS_Updater_Connector_stub DDS_Updater_Connector_svnt Receiver_exec DDS_UPDATER_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Updater_ReceiverS.cpp
-    Updater_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Updater_ReceiverS.h
-    Updater_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp
deleted file mode 100644
index 4ccbc02a680..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp
+++ /dev/null
@@ -1,278 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Updater_Receiver_exec.h"
-
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_Updater_Receiver_Impl
-{
-
-  /**
-   * Facet Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  info_out_data_listener_exec_i::info_out_data_listener_exec_i (
-        ::Updater::CCM_Receiver_Context_ptr ctx,
-        ACE_Thread_ID &thread_id)
-    : ciao_context_ (
-        ::Updater::CCM_Receiver_Context::_duplicate (ctx))
-      , thread_id_ (thread_id)
-  {
-  }
-
-  info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::Updater::UpdaterConnector::Listener
-
-  void
-  info_out_data_listener_exec_i::on_one_data (const ::TestTopic & datum,
-  const ::CCM_DDS::ReadInfo & info)
-  {
-    ACE_Thread_ID t_id;
-    this->thread_id_ = t_id;
-
-    ACE_DEBUG ((LM_DEBUG, "ListenOneByOneTest_Listener_exec_i::on_one_data: "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.x));
-    if (::DDS::HANDLE_NIL == info.instance_handle)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ListenOneByOneTest_Listener_exec_i::on_one_data: "
-                            "instance handle seems to be invalid "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.x));
-      }
-    if (info.source_timestamp.sec == 0 &&
-        info.source_timestamp.nanosec == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ListenOneByOneTest_Listener_exec_i::on_one_data: "
-                            "source timestamp seems to be invalid (nil) "
-                            "key <%C> - iteration <%d>\n",
-                            datum.key.in (),
-                            datum.x));
-      }
-  }
-
-  void
-  info_out_data_listener_exec_i::on_many_data (const ::TestTopicSeq & /* data */,
-  const ::CCM_DDS::ReadInfoSeq & /* infos */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Facet Executor Implementation Class: info_out_status_exec_i
-   */
-
-  info_out_status_exec_i::info_out_status_exec_i (
-        ::Updater::CCM_Receiver_Context_ptr ctx)
-    : ciao_context_ (
-        ::Updater::CCM_Receiver_Context::_duplicate (ctx))
-  {
-  }
-
-  info_out_status_exec_i::~info_out_status_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::RequestedDeadlineMissedStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  void
-  info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */,
-  const ::DDS::SampleLostStatus & /* status */)
-  {
-    /* Your code here. */
-  }
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : thread_id_listener_ (0, 0)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
-
-  ::Updater::UpdaterConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ()))
-      {
-        info_out_data_listener_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_data_listener_exec_i (
-            this->ciao_context_.in (),
-            this->thread_id_listener_),
-          ::Updater::UpdaterConnector::CCM_Listener::_nil ());
-
-          this->ciao_info_out_data_listener_ = tmp;
-      }
-
-    return
-      ::Updater::UpdaterConnector::CCM_Listener::_duplicate (
-        this->ciao_info_out_data_listener_.in ());
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ()))
-      {
-        info_out_status_exec_i *tmp = 0;
-        ACE_NEW_RETURN (
-          tmp,
-          info_out_status_exec_i (
-            this->ciao_context_.in ()),
-            ::CCM_DDS::CCM_PortStatusListener::_nil ());
-
-          this->ciao_info_out_status_ = tmp;
-      }
-
-    return
-      ::CCM_DDS::CCM_PortStatusListener::_duplicate (
-        this->ciao_info_out_status_.in ());
-  }
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Updater::CCM_Receiver_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-    ::CCM_DDS::DataListenerControl_var dlc =
-        this->ciao_context_->get_connection_info_out_data_control ();
-    dlc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    char ccm_buf [65];
-    ACE_Thread_ID ccm_thread_id;
-    ccm_thread_id.to_string (ccm_buf);
-
-    char list_buf [65];
-    this->thread_id_listener_.to_string(list_buf);
-    if (this->thread_id_listener_.id() == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for ReaderListener not set!\n"));
-      }
-#if (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (this->thread_id_listener_ == ccm_thread_id)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ONE_BY_ONE: "
-                              "Thread switch for ReaderListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ONE_BY_ONE: "
-                              "Thread switch for ReaderListener "
-                              "doesn't seem to work! "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-  #else
-      else if (this->thread_id_listener_ == ccm_thread_id)
-        {
-        ACE_ERROR ((LM_ERROR, "ERROR: ONE_BY_ONE: ReaderListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-     }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "ONE_BY_ONE: ReaderListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%C> - component <%C>\n",
-                              list_buf,
-                              ccm_buf));
-      }
-    #endif
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Updater_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/Updater/Receiver/Updater_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h
deleted file mode 100644
index a96430fb0ed..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h
+++ /dev/null
@@ -1,173 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_UPDATER_RECEIVER_EXEC_P7EWIN_H_
-#define CIAO_UPDATER_RECEIVER_EXEC_P7EWIN_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Updater_ReceiverEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Receiver_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_Updater_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Receiver_exec_i;
-
-  /**
-   * Provider Executor Implementation Class: info_out_data_listener_exec_i
-   */
-
-  class info_out_data_listener_exec_i
-    : public virtual ::Updater::UpdaterConnector::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_data_listener_exec_i (
-      ::Updater::CCM_Receiver_Context_ptr ctx,
-      ACE_Thread_ID &);
-    virtual ~info_out_data_listener_exec_i (void);
-
-    //@{
-    /** Operations and attributes from Updater::UpdaterConnector::Listener. */
-
-    virtual
-    void on_one_data (const ::TestTopic & datum,
-    const ::CCM_DDS::ReadInfo & info);
-
-    virtual
-    void on_many_data (const ::TestTopicSeq & data,
-    const ::CCM_DDS::ReadInfoSeq & infos);
-    //@}
-
-  private:
-    ::Updater::CCM_Receiver_Context_var ciao_context_;
-    ACE_Thread_ID &thread_id_;
-  };
-
-  /**
-   * Provider Executor Implementation Class: info_out_status_exec_i
-   */
-
-  class info_out_status_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    info_out_status_exec_i (
-      ::Updater::CCM_Receiver_Context_ptr ctx);
-    virtual ~info_out_status_exec_i (void);
-
-    //@{
-    /** Operations and attributes from CCM_DDS::PortStatusListener. */
-
-    virtual
-    void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual
-    void on_sample_lost (::DDS::DataReader_ptr the_reader,
-    const ::DDS::SampleLostStatus & status);
-    //@}
-
-  private:
-    ::Updater::CCM_Receiver_Context_var ciao_context_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Receiver_exec_i
-   */
-
-  class 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 and port operations. */
-
-    virtual ::Updater::UpdaterConnector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-
-    //@}
-
-  private:
-    ::Updater::CCM_Receiver_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    ::Updater::UpdaterConnector::CCM_Listener_var ciao_info_out_data_listener_;
-    ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
-    //@}
-
-    //@{
-    /** User defined members. */
-    ACE_Thread_ID thread_id_listener_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    //@}
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Updater_Receiver_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl
deleted file mode 100644
index 8ae5f432194..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_UPDATER_SENDER_IDL
-#define DDS_UPDATER_SENDER_IDL
-
-#include "Connector/Updater_Connector.idl"
-
-module Updater
-{
-  component Sender
-  {
-    port UpdaterConnector::DDS_Update test_topic_update;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc
deleted file mode 100644
index 83da223de82..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_Updater_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_Updater_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_UPDATER_Connector_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 {
-    Updater_Sender.idl
-  }
-}
-
-project(DDS_Updater_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Updater_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 {
-    Updater_SenderE.idl
-  }
-}
-
-project(DDS_Updater_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Updater_Sender_lem_gen DDS_Updater_Sender_stub DDS_Updater_Base_stub
-  libs  += DDS_Updater_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Updater_SenderEC.cpp
-  }
-
-  Header_Files {
-    Updater_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Updater_SenderEC.inl
-  }
-}
-
-project(DDS_Updater_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Updater_Sender_idl_gen DDS_Updater_Base_stub DDS_Updater_Connector_stub
-  libs  += DDS_Updater_Base_stub DDS_Updater_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Updater_SenderC.cpp
-  }
-
-  Header_Files {
-    Updater_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Updater_SenderC.inl
-  }
-}
-
-project(DDS_Updater_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_Updater_Sender_lem_stub DDS_Updater_Sender_stub DDS_UPDATER_Connector_lem_stub DDS_Updater_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_Updater_Base_stub DDS_UPDATER_Connector_lem_stub  DDS_Updater_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Updater_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Updater_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Updater_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_Updater_Base_stub  DDS_Updater_Sender_lem_stub DDS_Updater_Connector_stub DDS_Updater_Connector_svnt DDS_UPDATER_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_Updater_Base_stub DDS_Updater_Connector_stub  DDS_Updater_Connector_svnt DDS_UPDATER_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Updater_SenderS.cpp
-    Updater_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Updater_SenderS.h
-    Updater_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp
deleted file mode 100644
index c127816dfdd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp
+++ /dev/null
@@ -1,773 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "Updater_Sender_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-#include "dds4ccm/impl/dds4ccm_conf.h"
-
-namespace CIAO_Updater_Sender_Impl
-{
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  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 /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    if (status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status - "
-          "Publication matched received: starting the test\n"));
-
-        this->callback_.get_started ();
-      }
-  }
-
-  /**
-   * Write action 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;
-  }
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  Sender_exec_i::Sender_exec_i (void)
-    : test_nr_(UPDATE_CREATE),
-      test_ok_(true)
-  {
-    ACE_NEW_THROW_EX (this->ticker_,
-                      pulse_Generator (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-    delete this->ticker_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  Sender_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i  (*this);
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::create_one (
-    ::Updater::UpdaterConnector::Updater_ptr updater)
-  {
-    TestTopic i = this->topic_seq_one_[0];
-    try
-      {
-        if (! ::CORBA::is_nil (updater) )
-          {
-            updater->create_one(i);
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: create_one with instance key <%C>\n"),
-                         i.key.in ()));
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: updater_ is nil")));
-            return false;
-          }
-      }
-    catch(const CCM_DDS::AlreadyCreated &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: AlreadyCreated with test updater create_one <%C>.\n"),
-                        i.key.in ()));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while create_one for <%C>.\n"),
-                        i.key.in ()));
-        return false;;
-      }
-    return true;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::create_one_already_exist (
-    ::Updater::UpdaterConnector::Updater_ptr updater)
-  {
-    TestTopic i = this->topic_seq_one_[0];
-    //try to create same instance again, this should erase an AlreadyCreated exception
-    try
-      {
-        updater->create_one (i);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: create_one with already existing instance key <%Cs>\n"),
-                      i.key.in ()));
-      }
-    catch(const CCM_DDS::AlreadyCreated &)
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Expected : Exception AlreadyCreated test updater create_one.\n")));
-        return true;
-      }
-    catch (const CCM_DDS::InternalError &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while create_one for <%C>.\n"),
-                        i.key.in ()));
-      }
-    return false;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::update_one (
-    ::Updater::UpdaterConnector::Updater_ptr updater)
-  {
-    //update already created instance with handle nil
-    TestTopic i = this->topic_seq_one_[0];
-    try
-      {
-        updater->update_one(i, DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: update_one with already existing instance with DDS::HANDLE_NIL, key <%C>\n"),
-                      i.key.in ()));
-      }
-    catch(const CCM_DDS::NonExistent &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater update_one <%C>.\n"),
-                       i.key.in ()));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while update_one for <%C>.\n"),
-                        i.key.in ()));
-        return false;
-      }
-    return true;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::update_one_not_registered (
-    ::Updater::UpdaterConnector::Updater_ptr updater)
-  {
-    //update a not yet registered instance, expect a NonExistent exception
-     //use second instance of table
-    TestTopic i = this->topic_seq_one_[1];
-    try
-      {
-        updater->update_one(i, DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: update_one with unregistered instance, key <%C>\n"),
-                      i.key.in ()));
-      }
-    catch (const CCM_DDS::NonExistent &)
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Expected : Exception NonExistent test updater updater_one.\n")));
-        return true;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while update_one for <%C>.\n"),
-                        i.key.in ()));
-      }
-    return false;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::delete_one (
-    ::Updater::UpdaterConnector::Updater_ptr updater)
-  {
-    //delete registered instance with DDS::HANDLE_NIL
-    TestTopic i = this->topic_seq_one_[0];
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: delete_one with registered instance with DDS::HANDLE_NIL, key <%C>\n"),
-                      i.key.in ()));
-        updater->delete_one(i, DDS::HANDLE_NIL);
-      }
-    catch(const CCM_DDS::NonExistent &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater delete_one <%C>.\n"),
-                       i.key.in ()));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while delete_one for <%C>.\n"),
-                        i.key.in ()));
-        return false;
-      }
-    return true;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::delete_one_not_registered (
-    ::Updater::UpdaterConnector::Updater_ptr updater)
-  {
-    //delete non-existing instance, expect NonExistent exception
-    TestTopic i = this->topic_seq_one_[1];
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: delete_one with not registered instance, key <%C>\n"),
-                     i.key.in ()));
-        updater->delete_one(i, DDS::HANDLE_NIL);
-      }
-    catch(const CCM_DDS::NonExistent &)
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Expected : Exception NonExistent test updater delete_one.\n")));
-        return true;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while delete_one for <%C>.\n"),
-                       i.key.in ()));
-      }
-    return false;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::update_and_delete_one_after_register (
-    ::Updater::UpdaterConnector::Updater_ptr updater)
-  {
-    // Update an instance after registering first, using a handle
-    TestTopic i = this->topic_seq_one_[2];
-    // Take third instance of table
-    DDS::InstanceHandle_t const hnd = updater->register_instance(i);
-    try
-      {
-        if (hnd != ::DDS::HANDLE_NIL)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: update a new instance after registering instance, key <%C>\n"),
-                        i.key.in ()));
-            updater->update_one(i, hnd);
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error, invalid handle for <%C>.\n"),
-                          i.key.in ()));
-            return false;
-          }
-      }
-    catch(const CCM_DDS::NonExistent &)
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater update_one using handle <%C>.\n"),
-                       i.key.in ()));
-         return false;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while update_one for <%C>.\n"),
-                        i.key.in ()));
-        return false;
-      }
-    //update an instance with an instance_handler belonging to an other instance
-    try
-      {
-        TestTopic y = this->topic_seq_one_[0];
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: update an instance with an instance_handler belonging to an other instance\n")));
-        updater->update_one(y, hnd);
-      }
-    catch(const CCM_DDS::NonExistent &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater update_one with incompatible datum and handle.\n")));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& ex )
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Expected : Exception InternalE. test updater update_one with incompatible datum and handle. ex %d\n"),ex.error_code));
-        return true;
-      }
-
-    try
-      {
-         i = this->topic_seq_one_[2];
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: delete a instance with handle, key <%C>\n"),
-                    i.key.in ()));
-         updater->delete_one(i, hnd);
-      }
-    catch (const CCM_DDS::NonExistent &)
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater delett_one with valid handler.\n")));
-         return false;
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while delete_one for <%C>.\n"),
-                      i.key.in ()));
-        return false;
-      }
-    return true;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::create_many (
-    ::Updater::UpdaterConnector::Updater_ptr updater)
-  {
-    //create many with no exception
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("create_many : <%u> samples\n"),
-                         this->topic_seq_many_.length ()));
-        updater->create_many (this->topic_seq_many_);
-      }
-    catch(const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater create_many\n")));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                     ACE_TEXT ("in updater: create_many: index <%d> - retval <%d>\n"),
-                     ex.index, ex.error_code));
-        return false;
-    }
-    //test create_many  with AlreadyCreated exception
-
-    try
-      {
-         updater->create_many (this->topic_seq_many_);
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("create_many which are already created : <%u> samples\n"),
-                       this->topic_seq_many_.length ()));
-
-      }
-    catch (const CCM_DDS::NonExistent & )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unexpected Error ")
-                     ACE_TEXT ("in create_many , already created.\n")));
-         return false;
-      }
-    catch (const CCM_DDS::AlreadyCreated & )
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Expected : Exception AlreadyCreated test updater create_many.\n")));
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                     ACE_TEXT ("in test create_many,already created: index <%d> - retval <%d>\n"),
-                     ex.index, ex.error_code));
-        return false;
-      }
-    return true;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::update_many (
-    ::Updater::UpdaterConnector::Updater_ptr updater)
-  {
-    try
-      {
-        updater->update_many (this->topic_seq_many_);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("update_many : written <%u> samples\n"),
-                   this->topic_seq_many_.length ()));
-      }
-    catch(const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater update_many.\n")));
-        return false;
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                     ACE_TEXT ("with update_many: index <%d> - retval <%d>\n"),
-                     ex.index, ex.error_code));
-        return false;
-      }
-    //update with exception
-    // make from the second and third instances a unregistered instance , see above
-    char key[7];
-    TestTopic test_key;
-    ACE_OS::sprintf (key, "XXX_%d",2);
-    test_key.key = CORBA::string_dup(key);
-    test_key.x = 2;
-    this->topic_seq_many_[1] = test_key;
-    ACE_OS::sprintf (key, "YYY_%d",3);
-    test_key.key = CORBA::string_dup(key);
-    test_key.x = 3;
-    this->topic_seq_many_[2] = test_key;
-    try
-      {
-        updater->update_many (this->topic_seq_many_);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("create_many : <%u> samples\n"),
-                     this->topic_seq_many_.length ()));
-      }
-    catch (const CCM_DDS::NonExistent & ex)
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Expected : Exception NonExistent test updater update_many.\n"),
-                              ACE_TEXT ("index length expected = 2 and  value = %d, expected index[0] = 1 and value = %d.\n"),
-                              ex.indexes.length(),ex.indexes[0]));
-
-        if (ex.indexes.length() != 2 || ex.indexes[0] != 1 || ex.indexes[1] != 2)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("create_many:expected exception: NonExistent gives wrong indexes.\n")));
-            return false;
-          }
-        else
-          {
-            return true;
-          }
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                    ACE_TEXT ("test update_many with not registered instances\n")));
-      }
-    catch (const CCM_DDS::AlreadyCreated & )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: AlreadyCreated with test update_many with not registered instances.\n")));
-      }
-    return false;
-  }
-
-  CORBA::Boolean
-  Sender_exec_i::delete_many (
-    ::Updater::UpdaterConnector::Updater_ptr updater)
-  {
-    // delete_many with exception
-    // make from the second and third instances a unregistered instance
-    try
-      {
-        updater->delete_many (this->topic_seq_many_);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("create_many : <%u> samples\n"),
-                       this->topic_seq_many_.length ()));
-      }
-    catch (const CCM_DDS::NonExistent & ex)
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Expected : Exception NonExistent test updater delete_many.\n"),
-                               ACE_TEXT ("index length expected = 2 and  value = %d, expected index[0] = 1 and value = %d.\n"),
-                               ex.indexes.length(),ex.indexes[0]));
-
-        if (ex.indexes.length() != 2 || ex.indexes[0] != 1 || ex.indexes[1] != 2)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("delete_many:expected exception: NonExistent gives wrong indices.\n")));
-            return false;
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                    ACE_TEXT ("test updater delete_many with inregistered instances, info: index <%d> - retval <%d>\n"),
-                    ex.index, ex.error_code));
-        return false;
-      }
-    catch (const CCM_DDS::AlreadyCreated &)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: AlreadyCreated  with test updater delete_many.\n")));
-        return false;
-      }
-
-    // Delete many with no exception
-    // reset instances to original values
-    for (int i = 1; i < 4; i++)
-      {
-        char key[7];
-        TestTopic new_key;
-        ACE_OS::sprintf (key, "many_%d", i);
-        new_key.key = CORBA::string_dup(key);
-        new_key.x = i;
-        this->topic_seq_many_[i-1] = new_key;
-      }
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_many : deleted <%u> samples\n"),
-                                          this->topic_seq_many_.length ()));
-
-        updater->delete_many (this->topic_seq_many_);
-        return true;
-      }
-    catch(const CCM_DDS::NonExistent& )
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent with test updater delete_many\n")));
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                  ACE_TEXT ("with test updater delete_many: index <%d> - retval <%d>\n"),
-                  ex.index, ex.error_code));
-      }
-    return false;
-  }
-
-  void
-  Sender_exec_i::add_instances_of_topic (void)
-  {
-    //make 2 sequences of instances as testdata
-    CORBA::UShort total = 3;
-    this->topic_seq_one_.length (total);
-    //sequence for tests with .._one
-    for (int i = 1; i < (total + 1); i++)
-      {
-        char key[7];
-        TestTopic new_key;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key.key = CORBA::string_dup(key);
-        new_key.x = i;
-        this->topic_seq_one_[i-1] = new_key;
-      }
-    //sequence for tests with .._many
-    this->topic_seq_many_.length (total);
-    for (int i = 1; i < (total + 1); i++)
-      {
-        char key[7];
-        TestTopic new_key;
-        ACE_OS::sprintf (key, "many_%d", i);
-        new_key.key = CORBA::string_dup(key);
-        new_key.x = i;
-        this->topic_seq_many_[i-1] = new_key;
-      }
-  }
-
-  void
-  Sender_exec_i::tick (void)
-  {
-    if  (this->test_ok_.value())
-      {
-        ::Updater::UpdaterConnector::Updater_var updater =
-          this->ciao_context_->get_connection_test_topic_update_data ();
-        if (!::CORBA::is_nil (updater.in ()))
-          {
-            switch (this->test_nr_)
-              {
-                case UPDATE_CREATE:
-                  this->test_ok_ = this->create_one (updater.in ());
-                  if(this->test_ok_.value())
-                    {
-                      this->test_nr_ = UPDATE_CREATE_ALREADY_EXIST;
-                    }
-                  else
-                    {
-                      this->test_nr_ = END_TEST;
-                    }
-                  break;
-                case UPDATE_CREATE_ALREADY_EXIST:
-                  this->test_ok_ = this->create_one_already_exist (updater.in ());
-                  this->test_nr_ = UPDATE_ONE;
-                  break;
-                case UPDATE_ONE:
-                  this->test_ok_ = this->update_one (updater.in ());
-                  this->test_nr_ = UPDATE_ONE_NOT_REGISTERED;
-                  break;
-                case UPDATE_ONE_NOT_REGISTERED:
-                  this->test_ok_ = this->update_one_not_registered (updater.in ());
-                  this->test_nr_ = DELETE_ONE;
-                  break;
-                case DELETE_ONE:
-                  this->test_ok_ = this->delete_one (updater.in ());
-                  this->test_nr_ = DELETE_ONE_NOT_REGISTERED;
-                  break;
-                case DELETE_ONE_NOT_REGISTERED:
-                  this->test_ok_ = this->delete_one_not_registered (updater.in ());
-                  this->test_nr_ = UPDATE_DELETE_REGISTER;
-                  break;
-                case UPDATE_DELETE_REGISTER:
-                  this->test_ok_ = this->update_and_delete_one_after_register (updater.in ());
-                  this->test_nr_ = CREATE_MANY;
-                  break;
-                case CREATE_MANY:
-                  this->test_ok_ = this->create_many (updater.in ());
-                  if(this->test_ok_.value())
-                    {
-                      this->test_nr_ = UPDATE_MANY;
-                    }
-                  else
-                    {
-                      this->test_nr_ = END_TEST;
-                    }
-                  this->test_nr_ = UPDATE_MANY;
-                  break;
-                case UPDATE_MANY:
-                  this->test_ok_ = this->update_many (updater.in ());
-                  this->test_nr_ = DELETE_MANY;
-                  break;
-                case DELETE_MANY:
-                  this->test_ok_ = this->delete_many (updater.in ());
-                  this->test_nr_ = END_TEST;
-                  break;
-                default:
-                  break;
-              }
-          }
-        else
-          {
-            ACE_ERROR ((LM_ERROR, "Sender_exec_i::tick - "
-                      "ERROR: Updater seems nil.\n"));
-            this->test_ok_ = false;
-          }
-      }
-  }
-
-  void
-  Sender_exec_i::get_started (void)
-  {
-    this->add_instances_of_topic ();
-    this->start ();
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    if (this->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (3, 0),
-                ACE_Time_Value (3, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                               ACE_TEXT ("Error scheduling timer")));
-      }
-  }
-
-  void
-  Sender_exec_i::stop (void)
-  {
-    this->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-  }
-
-  // Component attributes and port operations.
-
-  // Operations from Components::SessionComponent.
-
-  void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::Updater::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    this->stop ();
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    if (!this->test_ok_.value())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Error in Updater in Sender")));
-      }
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Updater_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/Updater/Sender/Updater_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h
deleted file mode 100644
index 63fe557151d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h
+++ /dev/null
@@ -1,201 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_UPDATER_SENDER_EXEC_QTARYT_H_
-#define CIAO_UPDATER_SENDER_EXEC_QTARYT_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Updater_SenderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Sender_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_Updater_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Sender_exec_i;
-
-  enum UPDATER_TEST {
-    UPDATE_CREATE,
-    UPDATE_CREATE_ALREADY_EXIST,
-    UPDATE_ONE,
-    UPDATE_ONE_NOT_REGISTERED,
-    DELETE_ONE,
-    DELETE_ONE_NOT_REGISTERED,
-    UPDATE_DELETE_REGISTER,
-    CREATE_MANY,
-    UPDATE_MANY,
-    DELETE_MANY,
-    END_TEST
-  };
-
-  /**
-   * ConnectorStatusListener_exec_i
-   */
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Sender_exec_i &callback);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-  /**
-   * Pulse generator
-   */
-
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: Sender_exec_i
-   */
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void tick (void);
-    void get_started (void);
-    //@}
-
-  private:
-    ::Updater::CCM_Sender_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    //@}
-
-    //@{
-    /** User defined members. */
-    pulse_Generator * ticker_;
-
-    UPDATER_TEST test_nr_;
-    Atomic_Boolean test_ok_;
-    TestTopicSeq topic_seq_one_;
-    TestTopicSeq topic_seq_many_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-    void start (void);
-    void stop (void);
-    void add_instances_of_topic (void);
-
-    CORBA::Boolean create_one (
-      ::Updater::UpdaterConnector::Updater_ptr updater);
-    CORBA::Boolean create_one_already_exist (
-      ::Updater::UpdaterConnector::Updater_ptr updater);
-    CORBA::Boolean update_one (
-      ::Updater::UpdaterConnector::Updater_ptr updater);
-    CORBA::Boolean update_one_not_registered (
-      ::Updater::UpdaterConnector::Updater_ptr updater);
-    CORBA::Boolean delete_one (
-      ::Updater::UpdaterConnector::Updater_ptr updater);
-    CORBA::Boolean delete_one_not_registered (
-      ::Updater::UpdaterConnector::Updater_ptr updater);
-    CORBA::Boolean update_and_delete_one_after_register (
-      ::Updater::UpdaterConnector::Updater_ptr updater);
-    CORBA::Boolean create_many (
-      ::Updater::UpdaterConnector::Updater_ptr updater);
-    CORBA::Boolean update_many (
-      ::Updater::UpdaterConnector::Updater_ptr updater);
-    CORBA::Boolean delete_many (
-      ::Updater::UpdaterConnector::Updater_ptr updater);
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Updater_Sender_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp
deleted file mode 100644
index 8a2f5e8114c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp
+++ /dev/null
@@ -1,390 +0,0 @@
-<!--  -->
-<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>Updater_Depl_1</label>
-  <UUID>Updater_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_Updater_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Updater_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="Updater_ConnectorComponentImplementation">
-    <name>Updater_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Updater_Connector_ExecArtifact" />
-    <artifact xmi:idref="Updater_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_Updater_UpdaterConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Updater_UpdaterConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Updater_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Updater_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_Updater_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Updater_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="Updater_ConnectorComponentInstance">
-    <name>Updater_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Updater_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Updater_ConnectorComponentInstance2">
-    <name>Updater_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Updater_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>_listenercontrol</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Updater_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_statelistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Updater_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>_portstatuslistener</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Updater_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_state_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Updater_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>updater_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>test_topic_update_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Updater_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Updater_ConnectorComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </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="Updater_Connector_ExecArtifact">
-    <name>Updater_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Updater_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Updater_Connector_SvntArtifact">
-    <name>Updater_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Updater_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Updater_Connector_StubArtifact">
-    <name>Updater_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Updater_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/Updater/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl
deleted file mode 100755
index b87434bef7e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 60 seconds to allow task to complete\n";
-sleep (60);
-
-# 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 -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/.gitignore b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/.gitignore
deleted file mode 100644
index 5b70c1e48f4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/UCC_Test_Base.cxx
-/UCC_Test_Base.h
-/UCC_Test_BasePlugin.cxx
-/UCC_Test_BasePlugin.h
-/UCC_Test_BaseSupport.cxx
-/UCC_Test_BaseSupport.h
-/UCC_Test_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl
deleted file mode 100644
index 1d489688614..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * @file UCC_Test_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef USERDATA_COPY_COUNT_TEST_BASE_IDL
-#define USERDATA_COPY_COUNT_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/UCC_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/UCC_Test_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "UCCVariableSizedStructTest"
-#pragma DCPS_DATA_KEY "UCCVariableSizedStructTest symbol"
-
-struct UCCVariableSizedStructTest {
-  string symbol; //@key
-  long x;
-  long y;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<UCCVariableSizedStructTest> UCCVariableSizedStructTestSeq;
-#endif
-
-#pragma DCPS_DATA_TYPE "UCCFixedSizedStructTest"
-
-struct UCCFixedSizedStructTest {
-  long x;
-  long y;
-  long z;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<UCCFixedSizedStructTest> UCCFixedSizedStructTestSeq;
-#endif
-
-#endif /* USERDATA_COPY_COUNT_TEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.mpc
deleted file mode 100644
index af35527d256..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (UCC_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = UCC_Test_Base_stub
-  dynamicflags += USERDATA_COPY_COUNT_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=USERDATA_COPY_COUNT_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=UCC_Test_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    UCC_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=USERDATA_COPY_COUNT_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    UCC_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/.gitignore b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/.gitignore
deleted file mode 100644
index 24bc50d2249..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Component_exec_export.h
-/Component_lem_stub_export.h
-/Component_stub_export.h
-/Component_svnt_export.h
-/UCC_Test_ComponentE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.idl
deleted file mode 100644
index 3ec41b3c515..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef COMPONENT_IDL
-#define COMPONENT_IDL
-
-#include "Connector/UCC_Test_Connector.idl"
-
-module UCC_Test
-{
-  component UCCTestComponent
-  {
-    port UCCVariableSizedStruct_Test::UCCVariableSizedStructTestConnector::DDS_Write var_size_write;
-    port UCCFixedSizeStruct_Test::UCCFixedSizedStructTestConnector::DDS_Write fixed_size_write;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc
deleted file mode 100644
index 5577d943f76..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc
+++ /dev/null
@@ -1,146 +0,0 @@
-project(UCC_Test_Component_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += UCC_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Component_stub_export.h \
-              -Wb,skel_export_macro=COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Component_svnt_export.h \
-              -Wb,svnt_export_macro=COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Component_svnt_export.h \
-              -Wb,exec_export_macro=COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Component_exec_export.h \
-              -I..
-
-  IDL_Files {
-    UCC_Test_Component.idl
-  }
-}
-
-project(UCC_Test_Component_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += UCC_Test_Component_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
-              -Wb,stub_export_include=Component_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    UCC_Test_ComponentE.idl
-  }
-}
-
-project(UCC_Test_Component_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += UCC_Test_Component_lem_gen UCC_Test_Component_stub  \
-           UCC_Test_Connector_stub UCC_Test_Base_stub
-  libs  +=  Component_stub UCC_Test_Connector_stub \
-            UCC_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_lem_stub
-  dynamicflags += COMPONENT_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UCC_Test_ComponentEC.cpp
-  }
-
-  Header_Files {
-    UCC_Test_ComponentEC.h
-    Component_lem_stub_export.h
-  }
-
-  Inline_Files {
-    UCC_Test_ComponentEC.inl
-  }
-}
-
-project(UCC_Test_Component_stub) : ccm_stub, dds4ccm_base {
-  after += UCC_Test_Component_idl_gen  UCC_Test_Connector_stub \
-           UCC_Test_Base_stub UCC_Test_Connector_lem_gen
-  libs  += UCC_Test_Connector_stub UCC_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Component_stub
-  dynamicflags += COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UCC_Test_ComponentC.cpp
-  }
-
-  Header_Files {
-    UCC_Test_ComponentC.h
-    Component_stub_export.h
-  }
-
-  Inline_Files {
-    UCC_Test_ComponentC.inl
-  }
-}
-
-project(UCC_Test_Component_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += UCC_Test_Component_lem_stub UCC_Test_Component_stub \
-             UCC_Test_Base_stub UCC_Test_Connector_stub \
-             UCC_Test_Connector_lem_stub
-  sharedname = Component_exec
-  libs += Component_stub Component_lem_stub UCC_Test_Base_stub \
-          UCC_Test_Connector_stub UCC_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UCC_Test_Component_exec.cpp
-  }
-
-  Header_Files {
-    UCC_Test_Component_exec.h
-    Component_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(UCC_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   UCC_Test_Component_lem_stub UCC_Test_Base_stub \
-                  UCC_Test_Connector_stub UCC_Test_Connector_svnt \
-                  UCC_Test_Component_exec UCC_Test_Connector_lem_stub
-  sharedname  = Component_svnt
-  libs       += Component_stub Component_lem_stub UCC_Test_Base_stub \
-                UCC_Test_Connector_stub UCC_Test_Connector_svnt \
-                Component_exec UCC_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UCC_Test_ComponentS.cpp
-    UCC_Test_Component_svnt.cpp
-  }
-
-  Header_Files {
-    UCC_Test_ComponentS.h
-    UCC_Test_Component_svnt.h
-    Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp
deleted file mode 100644
index 8b2d5ea2849..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.cpp
+++ /dev/null
@@ -1,322 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-
-#include "UCC_Test_Component_exec.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-#define NR_OF_KEYS 10
-
-namespace CIAO_UCC_Test_UCCTestComponent_Impl
-{
-  size_t UCCVariableSizedStructTest_i::count_ = 0;
-  size_t UCCVariableSizedStructTest_i::max_count_ = 0;
-  size_t UCCFixedSizedStructTest_i::count_ = 0;
-  size_t UCCFixedSizedStructTest_i::max_count_ = 0;
-
-  /**
-   * WriteVariableHandler
-   */
-
-  WriteVariableHandler::WriteVariableHandler (UCCTestComponent_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteVariableHandler::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->callback_.write_variable ();
-    return 0;
-  }
-
-  /**
-   * WriteFixedHandler
-   */
-
-  WriteFixedHandler::WriteFixedHandler (UCCTestComponent_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteFixedHandler::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    this->callback_.write_fixed ();
-    return 0;
-  }
-
-  /**
-   * Component Executor Implementation Class: UCCTestComponent_exec_i
-   */
-
-  UCCTestComponent_exec_i::UCCTestComponent_exec_i (void)
-  {
-    ACE_NEW_THROW_EX (this->var_rh_,
-                      WriteVariableHandler (*this),
-                      ::CORBA::NO_MEMORY ());
-    ACE_NEW_THROW_EX (this->fixed_rh_,
-                      WriteFixedHandler (*this),
-                      ::CORBA::NO_MEMORY ());
-  }
-
-  UCCTestComponent_exec_i::~UCCTestComponent_exec_i (void)
-  {
-    delete this->var_rh_;
-    delete this->fixed_rh_;
-  }
-
-  // Supported operations and attributes.
-  ACE_Reactor*
-  UCCTestComponent_exec_i::reactor (void)
-  {
-    ACE_Reactor* reactor = 0;
-    ::CORBA::Object_var ccm_object =
-      this->ciao_context_->get_CCM_object();
-    if (! ::CORBA::is_nil (ccm_object.in ()))
-      {
-        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
-        if (! ::CORBA::is_nil (orb.in ()))
-          {
-            reactor = orb->orb_core ()->reactor ();
-          }
-      }
-    if (reactor == 0)
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-    return reactor;
-  }
-
-  void
-  UCCTestComponent_exec_i::write_fixed (void)
-  {
-    ::UCCFixedSizeStruct_Test::UCCFixedSizedStructTestConnector::Writer_var fixed_writer
-      = this->ciao_context_->get_connection_fixed_size_write_data ();
-
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->fixed_mutex_, CORBA::INTERNAL ());
-    {
-      for (CORBA::UShort i = 1; i < NR_OF_KEYS + 1; ++i)
-        {
-          ACE_DEBUG ((LM_DEBUG, "Write fixed %i\n", i));
-          fixed_writer->write_one (*(this->fixed_samples_[i]), ::DDS::HANDLE_NIL);
-        }
-    }
-  }
-
-  void
-  UCCTestComponent_exec_i::write_variable (void)
-  {
-    ::UCCVariableSizedStruct_Test::UCCVariableSizedStructTestConnector::Writer_var var_writer
-      = this->ciao_context_->get_connection_var_size_write_data ();
-
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->var_mutex_, CORBA::INTERNAL ());
-    {
-      for (CORBA::UShort i = 1; i < NR_OF_KEYS + 1; ++i)
-        {
-          ACE_DEBUG ((LM_DEBUG, "Write variable %C\n", this->var_samples_[i]->symbol.in ()));
-          var_writer->write_one (*(this->var_samples_[i]), ::DDS::HANDLE_NIL);
-        }
-    }
-  }
-
-  void
-  UCCTestComponent_exec_i::create_fixed_sized_samples (void)
-  {
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->fixed_mutex_, CORBA::INTERNAL ());
-    ACE_DEBUG ((LM_DEBUG, "Component_exec_i::create_fixed_sized_samples - "
-                          "Create fixed sized samples.\n"));
-    for (::CORBA::UShort i = 1; i < NR_OF_KEYS + 1; ++i)
-      {
-        UCCFixedSizedStructTest_i* new_key = new UCCFixedSizedStructTest_i;
-        new_key->x = i;
-        new_key->y = new_key->x;
-        new_key->z = 2*i;
-
-        this->fixed_samples_[i] = new_key;
-      }
-  }
-
-  void
-  UCCTestComponent_exec_i::create_variable_sized_samples (void)
-  {
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->var_mutex_, CORBA::INTERNAL ());
-    ACE_DEBUG ((LM_DEBUG, "Component_exec_i::create_variable_sized_samples - "
-                      "Create variable sized samples\n"));
-    for (::CORBA::UShort i = 1; i < NR_OF_KEYS + 1; ++i)
-      {
-        UCCVariableSizedStructTest_i* new_key = new UCCVariableSizedStructTest_i;
-        char key[7];
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->symbol = CORBA::string_dup (key);
-        new_key->x = i;
-        new_key->y = new_key->x;
-        this->var_samples_[i] = new_key;
-      }
-  }
-  // Component attributes and port operations.
-
-  // Operations from Components::SessionComponent.
-
-  void
-  UCCTestComponent_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::UCC_Test::CCM_UCCTestComponent_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  UCCTestComponent_exec_i::configuration_complete (void)
-  {
-    /* Your code here. */
-  }
-
-  void
-  UCCTestComponent_exec_i::ccm_activate (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Component_exec_i::ccm_activate - "
-                          "Create samples.\n"));
-    this->create_fixed_sized_samples ();
-    this->create_variable_sized_samples ();
-
-    if (this->reactor ()->schedule_timer (
-                this->var_rh_,
-                0,
-                ACE_Time_Value (2, 0),
-                ACE_Time_Value (1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Component_exec_i::ccm_activate : ")
-                              ACE_TEXT ("Error scheduling timer for variable sized struct.\n")));
-      }
-
-    if (this->reactor ()->schedule_timer (
-                this->fixed_rh_,
-                0,
-                ACE_Time_Value (2, 0),
-                ACE_Time_Value (1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Component_exec_i::ccm_activate : ")
-                              ACE_TEXT ("Error scheduling timer for fixed sized struct.\n")));
-      }
-  }
-
-  void
-  UCCTestComponent_exec_i::ccm_passivate (void)
-  {
-    this->reactor ()->cancel_timer (this->var_rh_);
-    this->reactor ()->cancel_timer (this->fixed_rh_);
-   }
-
-  void
-  UCCTestComponent_exec_i::ccm_remove (void)
-  {
-    for (::CORBA::UShort i = 1; i < NR_OF_KEYS + 1; ++i)
-      {
-        UCCVariableSizedStructTest_i* stype =this->var_samples_[i];
-        delete stype;
-      }
-
-    for (::CORBA::UShort i = 1; i < NR_OF_KEYS + 1; ++i)
-      {
-        UCCFixedSizedStructTest_i* stype =this->fixed_samples_[i];
-        delete stype;
-      }
-
-    this->var_samples_.clear ();
-    this->fixed_samples_.clear ();
-
-    // Check count_
-    if (UCCFixedSizedStructTest_i::count_ != 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Reference count for fixed sized "
-                              "samples is not 0. expected <0> - found <%d>\n",
-                              UCCFixedSizedStructTest_i::count_));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Reference count for fixed sized "
-                              "samples is 0\n"));
-      }
-    if (UCCVariableSizedStructTest_i::count_ != 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Reference count for variable sized "
-                              "samples is not 0. expected <0> - found <%d>\n",
-                              UCCVariableSizedStructTest_i::count_));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Reference count for variable sized "
-                              "samples is 0\n"));
-      }
-
-    // Check max_count_, for each sample we allocated an instance so we
-    // expect a count of 10
-    if (UCCFixedSizedStructTest_i::max_count_ != 10)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Maximum refence count for fixed sized "
-                              "samples is not ok, expected <10> - found <%d>\n",
-                              UCCFixedSizedStructTest_i::max_count_));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Maximum reference count for fixed sized "
-                              "samples is 10\n"));
-      }
-    if (UCCVariableSizedStructTest_i::max_count_ != 10)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Maximum reference count for variable sized "
-                              "samples is not ok, expected <10> - found <%d>\n",
-                              UCCVariableSizedStructTest_i::max_count_));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Maximum reference count for variable sized "
-                              "samples is 10\n"));
-      }
-  }
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_UCC_Test_UCCTestComponent_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      UCCTestComponent_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.h
deleted file mode 100644
index 906a83c7cfd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component_exec.h
+++ /dev/null
@@ -1,202 +0,0 @@
-// -*- C++ -*-
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
- **/
-#ifndef CIAO_UCC_TEST_COMPONENT_EXEC_GWWVKC_H_
-#define CIAO_UCC_TEST_COMPONENT_EXEC_GWWVKC_H_
-
-#include /**/ "ace/pre.h"
-
-#include "UCC_Test_ComponentEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Component_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_UCC_Test_UCCTestComponent_Impl
-{
-  struct UCCVariableSizedStructTest_i : UCCVariableSizedStructTest
-  {
-    static size_t count_;
-    static size_t max_count_;
-
-    UCCVariableSizedStructTest_i ()
-      {
-        ++count_;
-        if (count_ > max_count_)
-          {
-            max_count_ = count_;
-          }
-      }
-
-    ~UCCVariableSizedStructTest_i ()
-      {
-        --count_;
-      }
-  private:
-    UCCVariableSizedStructTest_i (const UCCVariableSizedStructTest_i &);
-    UCCVariableSizedStructTest_i operator = (const UCCVariableSizedStructTest_i &);
-
-  };
-
-  struct UCCFixedSizedStructTest_i : UCCFixedSizedStructTest
-  {
-    static size_t count_;
-    static size_t max_count_;
-
-    UCCFixedSizedStructTest_i ()
-      {
-        ++count_;
-        if (count_ > max_count_)
-          {
-            max_count_ = count_;
-          }
-      }
-
-    ~UCCFixedSizedStructTest_i ()
-      {
-        --count_;
-      }
-  private:
-    UCCFixedSizedStructTest_i (const UCCFixedSizedStructTest_i &);
-    UCCFixedSizedStructTest_i operator = (const UCCFixedSizedStructTest_i &);
-
-  };
-
-  class UCCTestComponent_exec_i;
-
-  //============================================================
-  // WriteVariableHandler
-  //============================================================
-  class WriteVariableHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteVariableHandler (UCCTestComponent_exec_i &callback);
-    int handle_timeout (const ACE_Time_Value &, const void *);
-  private:
-    UCCTestComponent_exec_i &callback_;
-  };
-
-  //============================================================
-  // WriteFixedHandler
-  //============================================================
-  class WriteFixedHandler :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteFixedHandler (UCCTestComponent_exec_i &callback);
-    int handle_timeout (const ACE_Time_Value &, const void *);
-  private:
-    UCCTestComponent_exec_i &callback_;
-  };
-
-  /**
-   * Component Executor Implementation Class: UCCTestComponent_exec_i
-   */
-
-  class UCCTestComponent_exec_i
-    : public virtual UCCTestComponent_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    UCCTestComponent_exec_i (void);
-    virtual ~UCCTestComponent_exec_i (void);
-
-    //@{
-    /** Supported operations and attributes. */
-
-    //@}
-
-    //@{
-    /** Component attributes and port operations. */
-    //@}
-
-    //@{
-    /** 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);
-    //@}
-
-    //@{
-    /** User defined public operations. */
-    void write_variable (void);
-    void write_fixed (void);
-
-    //@}
-
-  private:
-    ::UCC_Test::CCM_UCCTestComponent_Context_var ciao_context_;
-
-    //@{
-    /** Component attributes. */
-    //@}
-
-    //@{
-    /** User defined members. */
-    /// Variable sized struct
-    WriteVariableHandler *var_rh_;
-
-    TAO_SYNCH_MUTEX var_mutex_;
-    typedef std::map< ::CORBA::UShort, UCCVariableSizedStructTest_i* > UCCVarSized_Table;
-    UCCVarSized_Table var_samples_;
-
-    /// Fixed sized struct
-    WriteFixedHandler *fixed_rh_;
-
-    TAO_SYNCH_MUTEX fixed_mutex_;
-    typedef std::map< ::CORBA::UShort, UCCFixedSizedStructTest_i* > UCCFixedSized_Table;
-    UCCFixedSized_Table fixed_samples_;
-
-    //@}
-
-    //@{
-    /** User defined private operations. */
-
-    /// Variable sized struct
-    void create_variable_sized_samples (void);
-
-    /// Fixed sized struct
-    void create_fixed_sized_samples (void);
-
-    //@}
-
-    /// Get the ACE_Reactor
-    ACE_Reactor* reactor (void);
-  };
-
-  extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_UCC_Test_UCCTestComponent_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/.gitignore
deleted file mode 100644
index 4cc50acd285..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/UCC_Test_ConnectorE.idl
-/UCC_Test_Connector_conn.cpp
-/UCC_Test_Connector_conn.h
-/UCC_Test_Connector_conn_export.h
-/UCC_Test_Connector_lem_stub_export.h
-/UCC_Test_Connector_stub_export.h
-/UCC_Test_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl
deleted file mode 100644
index e058fb2f905..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @file UCC_Test_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef USERDATA_COPY_COUNT_TEST_CONNECTOR_IDL_
-#define USERDATA_COPY_COUNT_TEST_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/UCC_Test_Base.idl"
-
-#pragma ciao lem "Connector/UCC_Test_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/UCC_Test_BaseTypeSupport.idl"
-#endif
-
-module UCCVariableSizedStruct_Test
-{
-  module ::CCM_DDS::Typed < ::UCCVariableSizedStructTest, ::UCCVariableSizedStructTestSeq> UCCVariableSizedStructTestConnector;
-};
-
-module UCCFixedSizeStruct_Test
-{
-  module ::CCM_DDS::Typed < ::UCCFixedSizedStructTest, ::UCCFixedSizedStructTestSeq> UCCFixedSizedStructTestConnector;
-};
-
-#endif /* USERDATA_COPY_COUNT_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc
deleted file mode 100644
index ecb293b6ccc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p UCC_Test_Base -l .. -o ../lib -u DDS UCC_Test_Connector"
-
-project(UCC_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen UCC_Test_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=USERDATA_COPY_COUNT_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=UCC_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=USERDATA_COPY_COUNT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=UCC_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=USERDATA_COPY_COUNT_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=UCC_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=USERDATA_COPY_COUNT_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=UCC_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    UCC_Test_Connector.idl
-  }
-}
-
-project(UCC_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += UCC_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=USERDATA_COPY_COUNT_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=UCC_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    UCC_Test_ConnectorE.idl
-  }
-}
-
-project(UCC_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += UCC_Test_Connector_lem_gen UCC_Test_Connector_stub UCC_Test_Base_stub
-  libs  += UCC_Test_Base_stub UCC_Test_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = UCC_Test_Connector_lem_stub
-  dynamicflags += USERDATA_COPY_COUNT_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UCC_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    UCC_Test_ConnectorEC.h
-    UCC_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    UCC_Test_ConnectorEC.inl
-  }
-}
-
-project(UCC_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += UCC_Test_Connector_idl_gen UCC_Test_Base_stub
-  libs  += UCC_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = UCC_Test_Connector_stub
-  dynamicflags += USERDATA_COPY_COUNT_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UCC_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    UCC_Test_ConnectorC.h
-    UCC_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    UCC_Test_ConnectorC.inl
-  }
-}
-
-project(UCC_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += UCC_Test_Connector_lem_stub UCC_Test_Connector_stub UCC_Test_Base_stub
-  sharedname = UCC_Test_Connector_exec
-  libs += UCC_Test_Connector_stub UCC_Test_Connector_lem_stub UCC_Test_Base_stub UCC_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += USERDATA_COPY_COUNT_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UCC_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    UCC_Test_Connector_conn.h
-    UCC_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(UCC_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += UCC_Test_Connector_lem_stub UCC_Test_Connector_exec UCC_Test_Connector_stub
-  sharedname  = UCC_Test_Connector_svnt
-  libs       += UCC_Test_Connector_stub \
-                UCC_Test_Connector_lem_stub  \
-                UCC_Test_Base_stub \
-                UCC_Test_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += USERDATA_COPY_COUNT_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    UCC_Test_ConnectorS.cpp
-    UCC_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    UCC_Test_ConnectorS.h
-    UCC_Test_Connector_svnt.h
-    UCC_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/descriptors/Plan.cdp
deleted file mode 100644
index a2b2d93ec0b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/descriptors/Plan.cdp
+++ /dev/null
@@ -1,283 +0,0 @@
-<!--  -->
-<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>UCCTest_Depl</label>
-  <UUID>UCCTest_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_UCC_Test_UCCTestComponent_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_UCC_Test_UCCTestComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="TwoDim_UCC_Test_ConnectorImplementation">
-    <name>TwoDim_UCC_Test_ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="UCC_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="UCC_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_UCCVariableSizedStruct_Test_UCCVariableSizedStructTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_UCCVariableSizedStruct_Test_UCCVariableSizedStructTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>UCC_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>UCC_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="ThreeDim_UCC_Test_ConnectorImplementation">
-    <name>ThreeDim_UCC_Test_ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="UCC_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="UCC_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_UCCFixedSizeStruct_Test_UCCFixedSizedStructTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_UCCFixedSizeStruct_Test_UCCFixedSizedStructTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>UCC_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>UCC_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ComponentInstance">
-    <name>Component</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="TwoDim_UCC_Test_ConnectorInstance">
-    <name>TwoDim_UCC_Test_Connector</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="TwoDim_UCC_Test_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TwoDimensionalTopic</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ThreeDim_UCC_Test_ConnectorInstance">
-    <name>ThreeDim_UCC_Test_Connector</name>
-    <node>ComponentNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ThreeDim_UCC_Test_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ThreeDimensionalTopic</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>var_size_write_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>var_size_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TwoDim_UCC_Test_ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>fixed_size_write_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>fixed_size_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ThreeDim_UCC_Test_ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="UCC_Test_Connector_ExecArtifact">
-    <name>UCC_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>UCC_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="UCC_Test_Connector_SvntArtifact">
-    <name>UCC_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>UCC_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="UCC_Test_Connector_StubArtifact">
-    <name>UCC_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>UCC_Test_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/descriptors/run_test.pl
deleted file mode 100755
index dbe5a142f2b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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 = 1;
-@ports = ( 60001 );
-@iorbases = ( "Component.ior" );
-@iorfiles = 0;
-@nodenames = ( "ComponentNode" );
-
-# 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 10 seconds to allow task to complete\n";
-sleep (10);
-
-# 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 -s\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/.gitignore
deleted file mode 100644
index 9fb033fd01c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/VTopic_Base.cxx
-/VTopic_Base.h
-/VTopic_BasePlugin.cxx
-/VTopic_BasePlugin.h
-/VTopic_BaseSupport.cxx
-/VTopic_BaseSupport.h
-/VTopic_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl
deleted file mode 100644
index 851ed0ad11e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * @file   VTopic_Base.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef VTOPIC_BASE_IDL
-#define VTOPIC_BASE_IDL
-
-#pragma ndds typesupport "Base/VTopic_BaseSupport.h"
-#pragma opendds typesupport "Base/VTopic_BaseTypeSupportImpl.h"
-
-typedef octet octet_array[5];
-
-#pragma DCPS_DATA_TYPE "TestTopic"
-#pragma DCPS_DATA_KEY "TestTopic key"
-
-// Plain topic
-struct TestTopic {
-  string key; //@key
-  long x;
-};
-
-#pragma DCPS_DATA_TYPE "TopicString"
-#pragma DCPS_DATA_KEY "TopicString key"
-
-// String
-struct TopicString {
-  string key; //@key
-  string x_str;
-};
-
-#pragma DCPS_DATA_TYPE "TopicArray"
-#pragma DCPS_DATA_KEY "TopicArray key"
-
-// Arrays
-struct TopicArray {
-  string key; //@key
-  octet_array x_array;
- };
-
-// Unions
-union X_Union switch (short) {
-    case 0:
-      string x_test;
-    case 1:
-      long   x_long;
-};
-
-#pragma DCPS_DATA_TYPE "TopicUnion"
-#pragma DCPS_DATA_KEY "TopicUnion key"
-
-struct TopicUnion {
-  string key; //@key
-  X_Union x_uni;
-};
-
-// Sequence
-struct test {
-  short x_test;
-  string x_teststr;
-};
-
-typedef sequence<test> testSeq;
-
-#pragma DCPS_DATA_TYPE "TopicSeq"
-#pragma DCPS_DATA_KEY "TopicSeq key"
-
-struct TopicSeq {
-  string key; //@key
-  testSeq x_seq;
-};
-
-// ValueType
-valuetype X_Valuetype {
-  public string type;
-  public long x_long;
-};
-
-#if !defined (CIAO_DDS4CCM_OPENDDS)
-// OpenDDS doesn't support valuetype as topic member
-#pragma DCPS_DATA_TYPE "TopicValuetype"
-#pragma DCPS_DATA_KEY "TopicValuetype key"
-
-struct TopicValuetype {
-  string key; //@key
-  X_Valuetype x_vt;
-};
-#endif
-
-// Sequences
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopic> TestTopicSeq;
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TopicString> TopicStringSeq;
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TopicArray> TopicArraySeq;
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TopicUnion> TopicUnionSeq;
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<X_Union> X_UnionSeq;
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TopicSeq> TopicSeqSeq;
-#endif
-#if !defined (CIAO_DDS4CCM_OPENDDS)
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TopicValuetype> TopicValuetypeSeq;
-#endif
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<X_Valuetype> X_ValuetypeSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc
deleted file mode 100644
index 1aa5f52cfda..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc
+++ /dev/null
@@ -1,25 +0,0 @@
-project (DDS_VTopic_Base_stub) : taoidldefaults, \
-                                 dds4ccm_ts_default, valuetype {
-  sharedname = DDS_VTopic_Base_stub
-  dynamicflags += VTOPIC_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS \
-              -Wb,stub_export_macro=VTOPIC_BASE_STUB_Export \
-              -Wb,stub_export_include=VTopic_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    VTopic_Base.idl
-  }
-
-  opendds_ts_flags += --export=VTOPIC_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    VTopic_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/.gitignore
deleted file mode 100644
index f6f1b6886a7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/VT_Array_ConnectorE.idl
-/VT_Array_Connector_conn.cpp
-/VT_Array_Connector_conn.h
-/VT_Array_Connector_conn_export.h
-/VT_Array_Connector_lem_stub_export.h
-/VT_Array_Connector_stub_export.h
-/VT_Array_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl
deleted file mode 100644
index 7bde349812c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file VT_Array_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef VT_ARRAY_CONNECTOR_IDL_
-#define VT_ARRAY_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/VTopic_Base.idl"
-
-#pragma ciao lem "Conn_Array/VT_Array_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/VTopic_BaseTypeSupport.idl"
-#endif
-
-module VTopic
-{
-  module ::CCM_DDS::Typed < ::TopicArray, ::TopicArraySeq> TopicArrayConnector;
-};
-
-#endif /* VT_ARRAY_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc
deleted file mode 100644
index b1b95129172..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc
+++ /dev/null
@@ -1,141 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VT_Array_Connector"
-
-project(DDS_VT_ARRAY_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_VTopic_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=VT_ARRAY_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=VT_Array_Connector_stub_export.h \
-              -Wb,skel_export_macro=VT_ARRAY_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=VT_Array_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=VT_ARRAY_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=VT_Array_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VT_ARRAY_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VT_Array_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    VT_Array_Connector.idl
-  }
-}
-
-project(DDS_VT_ARRAY_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_VT_ARRAY_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=VT_ARRAY_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=VT_Array_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    VT_Array_ConnectorE.idl
-  }
-}
-
-project(DDS_VT_ARRAY_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VT_ARRAY_Connector_lem_gen DDS_VT_Array_Connector_stub DDS_VTopic_Base_stub
-  libs  += DDS_VTopic_Base_stub DDS_VT_Array_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VT_ARRAY_Connector_lem_stub
-  dynamicflags += VT_ARRAY_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Array_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    VT_Array_ConnectorEC.h
-    VT_Array_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VT_Array_ConnectorEC.inl
-  }
-}
-
-project(DDS_VT_Array_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VT_ARRAY_Connector_idl_gen DDS_VTopic_Base_stub
-  libs  += DDS_VTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VT_Array_Connector_stub
-  dynamicflags += VT_ARRAY_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Array_ConnectorC.cpp
-  }
-
-  Header_Files {
-    VT_Array_ConnectorC.h
-    VT_Array_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    VT_Array_ConnectorC.inl
-  }
-}
-
-project(DDS_VT_Array_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VT_ARRAY_Connector_lem_stub DDS_VT_Array_Connector_stub DDS_VTopic_Base_stub
-  sharedname = DDS_VT_Array_Connector_exec
-  libs += DDS_VT_Array_Connector_stub DDS_VT_ARRAY_Connector_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VT_ARRAY_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Array_Connector_conn.cpp
-  }
-
-  Header_Files {
-    VT_Array_Connector_conn.h
-    VT_Array_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VT_Array_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VT_ARRAY_Connector_lem_stub DDS_VT_Array_Connector_exec DDS_VT_Array_Connector_stub
-  sharedname  = DDS_VT_Array_Connector_svnt
-  libs       += DDS_VT_Array_Connector_stub \
-                DDS_VT_ARRAY_Connector_lem_stub  \
-                DDS_VTopic_Base_stub \
-                DDS_VT_Array_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VT_ARRAY_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Array_ConnectorS.cpp
-    VT_Array_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    VT_Array_ConnectorS.h
-    VT_Array_Connector_svnt.h
-    VT_Array_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/.gitignore
deleted file mode 100644
index 18235baa020..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/VT_Seq_ConnectorE.idl
-/VT_Seq_Connector_conn.cpp
-/VT_Seq_Connector_conn.h
-/VT_Seq_Connector_conn_export.h
-/VT_Seq_Connector_lem_stub_export.h
-/VT_Seq_Connector_stub_export.h
-/VT_Seq_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl
deleted file mode 100644
index 89067ebe269..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file VT_Seq_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef VT_SEQ_CONNECTOR_IDL_
-#define VT_SEQ_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/VTopic_Base.idl"
-
-#pragma ciao lem "Conn_Seq/VT_Seq_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/VTopic_BaseTypeSupport.idl"
-#endif
-
-module VTopic
-{
-  module ::CCM_DDS::Typed < ::TopicSeq, ::TopicSeqSeq> TopicSeqConnector;
-};
-
-#endif /* VTopic_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc
deleted file mode 100644
index 8eba6b3a2ad..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc
+++ /dev/null
@@ -1,141 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VT_Seq_Connector"
-
-project(DDS_VT_SEQ_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_VTopic_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=VT_SEQ_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=VT_Seq_Connector_stub_export.h \
-              -Wb,skel_export_macro=VT_SEQ_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=VT_Seq_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=VT_SEQ_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=VT_Seq_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VT_SEQ_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VT_Seq_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    VT_Seq_Connector.idl
-  }
-}
-
-project(DDS_VT_SEQ_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_VT_SEQ_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=VT_SEQ_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=VT_Seq_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    VT_Seq_ConnectorE.idl
-  }
-}
-
-project(DDS_VT_SEQ_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VT_SEQ_Connector_lem_gen DDS_VT_Seq_Connector_stub DDS_VTopic_Base_stub
-  libs  += DDS_VTopic_Base_stub DDS_VT_Seq_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VT_SEQ_Connector_lem_stub
-  dynamicflags += VT_SEQ_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Seq_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    VT_Seq_ConnectorEC.h
-    VT_Seq_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VT_Seq_ConnectorEC.inl
-  }
-}
-
-project(DDS_VT_Seq_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VT_SEQ_Connector_idl_gen DDS_VTopic_Base_stub
-  libs  += DDS_VTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VT_Seq_Connector_stub
-  dynamicflags += VT_SEQ_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Seq_ConnectorC.cpp
-  }
-
-  Header_Files {
-    VT_Seq_ConnectorC.h
-    VT_Seq_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    VT_Seq_ConnectorC.inl
-  }
-}
-
-project(DDS_VT_Seq_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VT_SEQ_Connector_lem_stub DDS_VT_Seq_Connector_stub DDS_VTopic_Base_stub
-  sharedname = DDS_VT_Seq_Connector_exec
-  libs += DDS_VT_Seq_Connector_stub DDS_VT_SEQ_Connector_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VT_SEQ_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Seq_Connector_conn.cpp
-  }
-
-  Header_Files {
-    VT_Seq_Connector_conn.h
-    VT_Seq_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VT_Seq_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VT_SEQ_Connector_lem_stub DDS_VT_Seq_Connector_exec DDS_VT_Seq_Connector_stub
-  sharedname  = DDS_VT_Seq_Connector_svnt
-  libs       += DDS_VT_Seq_Connector_stub \
-                DDS_VT_SEQ_Connector_lem_stub  \
-                DDS_VTopic_Base_stub \
-                DDS_VT_Seq_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VT_SEQ_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Seq_ConnectorS.cpp
-    VT_Seq_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    VT_Seq_ConnectorS.h
-    VT_Seq_Connector_svnt.h
-    VT_Seq_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/.gitignore
deleted file mode 100644
index 3b0c72dc76e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/VT_String_ConnectorE.idl
-/VT_String_Connector_conn.cpp
-/VT_String_Connector_conn.h
-/VT_String_Connector_conn_export.h
-/VT_String_Connector_lem_stub_export.h
-/VT_String_Connector_stub_export.h
-/VT_String_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl
deleted file mode 100644
index 77638199e2d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file VT_String_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef VT_STRING_CONNECTOR_IDL_
-#define VT_STRING_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/VTopic_Base.idl"
-
-#pragma ciao lem "Conn_String/VT_String_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/VTopic_BaseTypeSupport.idl"
-#endif
-
-module VTopic
-{
-  module ::CCM_DDS::Typed < ::TopicString, ::TopicStringSeq> TopicStringConnector;
-};
-
-#endif /* VTopic_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc
deleted file mode 100644
index 480834a3807..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VT_String_Connector"
-
-project(DDS_VT_STRING_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_VTopic_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=VT_STRING_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=VT_String_Connector_stub_export.h \
-              -Wb,skel_export_macro=VT_STRING_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=VT_String_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=VT_STRING_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=VT_String_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VT_STRING_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VT_String_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    VT_String_Connector.idl
-  }
-}
-
-project(DDS_VT_STRING_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_VT_STRING_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=VT_STRING_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=VT_String_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    VT_String_ConnectorE.idl
-  }
-}
-
-project(DDS_VT_STRING_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VT_STRING_Connector_lem_gen DDS_VT_String_Connector_stub DDS_VTopic_Base_stub
-  libs  += DDS_VTopic_Base_stub DDS_VT_String_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VT_STRING_Connector_lem_stub
-  dynamicflags += VT_STRING_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_String_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    VT_String_ConnectorEC.h
-    VT_String_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VT_String_ConnectorEC.inl
-  }
-}
-
-project(DDS_VT_String_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VT_STRING_Connector_idl_gen DDS_VTopic_Base_stub
-  libs  += DDS_VTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VT_String_Connector_stub
-  dynamicflags += VT_STRING_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_String_ConnectorC.cpp
-  }
-
-  Header_Files {
-    VT_String_ConnectorC.h
-    VT_String_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    VT_String_ConnectorC.inl
-  }
-}
-
-project(DDS_VT_String_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VT_STRING_Connector_lem_stub DDS_VT_String_Connector_stub DDS_VTopic_Base_stub
-  sharedname = DDS_VT_String_Connector_exec
-  libs += DDS_VT_String_Connector_stub DDS_VT_STRING_Connector_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VT_STRING_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_String_Connector_conn.cpp
-  }
-
-  Header_Files {
-    VT_String_Connector_conn.h
-    VT_String_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VT_String_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VT_STRING_Connector_lem_stub DDS_VT_String_Connector_exec DDS_VT_String_Connector_stub
-  sharedname  = DDS_VT_String_Connector_svnt
-  libs       += DDS_VT_String_Connector_stub \
-                DDS_VT_STRING_Connector_lem_stub  \
-                DDS_VTopic_Base_stub \
-                DDS_VT_String_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VT_STRING_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_String_ConnectorS.cpp
-    VT_String_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    VT_String_ConnectorS.h
-    VT_String_Connector_svnt.h
-    VT_String_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/.gitignore
deleted file mode 100644
index f31e62c9ad2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/VT_Union_ConnectorE.idl
-/VT_Union_Connector_conn.cpp
-/VT_Union_Connector_conn.h
-/VT_Union_Connector_conn_export.h
-/VT_Union_Connector_lem_stub_export.h
-/VT_Union_Connector_stub_export.h
-/VT_Union_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl
deleted file mode 100644
index f24b37413ee..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @file VT_Union_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef VT_UNION_CONNECTOR_IDL_
-#define VT_UNION_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/VTopic_Base.idl"
-
-#pragma ciao lem "Conn_Union/VT_Union_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/VTopic_BaseTypeSupport.idl"
-#endif
-
-module VTopic
-{
-  module ::CCM_DDS::Typed < ::TopicUnion, ::TopicUnionSeq> TopicUnionConnector;
-#if !defined (CIAO_DDS4CCM_OPENDDS)
-  module ::CCM_DDS::Typed < ::X_Union, ::X_UnionSeq> X_UnionConnector;
-#else
-  module ::CCM_DDS::Typed < ::TopicString, ::TopicStringSeq> X_UnionConnector;
-#endif
-};
-
-#endif /* VT_UNION_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc
deleted file mode 100644
index c517a48c0c4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc
+++ /dev/null
@@ -1,140 +0,0 @@
-project(DDS_VT_UNION_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_VTopic_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=VT_UNION_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=VT_Union_Connector_stub_export.h \
-              -Wb,skel_export_macro=VT_UNION_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=VT_Union_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=VT_UNION_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=VT_Union_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VT_UNION_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VT_Union_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    VT_Union_Connector.idl
-  }
-}
-
-project(DDS_VT_UNION_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_VT_UNION_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=VT_UNION_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=VT_Union_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    VT_Union_ConnectorE.idl
-  }
-}
-
-project(DDS_VT_UNION_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VT_UNION_Connector_lem_gen DDS_VT_Union_Connector_stub DDS_VTopic_Base_stub
-  libs  += DDS_VTopic_Base_stub DDS_VT_Union_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VT_UNION_Connector_lem_stub
-  dynamicflags += VT_UNION_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Union_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    VT_Union_ConnectorEC.h
-    VT_Union_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VT_Union_ConnectorEC.inl
-  }
-}
-
-project(DDS_VT_Union_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VT_UNION_Connector_idl_gen DDS_VTopic_Base_stub
-  libs  += DDS_VTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VT_Union_Connector_stub
-  dynamicflags += VT_UNION_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Union_ConnectorC.cpp
-  }
-
-  Header_Files {
-    VT_Union_ConnectorC.h
-    VT_Union_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    VT_Union_ConnectorC.inl
-  }
-}
-
-project(DDS_VT_Union_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VT_UNION_Connector_lem_stub DDS_VT_Union_Connector_stub DDS_VTopic_Base_stub
-  sharedname = DDS_VT_Union_Connector_exec
-  libs += DDS_VT_Union_Connector_stub DDS_VT_UNION_Connector_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VT_UNION_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Union_Connector_conn.cpp
-  }
-
-  Header_Files {
-    VT_Union_Connector_conn.h
-    VT_Union_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VT_Union_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VT_UNION_Connector_lem_stub DDS_VT_Union_Connector_exec \
-                DDS_VT_Union_Connector_stub
-  sharedname  = DDS_VT_Union_Connector_svnt
-  libs       += DDS_VT_Union_Connector_stub \
-                DDS_VT_UNION_Connector_lem_stub  \
-                DDS_VTopic_Base_stub \
-                DDS_VT_Union_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VT_UNION_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Union_ConnectorS.cpp
-    VT_Union_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    VT_Union_ConnectorS.h
-    VT_Union_Connector_svnt.h
-    VT_Union_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/.gitignore
deleted file mode 100644
index b4c58344475..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/VT_Valuetype_ConnectorE.idl
-/VT_Valuetype_Connector_conn.cpp
-/VT_Valuetype_Connector_conn.h
-/VT_Valuetype_Connector_conn_export.h
-/VT_Valuetype_Connector_lem_stub_export.h
-/VT_Valuetype_Connector_stub_export.h
-/VT_Valuetype_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl
deleted file mode 100644
index d77be1c18e3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @file VT_Valuetype_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef VT_VALUETYPE_CONNECTOR_IDL_
-#define VT_VALUETYPE_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/VTopic_Base.idl"
-
-#pragma ciao lem "Conn_Valuetype/VT_Valuetype_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/VTopic_BaseTypeSupport.idl"
-#endif
-
-module VTopic
-{
-#if !defined (CIAO_DDS4CCM_OPENDDS)
-  module ::CCM_DDS::Typed < ::TopicValuetype, ::TopicValuetypeSeq> TopicValuetypeConnector;
-#else
-  // Just use another topic, that way we get a connector
-  module ::CCM_DDS::Typed < ::TopicString, ::TopicStringSeq> TopicValuetypeConnector;
-#endif
-};
-
-#endif /* VT_VALUETYPE_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc
deleted file mode 100644
index 41549b931ce..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc
+++ /dev/null
@@ -1,140 +0,0 @@
-project(DDS_VT_VALUETYPE_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=VT_VALUETYPE_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=VT_Valuetype_Connector_stub_export.h \
-              -Wb,skel_export_macro=VT_VALUETYPE_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=VT_Valuetype_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=VT_VALUETYPE_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=VT_Valuetype_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VT_VALUETYPE_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VT_Valuetype_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    VT_Valuetype_Connector.idl
-  }
-}
-
-project(DDS_VT_VALUETYPE_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_VT_VALUETYPE_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=VT_VALUETYPE_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=VT_Valuetype_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    VT_Valuetype_ConnectorE.idl
-  }
-}
-
-project(DDS_VT_VALUETYPE_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VT_VALUETYPE_Connector_lem_gen DDS_VT_Valuetype_Connector_stub DDS_VTopic_Base_stub 
-  libs  += DDS_VTopic_Base_stub DDS_VT_Valuetype_Connector_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VT_VALUETYPE_Connector_lem_stub
-  dynamicflags += VT_VALUETYPE_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Valuetype_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    VT_Valuetype_ConnectorEC.h
-    VT_Valuetype_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VT_Valuetype_ConnectorEC.inl
-  }
-}
-
-project(DDS_VT_Valuetype_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VT_VALUETYPE_Connector_idl_gen DDS_VTopic_Base_stub
-  libs  += DDS_VTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VT_Valuetype_Connector_stub
-  dynamicflags += VT_VALUETYPE_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Valuetype_ConnectorC.cpp
-  }
-
-  Header_Files {
-    VT_Valuetype_ConnectorC.h
-    VT_Valuetype_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    VT_Valuetype_ConnectorC.inl
-  }
-}
-
-project(DDS_VT_Valuetype_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VT_VALUETYPE_Connector_lem_stub DDS_VT_Valuetype_Connector_stub DDS_VTopic_Base_stub
-  sharedname = DDS_VT_Valuetype_Connector_exec
-  libs += DDS_VT_Valuetype_Connector_stub DDS_VT_VALUETYPE_Connector_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VT_VALUETYPE_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Valuetype_Connector_conn.cpp
-  }
-
-  Header_Files {
-    VT_Valuetype_Connector_conn.h
-    VT_Valuetype_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VT_Valuetype_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VT_VALUETYPE_Connector_lem_stub DDS_VT_Valuetype_Connector_exec \
-                DDS_VT_Valuetype_Connector_stub 
-  sharedname  = DDS_VT_Valuetype_Connector_svnt
-  libs       += DDS_VT_Valuetype_Connector_stub \
-                DDS_VT_VALUETYPE_Connector_lem_stub  \
-                DDS_VTopic_Base_stub \
-                DDS_VT_Valuetype_Connector_exec 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VT_VALUETYPE_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VT_Valuetype_ConnectorS.cpp
-    VT_Valuetype_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    VT_Valuetype_ConnectorS.h
-    VT_Valuetype_Connector_svnt.h
-    VT_Valuetype_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/.gitignore
deleted file mode 100644
index 87fede18822..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/VTopic_ConnectorE.idl
-/VTopic_Connector_conn.cpp
-/VTopic_Connector_conn.h
-/VTopic_Connector_conn_export.h
-/VTopic_Connector_lem_stub_export.h
-/VTopic_Connector_stub_export.h
-/VTopic_Connector_svnt_export.h
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl
deleted file mode 100644
index 5fb041c38ba..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file VTopic_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef VTOPIC_CONNECTOR_IDL_
-#define VTOPIC_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/VTopic_Base.idl"
-
-#pragma ciao lem "Connector/VTopic_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/VTopic_BaseTypeSupport.idl"
-#endif
-
-module VTopic
-{
-  module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> TestTopicConnector;
-};
-
-#endif /* VTopic_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
deleted file mode 100644
index f453a351a0b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VTopic_Connector"
-
-project(DDS_VTopic_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_VTopic_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=VTOPIC_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=VTopic_Connector_stub_export.h \
-              -Wb,skel_export_macro=VTOPIC_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=VTopic_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=VTOPIC_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=VTopic_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VTOPIC_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VTopic_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    VTopic_Connector.idl
-  }
-}
-
-project(DDS_VTopic_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_VTopic_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=VTOPIC_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=VTopic_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    VTopic_ConnectorE.idl
-  }
-}
-
-project(DDS_VTopic_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VTopic_Connector_lem_gen DDS_VTopic_Connector_stub DDS_VTopic_Base_stub
-  libs  += DDS_VTopic_Base_stub DDS_VTopic_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTopic_Connector_lem_stub
-  dynamicflags += VTOPIC_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopic_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    VTopic_ConnectorEC.h
-    VTopic_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VTopic_ConnectorEC.inl
-  }
-}
-
-project(DDS_VTopic_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VTopic_Connector_idl_gen DDS_VTopic_Base_stub
-  libs  += DDS_VTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTopic_Connector_stub
-  dynamicflags += VTOPIC_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopic_ConnectorC.cpp
-  }
-
-  Header_Files {
-    VTopic_ConnectorC.h
-    VTopic_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    VTopic_ConnectorC.inl
-  }
-}
-
-project(DDS_VTopic_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub DDS_VTopic_Base_stub
-  sharedname = DDS_VTopic_Connector_exec
-  libs += DDS_VTopic_Connector_stub DDS_VTopic_Connector_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VTOPIC_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopic_Connector_conn.cpp
-  }
-
-  Header_Files {
-    VTopic_Connector_conn.h
-    VTopic_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VTopic_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_exec DDS_VTopic_Connector_stub
-  sharedname  = DDS_VTopic_Connector_svnt
-  libs       += DDS_VTopic_Connector_stub \
-                DDS_VTopic_Connector_lem_stub  \
-                DDS_VTopic_Base_stub \
-                DDS_VTopic_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VTOPIC_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopic_ConnectorS.cpp
-    VTopic_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    VTopic_ConnectorS.h
-    VTopic_Connector_svnt.h
-    VTopic_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/.gitignore
deleted file mode 100644
index d15d8965d3e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Receiver_exec_export.h
-/Receiver_lem_stub_export.h
-/Receiver_stub_export.h
-/Receiver_svnt_export.h
-/VTopic_ReceiverE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.idl
deleted file mode 100644
index 596e652a286..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/VTopic_Connector.idl"
-
-module VTopic
-{
-  component Receiver
-  {
-    port TestTopicConnector::DDS_Listen info_out;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-   };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc
deleted file mode 100644
index 096d14bb5f7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc
+++ /dev/null
@@ -1,166 +0,0 @@
-project(DDS_VTopic_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_VTopic_Connector_idl_gen
-  custom_only = 1
-  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 {
-    VTopic_Receiver.idl
-  }
-}
-
-project(DDS_VTopic_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_VTopic_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 $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    VTopic_ReceiverE.idl
-  }
-}
-
-project(DDS_VTopic_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_VTopic_Receiver_lem_gen DDS_VTopic_Receiver_stub DDS_VTopic_Base_stub
-  libs  += DDS_VTopic_Base_stub Receiver_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopic_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    VTopic_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VTopic_ReceiverEC.inl
-  }
-}
-
-project(DDS_VTopic_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VTopic_Receiver_idl_gen DDS_VTopic_Base_stub \
-           DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub \
-           DDS_VT_String_Connector_lem_stub DDS_VT_String_Connector_stub \
-           DDS_VT_Array_Connector_lem_stub DDS_VT_Array_Connector_stub \
-           DDS_VT_Valuetype_Connector_lem_stub DDS_VT_Valuetype_Connector_stub \
-           DDS_VT_Union_Connector_lem_stub DDS_VT_Union_Connector_stub \
-           DDS_VT_Seq_Connector_lem_stub DDS_VT_Seq_Connector_stub
-  libs  += DDS_VTopic_Base_stub DDS_VTopic_Connector_stub  DDS_VT_Array_Connector_stub \
-           DDS_VT_Valuetype_Connector_stub DDS_VT_Union_Connector_stub \
-           DDS_VT_String_Connector_stub DDS_VT_Seq_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopic_ReceiverC.cpp
-  }
-
-  Header_Files {
-    VTopic_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    VTopic_ReceiverC.inl
-  }
-}
-
-project(DDS_VTopic_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after     += DDS_VTopic_Receiver_lem_stub DDS_VTopic_Receiver_stub \
-               DDS_VTopic_Connector_lem_stub  DDS_VTopic_Connector_stub\
-               DDS_VT_Array_Connector_lem_stub DDS_VT_Array_Connector_stub \
-               DDS_VT_String_Connector_lem_stub DDS_VT_String_Connector_stub \
-               DDS_VT_Valuetype_Connector_lem_stub DDS_VT_Valuetype_Connector_stub \
-               DDS_VT_Union_Connector_lem_stub DDS_VT_Union_Connector_stub \
-               DDS_VT_Seq_Connector_lem_stub DDS_VT_Seq_Connector_stub 
-  sharedname = Receiver_exec
-  libs      += Receiver_stub Receiver_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Connector_lem_stub \
-               DDS_VTopic_Connector_stub DDS_VT_Array_Connector_stub DDS_VT_String_Connector_stub \
-               DDS_VT_Valuetype_Connector_stub DDS_VT_Union_Connector_stub \
-               DDS_VT_Seq_Connector_stub 
-  libpaths  += ../lib
-  includes  += ..
-  libout = ../lib
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopic_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    VTopic_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VTopic_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_VTopic_Base_stub  DDS_VTopic_Receiver_lem_stub \
-                DDS_VT_String_Connector_stub DDS_VT_String_Connector_svnt DDS_VT_String_Connector_lem_stub \
-                DDS_VT_Seq_Connector_stub DDS_VT_Seq_Connector_svnt DDS_VT_Seq_Connector_lem_stub\
-                DDS_VT_Array_Connector_stub DDS_VT_Array_Connector_svnt DDS_VT_Array_Connector_lem_stub \
-                DDS_VT_Valuetype_Connector_stub DDS_VT_Valuetype_Connector_svnt DDS_VT_Valuetype_Connector_lem_stub \
-                DDS_VT_Union_Connector_stub DDS_VT_Union_Connector_svnt DDS_VT_Union_Connector_lem_stub \
-                DDS_VTopic_Connector_stub DDS_VTopic_Connector_svnt DDS_VTopic_Connector_lem_stub
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub \
-                DDS_VTopic_Base_stub \
-                DDS_VTopic_Connector_stub DDS_VTopic_Connector_svnt \
-                DDS_VT_Array_Connector_stub DDS_VT_Array_Connector_svnt \
-                DDS_VT_String_Connector_stub DDS_VT_String_Connector_svnt \
-                DDS_VT_Seq_Connector_stub DDS_VT_Seq_Connector_svnt \
-                DDS_VT_Valuetype_Connector_stub DDS_VT_Valuetype_Connector_svnt \
-                DDS_VT_Union_Connector_stub DDS_VT_Union_Connector_svnt
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopic_ReceiverS.cpp
-    VTopic_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    VTopic_ReceiverS.h
-    VTopic_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp
deleted file mode 100644
index 532551382f1..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-// -*- C++ -*-
-//Test for different topictypes with DDS_Event connector, look for 'SUBSCRIPTION_MATCHED_STATUS
-
-#include "VTopic_Receiver_exec.h"
-#include "ace/Log_Msg.h"
-#include "dds4ccm/impl/Utils.h"
-
-namespace CIAO_VTopic_Receiver_Impl
-{
-//============================================================
-  // Facet Executor Implementation Class: ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Atomic_Boolean &subscription_matched)
-    : subscription_matched_ (subscription_matched)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected(
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind  status_kind)
-  {
-    if (! ::CORBA::is_nil (the_entity) &&
-        status_kind == ::DDS::SUBSCRIPTION_MATCHED_STATUS)
-      {
-        this->subscription_matched_ = true;
-      }
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Receiver_exec_iTestTopic_RawListener_exec_i ();
-  //============================================================
-  Receiver_exec_i::Receiver_exec_i (void)
-    : subscription_matched_ (false)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-  // Port operations.
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Receiver_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (this->subscription_matched_);
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    return CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::VTopic::TestTopicConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    return ::VTopic::TestTopicConnector::CCM_Listener::_nil ();
-  }
-
-
-  // Operations from Components::SessionComponent.
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::VTopic::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)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-     if(!this->subscription_matched_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
-                               ACE_TEXT ("states 'SUBSCRIPTION_MATCHED_STATUS' in Receiver\n")
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Received the expected ")
-                               ACE_TEXT ("'SUBSCRIPTION_MATCHED_STATUS' in Receiver\n")
-                    ));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_VTopic_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/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.h
deleted file mode 100644
index 2358cf76e53..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_RECEIVER_EXEC_H_
-#define CIAO_RECEIVER_EXEC_H_
-
-#include "VTopic_ReceiverEC.h"
-
-#include /**/ "Receiver_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-
-
-namespace CIAO_VTopic_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Receiver_exec_i;
-
-  class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean &);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                     const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                               ::DDS::StatusKind  status_kind);
-
-  private:
-    Atomic_Boolean &subscription_matched_;
-  };
-
-  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.
-   // Port operations.
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::VTopic::TestTopicConnector::CCM_Listener_ptr
-    get_info_out_data_listener (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:
-    ::VTopic::CCM_Receiver_Context_var context_;
-    Atomic_Boolean subscription_matched_;
-};
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_VTopic_Receiver_Impl (void);
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/.gitignore
deleted file mode 100644
index abf3e87655b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Sender_exec_export.h
-/Sender_lem_stub_export.h
-/Sender_stub_export.h
-/Sender_svnt_export.h
-/VTopic_SenderE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl
deleted file mode 100644
index 1f865a9eee5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_VTOPIC_SENDER_IDL
-#define DDS_VTOPIC_SENDER_IDL
-
-#include "Connector/VTopic_Connector.idl"
-
-module VTopic
-{
-  component Sender
-  {
-    port TestTopicConnector::DDS_Write info_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc
deleted file mode 100644
index 875462836f2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc
+++ /dev/null
@@ -1,169 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_VTopic_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_VTopic_Connector_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 {
-    VTopic_Sender.idl
-  }
-}
-
-project(DDS_VTopic_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_VTopic_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 {
-    VTopic_SenderE.idl
-  }
-}
-
-project(DDS_VTopic_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_VTopic_Sender_lem_gen DDS_VTopic_Sender_stub DDS_VTopic_Base_stub
-  libs  += DDS_VTopic_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopic_SenderEC.cpp
-  }
-
-  Header_Files {
-    VTopic_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VTopic_SenderEC.inl
-  }
-}
-
-project(DDS_VTopic_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VTopic_Sender_idl_gen DDS_VTopic_Base_stub \
-           DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub \
-           DDS_VT_String_Connector_lem_stub DDS_VT_String_Connector_stub \
-           DDS_VT_Array_Connector_lem_stub DDS_VT_Array_Connector_stub \
-           DDS_VT_Valuetype_Connector_lem_stub DDS_VT_Valuetype_Connector_stub \
-           DDS_VT_Union_Connector_lem_stub DDS_VT_Union_Connector_stub \
-           DDS_VT_Seq_Connector_lem_stub DDS_VT_Seq_Connector_stub
-  libs  += DDS_VTopic_Base_stub DDS_VTopic_Connector_stub \
-           DDS_VT_Array_Connector_stub DDS_VT_String_Connector_stub \
-           DDS_VT_Seq_Connector_stub DDS_VT_Valuetype_Connector_stub \
-           DDS_VT_Union_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopic_SenderC.cpp
-  }
-
-  Header_Files {
-    VTopic_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    VTopic_SenderC.inl
-  }
-}
-
-project(DDS_VTopic_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_VTopic_Sender_lem_stub DDS_VTopic_Sender_stub \
-             DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub \
-             DDS_VT_Array_Connector_lem_stub DDS_VT_Array_Connector_stub \
-             DDS_VT_Valuetype_Connector_lem_stub DDS_VT_Valuetype_Connector_stub \
-             DDS_VT_Union_Connector_lem_stub DDS_VT_Union_Connector_stub \
-             DDS_VT_String_Connector_lem_stub DDS_VT_String_Connector_stub \
-             DDS_VT_Seq_Connector_lem_stub DDS_VT_Seq_Connector_stub 
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_VTopic_Base_stub \
-          DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub \
-          DDS_VT_Array_Connector_stub DDS_VT_String_Connector_stub \
-          DDS_VT_Seq_Connector_stub DDS_VT_Valuetype_Connector_stub \
-          DDS_VT_Union_Connector_stub 
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopic_Sender_exec.cpp
-  }
-
-  Header_Files {
-    VTopic_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VTopic_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_VTopic_Base_stub  DDS_VTopic_Sender_lem_stub \
-                DDS_VTopic_Connector_stub DDS_VTopic_Connector_svnt DDS_VTopic_Connector_lem_stub \
-                DDS_VT_Array_Connector_stub DDS_VT_Array_Connector_svnt DDS_VT_Array_Connector_lem_stub \
-                DDS_VT_Valuetype_Connector_stub DDS_VT_Valuetype_Connector_svnt DDS_VT_Valuetype_Connector_lem_stub \
-                DDS_VT_Union_Connector_stub DDS_VT_Union_Connector_svnt DDS_VT_Union_Connector_lem_stub \
-                DDS_VT_String_Connector_stub DDS_VT_String_Connector_svnt DDS_VT_String_Connector_lem_stub \
-                DDS_VT_Seq_Connector_stub DDS_VT_Seq_Connector_svnt DDS_VT_Seq_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_VTopic_Base_stub \
-                DDS_VTopic_Connector_stub DDS_VTopic_Connector_svnt \
-                DDS_VT_Array_Connector_stub DDS_VT_Array_Connector_svnt \
-                DDS_VT_Valuetype_Connector_stub DDS_VT_Valuetype_Connector_svnt \
-                DDS_VT_Union_Connector_stub DDS_VT_Union_Connector_svnt \
-                DDS_VT_String_Connector_stub DDS_VT_String_Connector_svnt \
-                DDS_VT_Seq_Connector_stub DDS_VT_Seq_Connector_svnt
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopic_SenderS.cpp
-    VTopic_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    VTopic_SenderS.h
-    VTopic_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp
deleted file mode 100644
index 9bfe71d10d6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-// -*- C++ -*-
-
-//Test different topic types, with DDS_EVENT connectors,  look for 'PUBLICATION_MATCHED_STATUS
-#include "VTopic_Sender_exec.h"
-#include "ace/Log_Msg.h"
-#include "dds4ccm/impl/Utils.h"
-
-namespace CIAO_VTopic_Sender_Impl
-{
-  //============================================================
-  // Facet Executor Implementation Class: ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Atomic_Boolean &publication_matched)
-    : publication_matched_ (publication_matched)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected(
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind  status_kind)
-  {
-    if (! ::CORBA::is_nil (the_entity) &&
-        status_kind == ::DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        this->publication_matched_ = true;
-      }
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-  Sender_exec_i::Sender_exec_i (void)
-    : publication_matched_ (false)
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-
-  {
-    return new ConnectorStatusListener_exec_i (this->publication_matched_);
-  }
-
-  // Supported operations and attributes.
-  void
-  Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ = ::VTopic::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)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    if(!this->publication_matched_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
-                               ACE_TEXT ("states 'PUBLICATION_MATCHED_STATUS' in Sender\n")
-                    ));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Received the expected ")
-                               ACE_TEXT ("'PUBLICATION_MATCHED_STATUS' in Sender\n")
-                    ));
-      }
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_VTopic_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/VariousTopicsEvent/Sender/VTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.h
deleted file mode 100644
index 501bb50c7f8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_SENDER_EXEC_H_
-#define CIAO_SENDER_EXEC_H_
-
-#include "VTopic_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_VTopic_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Sender_exec_i;
-
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean &);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                     const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                               ::DDS::StatusKind  status_kind);
-  private:
-    Atomic_Boolean &publication_matched_;
-  };
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (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);
-
-    // Port operations.
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status(void);
-
-  private:
-    ::VTopic::CCM_Sender_Context_var context_;
-
-    Atomic_Boolean publication_matched_;
-};
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_VTopic_Sender_Impl (void);
-
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp
deleted file mode 100644
index a224e9d2671..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp
+++ /dev/null
@@ -1,1247 +0,0 @@
-<!--  -->
-<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>VTopic_Depl_1</label>
-  <UUID>VTopic_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_VTopic_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_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="VTopic_ConnectorComponentImplementation">
-    <name>VTopic_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="VTopic_Connector_ExecArtifact" />
-    <artifact xmi:idref="VTopic_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_VTopic_TestTopicConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_TestTopicConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTopic_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTopic_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="VT_String_ConnectorComponentImplementation">
-    <name>VT_String_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="VT_String_Connector_ExecArtifact" />
-    <artifact xmi:idref="VT_String_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_VTopic_TopicStringConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_TopicStringConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VT_String_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VT_String_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="VT_Array_ConnectorComponentImplementation">
-    <name>VT_Array_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="VT_Array_Connector_ExecArtifact" />
-    <artifact xmi:idref="VT_Array_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_VTopic_TopicArrayConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_TopicArrayConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VT_Array_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VT_Array_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="VT_Valuetype_ConnectorComponentImplementation">
-    <name>VT_Valuetype_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="VT_Valuetype_Connector_ExecArtifact" />
-    <artifact xmi:idref="VT_Valuetype_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_VTopic_TopicValuetypeConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_TopicValuetypeConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VT_Valuetype_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VT_Valuetype_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="VT_Union_ConnectorComponentImplementation">
-    <name>VT_Union_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="VT_Union_Connector_ExecArtifact" />
-    <artifact xmi:idref="VT_Union_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_VTopic_TopicUnionConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_TopicUnionConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VT_Union_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VT_Union_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="VT_X_Union_ConnectorComponentImplementation">
-    <name>VT_X_Union_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="VT_Union_Connector_ExecArtifact" />
-    <artifact xmi:idref="VT_Union_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_VTopic_X_UnionConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_X_UnionConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VT_Union_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VT_Union_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="VT_Seq_ConnectorComponentImplementation">
-    <name>VT_Seq_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="VT_Seq_Connector_ExecArtifact" />
-    <artifact xmi:idref="VT_Seq_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_VTopic_TopicSeqConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_TopicSeqConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VT_Seq_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VT_Seq_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_VTopic_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_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="VTopic_ConnectorComponentInstance">
-    <name>VTopic_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VTopic_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestUS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="VTopic_ConnectorComponentInstance2">
-    <name>VTopic_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VTopic_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestUS</string>
-        </value>
-      </value>
-    </configProperty>
-   </instance>
-
-  <instance xmi:id="VT_String_ConnectorComponentInstance">
-    <name>VT_String_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_String_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestString</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="VT_String_ConnectorComponentInstance2">
-    <name>VT_String_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_String_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestString</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="VT_Array_ConnectorComponentInstance">
-    <name>VT_Array_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_Array_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestArray</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="VT_Array_ConnectorComponentInstance2">
-    <name>VT_Array_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_Array_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestArray</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="VT_Valuetype_ConnectorComponentInstance">
-    <name>VT_Valuetype_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_Valuetype_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestValuetype</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="VT_Valuetype_ConnectorComponentInstance2">
-    <name>VT_Valuetype_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_Valuetype_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestValuetype</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="VT_Union_ConnectorComponentInstance">
-    <name>VT_Union_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_Union_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestUnion</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="VT_Union_ConnectorComponentInstance2">
-    <name>VT_Union_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_Union_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestUnion</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="VT_X_Union_ConnectorComponentInstance">
-    <name>VT_X_Union_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_X_Union_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Test_X_Union</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="VT_X_Union_ConnectorComponentInstance2">
-    <name>VT_X_Union_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_X_Union_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Test_X_Union</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="VT_Seq_ConnectorComponentInstance">
-    <name>VT_Seq_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_Seq_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestSeq</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="VT_Seq_ConnectorComponentInstance2">
-    <name>VT_Seq_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_Seq_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestSeq</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <!--
-      *****************************
-      Regular connector connections
-      *****************************
-  -->
-  <connection>
-    <name>connector_status_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VTopic_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VTopic_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <!-- connection in order to establish a publication_matched
-  -->
-  <connection>
-    <name>test_topic_info_write</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <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="VTopic_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <!-- connection in order to establish a subscription_matched
-       -->
-  <connection>
-    <name>test_topic_info_out</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="VTopic_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <!--
-      *****************************
-      String connector connections
-      *****************************
-  -->
-  <connection>
-    <name>connector_status_receiver_string</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_String_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender_string</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_String_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!--
-      *****************************
-      Array connector connections
-      *****************************
-  -->
-  <connection>
-    <name>connector_status_receiver_array</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_Array_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender_array</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_Array_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!--
-      *****************************
-      ValueType connector connections
-      *****************************
-  -->
-  <connection>
-    <name>connector_status_receiver_valuetype</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_Valuetype_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender_valuetype</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_Valuetype_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!--
-      *****************************
-      Union connector connections
-      *****************************
-  -->
-  <connection>
-    <name>connector_status_receiver_union</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_Union_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender_union</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_Union_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_receiver_x_union</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_X_Union_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender_x_union</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_X_Union_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!--
-      *****************************
-      Sequence connector connections
-      *****************************
-  -->
-  <connection>
-    <name>connector_status_receiver_seq</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_Seq_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender_seq</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_Seq_ConnectorComponentInstance" />
-    </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="VTopic_Connector_ExecArtifact">
-    <name>VTopic_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_VTopic_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="VTopic_Connector_SvntArtifact">
-    <name>VTopic_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_VTopic_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="VTopic_Connector_StubArtifact">
-    <name>VTopic_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_VTopic_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="VT_String_Connector_ExecArtifact">
-    <name>VT_String_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_String_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="VT_String_Connector_SvntArtifact">
-    <name>VT_String_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_String_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="VT_String_Connector_StubArtifact">
-    <name>VT_String_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDSVT_String_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="VT_Array_Connector_ExecArtifact">
-    <name>VT_Array_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_Array_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="VT_Array_Connector_SvntArtifact">
-    <name>VT_Array_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_Array_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="VT_Array_Connector_StubArtifact">
-    <name>VT_Array_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_Array_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="VT_Valuetype_Connector_ExecArtifact">
-    <name>VT_Valuetype_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_Valuetype_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="VT_Valuetype_Connector_SvntArtifact">
-    <name>VT_Valuetype_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_Valuetype_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="VT_Valuetype_Connector_StubArtifact">
-    <name>VT_Valuetype_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_Valuetype_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="VT_Union_Connector_ExecArtifact">
-    <name>VT_Union_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_Union_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="VT_Union_Connector_SvntArtifact">
-    <name>VT_Union_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_Union_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="VT_Union_Connector_StubArtifact">
-    <name>VT_Union_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_Union_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="VT_Seq_Connector_ExecArtifact">
-    <name>VT_Seq_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_Seq_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="VT_Seq_Connector_SvntArtifact">
-    <name>VT_Seq_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_Seq_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="VT_Seq_Connector_StubArtifact">
-    <name>VT_Seq_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_VT_Seq_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/VariousTopicsEvent/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl
deleted file mode 100755
index 7badf0431b3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 10 seconds to allow task to complete\n";
-sleep (10);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill (4 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/.gitignore b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/.gitignore
deleted file mode 100644
index 502167fa0b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
deleted file mode 100644
index 0d4e8b46db4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * @file   VTopics_Base.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef VTOPICS_BASE_IDL
-#define VTOPICS_BASE_IDL
-
-#pragma ndds typesupport "Base/VTopics_BaseSupport.h"
-#pragma opendds typesupport "Base/VTopics_BaseTypeSupportImpl.h"
-
-typedef octet octet_array[5];
-
-#pragma DCPS_DATA_TYPE "TestTopic"
-#pragma DCPS_DATA_KEY "TestTopic key"
-
-// Plain Topic
-struct TestTopic {
-  string key; //@key
-  long x;
-};
-
-#pragma DCPS_DATA_TYPE "TopicString"
-#pragma DCPS_DATA_KEY "TopicString key"
-
-// String
-struct TopicString {
-  string key; //@key
-  string x_str;
-};
-
-#pragma DCPS_DATA_TYPE "TopicArray"
-#pragma DCPS_DATA_KEY "TopicArray key"
-
-// Arrays
-struct TopicArray {
-  string key; //@key
-  octet_array x_array;
-};
-
-// Unions
-union X_Union switch (short) {
-  case 0:
-    string x_test;
-  case 1:
-    long   x_long;
-};
-
-#pragma DCPS_DATA_TYPE "TopicUnion"
-#pragma DCPS_DATA_KEY "TopicUnion key"
-
-struct TopicUnion {
-  string key; //@key
-  X_Union x_uni;
-};
-
-// Sequence
-struct test {
-  short x_test;
-  string x_teststr;
-};
-
-typedef sequence<test> testSeq;
-
-#pragma DCPS_DATA_TYPE "TopicSeq"
-#pragma DCPS_DATA_KEY "TopicSeq key"
-
-struct TopicSeq {
-  string key; //@key
-  testSeq x_seq;
-};
-
- // ValueType
-valuetype X_Valuetype {
-  public string type;
-  public long x_long;
-};
-
-#if !defined (CIAO_DDS4CCM_OPENDDS)
-// OpenDDS doesn't support valuetype as topic member
-#pragma DCPS_DATA_TYPE "TopicValuetype"
-#pragma DCPS_DATA_KEY "TopicValuetype key"
-
-struct TopicValuetype {
-  string key; //@key
-  X_Valuetype x_vt;
-};
-#endif
-
-// Sequences
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TestTopic> TestTopicSeq;
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TopicString> TopicStringSeq;
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TopicArray> TopicArraySeq;
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TopicUnion> TopicUnionSeq;
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<X_Union> X_UnionSeq;
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TopicSeq> TopicSeqSeq;
-#endif
-#if !defined (CIAO_DDS4CCM_OPENDDS)
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<TopicValuetype> TopicValuetypeSeq;
-#endif
-#endif
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<X_Valuetype> X_ValuetypeSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc
deleted file mode 100644
index 93338d3676d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc
+++ /dev/null
@@ -1,25 +0,0 @@
-project (DDS_VTopics_Base_stub) : taoidldefaults, \
-                                  dds4ccm_ts_default, valuetype {
-  sharedname = DDS_VTopics_Base_stub
-  dynamicflags += VTOPICS_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS \
-              -Wb,stub_export_macro=VTOPICS_BASE_STUB_Export \
-              -Wb,stub_export_include=VTopics_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    VTopics_Base.idl
-  }
-
-  opendds_ts_flags += --export=VTOPICS_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    VTopics_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl
deleted file mode 100644
index ec502e9d437..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file VTS_Array_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef VTS_ARRAY_CONNECTOR_IDL_
-#define VTS_ARRAY_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/VTopics_Base.idl"
-
-#pragma ciao lem "Conn_Array/VTS_Array_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/VTopics_BaseTypeSupport.idl"
-#endif
-
-module VTopics
-{
-  module ::CCM_DDS::Typed < ::TopicArray, ::TopicArraySeq> TopicArrayConnector;
-};
-
-#endif /* VTS_Array_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc
deleted file mode 100644
index c522762166e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc
+++ /dev/null
@@ -1,141 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTS_Array_Connector"
-
-project(DDS_VTS_ARRAY_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_VTopics_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=VTS_ARRAY_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=VTS_Array_Connector_stub_export.h \
-              -Wb,skel_export_macro=VTS_ARRAY_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=VTS_Array_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=VTS_ARRAY_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=VTS_Array_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VTS_ARRAY_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VTS_Array_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    VTS_Array_Connector.idl
-  }
-}
-
-project(DDS_VTS_ARRAY_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_VTS_ARRAY_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=VTS_ARRAY_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=VTS_Array_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    VTS_Array_ConnectorE.idl
-  }
-}
-
-project(DDS_VTS_ARRAY_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VTS_ARRAY_Connector_lem_gen DDS_VTS_Array_Connector_stub DDS_VTopics_Base_stub
-  libs  += DDS_VTopics_Base_stub DDS_VTS_Array_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTS_ARRAY_Connector_lem_stub
-  dynamicflags += VTS_ARRAY_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Array_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    VTS_Array_ConnectorEC.h
-    VTS_Array_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VTS_Array_ConnectorEC.inl
-  }
-}
-
-project(DDS_VTS_Array_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VTS_ARRAY_Connector_idl_gen DDS_VTopics_Base_stub
-  libs  += DDS_VTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTS_Array_Connector_stub
-  dynamicflags += VTS_ARRAY_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Array_ConnectorC.cpp
-  }
-
-  Header_Files {
-    VTS_Array_ConnectorC.h
-    VTS_Array_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    VTS_Array_ConnectorC.inl
-  }
-}
-
-project(DDS_VTS_Array_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VTS_ARRAY_Connector_lem_stub DDS_VTS_Array_Connector_stub DDS_VTopics_Base_stub
-  sharedname = DDS_VTS_Array_Connector_exec
-  libs += DDS_VTS_Array_Connector_stub DDS_VTS_ARRAY_Connector_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VTS_ARRAY_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Array_Connector_conn.cpp
-  }
-
-  Header_Files {
-    VTS_Array_Connector_conn.h
-    VTS_Array_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VTS_Array_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VTS_ARRAY_Connector_lem_stub DDS_VTS_Array_Connector_exec DDS_VTS_Array_Connector_stub
-  sharedname  = DDS_VTS_Array_Connector_svnt
-  libs       += DDS_VTS_Array_Connector_stub \
-                DDS_VTS_ARRAY_Connector_lem_stub  \
-                DDS_VTopics_Base_stub \
-                DDS_VTS_Array_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VTS_ARRAY_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Array_ConnectorS.cpp
-    VTS_Array_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    VTS_Array_ConnectorS.h
-    VTS_Array_Connector_svnt.h
-    VTS_Array_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl
deleted file mode 100644
index 4dfa1f811e8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file VTS_Seq_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef VTS_SEQ_CONNECTOR_IDL_
-#define VTS_SEQ_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/VTopics_Base.idl"
-
-#pragma ciao lem "Conn_Seq/VTS_Seq_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/VTopics_BaseTypeSupport.idl"
-#endif
-
-module VTopics
-{
-  module ::CCM_DDS::Typed < ::TopicSeq, ::TopicSeqSeq> TopicSeqConnector;
-};
-
-#endif /* VTS_SEQ_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
deleted file mode 100644
index 757e94922d2..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
+++ /dev/null
@@ -1,141 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTS_Seq_Connector"
-
-project(DDS_VTS_SEQ_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_VTopics_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=VTS_SEQ_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=VTS_Seq_Connector_stub_export.h \
-              -Wb,skel_export_macro=VTS_SEQ_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=VTS_Seq_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=VTS_SEQ_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=VTS_Seq_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VTS_SEQ_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VTS_Seq_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    VTS_Seq_Connector.idl
-  }
-}
-
-project(DDS_VTS_SEQ_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_VTS_SEQ_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=VTS_SEQ_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=VTS_Seq_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    VTS_Seq_ConnectorE.idl
-  }
-}
-
-project(DDS_VTS_SEQ_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VTS_SEQ_Connector_lem_gen DDS_VTS_Seq_Connector_stub DDS_VTopics_Base_stub
-  libs  += DDS_VTopics_Base_stub DDS_VTS_Seq_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTS_SEQ_Connector_lem_stub
-  dynamicflags += VTS_SEQ_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Seq_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    VTS_Seq_ConnectorEC.h
-    VTS_Seq_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VTS_Seq_ConnectorEC.inl
-  }
-}
-
-project(DDS_VTS_Seq_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VTS_SEQ_Connector_idl_gen DDS_VTopics_Base_stub
-  libs  += DDS_VTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTS_Seq_Connector_stub
-  dynamicflags += VTS_SEQ_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Seq_ConnectorC.cpp
-  }
-
-  Header_Files {
-    VTS_Seq_ConnectorC.h
-    VTS_Seq_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    VTS_Seq_ConnectorC.inl
-  }
-}
-
-project(DDS_VTS_Seq_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VTS_SEQ_Connector_lem_stub DDS_VTS_Seq_Connector_stub DDS_VTopics_Base_stub
-  sharedname = DDS_VTS_Seq_Connector_exec
-  libs += DDS_VTS_Seq_Connector_stub DDS_VTS_SEQ_Connector_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VTS_SEQ_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Seq_Connector_conn.cpp
-  }
-
-  Header_Files {
-    VTS_Seq_Connector_conn.h
-    VTS_Seq_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VTS_Seq_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VTS_SEQ_Connector_lem_stub DDS_VTS_Seq_Connector_exec DDS_VTS_Seq_Connector_stub
-  sharedname  = DDS_VTS_Seq_Connector_svnt
-  libs       += DDS_VTS_Seq_Connector_stub \
-                DDS_VTS_SEQ_Connector_lem_stub  \
-                DDS_VTopics_Base_stub \
-                DDS_VTS_Seq_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VTS_SEQ_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Seq_ConnectorS.cpp
-    VTS_Seq_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    VTS_Seq_ConnectorS.h
-    VTS_Seq_Connector_svnt.h
-    VTS_Seq_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl
deleted file mode 100644
index d224a66f793..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file VTS_String_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef VTS_STRING_CONNECTOR_IDL_
-#define VTS_STRING_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/VTopics_Base.idl"
-
-#pragma ciao lem "Conn_String/VTS_String_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/VTopics_BaseTypeSupport.idl"
-#endif
-
-module VTopics
-{
-  module ::CCM_DDS::Typed < ::TopicString, ::TopicStringSeq> TopicStringConnector;
-};
-
-#endif /* VTS_STRING_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc
deleted file mode 100644
index 58edb6b9ad4..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTS_String_Connector"
-
-project(DDS_VTS_STRING_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_VTopics_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=VTS_STRING_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=VTS_String_Connector_stub_export.h \
-              -Wb,skel_export_macro=VTS_STRING_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=VTS_String_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=VTS_STRING_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=VTS_String_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VTS_STRING_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VTS_String_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    VTS_String_Connector.idl
-  }
-}
-
-project(DDS_VTS_STRING_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_VTS_STRING_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=VTS_STRING_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=VTS_String_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    VTS_String_ConnectorE.idl
-  }
-}
-
-project(DDS_VTS_STRING_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VTS_STRING_Connector_lem_gen DDS_VTS_String_Connector_stub DDS_VTopics_Base_stub
-  libs  += DDS_VTopics_Base_stub DDS_VTS_String_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTS_STRING_Connector_lem_stub
-  dynamicflags += VTS_STRING_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_String_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    VTS_String_ConnectorEC.h
-    VTS_String_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VTS_String_ConnectorEC.inl
-  }
-}
-
-project(DDS_VTS_String_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VTS_STRING_Connector_idl_gen DDS_VTopics_Base_stub
-  libs  += DDS_VTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTS_String_Connector_stub
-  dynamicflags += VTS_STRING_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_String_ConnectorC.cpp
-  }
-
-  Header_Files {
-    VTS_String_ConnectorC.h
-    VTS_String_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    VTS_String_ConnectorC.inl
-  }
-}
-
-project(DDS_VTS_String_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VTS_STRING_Connector_lem_stub DDS_VTS_String_Connector_stub DDS_VTopics_Base_stub
-  sharedname = DDS_VTS_String_Connector_exec
-  libs += DDS_VTS_String_Connector_stub DDS_VTS_STRING_Connector_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VTS_STRING_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_String_Connector_conn.cpp
-  }
-
-  Header_Files {
-    VTS_String_Connector_conn.h
-    VTS_String_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VTS_String_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VTS_STRING_Connector_lem_stub DDS_VTS_String_Connector_exec DDS_VTS_String_Connector_stub
-  sharedname  = DDS_VTS_String_Connector_svnt
-  libs       += DDS_VTS_String_Connector_stub \
-                DDS_VTS_STRING_Connector_lem_stub  \
-                DDS_VTopics_Base_stub \
-                DDS_VTS_String_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VTS_STRING_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_String_ConnectorS.cpp
-    VTS_String_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    VTS_String_ConnectorS.h
-    VTS_String_Connector_svnt.h
-    VTS_String_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl
deleted file mode 100644
index f728c9d2cdc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * @file VTS_Union_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef VT_UNION_CONNECTOR_IDL_
-#define VT_UNION_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/VTopics_Base.idl"
-
-#pragma ciao lem "Conn_Union/VTS_Union_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/VTopics_BaseTypeSupport.idl"
-#endif
-
-module VTopic
-{
-  module ::CCM_DDS::Typed < ::TopicUnion, ::TopicUnionSeq> TopicUnionConnector;
-#if !defined (CIAO_DDS4CCM_OPENDDS)
-  module ::CCM_DDS::Typed < ::X_Union, ::X_UnionSeq> X_UnionConnector;
-#else
-  // Just use another topic, that way we get a connector
-  module ::CCM_DDS::Typed < ::TopicString, ::TopicStringSeq> X_UnionConnector;
-#endif
-};
-
-#endif /* VT_UNION_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc
deleted file mode 100644
index 104300fd1bc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc
+++ /dev/null
@@ -1,140 +0,0 @@
-project(DDS_VTS_Union_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_VTopics_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=VT_UNION_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=VTS_Union_Connector_stub_export.h \
-              -Wb,skel_export_macro=VT_UNION_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=VTS_Union_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=VT_UNION_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=VTS_Union_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VT_UNION_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VTS_Union_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    VTS_Union_Connector.idl
-  }
-}
-
-project(DDS_VTS_Union_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_VTS_Union_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=VT_UNION_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=VTS_Union_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    VTS_Union_ConnectorE.idl
-  }
-}
-
-project(DDS_VTS_Union_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VTS_Union_Connector_lem_gen DDS_VTS_Union_Connector_stub DDS_VTopics_Base_stub
-  libs  += DDS_VTopics_Base_stub DDS_VTS_Union_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTS_Union_Connector_lem_stub
-  dynamicflags += VT_UNION_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Union_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    VTS_Union_ConnectorEC.h
-    VTS_Union_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VTS_Union_ConnectorEC.inl
-  }
-}
-
-project(DDS_VTS_Union_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VTS_Union_Connector_idl_gen DDS_VTopics_Base_stub
-  libs  += DDS_VTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTS_Union_Connector_stub
-  dynamicflags += VT_UNION_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Union_ConnectorC.cpp
-  }
-
-  Header_Files {
-    VTS_Union_ConnectorC.h
-    VTS_Union_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    VTS_Union_ConnectorC.inl
-  }
-}
-
-project(DDS_VTS_Union_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VTS_Union_Connector_lem_stub DDS_VTS_Union_Connector_stub DDS_VTopics_Base_stub
-  sharedname = DDS_VTS_Union_Connector_exec
-  libs += DDS_VTS_Union_Connector_stub DDS_VTS_Union_Connector_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VT_UNION_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Union_Connector_conn.cpp
-  }
-
-  Header_Files {
-    VTS_Union_Connector_conn.h
-    VTS_Union_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VTS_Union_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VTS_Union_Connector_lem_stub DDS_VTS_Union_Connector_exec \
-                DDS_VTS_Union_Connector_stub
-  sharedname  = DDS_VTS_Union_Connector_svnt
-  libs       += DDS_VTS_Union_Connector_stub \
-                DDS_VTS_Union_Connector_lem_stub  \
-                DDS_VTopics_Base_stub \
-                DDS_VTS_Union_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VT_UNION_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Union_ConnectorS.cpp
-    VTS_Union_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    VTS_Union_ConnectorS.h
-    VTS_Union_Connector_svnt.h
-    VTS_Union_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl
deleted file mode 100644
index fc61e9b9eea..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @file VTS_Valuetype_Connector.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef VTS_VALUE_TYPE_CONNECTOR_IDL_
-#define VTS_VALUE_TYPE_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/VTopics_Base.idl"
-
-#pragma ciao lem "Conn_Valuetype/VTS_Valuetype_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/VTopics_BaseTypeSupport.idl"
-#endif
-
-module VTopics
-{
-#if !defined (CIAO_DDS4CCM_OPENDDS)
-  module ::CCM_DDS::Typed < ::TopicValuetype, ::TopicValuetypeSeq> TopicValuetypeConnector;
-#else
-  // Just use another topic, that way we get a connector
-  module ::CCM_DDS::Typed < ::TopicString, ::TopicStringSeq> TopicValuetypeConnector;
-#endif
-};
-
-#endif /* VTS_VALUE_TYPE_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc
deleted file mode 100644
index a46ce3bfc4d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc
+++ /dev/null
@@ -1,143 +0,0 @@
-project(DDS_VTS_Valuetype_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_VTopics_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=VTS_VALUE_TYPE_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=VTS_Valuetype_Connector_stub_export.h \
-              -Wb,skel_export_macro=VTS_VALUE_TYPE_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=VTS_Valuetype_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=VTS_VALUE_TYPE_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=VTS_Valuetype_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VTS_VALUE_TYPE_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VTS_Valuetype_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    VTS_Valuetype_Connector.idl
-  }
-}
-
-project(DDS_VTS_Valuetype_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_VTS_Valuetype_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=VTS_VALUE_TYPE_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=VTS_Valuetype_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    VTS_Valuetype_ConnectorE.idl
-  }
-}
-
-project(DDS_VTS_VALUE_TYPE_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VTS_Valuetype_Connector_lem_gen DDS_VTS_Valuetype_Connector_stub \
-           DDS_VTopics_Base_stub
-  libs  += DDS_VTopics_Base_stub DDS_VTS_Valuetype_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTS_VALUE_TYPE_Connector_lem_stub
-  dynamicflags += VTS_VALUE_TYPE_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Valuetype_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    VTS_Valuetype_ConnectorEC.h
-    VTS_Valuetype_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VTS_Valuetype_ConnectorEC.inl
-  }
-}
-
-project(DDS_VTS_Valuetype_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VTS_Valuetype_Connector_idl_gen DDS_VTopics_Base_stub
-  libs  += DDS_VTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTS_Valuetype_Connector_stub
-  dynamicflags += VTS_VALUE_TYPE_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Valuetype_ConnectorC.cpp
-  }
-
-  Header_Files {
-    VTS_Valuetype_ConnectorC.h
-    VTS_Valuetype_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    VTS_Valuetype_ConnectorC.inl
-  }
-}
-
-project(DDS_VTS_Valuetype_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VTS_VALUE_TYPE_Connector_lem_stub DDS_VTS_Valuetype_Connector_stub \
-             DDS_VTopics_Base_stub
-  sharedname = DDS_VTS_Valuetype_Connector_exec
-  libs += DDS_VTS_Valuetype_Connector_stub DDS_VTS_VALUE_TYPE_Connector_lem_stub \
-          DDS_VTopics_Base_stub DDS_VTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VTS_VALUE_TYPE_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Valuetype_Connector_conn.cpp
-  }
-
-  Header_Files {
-    VTS_Valuetype_Connector_conn.h
-    VTS_Valuetype_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VTS_Valuetype_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VTS_VALUE_TYPE_Connector_lem_stub DDS_VTS_Valuetype_Connector_exec\
-                DDS_VTS_Valuetype_Connector_stub
-  sharedname  = DDS_VTS_Valuetype_Connector_svnt
-  libs       += DDS_VTS_Valuetype_Connector_stub \
-                DDS_VTS_VALUE_TYPE_Connector_lem_stub  \
-                DDS_VTopics_Base_stub \
-                DDS_VTS_Valuetype_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VTS_VALUE_TYPE_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTS_Valuetype_ConnectorS.cpp
-    VTS_Valuetype_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    VTS_Valuetype_ConnectorS.h
-    VTS_Valuetype_Connector_svnt.h
-    VTS_Valuetype_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl
deleted file mode 100644
index 8e454b7fe4a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file VTopics_Connector.idl
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef VTOPICS_CONNECTOR_IDL_
-#define VTOPICS_CONNECTOR_IDL_
-
-#include <Components.idl>
-#include <ccm_dds.idl>
-
-#include "Base/VTopics_Base.idl"
-
-#pragma ciao lem "Connector/VTopics_ConnectorE.idl"
-
-#if (CIAO_DDS4CCM_OPENDDS==1)
-# include "Base/VTopics_BaseTypeSupport.idl"
-#endif
-
-module VTopics
-{
-  module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> TestTopicConnector;
-};
-
-#endif /* VTopics_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
deleted file mode 100644
index 0b49ebf7e6e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
+++ /dev/null
@@ -1,142 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTopics_Connector"
-
-project(DDS_VTopics_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen DDS_VTopics_Base_stub
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=VTOPICS_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=VTopics_Connector_stub_export.h \
-              -Wb,skel_export_macro=VTOPICS_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=VTopics_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=VTOPICS_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=VTopics_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VTOPICS_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VTopics_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    VTopics_Connector.idl
-  }
-}
-
-project(DDS_VTopics_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_VTopics_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=VTOPICS_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=VTopics_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I ..
-
-  IDL_Files {
-    VTopics_ConnectorE.idl
-  }
-}
-
-project(DDS_VTopics_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VTopics_Connector_lem_gen DDS_VTopics_Connector_stub DDS_VTopics_Base_stub
-  libs  += DDS_VTopics_Base_stub DDS_VTopics_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTopics_Connector_lem_stub
-  dynamicflags += VTOPICS_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopics_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    VTopics_ConnectorEC.h
-    VTopics_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VTopics_ConnectorEC.inl
-  }
-}
-
-project(DDS_VTopics_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VTopics_Connector_idl_gen DDS_VTopics_Base_stub
-  libs  += DDS_VTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_VTopics_Connector_stub
-  dynamicflags += VTOPICS_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopics_ConnectorC.cpp
-  }
-
-  Header_Files {
-    VTopics_ConnectorC.h
-    VTopics_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    VTopics_ConnectorC.inl
-  }
-}
-
-project(DDS_VTopics_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VTopics_Connector_lem_stub DDS_VTopics_Connector_stub DDS_VTopics_Base_stub
-  sharedname = DDS_VTopics_Connector_exec
-  libs += DDS_VTopics_Connector_stub DDS_VTopics_Connector_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VTOPICS_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopics_Connector_conn.cpp
-  }
-
-  Header_Files {
-    VTopics_Connector_conn.h
-    VTopics_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VTopics_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VTopics_Connector_lem_stub DDS_VTopics_Connector_exec DDS_VTopics_Connector_stub
-  sharedname  = DDS_VTopics_Connector_svnt
-  libs       += DDS_VTopics_Connector_stub \
-                DDS_VTopics_Connector_lem_stub  \
-                DDS_VTopics_Base_stub \
-                DDS_VTopics_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += VTOPICS_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopics_ConnectorS.cpp
-    VTopics_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    VTopics_ConnectorS.h
-    VTopics_Connector_svnt.h
-    VTopics_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.idl
deleted file mode 100644
index c90d09b525e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @file
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/VTopics_Connector.idl"
-
-module VTopics
-{
-  component Receiver
-  {
-    port TestTopicConnector::DDS_Listen info_out;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-   };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
deleted file mode 100644
index 6e2ffd342cc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
+++ /dev/null
@@ -1,170 +0,0 @@
-project(DDS_VTopics_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_VTopics_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 {
-    VTopics_Receiver.idl
-  }
-}
-
-project(DDS_VTopics_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_VTopics_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 {
-    VTopics_ReceiverE.idl
-  }
-}
-
-project(DDS_VTopics_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_VTopics_Receiver_lem_gen DDS_VTopics_Receiver_stub DDS_VTopics_Base_stub \
-           DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub \
-           DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub \
-           DDS_VTS_Valuetype_Connector_stub DDS_VTS_Union_Connector_stub
-  libs  +=  Receiver_stub DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub \
-            DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub DDS_VTopics_Base_stub \
-            DDS_VTS_Valuetype_Connector_stub DDS_VTS_Union_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags += RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopics_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    VTopics_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VTopics_ReceiverEC.inl
-  }
-}
-
-project(DDS_VTopics_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VTopics_Receiver_idl_gen DDS_VTopics_Base_stub \
-           DDS_VTopics_Connector_stub DDS_VTopics_Connector_lem_gen \
-           DDS_VTS_String_Connector_stub DDS_VTS_String_Connector_lem_gen \
-           DDS_VTS_Array_Connector_stub DDS_VTS_Array_Connector_lem_gen \
-           DDS_VTS_Valuetype_Connector_stub DDS_VTS_Valuetype_Connector_lem_gen \
-           DDS_VTS_Union_Connector_stub DDS_VTS_Union_Connector_lem_gen \
-           DDS_VTS_Seq_Connector_stub DDS_VTS_Seq_Connector_lem_gen
-  libs  += DDS_VTopics_Connector_stub DDS_VTS_Valuetype_Connector_stub \
-           DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub \
-           DDS_VTS_Union_Connector_stub DDS_VTS_Seq_Connector_stub \
-           DDS_VTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags += RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopics_ReceiverC.cpp
-  }
-
-  Header_Files {
-    VTopics_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    VTopics_ReceiverC.inl
-  }
-}
-
-project(DDS_VTopics_Receiver_exec) : ciao_executor, dds4ccm_lem_stub {
-  after     += DDS_VTopics_Receiver_lem_stub DDS_VTopics_Receiver_stub DDS_VTopics_Base_stub \
-               DDS_VTopics_Connector_stub DDS_VTopics_Connector_lem_stub \
-               DDS_VTS_String_Connector_stub DDS_VTS_String_Connector_lem_stub \
-               DDS_VTS_Array_Connector_stub DDS_VTS_Array_Connector_lem_stub \
-               DDS_VTS_Valuetype_Connector_stub DDS_VTS_Valuetype_Connector_lem_stub \
-               DDS_VTS_Union_Connector_stub DDS_VTS_Union_Connector_lem_stub \
-               DDS_VTS_Seq_Connector_stub DDS_VTS_Seq_Connector_lem_stub 
-  sharedname = Receiver_exec
-  libs      += Receiver_stub Receiver_lem_stub DDS_VTopics_Base_stub \
-               DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub \
-               DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub \
-               DDS_VTopics_Connector_lem_stub \
-               DDS_VTS_Valuetype_Connector_stub DDS_VTS_Union_Connector_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopics_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    VTopics_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VTopics_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_VTopics_Receiver_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Receiver_exec \
-                DDS_VTopics_Connector_stub DDS_VTopics_Connector_svnt DDS_VTopics_Connector_lem_stub \
-                DDS_VTS_String_Connector_stub DDS_VTS_String_Connector_svnt DDS_VTS_String_Connector_lem_stub \
-                DDS_VTS_Array_Connector_stub DDS_VTS_Array_Connector_svnt DDS_VTS_Array_Connector_lem_stub \
-                DDS_VTS_Valuetype_Connector_stub DDS_VTS_Valuetype_Connector_svnt DDS_VTS_Valuetype_Connector_lem_stub \
-                DDS_VTS_Union_Connector_stub DDS_VTS_Union_Connector_svnt DDS_VTS_Union_Connector_lem_stub \
-                DDS_VTS_Seq_Connector_stub DDS_VTS_Seq_Connector_svnt DDS_VTS_Seq_Connector_lem_stub 
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_VTopics_Base_stub \
-                DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub \
-                DDS_VTopics_Connector_svnt DDS_VTS_String_Connector_svnt DDS_VTS_Array_Connector_svnt DDS_VTS_Seq_Connector_svnt  \
-                DDS_VTS_Valuetype_Connector_svnt DDS_VTS_Valuetype_Connector_stub \
-                DDS_VTS_Union_Connector_svnt DDS_VTS_Union_Connector_stub \
-                Receiver_exec DDS_VTopics_Connector_lem_stub 
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopics_ReceiverS.cpp
-    VTopics_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    VTopics_ReceiverS.h
-    VTopics_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp
deleted file mode 100644
index 72da2d96393..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-// -*- C++ -*-
-//Test for different topic types , with DDS_STATE connector, look for 'SUBSCRIPTION_MATCHED_STATUS
-
-#include "VTopics_Receiver_exec.h"
-#include "dds4ccm/impl/Utils.h"
-
-
-namespace CIAO_VTopics_Receiver_Impl
-{
-//============================================================
-  // Facet Executor Implementation Class: ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Atomic_Boolean &subscription_matched)
-    : subscription_matched_ (subscription_matched)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-     ::DDS::Topic_ptr /*the_topic*/,
-     const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-     const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status (
-    ::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind  status_kind)
-  {
-    if (! ::CORBA::is_nil(the_entity) &&
-        status_kind == DDS::SUBSCRIPTION_MATCHED_STATUS)
-      {
-        this->subscription_matched_ = true;
-      }
-  }
-
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  Receiver_exec_i::Receiver_exec_i (void)
-    : subscription_matched_ (false)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Port operations.
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Receiver_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (this->subscription_matched_);
-  }
-
-  ::VTopics::TestTopicConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    return ::VTopics::TestTopicConnector::CCM_Listener::_nil ();
-  }
-
-  CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_status (void)
-  {
-    return CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  // Operations from Components::SessionComponent.
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::VTopics::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)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-     if(!this->subscription_matched_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
-                              ACE_TEXT ("status 'SUBSCRIPTION_MATCHED_STATUS' ")
-                              ACE_TEXT ("in Receiver\n")
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Received the expected ")
-                               ACE_TEXT ("'SUBSCRIPTION_MATCHED_STATUS' ")
-                               ACE_TEXT ("in Receiver\n")
-                    ));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_VTopics_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/VariousTopicsState/Receiver/VTopics_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.h
deleted file mode 100644
index 9e15ddc171a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_RECEIVER_EXEC_H_
-#define CIAO_RECEIVER_EXEC_H_
-
-#include "VTopics_ReceiverEC.h"
-
-#include /**/ "Receiver_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-namespace CIAO_VTopics_Receiver_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Receiver_exec_i;
-
-  class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean &);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                     const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                               ::DDS::StatusKind  status_kind);
-
-  private:
-    Atomic_Boolean &subscription_matched_;
-  };
-
-  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.
-   // Port operations.
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::VTopics::TestTopicConnector::CCM_Listener_ptr
-    get_info_out_data_listener (void);
-
-    virtual CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_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:
-    ::VTopics::CCM_Receiver_Context_var context_;
-    Atomic_Boolean subscription_matched_;
-};
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_VTopics_Receiver_Impl (void);
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl
deleted file mode 100644
index 3236c47642c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @author Marijke Hengstmengel (mhengstmengel@remedy.nl)
- */
-
-#ifndef DDS_VTOPICS_SENDER_IDL
-#define DDS_VTOPICS_SENDER_IDL
-
-#include "Connector/VTopics_Connector.idl"
-
-module VTopics
-{
-  component Sender
-  {
-    port TestTopicConnector::DDS_Update info_write;
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc
deleted file mode 100644
index b0467e6d7c3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc
+++ /dev/null
@@ -1,166 +0,0 @@
-// This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_VTopics_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_VTopics_Connector_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 {
-    VTopics_Sender.idl
-  }
-}
-
-project(DDS_VTopics_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_VTopics_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 {
-    VTopics_SenderE.idl
-  }
-}
-
-project(DDS_VTopics_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_VTopics_Sender_lem_gen DDS_VTopics_Sender_stub DDS_VTopics_Base_stub
-  libs  += DDS_VTopics_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags += SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopics_SenderEC.cpp
-  }
-
-  Header_Files {
-    VTopics_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    VTopics_SenderEC.inl
-  }
-}
-
-project(DDS_VTopics_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_VTopics_Sender_idl_gen DDS_VTopics_Base_stub \
-           DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub \
-           DDS_VTS_Array_Connector_stub DDS_VTS_Valuetype_Connector_stub \
-           DDS_VTS_Union_Connector_stub DDS_VTS_Seq_Connector_stub
-  libs  += DDS_VTopics_Base_stub DDS_VTopics_Connector_stub  \
-           DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub \
-           DDS_VTS_Seq_Connector_stub DDS_VTS_Valuetype_Connector_stub \
-           DDS_VTS_Union_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags += SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopics_SenderC.cpp
-  }
-
-  Header_Files {
-    VTopics_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    VTopics_SenderC.inl
-  }
-}
-
-project(DDS_VTopics_Sender_exec) : ciao_executor, dds4ccm_lem_stub {
-  after   += DDS_VTopics_Sender_lem_stub DDS_VTopics_Sender_stub \
-             DDS_VTopics_Connector_lem_stub DDS_VTopics_Connector_stub \
-             DDS_VTS_String_Connector_lem_stub DDS_VTS_String_Connector_stub \
-             DDS_VTS_Array_Connector_lem_stub DDS_VTS_Array_Connector_stub \
-             DDS_VTS_Valuetype_Connector_lem_stub DDS_VTS_Valuetype_Connector_stub \
-             DDS_VTS_Union_Connector_lem_stub DDS_VTS_Union_Connector_stub \
-             DDS_VTS_Seq_Connector_lem_stub DDS_VTS_Seq_Connector_stub 
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_VTopics_Base_stub \
-          DDS_VTopics_Connector_lem_stub DDS_VTopics_Connector_stub \
-          DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub \
-          DDS_VTS_Valuetype_Connector_stub DDS_VTS_Seq_Connector_stub \
-          DDS_VTS_Union_Connector_stub 
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags += SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopics_Sender_exec.cpp
-  }
-
-  Header_Files {
-    VTopics_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_VTopics_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      += DDS_VTopics_Base_stub  DDS_VTopics_Sender_lem_stub \
-                DDS_VTopics_Connector_stub DDS_VTopics_Connector_svnt DDS_VTopics_Connector_lem_stub \
-                DDS_VTS_String_Connector_stub DDS_VTS_String_Connector_svnt DDS_VTS_String_Connector_lem_stub \
-                DDS_VTS_Array_Connector_stub DDS_VTS_Array_Connector_svnt DDS_VTS_Array_Connector_lem_stub \
-                DDS_VTS_Valuetype_Connector_stub DDS_VTS_Valuetype_Connector_svnt DDS_VTS_Valuetype_Connector_lem_stub \
-                DDS_VTS_Union_Connector_stub DDS_VTS_Union_Connector_svnt DDS_VTS_Union_Connector_lem_stub \
-                DDS_VTS_Seq_Connector_stub DDS_VTS_Seq_Connector_svnt DDS_VTS_Seq_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_VTopics_Base_stub \
-                DDS_VTopics_Connector_stub DDS_VTopics_Connector_svnt \
-                DDS_VTS_String_Connector_stub DDS_VTS_String_Connector_svnt \
-                DDS_VTS_Array_Connector_stub DDS_VTS_Array_Connector_svnt \
-                DDS_VTS_Valuetype_Connector_stub DDS_VTS_Valuetype_Connector_svnt \
-                DDS_VTS_Union_Connector_stub DDS_VTS_Union_Connector_svnt \
-                DDS_VTS_Seq_Connector_stub DDS_VTS_Seq_Connector_svnt
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    VTopics_SenderS.cpp
-    VTopics_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    VTopics_SenderS.h
-    VTopics_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp
deleted file mode 100644
index be057adabaf..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-// -*- C++ -*-
-
-//Test different topic types, with DDS_STATE connector, look for 'PUBLICATION_MATCHED_STATUS
-#include "VTopics_Sender_exec.h"
-#include "dds4ccm/impl/Utils.h"
-
-namespace CIAO_VTopics_Sender_Impl
-{
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
-    Atomic_Boolean &publication_matched)
-    : publication_matched_ (publication_matched)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
-     ::DDS::Topic_ptr /*the_topic*/,
-     const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status (
-    ::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind  status_kind)
-  {
-    if (! ::CORBA::is_nil (the_entity) &&
-        status_kind == DDS::PUBLICATION_MATCHED_STATUS)
-      {
-        this->publication_matched_ = true;
-      }
-    }
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-
-  Sender_exec_i::Sender_exec_i (void)
-    : publication_matched_ (false)
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (this->publication_matched_);
-  }
-
-  // Supported operations and attributes.
-  void
-  Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ = ::VTopics::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)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    if(!this->publication_matched_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
-                              ACE_TEXT ("states 'PUBLICATION_MATCHED_STATUS' ")
-                              ACE_TEXT ("in Sender\n")
-                    ));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Received the expected ")
-                              ACE_TEXT ("'PUBLICATION_MATCHED_STATUS' ")
-                              ACE_TEXT ("in Sender\n")
-                    ));
-      }
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_VTopics_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/VariousTopicsState/Sender/VTopics_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.h
deleted file mode 100644
index 38404213210..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// -*- C++ -*-
-#ifndef CIAO_SENDER_EXEC_H_
-#define CIAO_SENDER_EXEC_H_
-
-
-#include "VTopics_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_VTopics_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Sender_exec_i;
-
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-    public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean &);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                  const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                  const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
-                  const DDS::SampleRejectedStatus & status);
-    virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                  const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
-                  const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                  ::DDS::StatusKind  status_kind);
-  private:
-    Atomic_Boolean &publication_matched_;
-  };
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (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);
-
-    // Port operations.
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-  private:
-    ::VTopics::CCM_Sender_Context_var context_;
-
-    Atomic_Boolean publication_matched_;
-};
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_VTopics_Sender_Impl (void);
-
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp
deleted file mode 100644
index 61d6b37adcc..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp
+++ /dev/null
@@ -1,1095 +0,0 @@
-<!--  -->
-<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>VTopics_Depl_1</label>
-  <UUID>VTopics_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_VTopics_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopics_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="VTopics_ConnectorComponentImplementation">
-    <name>VTopics_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="VTopics_Connector_ExecArtifact" />
-    <artifact xmi:idref="VTopics_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_VTopics_TestTopicConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopics_TestTopicConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTopics_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTopics_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="VTS_String_ConnectorComponentImplementation">
-    <name>VTS_String_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="VTS_String_Connector_ExecArtifact" />
-    <artifact xmi:idref="VTS_String_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_VTopics_TopicStringConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopics_TopicStringConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTS_String_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTS_String_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="VTS_Array_ConnectorComponentImplementation">
-    <name>VTS_Array_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="VTS_Array_Connector_ExecArtifact" />
-    <artifact xmi:idref="VTS_Array_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_VTopics_TopicArrayConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopics_TopicArrayConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTS_Array_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTS_Array_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="VTS_Seq_ConnectorComponentImplementation">
-    <name>VTS_Seq_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="VTS_Seq_Connector_ExecArtifact" />
-    <artifact xmi:idref="VTS_Seq_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_VTopics_TopicSeqConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopics_TopicSeqConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTS_Seq_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTS_Seq_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="VTS_Union_ConnectorComponentImplementation">
-    <name>VTS_Union_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="VTS_Union_Connector_ExecArtifact" />
-    <artifact xmi:idref="VTS_Union_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_VTopic_TopicUnionConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_TopicUnionConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTS_Union_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTS_Union_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="VT_X_Union_ConnectorComponentImplementation">
-    <name>VT_X_Union_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="VTS_Union_Connector_ExecArtifact" />
-    <artifact xmi:idref="VTS_Union_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_VTopic_X_UnionConnector_DDS_State_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopic_X_UnionConnector_DDS_State_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTS_Union_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>VTS_Union_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_VTopics_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_VTopics_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="VTopics_ConnectorComponentInstance">
-    <name>VTopics_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VTopics_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestUS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="VTopics_ConnectorComponentInstance2">
-    <name>VTopics_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VTopics_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestUS</string>
-        </value>
-      </value>
-    </configProperty>
-   </instance>
-
-  <instance xmi:id="VTS_String_ConnectorComponentInstance">
-    <name>VTS_String_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VTS_String_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestString</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="VTS_String_ConnectorComponentInstance2">
-    <name>VTS_String_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VTS_String_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestString</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="VTS_Array_ConnectorComponentInstance">
-    <name>VTS_Array_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VTS_Array_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestArray</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="VTS_Array_ConnectorComponentInstance2">
-    <name>VTS_Array_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VTS_Array_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestArray</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="VTS_Seq_ConnectorComponentInstance">
-    <name>VTS_Seq_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VTS_Seq_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestSeq</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="VTS_Seq_ConnectorComponentInstance2">
-    <name>VTS_Seq_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VTS_Seq_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestSeq</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="VTS_Union_ConnectorComponentInstance">
-    <name>VTS_Union_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VTS_Union_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestUnion</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="VTS_Union_ConnectorComponentInstance2">
-    <name>VTS_Union_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VTS_Union_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TestUnion</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="VT_X_Union_ConnectorComponentInstance">
-    <name>VT_X_Union_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_X_Union_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Test_X_Union</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="VT_X_Union_ConnectorComponentInstance2">
-    <name>VT_X_Union_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="VT_X_Union_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Test_X_Union</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <!--
-      *****************************
-      Regular connector connections
-      *****************************
-  -->
-  <connection>
-    <name>connector_status_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VTopics_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VTopics_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <!-- connection in order to establish a publication_matched
-       -->
-  <connection>
-    <name>info_write_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>observable_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="VTopics_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <!-- connection in order to establish a subscription_matched
-       -->
-  <connection>
-    <name>info_out_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_out_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_observer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="VTopics_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <!--
-      *****************************
-      String connector connections
-      *****************************
-  -->
-  <connection>
-    <name>connector_status_receiver_string</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VTS_String_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender_string</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VTS_String_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!--
-      *****************************
-      Array connector connections
-      *****************************
-  -->
-  <connection>
-    <name>connector_status_receiver_array</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VTS_Array_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender_array</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VTS_Array_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!--
-      *****************************
-      Sequence connector connections
-      *****************************
-  -->
-  <connection>
-    <name>connector_status_receiver_seq</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VTS_Seq_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender_seq</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VTS_Seq_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!--
-      *****************************
-      Union connector connections
-      *****************************
-      -->
-  <connection>
-    <name>connector_status_receiver_union</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VTS_Union_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender_union</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VTS_Union_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_receiver_x_union</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_X_Union_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender_x_union</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="VT_X_Union_ConnectorComponentInstance" />
-    </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="VTopics_Connector_ExecArtifact">
-    <name>VTopics_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_VTopics_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="VTopics_Connector_SvntArtifact">
-    <name>VTopics_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_VTopics_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="VTopics_Connector_StubArtifact">
-    <name>VTopics_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_VTopics_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="VTS_String_Connector_ExecArtifact">
-    <name>VTS_String_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_VTS_String_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="VTS_String_Connector_SvntArtifact">
-    <name>VTS_String_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_VTS_String_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="VTS_String_Connector_StubArtifact">
-    <name>VTS_String_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDSVTS_String_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="VTS_Array_Connector_ExecArtifact">
-    <name>VTS_Array_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_VTS_Array_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="VTS_Array_Connector_SvntArtifact">
-    <name>VTS_Array_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_VTS_Array_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="VTS_Array_Connector_StubArtifact">
-    <name>VTS_Array_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_VTS_Array_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="VTS_Seq_Connector_ExecArtifact">
-    <name>VTS_Seq_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_VTS_Seq_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="VTS_Seq_Connector_SvntArtifact">
-    <name>VTS_Seq_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_VTS_Seq_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="VTS_Seq_Connector_StubArtifact">
-    <name>VTS_Seq_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_VTS_Seq_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="VTS_Union_Connector_ExecArtifact">
-    <name>VTS_Union_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_VTS_Union_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="VTS_Union_Connector_SvntArtifact">
-    <name>VTS_Union_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_VTS_Union_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="VTS_Union_Connector_StubArtifact">
-    <name>VTS_Union_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_VTS_Union_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/VariousTopicsState/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl
deleted file mode 100755
index 460cd1064d0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl
+++ /dev/null
@@ -1,243 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- 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";
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('../lib');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../lib');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('../lib');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('../lib');
-}
-
-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);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('dance_locality_manager');
-}
-
-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 = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
-
-        $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);
-        $DEAMONS[$i]->Spawn ();
-
-        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/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print STDERR "Starting Naming Service with  -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_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-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");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-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 10 seconds to allow task to complete\n";
-sleep (10);
-
-# 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\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;