Remove CIAO/DAnCE here because they are migrated to their own repositories

5 files changed, 0 insertions, 1171 deletions

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
-