Wed Dec 9 08:17:27 UTC 2009 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/tests/Get_Connection_Test/*:
          Renamed to Event_Connection_Test.

18 files changed, 5 insertions, 1889 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 4acd65bdc4e..6651a43fcde 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec  9 08:17:27 UTC 2009  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/Get_Connection_Test/*:
+          Renamed to Event_Connection_Test.
+
 Wed Dec  9 08:14:57 UTC 2009  Marcel Smit  <msmit@remedy.nl>
 
         * bin/ciao_tests.lst:
diff --git a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Base/Get_Connection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Base/Get_Connection_Test_Base.idl
deleted file mode 100644
index 11c5ab787d3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Base/Get_Connection_Test_Base.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-// $Id$
-
-/**
- * @file Get_Connection_Test_Base.idl
- * @author Marcel Smit <msmit@remedy.nl>
- */
-
-#ifndef GET_CONNECTION_TEST_BASE_IDL
-#define GET_CONNECTION_TEST_BASE_IDL
-
-struct Get_ConnectionTest {
-  string key; //@key
-  long iteration;
-};
-
-typedef sequence<Get_ConnectionTest> Get_ConnectionTest_Seq;
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Base/Get_Connection_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Base/Get_Connection_Test_Base.mpc
deleted file mode 100644
index 33d88e80b97..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Base/Get_Connection_Test_Base.mpc
+++ /dev/null
@@ -1,76 +0,0 @@
-// $Id$
-
-project(DDS_Get_Connection_Base_idl_gen) : taoidldefaults, anytypecode {
-  custom_only = 1
-  idlflags -= -St -Sa
-  idlflags += -SS -Gxhst \
-              -Wb,stub_export_macro=KEYED_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=Get_Connection_Test_Base_stub_export.h
-
-  IDL_Files {
-    Get_Connection_Test_Base.idl
-  }
-}
-
-project(DDS_Get_Connection_Base_ndds_ts_gen) : ndds_ts_defaults   {
-  custom_only = 1
-  after += DDS_Get_Connection_Base_idl_gen
-  ndds_ts_flags += -corba Get_Connection_Test_BaseC.h -orb ACE_TAO1.7
-
-  NDDSTypeSupport_Files {
-    Get_Connection_Test_Base.idl
-  }
-}
-
-project(DDS_Get_Connection_Base_NDDS_TS) : nddslib, taolib {
-  after += DDS_Get_Connection_Base_ndds_ts_gen DDS_Get_Connection_Base_stub
-  libs += DDS_Get_Connection_Base_stub
-  libout = ../lib
-  libpaths    += ../lib
-  sharedname = DDS_Get_Connection_Base_NDDS_TS
-  dynamicflags = NDDS_USER_DLL_EXPORT
-
-  verbatim(gnuace, macros) {
-    override no_hidden_visibility = 1
-  }
-
-  Source_Files {
-    Get_Connection_Test_Base.cxx
-    Get_Connection_Test_BasePlugin.cxx
-    Get_Connection_Test_BaseSupport.cxx
-  }
-
-  Header_Files {
-    Get_Connection_Test_Base.h
-    Get_Connection_Test_BasePlugin.h
-    Get_Connection_Test_BaseSupport.h
-  }
-
-  Inline_Files {
-  }
-}
-
-project(DDS_Get_Connection_Base_stub) : ccm_stub {
-  after += DDS_Get_Connection_Base_idl_gen
-  libout = ../lib
-  libpaths += ../lib
-  sharedname = DDS_Get_Connection_Base_stub
-  dynamicflags = KEYED_TEST_BASE_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Get_Connection_Test_BaseC.cpp
-  }
-
-  Header_Files {
-    Get_Connection_Test_BaseC.h
-    Get_Connection_Test_Base_stub_export.h
-  }
-
-  Inline_Files {
-    Get_Connection_Test_BaseC.inl
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Connector/Get_Connection_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Connector/Get_Connection_Test_Connector.idl
deleted file mode 100644
index 31486297cfd..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Connector/Get_Connection_Test_Connector.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-
-/**
- * @file Get_Connection_Test_Connector.idl
- * @author Marcel Smit <msmit@remedy.nl>
- *
- * by-hand translation of the idl3p.
- */
-
-#ifndef KEYED_TEST_CONNECTOR_IDL_
-#define KEYED_TEST_CONNECTOR_IDL_
-
-#include  <Components.idl>
-#include "Base/Get_Connection_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
-
-TYPED_MODULE( ::Get_ConnectionTest, ::Get_ConnectionTest_Seq, Get_ConnectionTest)
-
-module Get_Connection_Test
-{
-  connector Get_Connection_Test_Connector : ::CCM_DDS::Get_ConnectionTest::DDS_Event
-  {
-  };
-};
-
-#endif /* Get_Connection_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Connector/Get_Connection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Connector/Get_Connection_Test_Connector.mpc
deleted file mode 100644
index 79083b4306b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Connector/Get_Connection_Test_Connector.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -p DDS_Get_Connection_Base -l .. -o ../lib -u DDS Get_Connection_Test_Connector"
-
-project(DDS_Get_Connection_Connector_idl_gen) : connectoridldefaults {
-  after += DDS4CCM_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=GET_CONNECTION_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Get_Connection_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=GET_CONNECTION_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Get_Connection_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=GET_CONNECTION_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Get_Connection_Test_Connector_svnt_export.h \
-              -Wb,exec_export_macro=GET_CONNECTION_CONNECTOR_EXEC_Export \
-              -Wb,exec_export_include=Get_Connection_Test_Connector_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    Get_Connection_Test_Connector.idl
-  }
-}
-
-project(DDS_Get_Connection_Connector_lem_gen) : ciaoidldefaults {
-  custom_only = 1
-  after += DDS_Get_Connection_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=GET_CONNECTION_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Get_Connection_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
-
-  IDL_Files {
-    Get_Connection_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_Get_Connection_Connector_lem_stub) : ccm_svnt, dds4ccm_base   {
-  after += DDS_Get_Connection_Connector_lem_gen DDS_Get_Connection_Connector_stub DDS_Get_Connection_Base_stub DDS4CCM_lem_stub
-  libs  += DDS_Get_Connection_Base_stub DDS_Get_Connection_Connector_stub DDS4CCM_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Get_Connection_Connector_lem_stub
-  dynamicflags   = GET_CONNECTION_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Get_Connection_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Get_Connection_Test_ConnectorEC.h
-    Get_Connection_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Get_Connection_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_Get_Connection_Connector_stub) : ccm_stub, dds4ccm_base   {
-  after += DDS_Get_Connection_Connector_idl_gen DDS_Get_Connection_Base_stub
-  libs  += DDS_Get_Connection_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Get_Connection_Connector_stub
-  dynamicflags   = GET_CONNECTION_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Get_Connection_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Get_Connection_Test_ConnectorC.h
-    Get_Connection_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Get_Connection_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_Get_Connection_Connector_exec) : ciao_executor, dds4ccm_skel, nddslib {
-  after   += DDS_Get_Connection_Connector_lem_stub DDS_Get_Connection_Connector_stub DDS4CCM_lem_stub CIAO_DDS4CCM_NDDS_Impl DDS_Get_Connection_Base_NDDS_TS
-  sharedname = DDS_Get_Connection_Connector_exec
-  libs += DDS_Get_Connection_Connector_stub DDS_Get_Connection_Connector_lem_stub DDS_Get_Connection_Base_stub CIAO_DDS4CCM_NDDS_Impl DDS4CCM_lem_stub DDS_Get_Connection_Base_NDDS_TS
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags   = GET_CONNECTION_CONNECTOR_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Get_Connection_Test_Connector_exec.cpp
-  }
-
-  Header_Files {
-    Get_Connection_Test_Connector_exec.h
-    Get_Connection_Test_Connector_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Get_Connection_Connector_svnt) : ciao_servant, dds4ccm_skel, nddslib {
-  after      += DDS_Get_Connection_Connector_lem_stub DDS_Get_Connection_Connector_exec DDS_Get_Connection_Connector_stub DDS4CCM_lem_stub
-  sharedname  = DDS_Get_Connection_Connector_svnt
-  libs       += DDS_Get_Connection_Connector_stub \
-                DDS_Get_Connection_Connector_lem_stub  \
-                DDS_Get_Connection_Base_stub \
-                DDS_Get_Connection_Connector_exec \
-                DDS4CCM_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags = GET_CONNECTION_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Get_Connection_Test_ConnectorS.cpp
-    Get_Connection_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Get_Connection_Test_ConnectorS.h
-    Get_Connection_Test_Connector_svnt.h
-    Get_Connection_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-    Get_Connection_Test_ConnectorS.inl
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Connector/Get_Connection_Test_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Connector/Get_Connection_Test_Connector_exec.cpp
deleted file mode 100644
index f45defbcb1b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Connector/Get_Connection_Test_Connector_exec.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "Get_Connection_Test_Connector_exec.h"
-
-namespace CIAO_Get_Connection_Test_Get_Connection_Test_Connector_Impl
-{
-  Get_Connection_Test_Connector_exec_i::Get_Connection_Test_Connector_exec_i ()
-    : DDS_Event_Connector_T<Get_ConnectionTest_DDS_Traits, Get_ConnectionTest_Connector_Traits> ()
-  {
-  }
-
-  Get_Connection_Test_Connector_exec_i::~Get_Connection_Test_Connector_exec_i (void)
-  {
-  }
-
-  extern "C" GET_CONNECTION_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Get_Connection_Test_Get_Connection_Test_Connector_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Get_Connection_Test_Connector_exec_i ());
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Connector/Get_Connection_Test_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Connector/Get_Connection_Test_Connector_exec.h
deleted file mode 100644
index f1d87f451a3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Connector/Get_Connection_Test_Connector_exec.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#ifndef GET_CONNECTION_TEST_CONNECTOR_EXEC_H_
-#define GET_CONNECTION_TEST_CONNECTOR_EXEC_H_
-
-#include /**/ "ace/pre.h"
-
-#include "Get_Connection_Test_ConnectorEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "Get_Connection_Test_Connector_exec_export.h"
-#include "tao/LocalObject.h"
-
-#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
-#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
-
-#include "Base/Get_Connection_Test_BaseSupport.h"
-
-namespace CIAO_Get_Connection_Test_Get_Connection_Test_Connector_Impl
-{
-
-  // @from use of Get_ConnectionTest as a parameter
-  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
-    Get_ConnectionTest,
-    Get_ConnectionTestSeq,
-    Get_ConnectionTestTypeSupport,
-    Get_ConnectionTestDataWriter,
-    Get_ConnectionTestDataReader > Get_ConnectionTest_DDS_Traits;
-
-  typedef CIAO::DDS4CCM::Connector_Traits <
-    ::CIAO_Get_Connection_Test_Get_Connection_Test_Connector_Impl::Get_Connection_Test_Connector_Exec,
-    Get_ConnectionTest_Seq,
-    ::CCM_DDS::Get_ConnectionTest::CCM_Writer,
-    ::CCM_DDS::Get_ConnectionTest::CCM_Updater,
-    ::CCM_DDS::Get_ConnectionTest::CCM_Getter,
-    ::CCM_DDS::Get_ConnectionTest::CCM_Reader,
-    ::Get_Connection_Test::CCM_Get_Connection_Test_Connector_Context,
-    ::CCM_DDS::Get_ConnectionTest::Listener,
-    ::CCM_DDS::Get_ConnectionTest::StateListener,
-    ::CCM_DDS::ConnectorStatusListener> Get_ConnectionTest_Connector_Traits;
-
-  class GET_CONNECTION_CONNECTOR_EXEC_Export Get_Connection_Test_Connector_exec_i :
-    public DDS_Event_Connector_T <Get_ConnectionTest_DDS_Traits, Get_ConnectionTest_Connector_Traits>
-  {
-  public:
-    Get_Connection_Test_Connector_exec_i ();
-    virtual ~Get_Connection_Test_Connector_exec_i (void);
-  };
-
-  extern "C" GET_CONNECTION_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Get_Connection_Test_Get_Connection_Test_Connector_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/README b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/README
deleted file mode 100644
index f437d6b506e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/README
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id$
-
-This test tests all possible connections between
-a Sender and a DDS connector and a Receiver and a
-DDS connector.
-The Sender requests the following connections:
-  * A writer
-  * An updater
-  * A DDS updater
-  * A DDS writer
-
-The Receiver expects the following listeners to be created:
-  * A ConnectorStatusListener
-  * A PortStatusListener for the DDS_Listen port
-  * A PortStatusListener for the DDS_Get port
-  * A 'normal' listener
-
-The Receiver requests the following connections:
-  * A reader
-  * A getter
-  * A DDS reader
-  * A DataControlListener
-
-This test tests every single connection and reports an error when
-a connections couldn't be esthablished.
-
-No actual read/write/listen operations are performed.
diff --git a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver.idl
deleted file mode 100644
index 6f8c3008052..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-/**
- * @file
- * @author Marcel Smit <msmit@remedy.nl>
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Get_Connection_Test_Connector.idl"
-#include "Connector/Get_Connection_Test_ConnectorE.idl"
-
-module Get_Connection_Test
-{
-  component Receiver
-  {
-    port CCM_DDS::Get_ConnectionTest::DDS_Listen  info_listen;
-    port CCM_DDS::Get_ConnectionTest::DDS_Get     info_get;
-    //port CCM_DDS::Get_ConnectionTest::DDS_StateListen
-    provides CCM_DDS::ConnectorStatusListener status_listener;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver.mpc
deleted file mode 100644
index 5df207f5783..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver.mpc
+++ /dev/null
@@ -1,138 +0,0 @@
-// $Id$
-
-project(DDS_Get_Connection_Receiver_idl_gen) : componentidldefaults {
-  custom_only = 1
-  after += DDS_Get_Connection_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 {
-    Get_Connection_Test_Receiver.idl
-  }
-}
-
-project(DDS_Get_Connection_Receiver_lem_gen) : ciaoidldefaults {
-  after += DDS_Get_Connection_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 {
-    Get_Connection_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_Get_Connection_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
-  after += DDS_Get_Connection_Receiver_lem_gen DDS_Get_Connection_Receiver_stub  DDS_Get_Connection_Connector_stub DDS_Get_Connection_Base_stub
-  libs  +=  Receiver_stub DDS_Get_Connection_Connector_stub DDS_Get_Connection_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags   = RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Get_Connection_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Get_Connection_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Get_Connection_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_Get_Connection_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Get_Connection_Receiver_idl_gen  DDS_Get_Connection_Connector_stub DDS_Get_Connection_Base_stub DDS_Get_Connection_Connector_lem_gen
-  libs  += DDS_Get_Connection_Connector_stub DDS_Get_Connection_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags   = RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Get_Connection_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Get_Connection_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Get_Connection_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_Get_Connection_Receiver_exec) : ciao_executor, dds4ccm_base {
-  after   += DDS_Get_Connection_Receiver_lem_stub DDS_Get_Connection_Receiver_stub DDS_Get_Connection_Base_stub DDS_Get_Connection_Connector_stub DDS_Get_Connection_Connector_lem_stub DDS4CCM_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_Get_Connection_Base_stub DDS_Get_Connection_Connector_stub DDS_Get_Connection_Connector_lem_stub DDS4CCM_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags   = RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Get_Connection_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Get_Connection_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Get_Connection_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
-  after      +=   DDS_Get_Connection_Receiver_lem_stub DDS_Get_Connection_Base_stub DDS_Get_Connection_Connector_stub DDS_Get_Connection_Connector_svnt DDS_Get_Connection_Receiver_exec DDS_Get_Connection_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_Get_Connection_Base_stub DDS_Get_Connection_Connector_stub DDS_Get_Connection_Connector_svnt Receiver_exec DDS_Get_Connection_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags = RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Get_Connection_Test_ReceiverS.cpp
-    Get_Connection_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Get_Connection_Test_ReceiverS.h
-    Get_Connection_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-    Get_Connection_Test_ReceiverS.inl
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.cpp
deleted file mode 100644
index 22b8d3c92b8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "Get_Connection_Test_Receiver_exec.h"
-#include "ciao/Logger/Log_Macros.h"
-#include "tao/ORB_Core.h"
-
-namespace CIAO_Get_Connection_Test_Receiver_Impl
-{
-  //============================================================
-  // Component Executor Implementation Class: Receiver_exec_i
-  //============================================================
-
-  Receiver_exec_i::Receiver_exec_i (void)
-    : getter_ok_ (false),
-      reader_listen_ok_ (false),
-      dds_data_reader_listen_ok_ (false),
-      data_listener_control_ok_ (false),
-      raw_listener_created_ (false),
-      listen_port_status_created_ (false),
-      get_port_status_created_ (false),
-      get_status_listener_created_ (false)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  // Port operations.
-  ::CCM_DDS::Get_ConnectionTest::CCM_Listener_ptr
-  Receiver_exec_i::get_info_listen_data_listener (void)
-  {
-    CIAO_DEBUG ((LM_DEBUG, ACE_TEXT ("new Get_ConnectionTest RAW listener\n")));
-    this->raw_listener_created_ = true;
-    return ::CCM_DDS::Get_ConnectionTest::CCM_Listener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_listen_status (void)
-  {
-    CIAO_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener for DDS_Listen\n")));
-    this->listen_port_status_created_ = true;
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_get_status (void)
-  {
-    this->get_port_status_created_ = true;
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Receiver_exec_i::get_status_listener(void)
-  {
-    this->get_status_listener_created_ = true;
-    return ::CCM_DDS::CCM_ConnectorStatusListener::_nil ();
-  }
-
-
-  // Operations from Components::SessionComponent.
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::Get_Connection_Test::CCM_Receiver_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    this->getter_ =
-        this->context_->get_connection_info_get_fresh_data ();
-    if (!CORBA::is_nil (this->getter_))
-      {
-        this->getter_ok_ = true;
-      }
-    this->reader_listen_ =
-        this->context_->get_connection_info_listen_data ();
-    if (!CORBA::is_nil (this->reader_listen_))
-      {
-        this->reader_listen_ok_ = true;
-      }
-    this->dds_data_reader_listen_ =
-        this->context_->get_connection_info_listen_dds_entity ();
-    if (!CORBA::is_nil (this->dds_data_reader_listen_))
-      {
-        this->dds_data_reader_listen_ok_ = true;
-      }
-    ::CCM_DDS::DataListenerControl_var lc =
-        this->context_->get_connection_info_listen_data_control ();
-
-    if (!CORBA::is_nil (lc.in ()))
-      {
-        this->data_listener_control_ok_ = true;
-        lc->mode (::CCM_DDS::ONE_BY_ONE);
-      }
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-    if (!this->getter_ok_)
-      {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get getter failed\n")));
-      }
-    else
-      {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Receiver : Get getter passed\n")));
-      }
-    if (!this->reader_listen_ok_)
-      {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get reader of DDS_Listen failed\n")));
-      }
-    else
-      {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Receiver : Get reader of DDS_Listen passed\n")));
-      }
-    if (!this->dds_data_reader_listen_ok_)
-      {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get dds reader of DDS_Listen failed\n")));
-      }
-    else
-      {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Receiver : Get dds reader of DDS_Listen passed\n")));
-      }
-    if (!this->data_listener_control_ok_)
-      {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get data listen control of DDS_Listen failed\n")));
-      }
-    else
-      {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Receiver : Get data listen control of DDS_Listen passed\n")));
-      }
-    if (!this->raw_listener_created_)
-      {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : listener not created\n")));
-      }
-    else
-      {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Receiver : Listener was created\n")));
-      }
-    if (!this->listen_port_status_created_)
-      {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : PortStatusListener of DDS_Listen not created\n")));
-      }
-    else
-      {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Receiver : PortStatusListener of DDS_Listen was created\n")));
-      }
-    if (!this->get_port_status_created_)
-      {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : PortStatusListener of DDS_Get not created\n")));
-      }
-    else
-      {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Receiver : PortStatusListener of DDS_Get was created\n")));
-      }
-    if (!this->get_status_listener_created_)
-      {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : ConnectorStatusListener not created\n")));
-      }
-    else
-      {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Receiver : ConnectorStatusListener was created\n")));
-      }
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Get_Connection_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.h
deleted file mode 100644
index 49decd3dcb0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#ifndef GET_CONNECTION_RECEIVER_EXEC_H_
-#define GET_CONNECTION_RECEIVER_EXEC_H_
-
-#include "Get_Connection_Test_ReceiverEC.h"
-
-#include /**/ "Receiver_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-#include "ace/Task.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_Get_Connection_Test_Receiver_Impl
-{
-  class RECEIVER_EXEC_Export Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    // Port operations.
-    virtual ::CCM_DDS::Get_ConnectionTest::CCM_Listener_ptr
-    get_info_listen_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_listen_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_get_status (void);
-
-    virtual CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_status_listener(void);
-
-    // Operations from Components::SessionComponent.
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::Get_Connection_Test::CCM_Receiver_Context_var context_;
-    ::CCM_DDS::Get_ConnectionTest::Reader_var reader_;
-    ::CCM_DDS::Get_ConnectionTest::Getter_var getter_;
-    ::CCM_DDS::Get_ConnectionTest::Reader_var reader_listen_;
-    ::DDS::DataReader_var dds_data_reader_;
-    ::DDS::DataReader_var dds_data_reader_listen_;
-    
-    bool getter_ok_;
-    bool reader_listen_ok_;
-    bool dds_data_reader_listen_ok_;
-    bool data_listener_control_ok_;
-    bool raw_listener_created_;
-    bool listen_port_status_created_;
-    bool get_port_status_created_;
-    bool get_status_listener_created_;
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Get_Connection_Test_Receiver_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender.idl
deleted file mode 100644
index 70177ef5fa9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-/**
- * @file
- * @author Marcel Smit <msmit@remedy.nl>
- *
- * by-hand idl3 translation of sender components.
- */
-
-#ifndef DDS_KEYED_TEST_SENDER_IDL
-#define DDS_KEYED_TEST_SENDER_IDL
-
-#include "Connector/Get_Connection_Test_Connector.idl"
-#include "Connector/Get_Connection_Test_ConnectorE.idl"
-
-module Get_Connection_Test
-{
-  component Sender
-  {
-    port CCM_DDS::Get_ConnectionTest::DDS_Write info_write;
-    port CCM_DDS::Get_ConnectionTest::DDS_Update info_update;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender.mpc
deleted file mode 100644
index 0acc4f2d76e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender.mpc
+++ /dev/null
@@ -1,140 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -p DDS_Get_Connection_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_Get_Connection_Sender_idl_gen) : componentidldefaults   {
-  after += DDS_Get_Connection_Connector_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    Get_Connection_Test_Sender.idl
-  }
-}
-
-project(DDS_Get_Connection_Sender_lem_gen) : ciaoidldefaults {
-  after += DDS_Get_Connection_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 {
-    Get_Connection_Test_SenderE.idl
-  }
-}
-
-project(DDS_Get_Connection_Sender_lem_stub) : ccm_svnt, dds4ccm_base   {
-  after += DDS_Get_Connection_Sender_lem_gen DDS_Get_Connection_Sender_stub DDS_Get_Connection_Base_stub
-  libs  += DDS_Get_Connection_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags   = SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Get_Connection_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    Get_Connection_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Get_Connection_Test_SenderEC.inl
-  }
-}
-
-project(DDS_Get_Connection_Sender_stub) : ccm_stub, dds4ccm_base   {
-  after += DDS_Get_Connection_Sender_idl_gen DDS_Get_Connection_Base_stub DDS_Get_Connection_Connector_stub
-  libs  += DDS_Get_Connection_Base_stub DDS_Get_Connection_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags   = SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Get_Connection_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    Get_Connection_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Get_Connection_Test_SenderC.inl
-  }
-}
-
-project(DDS_Get_Connection_Sender_exec) : ciao_executor, dds4ccm_base   {
-  after   += DDS_Get_Connection_Sender_lem_stub DDS_Get_Connection_Sender_stub DDS_Get_Connection_Connector_lem_stub DDS_Get_Connection_Connector_stub
-  sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_Get_Connection_Base_stub DDS_Get_Connection_Connector_lem_stub DDS_Get_Connection_Connector_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags   = SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Get_Connection_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Get_Connection_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Get_Connection_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
-  after      += DDS_Get_Connection_Base_stub  DDS_Get_Connection_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Get_Connection_Connector_stub DDS_Get_Connection_Connector_svnt  DDS_Get_Connection_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub  \
-                DDS_Get_Connection_Base_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Get_Connection_Connector_stub DDS_Get_Connection_Connector_svnt DDS_Get_Connection_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags = SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Get_Connection_Test_SenderS.cpp
-    Get_Connection_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Get_Connection_Test_SenderS.h
-    Get_Connection_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-    Get_Connection_Test_SenderS.inl
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender_exec.cpp
deleted file mode 100644
index d4dae44d853..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "Get_Connection_Test_Sender_exec.h"
-#include "ace/Guard_T.h"
-#include "ciao/Logger/Log_Macros.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
-
-namespace CIAO_Get_Connection_Test_Sender_Impl
-{
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-
-  Sender_exec_i::Sender_exec_i (void)
-    : updater_ok_ (false),
-      writer_ok_ (false),
-      updater_dds_datawriter_ok_ (false),
-      writer_dds_datawriter_ok_ (false)
-  {
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  void
-  Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::Get_Connection_Test::CCM_Sender_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Sender_exec_i::configuration_complete (void)
-  {
-    this->writer_ = 
-        this->context_->get_connection_info_write_data ();
-    if (!CORBA::is_nil (this->writer_))
-      {
-        this->writer_ok_ = true;
-      }
-    this->updater_ = 
-        this->context_->get_connection_info_update_data ();
-    if (!CORBA::is_nil (this->updater_))
-      {
-        this->updater_ok_ = true;
-      }
-    this->updater_dds_datawriter_ = 
-        this->context_->get_connection_info_update_dds_entity ();
-    if (!CORBA::is_nil (this->updater_dds_datawriter_))
-      {
-        this->updater_dds_datawriter_ok_ = true;
-      }
-    this->writer_dds_datawriter_ = 
-        this->context_->get_connection_info_write_dds_entity ();
-    if (!CORBA::is_nil (this->writer_dds_datawriter_))
-      {
-        this->writer_dds_datawriter_ok_ = true;
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-    if (!this->updater_ok_)
-      {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender : get updater failed\n")));
-      }
-    else
-      {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Sender : Get updater passed\n")));
-      }
-    if (!this->writer_ok_)
-      {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender : get writer failed\n")));
-      }
-    else
-      {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Sender : Get writer passed\n")));
-      }
-    if (!this->updater_dds_datawriter_ok_)
-      {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender : get dds updater failed\n")));
-      }
-    else
-      {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Sender : Get dds updater passed\n")));
-      }
-    if (!this->writer_dds_datawriter_ok_)
-      {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender : get dds writer failed\n")));
-      }
-    else
-      {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Sender : Get dds writer passed\n")));
-      }
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Get_Connection_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender_exec.h
deleted file mode 100644
index a1a408f5c2e..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender_exec.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#ifndef GET_CONNECTION_SENDER_EXEC_H_
-#define GET_CONNECTION_SENDER_EXEC_H_
-
-
-#include "Get_Connection_Test_SenderEC.h"
-
-#include /**/ "Sender_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_Get_Connection_Test_Sender_Impl
-{
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete (void);
-
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-
-  private:
-    ::Get_Connection_Test::CCM_Sender_Context_var context_;
-    CCM_DDS::Get_ConnectionTest::Updater_var updater_;
-    CCM_DDS::Get_ConnectionTest::Writer_var writer_;
-    DDS::DataWriter_var updater_dds_datawriter_;
-    DDS::DataWriter_var writer_dds_datawriter_;
-    
-    bool updater_ok_;
-    bool writer_ok_;
-    bool updater_dds_datawriter_ok_;
-    bool writer_dds_datawriter_ok_;
-  };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Get_Connection_Test_Sender_Impl (void);
-}
-
-#endif /* ifndef */
-
diff --git a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/descriptors/Plan.cdp
deleted file mode 100644
index cd2189e3925..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/descriptors/Plan.cdp
+++ /dev/null
@@ -1,492 +0,0 @@
-<Deployment:DeploymentPlan
-   xmlns:Deployment="http://www.omg.org/Deployment"
-   xmlns:xmi="http://www.omg.org/XMI"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>Get_Connection_Test_Depl_1</label>
-  <UUID>Get_Connection_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Get_Connection_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Get_Connection_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Get_Connection_Test_ConnectorComponentImplementation">
-    <name>Get_Connection_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Get_Connection_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Get_Connection_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Get_Connection_Test_Get_Connection_Test_Connector_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Get_Connection_Test_Get_Connection_Test_Connector_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Get_Connection_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Get_Connection_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Get_Connection_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Get_Connection_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-  <instance xmi:id="Get_Connection_Test_ConnectorComponentInstance">
-    <name>Get_Connection_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Get_Connection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Get_Connection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Get_Connection_Test_ConnectorComponentInstance2">
-    <name>Get_Connection_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Get_Connection_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Get_Connection_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-  </instance>
-
-  <connection>
-    <name>listen_data</name>
-    <internalEndpoint>
-      <portName>info_listen_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Get_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_portstatuslistener</name>
-    <internalEndpoint>
-      <portName>info_listen_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Get_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_rawlistener</name>
-    <internalEndpoint>
-      <portName>info_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Get_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>listen_datacontrol</name>
-    <internalEndpoint>
-      <portName>info_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Get_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  
-  <connection>
-    <name>listen_dds_reader</name>
-    <internalEndpoint>
-      <portName>info_listen_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Get_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  
-  <connection>
-    <name>getter_portstatuslistener</name>
-    <internalEndpoint>
-      <portName>info_get_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_status</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Get_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  
-  <connection>
-    <name>getter_fresh_data</name>
-    <internalEndpoint>
-      <portName>info_get_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Get_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>getter_data</name>
-    <internalEndpoint>
-      <portName>info_get_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Get_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  
-  <connection>
-    <name>getter_dds_reader</name>
-    <internalEndpoint>
-      <portName>info_get_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Get_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>connector_status_listener</name>
-    <internalEndpoint>
-      <portName>status_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-     <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Get_Connection_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_data</name>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Get_Connection_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_dds_writer</name>
-    <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="Get_Connection_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <!--connection>
-    <name>updater_data</name>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Get_Connection_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  
-  <connection>
-    <name>updater_dds_writer</name>
-    <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="Get_Connection_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection-->
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Get_Connection_Test_Connector_ExecArtifact">
-    <name>Get_Connection_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Get_Connection_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Get_Connection_Test_Connector_SvntArtifact">
-    <name>Get_Connection_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Get_Connection_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Get_Connection_Test_Connector_StubArtifact">
-    <name>Get_Connection_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Get_Connection_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/Get_Connection_Test/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/descriptors/run_test.pl
deleted file mode 100755
index 5ec04ef96f8..00000000000
--- a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/descriptors/run_test.pl
+++ /dev/null
@@ -1,225 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::TestTarget;
-
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-$ns_running = 0;
-
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_naming = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-$cdp_file = "Plan.cdp";
-
-PerlACE::add_lib_path ('../lib');
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for deamon $i failed\n";
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-}
-
-sub init_ior_files {
-    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
-    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-    delete_ior_files ();
-}
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_naming->DeleteFile ($ior_nsbase);
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemon {
-  for ($i = 0; $i < $nr_daemon; ++$i) {
-    $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-  }
-}
-
-sub kill_open_processes {
-  if ($daemons_running == 1) {
-    kill_node_daemon ();
-  }
-
-  if ($em_running == 1) {
-    $EM->Kill (); $EM->TimedWait (1);
-  }
-
-  if ($ns_running == 1) {
-    $NS->Kill (); $NS->TimedWait (1);
-  }
-
-}
-
-sub run_node_daemons {
-  for ($i = 0; $i < $nr_daemon; ++$i) {
-      $iorbase = $iorbases[$i];
-      $iorfile = $iorfiles[$i];
-      $port = $ports[$i];
-      $nodename = $nodenames[$i];
-      $iiop = "iiop://localhost:$port";
-      $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
-
-      $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-      $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
-      print "Run dance_node_manager with $d_param\n";
-
-      $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
-      $result = $DEAMONS[$i]->Spawn ();
-      push(@processes, $DEAMONS[$i]);
-
-      if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
-                                      $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
-          print STDERR
-            "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
-          for (; $i >= 0; --$i) {
-              $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-          }
-          return -1;
-      }
-  }
-  return 0;
-}
-
-create_targets ();
-init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 1 -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$NS->Spawn ();
-
-print STDERR "Starting Naming Service with -m 1 -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1)
-{
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$EM->Spawn ();
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -1) {
-    print STDERR
-      "ERROR: The ior file of execution manager could not be found\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$em_running = 1;
-
-# Invoke executor - start the application -.
-print "Invoking executor - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
-$E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ());
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 10 seconds to allow task to complete\n";
-sleep (10);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n";
-
-$E =
-  new PerlACE::Process ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -q");
-$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ());
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;