Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO

# Conflicts:
#	ACE/protocols/ace/HTBP/HTBP_Channel.cpp
#	ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp
#	ACE/protocols/ace/HTBP/HTBP_Session.cpp

18 files changed, 0 insertions, 2973 deletions

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;