Changed SimpleFT test component

72 files changed, 183 insertions, 4342 deletions

diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
index 208beb21581..8da9daab7b3 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
@@ -731,6 +731,26 @@ NodeApplication_Impl::install_homed_component (Container &cont, Instance &inst)
                     "Component %s successfully installed in home %s\n",
                     idd.name.in (),
                     home_id));
+
+      DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_Impl::install_home - "
+                    "set attribute for component reference.\n"));
+
+      // this is a quick hack that allows an executor to get its own reference
+      // by using a component attribute COMPONENT_REFERENCE
+      for (size_t i = 0; i < idd.configProperty.length (); ++i)
+	{
+	  if (ACE_OS::strcmp (idd.configProperty[i].name,
+			      "COMPONENT_REFERENCE") == 0)
+	    {
+	      CORBA::Any value;
+	      value <<= inst.ref;
+
+	      // THIS IS UGLY AND SHOULD NOT STAY IN HERE FOR LONG!
+	      *(const_cast <CORBA::Any*> (&idd.configProperty[i].value)) = value;
+
+	      break;
+	    }
+	}
       
       DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_Impl::install_home - "
                     "Populating attributes for component %s\n",
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT.cidl b/CIAO/DAnCE/tests/CIAO/FTComponent/SimpleFT.cidl
index c923063eacd..c923063eacd 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT.cidl
+++ b/CIAO/DAnCE/tests/CIAO/FTComponent/SimpleFT.cidl
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT.idl b/CIAO/DAnCE/tests/CIAO/FTComponent/SimpleFT.idl
index ced46cf9224..7c859dbbfef 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT.idl
+++ b/CIAO/DAnCE/tests/CIAO/FTComponent/SimpleFT.idl
@@ -7,6 +7,7 @@ module Simple
 {
   component SimpleFT supports test
   {
+    attribute Object COMPONENT_REFERENCE;
     attribute string object_id;
     attribute double load;
     attribute short  role;
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT.mpc b/CIAO/DAnCE/tests/CIAO/FTComponent/SimpleFT.mpc
index cff45f0b366..cff45f0b366 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT.mpc
+++ b/CIAO/DAnCE/tests/CIAO/FTComponent/SimpleFT.mpc
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT_exec.cpp b/CIAO/DAnCE/tests/CIAO/FTComponent/SimpleFT_exec.cpp
index c5d29e4adda..17cf563e368 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT_exec.cpp
+++ b/CIAO/DAnCE/tests/CIAO/FTComponent/SimpleFT_exec.cpp
@@ -41,6 +41,7 @@ namespace CIDL_SimpleFT_Impl
       load_ (0.4),
       primary_ (true),
       orb_ (CORBA::ORB::_nil ()),
+      myself_ (CORBA::Object::_nil ()),
       agent_ (StateSynchronizationAgent::_nil ()),
       history_ (50),
       state_ (0)
@@ -104,20 +105,12 @@ namespace CIDL_SimpleFT_Impl
   {
     CIAO_TRACE ("SimpleFT_exec_i::configuration_complete\n");
     CIAO_DEBUG ((LM_EMERGENCY, "SimpleFT - Test - Lifecycle event - SimpleFT_exec_i::configuration_complete\n"));
-    // Your code here.
-  }
 
-  void
-  SimpleFT_exec_i::ccm_activate ()
-  {
-    CIAO_TRACE ("SimpleFT_exec_i::ccm_activate");
-    CIAO_DEBUG ((LM_EMERGENCY, "SimpleFT - Test - Lifecycle event - SimpleFT_exec_i::ccm_activate\n"));
-
-    try 
+    try
       {
 	if (CORBA::is_nil (orb_.in ()))
 	  {
-	    CIAO_ERROR ((LM_WARNING, "SimpleFT_exec_i::ccm_activate - orb_ member is nil.\n"));
+	    CIAO_ERROR ((LM_WARNING, "SimpleFT_exec_i::configuration_complete - orb_ member is nil.\n"));
 	    return;
 	  }
 
@@ -135,21 +128,49 @@ namespace CIDL_SimpleFT_Impl
 
 	if (CORBA::is_nil (agent_.in ()))
 	  {
-	    CIAO_ERROR ((LM_WARNING, "SimpleFT_exec_i::ccm_activate - could not find agent.\n"));
+	    CIAO_ERROR ((LM_WARNING, "SimpleFT_exec_i::configuration_complete - could not find agent.\n"));
 	    return;
 	  }
 	
 	CIAO_DEBUG ((LM_DEBUG, "registering the application with the agent.\n"));
 	    
-	ReplicatedApplication_var myself = ReplicatedApplication::_narrow (this);
+	ReplicatedApplication_var myself = ReplicatedApplication::_narrow (myself_.in ());
 
 	if (CORBA::is_nil (myself.in ()))
 	  {
-	    CIAO_ERROR ((LM_WARNING, "SimpleFT_exec_i::ccm_activate - could not get reference to itself.\n"));
+	    CIAO_ERROR ((LM_WARNING, "SimpleFT_exec_i::configuration_complete - could not get reference to itself.\n"));
 	    return;
 	  }
 
 	agent_->register_application (app_name_.c_str (), myself.in ());
+      }
+    catch (Name_Helper_Exception & ex)
+      {
+	CIAO_ERROR ((LM_ERROR, 
+		     "SimpleFT_exec_i::configuration_complete - "
+		     "caught Name_Helper_Exception: %s", 
+		     ex.what ()));
+      }
+    catch (CORBA::Exception &ex)
+      {
+	CIAO_ERROR ((LM_ERROR, "SimpleFT_exec_i::configuration_complete - caught: %s", ex._info ().c_str ()));
+      }
+
+  }
+
+  void
+  SimpleFT_exec_i::ccm_activate ()
+  {
+    CIAO_TRACE ("SimpleFT_exec_i::ccm_activate");
+    CIAO_DEBUG ((LM_EMERGENCY, "SimpleFT - Test - Lifecycle event - SimpleFT_exec_i::ccm_activate\n"));
+
+    try 
+      {
+	if (CORBA::is_nil (orb_.in ()))
+	  {
+	    CIAO_ERROR ((LM_WARNING, "SimpleFT_exec_i::ccm_activate - orb_ member is nil.\n"));
+	    return;
+	  }
 
 	// register application with ReplicationManager
 
@@ -162,14 +183,25 @@ namespace CIDL_SimpleFT_Impl
 	std::string hn = this->get_hostname ();
 	std::string pid = this->get_process_id ();
 
-	CORBA::Object_var self_obj = CORBA::Object::_narrow (this);
 
 	rm->register_application (app_name_.c_str (),
 				  load_,
 				  hn.c_str (),
 				  pid.c_str (),
 				  (primary_ ? 1 : 2),
-				  self_obj.in ());
+				  myself_.in ());
+
+	// publish application in NameService for the client
+	if (primary_)
+	  {
+	    Name_Helper_T <test> tnh (orb_.in (), true);
+
+	    test_var t_ref = test::_narrow (myself_.in ());
+
+	    tnh.bind ("FLARe/" + tnh.escape_dots (this->get_hostname ()) + "/" + 
+		      this->get_process_id () + "/test",
+		      t_ref.in ());
+	  }
       }
     catch (Name_Helper_Exception & ex)
       {
@@ -218,6 +250,20 @@ namespace CIDL_SimpleFT_Impl
 
   // Attribute operations
 
+  CORBA::Object_ptr
+  SimpleFT_exec_i::COMPONENT_REFERENCE (void)
+  {
+    return CORBA::Object::_duplicate (myself_.in ());
+  }
+    
+  void
+  SimpleFT_exec_i::COMPONENT_REFERENCE (const CORBA::Object_ptr COMPONENT_REFERENCE)
+  {
+    CIAO_TRACE ("SimpleFTHome_exec_i::COMPONENT_REFERENCE ()");
+    CIAO_DEBUG ((LM_EMERGENCY, "SimpleFT - Test - Lifecycle event - SimpleFTHome_exec_i::COMPONENT_REFERENCE setter method\n"));
+    myself_ = CORBA::Object::_duplicate (COMPONENT_REFERENCE);
+  }
+
   char *
   SimpleFT_exec_i::object_id (void)
   {
@@ -230,6 +276,7 @@ namespace CIDL_SimpleFT_Impl
   void 
   SimpleFT_exec_i::object_id (const char * object_id)
   {
+    CIAO_DEBUG ((LM_EMERGENCY, "SimpleFT - Test - Lifecycle event - SimpleFTHome_exec_i::object_id(%s)\n", object_id));
     app_name_ = object_id;
   }
 
@@ -242,6 +289,7 @@ namespace CIDL_SimpleFT_Impl
   void
   SimpleFT_exec_i::load (CORBA::Double load)
   {
+    CIAO_DEBUG ((LM_EMERGENCY, "SimpleFT - Test - Lifecycle event - SimpleFTHome_exec_i::load (%d)\n", load));
     load_ = load;
   }
     
@@ -257,7 +305,11 @@ namespace CIDL_SimpleFT_Impl
   void
   SimpleFT_exec_i::role (CORBA::Short role)
   {
-    primary_ = (role == 1);
+    CIAO_DEBUG ((LM_EMERGENCY, "SimpleFT - Test - Lifecycle event - SimpleFTHome_exec_i::role (%d)\n", role));
+    if (role == 1)
+      primary_ = true;
+    else
+      primary_ = false;
   }
 
   // Supported or inherited operations.
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT_exec.h b/CIAO/DAnCE/tests/CIAO/FTComponent/SimpleFT_exec.h
index b66ea665b4d..e3598b33716 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT_exec.h
+++ b/CIAO/DAnCE/tests/CIAO/FTComponent/SimpleFT_exec.h
@@ -60,6 +60,10 @@ namespace CIDL_SimpleFT_Impl
 
     // Attribute operations.
 
+    virtual CORBA::Object_ptr COMPONENT_REFERENCE (void);
+    
+    virtual void COMPONENT_REFERENCE (const CORBA::Object_ptr COMPONENT_REFERENCE);
+
     virtual char * object_id (void);
     
     virtual void object_id (const char * object_id);
@@ -107,6 +111,8 @@ namespace CIDL_SimpleFT_Impl
 
     CORBA::ORB_var orb_;
 
+    CORBA::Object_var myself_;
+
     StateSynchronizationAgent_var agent_;
 
     ACE_Sample_History history_;
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT_exec_export.h b/CIAO/DAnCE/tests/CIAO/FTComponent/SimpleFT_exec_export.h
index d9998cd3fb3..d9998cd3fb3 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT_exec_export.h
+++ b/CIAO/DAnCE/tests/CIAO/FTComponent/SimpleFT_exec_export.h
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT_stub_export.h b/CIAO/DAnCE/tests/CIAO/FTComponent/SimpleFT_stub_export.h
index 9f00b3d51b7..9f00b3d51b7 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT_stub_export.h
+++ b/CIAO/DAnCE/tests/CIAO/FTComponent/SimpleFT_stub_export.h
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT_svnt_export.h b/CIAO/DAnCE/tests/CIAO/FTComponent/SimpleFT_svnt_export.h
index 5b5bda97c49..5b5bda97c49 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT_svnt_export.h
+++ b/CIAO/DAnCE/tests/CIAO/FTComponent/SimpleFT_svnt_export.h
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/Test.idl b/CIAO/DAnCE/tests/CIAO/FTComponent/Test.idl
index 4fee003011c..4fee003011c 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/Test.idl
+++ b/CIAO/DAnCE/tests/CIAO/FTComponent/Test.idl
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/SimpleComponentExplicitHome.cdp b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/SimpleComponentExplicitHome.cdp
index e894997c52a..8ae48a6df9b 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/SimpleComponentExplicitHome.cdp
+++ b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/SimpleComponentExplicitHome.cdp
@@ -94,6 +94,50 @@
         </value>
       </value>
     </configProperty>
+    <configProperty>
+      <name>COMPONENT_REFERENCE</name>
+      <value>
+        <type>
+          <kind>tk_long</kind>
+        </type>
+        <value>
+          <long>0</long>
+        </value>
+      </value>
+    </configProperty>
+    <configProperty>
+      <name>object_id</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleFT</string>
+        </value>
+      </value>
+    </configProperty>
+    <configProperty>
+      <name>load</name>
+      <value>
+        <type>
+          <kind>tk_double</kind>
+        </type>
+        <value>
+          <double>40.0</double>
+        </value>
+      </value>
+    </configProperty>
+    <configProperty>
+      <name>role</name>
+      <value>
+        <type>
+          <kind>tk_short</kind>
+        </type>
+        <value>
+          <short>1</short>
+        </value>
+      </value>
+    </configProperty>
   </instance>
 
   <!-- Artifacts declarations -->
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/SimpleHome.cdp b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/SimpleHome.cdp
index a63da21f0f6..961dec397ae 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/SimpleHome.cdp
+++ b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/SimpleHome.cdp
@@ -69,6 +69,50 @@
     <name>SimpleNullHome</name>
     <node>Node</node>
     <!-- hostname -->
+    <configProperty>
+      <name>COMPONENT_REFERENCE</name>
+      <value>
+        <type>
+          <kind>tk_long</kind>
+        </type>
+        <value>
+          <long>0</long>
+        </value>
+      </value>
+    </configProperty>
+    <configProperty>
+      <name>object_id</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleFT</string>
+        </value>
+      </value>
+    </configProperty>
+    <configProperty>
+      <name>load</name>
+      <value>
+        <type>
+          <kind>tk_double</kind>
+        </type>
+        <value>
+          <double>40.0</double>
+        </value>
+      </value>
+    </configProperty>
+    <configProperty>
+      <name>role</name>
+      <value>
+        <type>
+          <kind>tk_short</kind>
+        </type>
+        <value>
+          <short>1</short>
+        </value>
+      </value>
+    </configProperty>
     <source/>
     <implementation xmi:idref="SimpleNullHomeImplementation" />
   </instance>
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleCommon.idl b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleCommon.idl
deleted file mode 100644
index 6f943e9d1d5..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleCommon.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-
-#ifndef SIMPLE_COMMON_IDL
-#define SIMPLE_COMMON_IDL
-
-#include "Components.idl"
-
-module Simple
-{
-  interface Trigger
-  {
-    void hello (in string hello);
-  };
-  
-  eventtype Hello
-  {
-    public string hello_;
-  };
-};
-
-#endif /*SIMPLE_COMMON_IDL*/
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleCommon.mpc b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleCommon.mpc
deleted file mode 100644
index b1f86554639..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleCommon.mpc
+++ /dev/null
@@ -1,67 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl SimpleCommon"
-
-project(SimpleCommon_idl_gen) : taoidldefaults, anytypecode {
-  avoids += ace_for_tao
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SIMPLECOMMON_STUB_Export \
-              -Wb,stub_export_include=SimpleCommon_stub_export.h \
-              -Wb,skel_export_macro=SIMPLECOMMON_SVNT_Export \
-              -Wb,skel_export_include=SimpleCommon_svnt_export.h
-
-  IDL_Files {
-    SimpleCommon.idl
-  }
-}
-
-project(SimpleCommon_stub) : ccm_stub {
-  avoids += ace_for_tao
-  after += SimpleCommon_idl_gen 
-  libs  += 
-  
-  sharedname = SimpleCommon_stub
-  dynamicflags   = SIMPLECOMMON_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SimpleCommonC.cpp
-  }
-
-  Header_Files {
-    SimpleCommonC.h
-    SimpleCommon_stub_export.h
-  }
-
-  Inline_Files {
-    SimpleCommonC.inl
-  }
-}
-
-project(SimpleCommon_skel) : ccm_svnt {
-  avoids += ace_for_tao
-  after      +=  SimpleCommon_stub
-  sharedname  = SimpleCommon_skel
-  libs       += SimpleCommon_stub 
-  
-  dynamicflags = SIMPLECOMMON_SVNT_BUILD_DLL
-  
-  IDL_Files {
-  }
-
-  Source_Files {
-    SimpleCommonS.cpp
-  }
-  
-  Header_Files {
-    SimpleCommonS.h
-    SimpleCommon_svnt_export.h
-  }
-  
-  Inline_Files {
-    SimpleCommonS.inl
-  }
-}
-
-
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleCommon_stub_export.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleCommon_stub_export.h
deleted file mode 100644
index 79aac6677b7..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleCommon_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SIMPLECOMMON_STUB
-// ------------------------------
-#ifndef SIMPLECOMMON_STUB_EXPORT_H
-#define SIMPLECOMMON_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLECOMMON_STUB_HAS_DLL)
-#  define SIMPLECOMMON_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLECOMMON_STUB_HAS_DLL */
-
-#if !defined (SIMPLECOMMON_STUB_HAS_DLL)
-#  define SIMPLECOMMON_STUB_HAS_DLL 1
-#endif /* ! SIMPLECOMMON_STUB_HAS_DLL */
-
-#if defined (SIMPLECOMMON_STUB_HAS_DLL) && (SIMPLECOMMON_STUB_HAS_DLL == 1)
-#  if defined (SIMPLECOMMON_STUB_BUILD_DLL)
-#    define SIMPLECOMMON_STUB_Export ACE_Proper_Export_Flag
-#    define SIMPLECOMMON_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLECOMMON_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLECOMMON_STUB_BUILD_DLL */
-#    define SIMPLECOMMON_STUB_Export ACE_Proper_Import_Flag
-#    define SIMPLECOMMON_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLECOMMON_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLECOMMON_STUB_BUILD_DLL */
-#else /* SIMPLECOMMON_STUB_HAS_DLL == 1 */
-#  define SIMPLECOMMON_STUB_Export
-#  define SIMPLECOMMON_STUB_SINGLETON_DECLARATION(T)
-#  define SIMPLECOMMON_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLECOMMON_STUB_HAS_DLL == 1 */
-
-// Set SIMPLECOMMON_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLECOMMON_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLECOMMON_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLECOMMON_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLECOMMON_STUB_NTRACE */
-
-#if (SIMPLECOMMON_STUB_NTRACE == 1)
-#  define SIMPLECOMMON_STUB_TRACE(X)
-#else /* (SIMPLECOMMON_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLECOMMON_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLECOMMON_STUB_NTRACE == 1) */
-
-#endif /* SIMPLECOMMON_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleCommon_svnt_export.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleCommon_svnt_export.h
deleted file mode 100644
index 0190bfeebab..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleCommon_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SIMPLECOMMON_SVNT
-// ------------------------------
-#ifndef SIMPLECOMMON_SVNT_EXPORT_H
-#define SIMPLECOMMON_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLECOMMON_SVNT_HAS_DLL)
-#  define SIMPLECOMMON_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLECOMMON_SVNT_HAS_DLL */
-
-#if !defined (SIMPLECOMMON_SVNT_HAS_DLL)
-#  define SIMPLECOMMON_SVNT_HAS_DLL 1
-#endif /* ! SIMPLECOMMON_SVNT_HAS_DLL */
-
-#if defined (SIMPLECOMMON_SVNT_HAS_DLL) && (SIMPLECOMMON_SVNT_HAS_DLL == 1)
-#  if defined (SIMPLECOMMON_SVNT_BUILD_DLL)
-#    define SIMPLECOMMON_SVNT_Export ACE_Proper_Export_Flag
-#    define SIMPLECOMMON_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLECOMMON_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLECOMMON_SVNT_BUILD_DLL */
-#    define SIMPLECOMMON_SVNT_Export ACE_Proper_Import_Flag
-#    define SIMPLECOMMON_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLECOMMON_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLECOMMON_SVNT_BUILD_DLL */
-#else /* SIMPLECOMMON_SVNT_HAS_DLL == 1 */
-#  define SIMPLECOMMON_SVNT_Export
-#  define SIMPLECOMMON_SVNT_SINGLETON_DECLARATION(T)
-#  define SIMPLECOMMON_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLECOMMON_SVNT_HAS_DLL == 1 */
-
-// Set SIMPLECOMMON_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLECOMMON_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLECOMMON_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLECOMMON_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLECOMMON_SVNT_NTRACE */
-
-#if (SIMPLECOMMON_SVNT_NTRACE == 1)
-#  define SIMPLECOMMON_SVNT_TRACE(X)
-#else /* (SIMPLECOMMON_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLECOMMON_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLECOMMON_SVNT_NTRACE == 1) */
-
-#endif /* SIMPLECOMMON_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer.cidl b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer.cidl
deleted file mode 100644
index ff5081f82dd..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer.cidl
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-#include "SimpleConsumer.idl"
-
-composition session SimpleConsumer_Impl
-{
-  home executor SimpleConsumerHome_Exec
-  {
-    implements Simple::SimpleConsumerHome;
-    manages SimpleConsumer_Exec;
-  };
-};
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer.idl b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer.idl
deleted file mode 100644
index 3895eacda3c..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-
-#ifndef SIMPLE_CONSUMER_IDL
-#define SIMPLE_CONSUMER_IDL
-
-#include "SimpleCommon.idl"
-#include <Components.idl>
-
-module Simple
-{
-  component SimpleConsumer
-  {
-    consumes Hello hello_;
-  };
-  
-  home SimpleConsumerHome manages SimpleConsumer
-  {
-  };
-};
-
-#endif /*SIMPLE_CONSUMER_IDL*/
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer.mpc b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer.mpc
deleted file mode 100644
index 5b4445933b5..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer.mpc
+++ /dev/null
@@ -1,122 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -p SimpleCommon SimpleConsumer"
-
-project(SimpleCommon_SimpleConsumer_idl_gen) : taoidldefaults, anytypecode {
-  avoids += ace_for_tao
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SIMPLECONSUMER_STUB_Export \
-              -Wb,stub_export_include=SimpleConsumer_stub_export.h \
-              -Wb,skel_export_macro=SIMPLECONSUMER_SVNT_Export \
-              -Wb,skel_export_include=SimpleConsumer_svnt_export.h
-  idlflags += -I$(CIAO_ROOT)/ccm
-
-  IDL_Files {
-    SimpleConsumer.idl
-  }
-}
-
-project(SimpleCommon_SimpleConsumer_cidl_gen) : ciaocidldefaults, taoidldefaults {
-  avoids += ace_for_tao
-  custom_only = 1
-  cidlflags += --svnt-export-macro SIMPLECONSUMER_SVNT_Export \
-               --svnt-export-include SimpleConsumer_svnt_export.h
-  idlflags += -Wb,export_macro=SIMPLECONSUMER_EXEC_Export \
-              -Wb,export_include=SimpleConsumer_exec_export.h \
-              -SS
-              
-  CIDL_Files {
-    SimpleConsumer.cidl
-  }
-  
-  IDL_Files {
-    SimpleConsumerE.idl
-  }
-}
-
-project(SimpleCommon_SimpleConsumer_stub) : ccm_stub {
-  avoids += ace_for_tao
-  after += SimpleCommon_SimpleConsumer_idl_gen SimpleCommon_stub
-  libs  += SimpleCommon_stub
-  
-  sharedname = SimpleConsumer_stub
-  dynamicflags   = SIMPLECONSUMER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SimpleConsumerC.cpp
-  }
-
-  Header_Files {
-    SimpleConsumerC.h
-    SimpleConsumer_stub_export.h
-  }
-
-  Inline_Files {
-    SimpleConsumerC.inl
-  }
-}
-
-project(SimpleCommon_SimpleConsumer_exec) : ciao_executor {
-  avoids += ace_for_tao
-  after   += SimpleCommon_SimpleConsumer_cidl_gen SimpleCommon_SimpleConsumer_stub
-  sharedname = SimpleConsumer_exec
-  libs += SimpleConsumer_stub SimpleCommon_stub
-  
-  dynamicflags   = SIMPLECONSUMER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SimpleConsumerEC.cpp
-    SimpleConsumer_exec.cpp
-  }
-  
-  Header_Files {
-    SimpleConsumerEC.h
-    SimpleConsumer_exec.h
-    SimpleConsumer_exec_export.h
-  }
-  
-  Inline_Files {
-    SimpleConsumerEC.inl
-  }
-}
-
-
-project(SimpleCommon_SimpleConsumer_svnt) : ciao_servant {
-  avoids += ace_for_tao
-  after      += SimpleCommon_skel SimpleCommon_SimpleConsumer_exec
-  sharedname  = SimpleConsumer_svnt
-  libs       += SimpleConsumer_exec \
-                SimpleConsumer_stub \
-                SimpleCommon_skel \
-                SimpleCommon_stub
-  
-  dynamicflags = SIMPLECONSUMER_SVNT_BUILD_DLL
-  
-  CIDL_Files {
-  }
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SimpleConsumerS.cpp
-    SimpleConsumer_svnt.cpp
-  }
-  
-  Header_Files {
-    SimpleConsumerS.h
-    SimpleConsumer_svnt.h
-    SimpleConsumer_svnt_export.h
-  }
-  
-  Inline_Files {
-    SimpleConsumerS.inl
-  }
-}
-
-
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer_exec.cpp b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer_exec.cpp
deleted file mode 100644
index 4f4d0fc613d..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer_exec.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
-
-#include "SimpleConsumer_exec.h"
-#include "ciao/CIAO_common.h"
-
-namespace CIDL_SimpleConsumer_Impl
-{
-  //==================================================================
-  // Component Executor Implementation Class:   SimpleConsumer_exec_i
-  //==================================================================
-
-  SimpleConsumer_exec_i::SimpleConsumer_exec_i (void)
-  {
-    CIAO_TRACE ("SimpleConsumer_exec_i::SimpleConsumer_exec_i (void)");
-  }
-
-  SimpleConsumer_exec_i::~SimpleConsumer_exec_i (void)
-  {
-    CIAO_TRACE ("SimpleConsumer_exec_i::~SimpleConsumer_exec_i (void)");
-  }
-
-  // Supported or inherited operations.
-
-  // Attribute operations.
-
-  // Port operations.
-
-  void
-  SimpleConsumer_exec_i::push_hello_ (
-    ::Simple::Hello * ev )
-  {
-    CIAO_TRACE ("SimpleConsumer_exec_i::push_hello_ ()");
-    // Your code here.
-    
-    ::Simple::Hello_var hello (ev);
-    
-    CIAO_DEBUG ((LM_NOTICE, CLINFO "SimpleConsumer_exec_i::push_hello_ - "
-                 "Received hell event, value is %s\n", ev->hello_ ()));
-  }
-
-  // Operations from Components::SessionComponent
-
-  void
-  SimpleConsumer_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    CIAO_TRACE ("SimpleConsumer_exec_i::set_session_context ()");
-    
-    this->context_ =
-      ::Simple::CCM_SimpleConsumer_Context::_narrow (ctx);
-
-    if (CORBA::is_nil (this->context_.in ()))
-    {
-      throw ::CORBA::INTERNAL ();
-    }
-  }
-
-  void
-  SimpleConsumer_exec_i::configuration_complete ()
-  {
-    CIAO_TRACE ("SimpleConsumer_exec_i::configuration_complete ()");
-    // Your code here.
-  }
-
-  void
-  SimpleConsumer_exec_i::ccm_activate ()
-  {
-    CIAO_TRACE ("SimpleConsumer_exec_i::ccm_activate ()");
-    // Your code here.
-  }
-
-  void
-  SimpleConsumer_exec_i::ccm_passivate ()
-  {
-    CIAO_TRACE ("SimpleConsumer_exec_i::ccm_passivate ()");
-    // Your code here.
-  }
-
-  void
-  SimpleConsumer_exec_i::ccm_remove ()
-  {
-    CIAO_TRACE ("SimpleConsumer_exec_i::ccm_remove ()");
-    // Your code here.
-  }
-
-  //==================================================================
-  // Home Executor Implementation Class:   SimpleConsumerHome_exec_i
-  //==================================================================
-
-  SimpleConsumerHome_exec_i::SimpleConsumerHome_exec_i (void)
-  {
-    CIAO_TRACE ("SimpleConsumerHome_exec_i::SimpleConsumerHome_exec_i (void)");
-  }
-
-  SimpleConsumerHome_exec_i::~SimpleConsumerHome_exec_i (void)
-  {
-    CIAO_TRACE ("SimpleConsumerHome_exec_i::~SimpleConsumerHome_exec_i (void)");
-  }
-
-  // Supported or inherited operations.
-
-  // Home operations.
-
-  // Factory and finder operations.
-
-  // Attribute operations.
-
-  // Implicit operations.
-
-  ::Components::EnterpriseComponent_ptr
-  SimpleConsumerHome_exec_i::create ()
-  {
-    CIAO_TRACE ("SimpleConsumerHome_exec_i::create ()");
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_THROW_EX (
-      retval,
-      SimpleConsumer_exec_i,
-      ::CORBA::NO_MEMORY ());
-
-    return retval;
-  }
-
-  extern "C" SIMPLECONSUMER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Simple_SimpleConsumerHome_Impl (void)
-  {
-    CIAO_TRACE ("create_Simple_SimpleConsumerHome_Impl (void)");
-    ::Components::HomeExecutorBase_ptr retval =
-      ::Components::HomeExecutorBase::_nil ();
-
-    ACE_NEW_RETURN (
-      retval,
-      SimpleConsumerHome_exec_i,
-      ::Components::HomeExecutorBase::_nil ());
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer_exec.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer_exec.h
deleted file mode 100644
index e4b9607bb45..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer_exec.h
+++ /dev/null
@@ -1,102 +0,0 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
-
-#ifndef CIAO_SIMPLECONSUMER_EXEC_H
-#define CIAO_SIMPLECONSUMER_EXEC_H
-
-#include /**/ "ace/pre.h"
-
-#include "SimpleConsumerEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "SimpleConsumer_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIDL_SimpleConsumer_Impl
-{
-  class SIMPLECONSUMER_EXEC_Export SimpleConsumer_exec_i
-    : public virtual SimpleConsumer_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-    public:
-    SimpleConsumer_exec_i (void);
-    virtual ~SimpleConsumer_exec_i (void);
-
-    // Supported or inherited operations.
-
-    // Attribute operations.
-
-    // Port operations.
-
-    virtual void
-    push_hello_ (
-      ::Simple::Hello *ev);
-
-    // Operations from Components::SessionComponent
-
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete ();
-
-    virtual void ccm_activate ();
-
-    virtual void ccm_passivate ();
-
-    virtual void ccm_remove ();
-
-    private:
-    ::Simple::CCM_SimpleConsumer_Context_var context_;
-  };
-
-  class SIMPLECONSUMER_EXEC_Export SimpleConsumerHome_exec_i
-    : public virtual SimpleConsumerHome_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-    public:
-    SimpleConsumerHome_exec_i (void);
-    virtual ~SimpleConsumerHome_exec_i (void);
-
-    // Supported or inherited operations.
-
-    // Home operations.
-
-    // Factory and finder operations.
-
-    // Attribute operations.
-
-    // Implicit operations.
-
-    virtual ::Components::EnterpriseComponent_ptr
-    create ();
-  };
-
-  extern "C" SIMPLECONSUMER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Simple_SimpleConsumerHome_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* CIAO_SIMPLECONSUMER_EXEC_H */
-
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer_exec_export.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer_exec_export.h
deleted file mode 100644
index a8074c4c81f..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer_exec_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SIMPLECONSUMER_EXEC
-// ------------------------------
-#ifndef SIMPLECONSUMER_EXEC_EXPORT_H
-#define SIMPLECONSUMER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLECONSUMER_EXEC_HAS_DLL)
-#  define SIMPLECONSUMER_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLECONSUMER_EXEC_HAS_DLL */
-
-#if !defined (SIMPLECONSUMER_EXEC_HAS_DLL)
-#  define SIMPLECONSUMER_EXEC_HAS_DLL 1
-#endif /* ! SIMPLECONSUMER_EXEC_HAS_DLL */
-
-#if defined (SIMPLECONSUMER_EXEC_HAS_DLL) && (SIMPLECONSUMER_EXEC_HAS_DLL == 1)
-#  if defined (SIMPLECONSUMER_EXEC_BUILD_DLL)
-#    define SIMPLECONSUMER_EXEC_Export ACE_Proper_Export_Flag
-#    define SIMPLECONSUMER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLECONSUMER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLECONSUMER_EXEC_BUILD_DLL */
-#    define SIMPLECONSUMER_EXEC_Export ACE_Proper_Import_Flag
-#    define SIMPLECONSUMER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLECONSUMER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLECONSUMER_EXEC_BUILD_DLL */
-#else /* SIMPLECONSUMER_EXEC_HAS_DLL == 1 */
-#  define SIMPLECONSUMER_EXEC_Export
-#  define SIMPLECONSUMER_EXEC_SINGLETON_DECLARATION(T)
-#  define SIMPLECONSUMER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLECONSUMER_EXEC_HAS_DLL == 1 */
-
-// Set SIMPLECONSUMER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLECONSUMER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLECONSUMER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLECONSUMER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLECONSUMER_EXEC_NTRACE */
-
-#if (SIMPLECONSUMER_EXEC_NTRACE == 1)
-#  define SIMPLECONSUMER_EXEC_TRACE(X)
-#else /* (SIMPLECONSUMER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLECONSUMER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLECONSUMER_EXEC_NTRACE == 1) */
-
-#endif /* SIMPLECONSUMER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer_stub_export.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer_stub_export.h
deleted file mode 100644
index 89e5e37b32e..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SIMPLECONSUMER_STUB
-// ------------------------------
-#ifndef SIMPLECONSUMER_STUB_EXPORT_H
-#define SIMPLECONSUMER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLECONSUMER_STUB_HAS_DLL)
-#  define SIMPLECONSUMER_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLECONSUMER_STUB_HAS_DLL */
-
-#if !defined (SIMPLECONSUMER_STUB_HAS_DLL)
-#  define SIMPLECONSUMER_STUB_HAS_DLL 1
-#endif /* ! SIMPLECONSUMER_STUB_HAS_DLL */
-
-#if defined (SIMPLECONSUMER_STUB_HAS_DLL) && (SIMPLECONSUMER_STUB_HAS_DLL == 1)
-#  if defined (SIMPLECONSUMER_STUB_BUILD_DLL)
-#    define SIMPLECONSUMER_STUB_Export ACE_Proper_Export_Flag
-#    define SIMPLECONSUMER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLECONSUMER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLECONSUMER_STUB_BUILD_DLL */
-#    define SIMPLECONSUMER_STUB_Export ACE_Proper_Import_Flag
-#    define SIMPLECONSUMER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLECONSUMER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLECONSUMER_STUB_BUILD_DLL */
-#else /* SIMPLECONSUMER_STUB_HAS_DLL == 1 */
-#  define SIMPLECONSUMER_STUB_Export
-#  define SIMPLECONSUMER_STUB_SINGLETON_DECLARATION(T)
-#  define SIMPLECONSUMER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLECONSUMER_STUB_HAS_DLL == 1 */
-
-// Set SIMPLECONSUMER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLECONSUMER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLECONSUMER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLECONSUMER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLECONSUMER_STUB_NTRACE */
-
-#if (SIMPLECONSUMER_STUB_NTRACE == 1)
-#  define SIMPLECONSUMER_STUB_TRACE(X)
-#else /* (SIMPLECONSUMER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLECONSUMER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLECONSUMER_STUB_NTRACE == 1) */
-
-#endif /* SIMPLECONSUMER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer_svnt_export.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer_svnt_export.h
deleted file mode 100644
index eab50bcfd0a..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SIMPLECONSUMER_SVNT
-// ------------------------------
-#ifndef SIMPLECONSUMER_SVNT_EXPORT_H
-#define SIMPLECONSUMER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLECONSUMER_SVNT_HAS_DLL)
-#  define SIMPLECONSUMER_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLECONSUMER_SVNT_HAS_DLL */
-
-#if !defined (SIMPLECONSUMER_SVNT_HAS_DLL)
-#  define SIMPLECONSUMER_SVNT_HAS_DLL 1
-#endif /* ! SIMPLECONSUMER_SVNT_HAS_DLL */
-
-#if defined (SIMPLECONSUMER_SVNT_HAS_DLL) && (SIMPLECONSUMER_SVNT_HAS_DLL == 1)
-#  if defined (SIMPLECONSUMER_SVNT_BUILD_DLL)
-#    define SIMPLECONSUMER_SVNT_Export ACE_Proper_Export_Flag
-#    define SIMPLECONSUMER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLECONSUMER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLECONSUMER_SVNT_BUILD_DLL */
-#    define SIMPLECONSUMER_SVNT_Export ACE_Proper_Import_Flag
-#    define SIMPLECONSUMER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLECONSUMER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLECONSUMER_SVNT_BUILD_DLL */
-#else /* SIMPLECONSUMER_SVNT_HAS_DLL == 1 */
-#  define SIMPLECONSUMER_SVNT_Export
-#  define SIMPLECONSUMER_SVNT_SINGLETON_DECLARATION(T)
-#  define SIMPLECONSUMER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLECONSUMER_SVNT_HAS_DLL == 1 */
-
-// Set SIMPLECONSUMER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLECONSUMER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLECONSUMER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLECONSUMER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLECONSUMER_SVNT_NTRACE */
-
-#if (SIMPLECONSUMER_SVNT_NTRACE == 1)
-#  define SIMPLECONSUMER_SVNT_TRACE(X)
-#else /* (SIMPLECONSUMER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLECONSUMER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLECONSUMER_SVNT_NTRACE == 1) */
-
-#endif /* SIMPLECONSUMER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter.cidl b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter.cidl
deleted file mode 100644
index 9de9153b267..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter.cidl
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-#include "SimpleEmitter.idl"
-
-composition session SimpleEmitter_Impl
-{
-  home executor SimpleEmitterHome_Exec
-  {
-    implements Simple::SimpleEmitterHome;
-    manages SimpleEmitter_Exec;
-  };
-};
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter.idl b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter.idl
deleted file mode 100644
index 37431ca8134..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-
-#ifndef SIMPLE_EMITTER_IDL
-#define SIMPLE_EMITTER_IDL
-
-#include "SimpleCommon.idl"
-#include "Components.idl"
-
-module Simple
-{
-  component SimpleEmitter
-  {
-    emits Hello hello;
-  };
-  
-  home SimpleEmitterHome manages SimpleEmitter
-  {
-  };
-};
-
-#endif /*SIMPLE_EMITTER_IDL*/
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter.mpc b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter.mpc
deleted file mode 100644
index 6a68a0a5376..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter.mpc
+++ /dev/null
@@ -1,121 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -p SimpleCommon SimpleEmitter"
-
-project(SimpleCommon_SimpleEmitter_idl_gen) : taoidldefaults, anytypecode {
-  avoids += ace_for_tao
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SIMPLEEMITTER_STUB_Export \
-              -Wb,stub_export_include=SimpleEmitter_stub_export.h \
-              -Wb,skel_export_macro=SIMPLEEMITTER_SVNT_Export \
-              -Wb,skel_export_include=SimpleEmitter_svnt_export.h
-
-  IDL_Files {
-    SimpleEmitter.idl
-  }
-}
-
-project(SimpleCommon_SimpleEmitter_cidl_gen) : ciaocidldefaults, taoidldefaults {
-  avoids += ace_for_tao
-  custom_only = 1
-  cidlflags += --svnt-export-macro SIMPLEEMITTER_SVNT_Export \
-               --svnt-export-include SimpleEmitter_svnt_export.h
-  idlflags += -Wb,export_macro=SIMPLEEMITTER_EXEC_Export \
-              -Wb,export_include=SimpleEmitter_exec_export.h \
-              -SS
-              
-  CIDL_Files {
-    SimpleEmitter.cidl
-  }
-  
-  IDL_Files {
-    SimpleEmitterE.idl
-  }
-}
-
-project(SimpleCommon_SimpleEmitter_stub) : ccm_stub {
-  avoids += ace_for_tao
-  after += SimpleCommon_SimpleEmitter_idl_gen SimpleCommon_stub
-  libs  += SimpleCommon_stub
-  
-  sharedname = SimpleEmitter_stub
-  dynamicflags   = SIMPLEEMITTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SimpleEmitterC.cpp
-  }
-
-  Header_Files {
-    SimpleEmitterC.h
-    SimpleEmitter_stub_export.h
-  }
-
-  Inline_Files {
-    SimpleEmitterC.inl
-  }
-}
-
-project(SimpleCommon_SimpleEmitter_exec) : ciao_executor {
-  avoids += ace_for_tao
-  after   += SimpleCommon_SimpleEmitter_cidl_gen SimpleCommon_SimpleEmitter_stub
-  sharedname = SimpleEmitter_exec
-  libs += SimpleEmitter_stub SimpleCommon_stub
-  
-  dynamicflags   = SIMPLEEMITTER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SimpleEmitterEC.cpp
-    SimpleEmitter_exec.cpp
-  }
-  
-  Header_Files {
-    SimpleEmitterEC.h
-    SimpleEmitter_exec.h
-    SimpleEmitter_exec_export.h
-  }
-  
-  Inline_Files {
-    SimpleEmitterEC.inl
-  }
-}
-
-
-project(SimpleCommon_SimpleEmitter_svnt) : ciao_servant {
-  avoids += ace_for_tao
-  after      += SimpleCommon_skel SimpleCommon_SimpleEmitter_exec
-  sharedname  = SimpleEmitter_svnt
-  libs       += SimpleEmitter_exec \
-                SimpleEmitter_stub \
-                SimpleCommon_skel \
-                SimpleCommon_stub
-  
-  dynamicflags = SIMPLEEMITTER_SVNT_BUILD_DLL
-  
-  CIDL_Files {
-  }
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SimpleEmitterS.cpp
-    SimpleEmitter_svnt.cpp
-  }
-  
-  Header_Files {
-    SimpleEmitterS.h
-    SimpleEmitter_svnt.h
-    SimpleEmitter_svnt_export.h
-  }
-  
-  Inline_Files {
-    SimpleEmitterS.inl
-  }
-}
-
-
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter_exec.cpp b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter_exec.cpp
deleted file mode 100644
index 4e4c8c791f6..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter_exec.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
-
-#include "SimpleEmitter_exec.h"
-#include "ciao/CIAO_common.h"
-
-namespace CIDL_SimpleEmitter_Impl
-{
-  //==================================================================
-  // Component Executor Implementation Class:   SimpleEmitter_exec_i
-  //==================================================================
-
-  SimpleEmitter_exec_i::SimpleEmitter_exec_i (void)
-  {
-    CIAO_TRACE ("SimpleEmitter_exec_i::SimpleEmitter_exec_i (void)");
-  }
-
-  SimpleEmitter_exec_i::~SimpleEmitter_exec_i (void)
-  {
-    CIAO_TRACE ("SimpleEmitter_exec_i::~SimpleEmitter_exec_i (void)");
-  }
-
-  // Supported or inherited operations.
-
-  // Attribute operations.
-
-  // Port operations.
-
-  // Operations from Components::SessionComponent
-
-  void
-  SimpleEmitter_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    CIAO_TRACE ("SimpleEmitter_exec_i::set_session_context ()");
-    this->context_ =
-      ::Simple::CCM_SimpleEmitter_Context::_narrow (ctx);
-
-    if (CORBA::is_nil (this->context_.in ()))
-    {
-      throw ::CORBA::INTERNAL ();
-    }
-  }
-
-  void
-  SimpleEmitter_exec_i::configuration_complete ()
-  {
-    CIAO_TRACE ("SimpleEmitter_exec_i::configuration_complete ()");
-    // Your code here.
-  }
-
-  void
-  SimpleEmitter_exec_i::ccm_activate ()
-  {
-    CIAO_TRACE ("SimpleEmitter_exec_i::ccm_activate ()");
-    // Your code here.
-    
-    ::Simple::Hello_var hello = new OBV_Simple::Hello ("Test successful, hello from SimpleEmitter_exec_i");
-    
-    this->context_->push_hello (hello.in ());
-  }
-
-  void
-  SimpleEmitter_exec_i::ccm_passivate ()
-  {
-    CIAO_TRACE ("SimpleEmitter_exec_i::ccm_passivate ()");
-    // Your code here.
-  }
-
-  void
-  SimpleEmitter_exec_i::ccm_remove ()
-  {
-    CIAO_TRACE ("SimpleEmitter_exec_i::ccm_remove ()");
-    // Your code here.
-  }
-
-  //==================================================================
-  // Home Executor Implementation Class:   SimpleEmitterHome_exec_i
-  //==================================================================
-
-  SimpleEmitterHome_exec_i::SimpleEmitterHome_exec_i (void)
-  {
-    CIAO_TRACE ("SimpleEmitterHome_exec_i::SimpleEmitterHome_exec_i (void)");
-  }
-
-  SimpleEmitterHome_exec_i::~SimpleEmitterHome_exec_i (void)
-  {
-    CIAO_TRACE ("SimpleEmitterHome_exec_i::~SimpleEmitterHome_exec_i (void)");
-  }
-
-  // Supported or inherited operations.
-
-  // Home operations.
-
-  // Factory and finder operations.
-
-  // Attribute operations.
-
-  // Implicit operations.
-
-  ::Components::EnterpriseComponent_ptr
-  SimpleEmitterHome_exec_i::create ()
-  {
-    CIAO_TRACE ("SimpleEmitterHome_exec_i::create ()");
-    
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_THROW_EX (
-      retval,
-      SimpleEmitter_exec_i,
-      ::CORBA::NO_MEMORY ());
-
-    return retval;
-  }
-
-  extern "C" SIMPLEEMITTER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Simple_SimpleEmitterHome_Impl (void)
-  {
-    CIAO_TRACE ("create_Simple_SimpleEmitterHome_Impl (void)");
-    ::Components::HomeExecutorBase_ptr retval =
-      ::Components::HomeExecutorBase::_nil ();
-
-    ACE_NEW_RETURN (
-      retval,
-      SimpleEmitterHome_exec_i,
-      ::Components::HomeExecutorBase::_nil ());
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter_exec.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter_exec.h
deleted file mode 100644
index a5008a85ea5..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter_exec.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
-
-#ifndef CIAO_SIMPLEEMITTER_EXEC_H
-#define CIAO_SIMPLEEMITTER_EXEC_H
-
-#include /**/ "ace/pre.h"
-
-#include "SimpleEmitterEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "SimpleEmitter_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIDL_SimpleEmitter_Impl
-{
-  class SIMPLEEMITTER_EXEC_Export SimpleEmitter_exec_i
-    : public virtual SimpleEmitter_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-    public:
-    SimpleEmitter_exec_i (void);
-    virtual ~SimpleEmitter_exec_i (void);
-
-    // Supported or inherited operations.
-
-    // Attribute operations.
-
-    // Port operations.
-
-    // Operations from Components::SessionComponent
-
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete ();
-
-    virtual void ccm_activate ();
-
-    virtual void ccm_passivate ();
-
-    virtual void ccm_remove ();
-
-    private:
-    ::Simple::CCM_SimpleEmitter_Context_var context_;
-  };
-
-  class SIMPLEEMITTER_EXEC_Export SimpleEmitterHome_exec_i
-    : public virtual SimpleEmitterHome_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-    public:
-    SimpleEmitterHome_exec_i (void);
-    virtual ~SimpleEmitterHome_exec_i (void);
-
-    // Supported or inherited operations.
-
-    // Home operations.
-
-    // Factory and finder operations.
-
-    // Attribute operations.
-
-    // Implicit operations.
-
-    virtual ::Components::EnterpriseComponent_ptr
-    create ();
-  };
-
-  extern "C" SIMPLEEMITTER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Simple_SimpleEmitterHome_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* CIAO_SIMPLEEMITTER_EXEC_H */
-
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter_exec_export.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter_exec_export.h
deleted file mode 100644
index 53fef48b799..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter_exec_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SIMPLEEMITTER_EXEC
-// ------------------------------
-#ifndef SIMPLEEMITTER_EXEC_EXPORT_H
-#define SIMPLEEMITTER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEEMITTER_EXEC_HAS_DLL)
-#  define SIMPLEEMITTER_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEEMITTER_EXEC_HAS_DLL */
-
-#if !defined (SIMPLEEMITTER_EXEC_HAS_DLL)
-#  define SIMPLEEMITTER_EXEC_HAS_DLL 1
-#endif /* ! SIMPLEEMITTER_EXEC_HAS_DLL */
-
-#if defined (SIMPLEEMITTER_EXEC_HAS_DLL) && (SIMPLEEMITTER_EXEC_HAS_DLL == 1)
-#  if defined (SIMPLEEMITTER_EXEC_BUILD_DLL)
-#    define SIMPLEEMITTER_EXEC_Export ACE_Proper_Export_Flag
-#    define SIMPLEEMITTER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEEMITTER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEEMITTER_EXEC_BUILD_DLL */
-#    define SIMPLEEMITTER_EXEC_Export ACE_Proper_Import_Flag
-#    define SIMPLEEMITTER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEEMITTER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEEMITTER_EXEC_BUILD_DLL */
-#else /* SIMPLEEMITTER_EXEC_HAS_DLL == 1 */
-#  define SIMPLEEMITTER_EXEC_Export
-#  define SIMPLEEMITTER_EXEC_SINGLETON_DECLARATION(T)
-#  define SIMPLEEMITTER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEEMITTER_EXEC_HAS_DLL == 1 */
-
-// Set SIMPLEEMITTER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEEMITTER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEEMITTER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEEMITTER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEEMITTER_EXEC_NTRACE */
-
-#if (SIMPLEEMITTER_EXEC_NTRACE == 1)
-#  define SIMPLEEMITTER_EXEC_TRACE(X)
-#else /* (SIMPLEEMITTER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEEMITTER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEEMITTER_EXEC_NTRACE == 1) */
-
-#endif /* SIMPLEEMITTER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter_stub_export.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter_stub_export.h
deleted file mode 100644
index 797140271a4..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SIMPLEEMITTER_STUB
-// ------------------------------
-#ifndef SIMPLEEMITTER_STUB_EXPORT_H
-#define SIMPLEEMITTER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEEMITTER_STUB_HAS_DLL)
-#  define SIMPLEEMITTER_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEEMITTER_STUB_HAS_DLL */
-
-#if !defined (SIMPLEEMITTER_STUB_HAS_DLL)
-#  define SIMPLEEMITTER_STUB_HAS_DLL 1
-#endif /* ! SIMPLEEMITTER_STUB_HAS_DLL */
-
-#if defined (SIMPLEEMITTER_STUB_HAS_DLL) && (SIMPLEEMITTER_STUB_HAS_DLL == 1)
-#  if defined (SIMPLEEMITTER_STUB_BUILD_DLL)
-#    define SIMPLEEMITTER_STUB_Export ACE_Proper_Export_Flag
-#    define SIMPLEEMITTER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEEMITTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEEMITTER_STUB_BUILD_DLL */
-#    define SIMPLEEMITTER_STUB_Export ACE_Proper_Import_Flag
-#    define SIMPLEEMITTER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEEMITTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEEMITTER_STUB_BUILD_DLL */
-#else /* SIMPLEEMITTER_STUB_HAS_DLL == 1 */
-#  define SIMPLEEMITTER_STUB_Export
-#  define SIMPLEEMITTER_STUB_SINGLETON_DECLARATION(T)
-#  define SIMPLEEMITTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEEMITTER_STUB_HAS_DLL == 1 */
-
-// Set SIMPLEEMITTER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEEMITTER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEEMITTER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEEMITTER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEEMITTER_STUB_NTRACE */
-
-#if (SIMPLEEMITTER_STUB_NTRACE == 1)
-#  define SIMPLEEMITTER_STUB_TRACE(X)
-#else /* (SIMPLEEMITTER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEEMITTER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEEMITTER_STUB_NTRACE == 1) */
-
-#endif /* SIMPLEEMITTER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter_svnt_export.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter_svnt_export.h
deleted file mode 100644
index 0fdc781a895..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SIMPLEEMITTER_SVNT
-// ------------------------------
-#ifndef SIMPLEEMITTER_SVNT_EXPORT_H
-#define SIMPLEEMITTER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEEMITTER_SVNT_HAS_DLL)
-#  define SIMPLEEMITTER_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEEMITTER_SVNT_HAS_DLL */
-
-#if !defined (SIMPLEEMITTER_SVNT_HAS_DLL)
-#  define SIMPLEEMITTER_SVNT_HAS_DLL 1
-#endif /* ! SIMPLEEMITTER_SVNT_HAS_DLL */
-
-#if defined (SIMPLEEMITTER_SVNT_HAS_DLL) && (SIMPLEEMITTER_SVNT_HAS_DLL == 1)
-#  if defined (SIMPLEEMITTER_SVNT_BUILD_DLL)
-#    define SIMPLEEMITTER_SVNT_Export ACE_Proper_Export_Flag
-#    define SIMPLEEMITTER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEEMITTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEEMITTER_SVNT_BUILD_DLL */
-#    define SIMPLEEMITTER_SVNT_Export ACE_Proper_Import_Flag
-#    define SIMPLEEMITTER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEEMITTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEEMITTER_SVNT_BUILD_DLL */
-#else /* SIMPLEEMITTER_SVNT_HAS_DLL == 1 */
-#  define SIMPLEEMITTER_SVNT_Export
-#  define SIMPLEEMITTER_SVNT_SINGLETON_DECLARATION(T)
-#  define SIMPLEEMITTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEEMITTER_SVNT_HAS_DLL == 1 */
-
-// Set SIMPLEEMITTER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEEMITTER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEEMITTER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEEMITTER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEEMITTER_SVNT_NTRACE */
-
-#if (SIMPLEEMITTER_SVNT_NTRACE == 1)
-#  define SIMPLEEMITTER_SVNT_TRACE(X)
-#else /* (SIMPLEEMITTER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEEMITTER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEEMITTER_SVNT_NTRACE == 1) */
-
-#endif /* SIMPLEEMITTER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser.cidl b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser.cidl
deleted file mode 100644
index 638efe0cb30..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser.cidl
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-#include "SimpleMultipleUser.idl"
-
-composition session SimpleMultipleUser_Impl
-{
-  home executor SimpleMultipleUserHome_Exec
-  {
-    implements Simple::SimpleMultipleUserHome;
-    manages SimpleMultipleUser_Exec;
-  };
-};
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser.idl b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser.idl
deleted file mode 100644
index 60aec58f9af..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-
-#ifndef SIMPLE_MULTIPLEUSER_IDL
-#define SIMPLE_MULTIPLEUSER_IDL
-
-#include "SimpleCommon.idl"
-#include "Components.idl"
-
-module Simple
-{
-  component SimpleMultipleUser
-  {
-    uses multiple Trigger trig;
-  };
-  
-  home SimpleMultipleUserHome manages SimpleMultipleUser
-  {
-  };
-};
-
-#endif /*SIMPLE_MULTIPLEUSER_IDL*/
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser.mpc b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser.mpc
deleted file mode 100644
index 841ba3c2c99..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser.mpc
+++ /dev/null
@@ -1,121 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -p SimpleCommon SimpleMultipleUser"
-
-project(SimpleCommon_SimpleMultipleUser_idl_gen) : taoidldefaults, anytypecode {
-  avoids += ace_for_tao
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SIMPLEMULTIPLEUSER_STUB_Export \
-              -Wb,stub_export_include=SimpleMultipleUser_stub_export.h \
-              -Wb,skel_export_macro=SIMPLEMULTIPLEUSER_SVNT_Export \
-              -Wb,skel_export_include=SimpleMultipleUser_svnt_export.h
-
-  IDL_Files {
-    SimpleMultipleUser.idl
-  }
-}
-
-project(SimpleCommon_SimpleMultipleUser_cidl_gen) : ciaocidldefaults, taoidldefaults {
-  avoids += ace_for_tao
-  custom_only = 1
-  cidlflags += --svnt-export-macro SIMPLEMULTIPLEUSER_SVNT_Export \
-               --svnt-export-include SimpleMultipleUser_svnt_export.h
-  idlflags += -Wb,export_macro=SIMPLEMULTIPLEUSER_EXEC_Export \
-              -Wb,export_include=SimpleMultipleUser_exec_export.h \
-              -SS
-              
-  CIDL_Files {
-    SimpleMultipleUser.cidl
-  }
-  
-  IDL_Files {
-    SimpleMultipleUserE.idl
-  }
-}
-
-project(SimpleCommon_SimpleMultipleUser_stub) : ccm_stub {
-  avoids += ace_for_tao
-  after += SimpleCommon_SimpleMultipleUser_idl_gen SimpleCommon_stub
-  libs  += SimpleCommon_stub
-  
-  sharedname = SimpleMultipleUser_stub
-  dynamicflags   = SIMPLEMULTIPLEUSER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SimpleMultipleUserC.cpp
-  }
-
-  Header_Files {
-    SimpleMultipleUserC.h
-    SimpleMultipleUser_stub_export.h
-  }
-
-  Inline_Files {
-    SimpleMultipleUserC.inl
-  }
-}
-
-project(SimpleCommon_SimpleMultipleUser_exec) : ciao_executor {
-  avoids += ace_for_tao
-  after   += SimpleCommon_SimpleMultipleUser_cidl_gen SimpleCommon_SimpleMultipleUser_stub
-  sharedname = SimpleMultipleUser_exec
-  libs += SimpleMultipleUser_stub SimpleCommon_stub
-  
-  dynamicflags   = SIMPLEMULTIPLEUSER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SimpleMultipleUserEC.cpp
-    SimpleMultipleUser_exec.cpp
-  }
-  
-  Header_Files {
-    SimpleMultipleUserEC.h
-    SimpleMultipleUser_exec.h
-    SimpleMultipleUser_exec_export.h
-  }
-  
-  Inline_Files {
-    SimpleMultipleUserEC.inl
-  }
-}
-
-
-project(SimpleCommon_SimpleMultipleUser_svnt) : ciao_servant {
-  avoids += ace_for_tao
-  after      += SimpleCommon_skel SimpleCommon_SimpleMultipleUser_exec
-  sharedname  = SimpleMultipleUser_svnt
-  libs       += SimpleMultipleUser_exec \
-                SimpleMultipleUser_stub \
-                SimpleCommon_skel \
-                SimpleCommon_stub
-  
-  dynamicflags = SIMPLEMULTIPLEUSER_SVNT_BUILD_DLL
-  
-  CIDL_Files {
-  }
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SimpleMultipleUserS.cpp
-    SimpleMultipleUser_svnt.cpp
-  }
-  
-  Header_Files {
-    SimpleMultipleUserS.h
-    SimpleMultipleUser_svnt.h
-    SimpleMultipleUser_svnt_export.h
-  }
-  
-  Inline_Files {
-    SimpleMultipleUserS.inl
-  }
-}
-
-
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser_exec.cpp b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser_exec.cpp
deleted file mode 100644
index 9fedb6b4bff..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser_exec.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
-
-#include "SimpleMultipleUser_exec.h"
-#include "ciao/CIAO_common.h"
-
-namespace CIDL_SimpleMultipleUser_Impl
-{
-  //==================================================================
-  // Component Executor Implementation Class:   SimpleMultipleUser_exec_i
-  //==================================================================
-
-  SimpleMultipleUser_exec_i::SimpleMultipleUser_exec_i (void)
-  {
-    CIAO_TRACE ("SimpleMultipleUser_exec_i::SimpleMultipleUser_exec_i (void)");
-  }
-
-  SimpleMultipleUser_exec_i::~SimpleMultipleUser_exec_i (void)
-  {
-    CIAO_TRACE ("SimpleMultipleUser_exec_i::~SimpleMultipleUser_exec_i (void)");
-  }
-
-  // Supported or inherited operations.
-
-  // Attribute operations.
-
-  // Port operations.
-
-  // Operations from Components::SessionComponent
-
-  void
-  SimpleMultipleUser_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    CIAO_TRACE ("SimpleMultipleUser_exec_i::set_session_context ()");
-    this->context_ =
-      ::Simple::CCM_SimpleMultipleUser_Context::_narrow (ctx);
-
-    if (CORBA::is_nil (this->context_.in ()))
-    {
-      throw ::CORBA::INTERNAL ();
-    }
-  }
-
-  void
-  SimpleMultipleUser_exec_i::configuration_complete ()
-  {
-    CIAO_TRACE ("SimpleMultipleUser_exec_i::configuration_complete ()");
-    // Your code here.
-  }
-
-  void
-  SimpleMultipleUser_exec_i::ccm_activate ()
-  {
-    CIAO_TRACE ("SimpleMultipleUser_exec_i::ccm_activate ()");
-    
-    ::Simple::SimpleMultipleUser::trigConnections_var conns = 
-        this->context_->get_connections_trig ();
-    
-    CIAO_DEBUG ((LM_NOTICE, CLINFO "SimpleMultipleUser_exec_i::ccm_activate - "
-                 "Got %u connections to my receptacle\n",
-                 conns->length ()));
-    
-    for (CORBA::ULong i = 0; i < conns->length (); ++i)
-      {
-        try
-          {
-            CIAO_DEBUG ((LM_NOTICE, CLINFO "SimpleMultipleUser_exec_i::ccm_activate - "
-                         "Invoking %u'th connection\n", i));
-            ::Simple::Trigger_var trig (conns[i].objref);
-            
-            trig->hello ("Test succeeded, hello from SimpleMultipleUser_exec");
-          }
-        catch (CORBA::Exception &ex)
-          {
-            CIAO_ERROR ((LM_ERROR, CLINFO "SimpleMultipleUser_exec_i::ccm_activate () - "
-                         "Caught CORBA exception on %u'th reference, details follow:\n",
-                         i));
-            ex._tao_print_exception (CLINFO "SimpleUser_exec_i::ccm_activate () - ");    
-          }
-        catch (...)
-          {
-            CIAO_ERROR ((LM_ERROR, CLINFO "SimpleMultipleUser_exec_i::ccm_activate () - "
-                         "Error: Caught unknown exception whilst invoking reference for port trig.\n"));
-          }
-      }
-    
-    // Your code here.
-  }
-
-  void
-  SimpleMultipleUser_exec_i::ccm_passivate ()
-  {
-    CIAO_TRACE ("SimpleMultipleUser_exec_i::ccm_passivate ()");
-    // Your code here.
-  }
-
-  void
-  SimpleMultipleUser_exec_i::ccm_remove ()
-  {
-    CIAO_TRACE ("SimpleMultipleUser_exec_i::ccm_remove ()");
-    // Your code here.
-  }
-
-  //==================================================================
-  // Home Executor Implementation Class:   SimpleMultipleUserHome_exec_i
-  //==================================================================
-
-  SimpleMultipleUserHome_exec_i::SimpleMultipleUserHome_exec_i (void)
-  {
-    CIAO_TRACE ("SimpleMultipleUserHome_exec_i::SimpleMultipleUserHome_exec_i (void)");
-  }
-
-  SimpleMultipleUserHome_exec_i::~SimpleMultipleUserHome_exec_i (void)
-  {
-    CIAO_TRACE ("SimpleMultipleUserHome_exec_i::~SimpleMultipleUserHome_exec_i (void)");
-  }
-
-  // Supported or inherited operations.
-
-  // Home operations.
-
-  // Factory and finder operations.
-
-  // Attribute operations.
-
-  // Implicit operations.
-
-  ::Components::EnterpriseComponent_ptr
-  SimpleMultipleUserHome_exec_i::create ()
-  {
-    CIAO_TRACE ("SimpleMultipleUserHome_exec_i::create ()");
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_THROW_EX (
-      retval,
-      SimpleMultipleUser_exec_i,
-      ::CORBA::NO_MEMORY ());
-
-    return retval;
-  }
-
-  extern "C" SIMPLEMULTIPLEUSER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Simple_SimpleMultipleUserHome_Impl (void)
-  {
-    CIAO_TRACE ("create_Simple_SimpleMultipleUserHome_Impl (void)");
-    ::Components::HomeExecutorBase_ptr retval =
-      ::Components::HomeExecutorBase::_nil ();
-
-    ACE_NEW_RETURN (
-      retval,
-      SimpleMultipleUserHome_exec_i,
-      ::Components::HomeExecutorBase::_nil ());
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser_exec.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser_exec.h
deleted file mode 100644
index 180cce92554..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser_exec.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
-
-#ifndef CIAO_SIMPLEMULTIPLEUSER_EXEC_H
-#define CIAO_SIMPLEMULTIPLEUSER_EXEC_H
-
-#include /**/ "ace/pre.h"
-
-#include "SimpleMultipleUserEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "SimpleMultipleUser_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIDL_SimpleMultipleUser_Impl
-{
-  class SIMPLEMULTIPLEUSER_EXEC_Export SimpleMultipleUser_exec_i
-    : public virtual SimpleMultipleUser_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-    public:
-    SimpleMultipleUser_exec_i (void);
-    virtual ~SimpleMultipleUser_exec_i (void);
-
-    // Supported or inherited operations.
-
-    // Attribute operations.
-
-    // Port operations.
-
-    // Operations from Components::SessionComponent
-
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete ();
-
-    virtual void ccm_activate ();
-
-    virtual void ccm_passivate ();
-
-    virtual void ccm_remove ();
-
-    private:
-    ::Simple::CCM_SimpleMultipleUser_Context_var context_;
-  };
-
-  class SIMPLEMULTIPLEUSER_EXEC_Export SimpleMultipleUserHome_exec_i
-    : public virtual SimpleMultipleUserHome_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-    public:
-    SimpleMultipleUserHome_exec_i (void);
-    virtual ~SimpleMultipleUserHome_exec_i (void);
-
-    // Supported or inherited operations.
-
-    // Home operations.
-
-    // Factory and finder operations.
-
-    // Attribute operations.
-
-    // Implicit operations.
-
-    virtual ::Components::EnterpriseComponent_ptr
-    create ();
-  };
-
-  extern "C" SIMPLEMULTIPLEUSER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Simple_SimpleMultipleUserHome_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* CIAO_SIMPLEMULTIPLEUSER_EXEC_H */
-
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser_exec_export.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser_exec_export.h
deleted file mode 100644
index 79cec9f8fe7..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser_exec_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SIMPLEMULTIPLEUSER_EXEC
-// ------------------------------
-#ifndef SIMPLEMULTIPLEUSER_EXEC_EXPORT_H
-#define SIMPLEMULTIPLEUSER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEMULTIPLEUSER_EXEC_HAS_DLL)
-#  define SIMPLEMULTIPLEUSER_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEMULTIPLEUSER_EXEC_HAS_DLL */
-
-#if !defined (SIMPLEMULTIPLEUSER_EXEC_HAS_DLL)
-#  define SIMPLEMULTIPLEUSER_EXEC_HAS_DLL 1
-#endif /* ! SIMPLEMULTIPLEUSER_EXEC_HAS_DLL */
-
-#if defined (SIMPLEMULTIPLEUSER_EXEC_HAS_DLL) && (SIMPLEMULTIPLEUSER_EXEC_HAS_DLL == 1)
-#  if defined (SIMPLEMULTIPLEUSER_EXEC_BUILD_DLL)
-#    define SIMPLEMULTIPLEUSER_EXEC_Export ACE_Proper_Export_Flag
-#    define SIMPLEMULTIPLEUSER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEMULTIPLEUSER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEMULTIPLEUSER_EXEC_BUILD_DLL */
-#    define SIMPLEMULTIPLEUSER_EXEC_Export ACE_Proper_Import_Flag
-#    define SIMPLEMULTIPLEUSER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEMULTIPLEUSER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEMULTIPLEUSER_EXEC_BUILD_DLL */
-#else /* SIMPLEMULTIPLEUSER_EXEC_HAS_DLL == 1 */
-#  define SIMPLEMULTIPLEUSER_EXEC_Export
-#  define SIMPLEMULTIPLEUSER_EXEC_SINGLETON_DECLARATION(T)
-#  define SIMPLEMULTIPLEUSER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEMULTIPLEUSER_EXEC_HAS_DLL == 1 */
-
-// Set SIMPLEMULTIPLEUSER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEMULTIPLEUSER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEMULTIPLEUSER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEMULTIPLEUSER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEMULTIPLEUSER_EXEC_NTRACE */
-
-#if (SIMPLEMULTIPLEUSER_EXEC_NTRACE == 1)
-#  define SIMPLEMULTIPLEUSER_EXEC_TRACE(X)
-#else /* (SIMPLEMULTIPLEUSER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEMULTIPLEUSER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEMULTIPLEUSER_EXEC_NTRACE == 1) */
-
-#endif /* SIMPLEMULTIPLEUSER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser_stub_export.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser_stub_export.h
deleted file mode 100644
index bf0be40ece3..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SIMPLEMULTIPLEUSER_STUB
-// ------------------------------
-#ifndef SIMPLEMULTIPLEUSER_STUB_EXPORT_H
-#define SIMPLEMULTIPLEUSER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEMULTIPLEUSER_STUB_HAS_DLL)
-#  define SIMPLEMULTIPLEUSER_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEMULTIPLEUSER_STUB_HAS_DLL */
-
-#if !defined (SIMPLEMULTIPLEUSER_STUB_HAS_DLL)
-#  define SIMPLEMULTIPLEUSER_STUB_HAS_DLL 1
-#endif /* ! SIMPLEMULTIPLEUSER_STUB_HAS_DLL */
-
-#if defined (SIMPLEMULTIPLEUSER_STUB_HAS_DLL) && (SIMPLEMULTIPLEUSER_STUB_HAS_DLL == 1)
-#  if defined (SIMPLEMULTIPLEUSER_STUB_BUILD_DLL)
-#    define SIMPLEMULTIPLEUSER_STUB_Export ACE_Proper_Export_Flag
-#    define SIMPLEMULTIPLEUSER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEMULTIPLEUSER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEMULTIPLEUSER_STUB_BUILD_DLL */
-#    define SIMPLEMULTIPLEUSER_STUB_Export ACE_Proper_Import_Flag
-#    define SIMPLEMULTIPLEUSER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEMULTIPLEUSER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEMULTIPLEUSER_STUB_BUILD_DLL */
-#else /* SIMPLEMULTIPLEUSER_STUB_HAS_DLL == 1 */
-#  define SIMPLEMULTIPLEUSER_STUB_Export
-#  define SIMPLEMULTIPLEUSER_STUB_SINGLETON_DECLARATION(T)
-#  define SIMPLEMULTIPLEUSER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEMULTIPLEUSER_STUB_HAS_DLL == 1 */
-
-// Set SIMPLEMULTIPLEUSER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEMULTIPLEUSER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEMULTIPLEUSER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEMULTIPLEUSER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEMULTIPLEUSER_STUB_NTRACE */
-
-#if (SIMPLEMULTIPLEUSER_STUB_NTRACE == 1)
-#  define SIMPLEMULTIPLEUSER_STUB_TRACE(X)
-#else /* (SIMPLEMULTIPLEUSER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEMULTIPLEUSER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEMULTIPLEUSER_STUB_NTRACE == 1) */
-
-#endif /* SIMPLEMULTIPLEUSER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser_svnt_export.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser_svnt_export.h
deleted file mode 100644
index 97f0fdf0f00..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SIMPLEMULTIPLEUSER_SVNT
-// ------------------------------
-#ifndef SIMPLEMULTIPLEUSER_SVNT_EXPORT_H
-#define SIMPLEMULTIPLEUSER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEMULTIPLEUSER_SVNT_HAS_DLL)
-#  define SIMPLEMULTIPLEUSER_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEMULTIPLEUSER_SVNT_HAS_DLL */
-
-#if !defined (SIMPLEMULTIPLEUSER_SVNT_HAS_DLL)
-#  define SIMPLEMULTIPLEUSER_SVNT_HAS_DLL 1
-#endif /* ! SIMPLEMULTIPLEUSER_SVNT_HAS_DLL */
-
-#if defined (SIMPLEMULTIPLEUSER_SVNT_HAS_DLL) && (SIMPLEMULTIPLEUSER_SVNT_HAS_DLL == 1)
-#  if defined (SIMPLEMULTIPLEUSER_SVNT_BUILD_DLL)
-#    define SIMPLEMULTIPLEUSER_SVNT_Export ACE_Proper_Export_Flag
-#    define SIMPLEMULTIPLEUSER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEMULTIPLEUSER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEMULTIPLEUSER_SVNT_BUILD_DLL */
-#    define SIMPLEMULTIPLEUSER_SVNT_Export ACE_Proper_Import_Flag
-#    define SIMPLEMULTIPLEUSER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEMULTIPLEUSER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEMULTIPLEUSER_SVNT_BUILD_DLL */
-#else /* SIMPLEMULTIPLEUSER_SVNT_HAS_DLL == 1 */
-#  define SIMPLEMULTIPLEUSER_SVNT_Export
-#  define SIMPLEMULTIPLEUSER_SVNT_SINGLETON_DECLARATION(T)
-#  define SIMPLEMULTIPLEUSER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEMULTIPLEUSER_SVNT_HAS_DLL == 1 */
-
-// Set SIMPLEMULTIPLEUSER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEMULTIPLEUSER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEMULTIPLEUSER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEMULTIPLEUSER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEMULTIPLEUSER_SVNT_NTRACE */
-
-#if (SIMPLEMULTIPLEUSER_SVNT_NTRACE == 1)
-#  define SIMPLEMULTIPLEUSER_SVNT_TRACE(X)
-#else /* (SIMPLEMULTIPLEUSER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEMULTIPLEUSER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEMULTIPLEUSER_SVNT_NTRACE == 1) */
-
-#endif /* SIMPLEMULTIPLEUSER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull.cidl b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull.cidl
deleted file mode 100644
index 8c10398272a..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull.cidl
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-
-#include "SimpleNull.idl"
-
-composition session SimpleNull_Impl
-{
-  home executor SimpleNullHome_Exec
-  {
-    implements Simple::SimpleNullHome;
-    manages SimpleProvider_Exec;
-  };
-};
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull.idl b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull.idl
deleted file mode 100644
index d8f02901be4..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull.idl
+++ /dev/null
@@ -1,14 +0,0 @@
-// $Id$
-
-#include <Components.idl>
-
-module Simple
-{
-  component SimpleNull
-  {
-  };
-  
-  home SimpleNullHome manages SimpleNull
-  {
-  };
-};
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull.mpc b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull.mpc
deleted file mode 100644
index 3e64dd78d9b..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull.mpc
+++ /dev/null
@@ -1,119 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl SimpleNull"
-
-project(SimpleNull_idl_gen) : taoidldefaults, anytypecode {
-  avoids += ace_for_tao
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SIMPLENULL_STUB_Export \
-              -Wb,stub_export_include=SimpleNull_stub_export.h \
-              -Wb,skel_export_macro=SIMPLENULL_SVNT_Export \
-              -Wb,skel_export_include=SimpleNull_svnt_export.h
-
-  IDL_Files {
-    SimpleNull.idl
-  }
-}
-
-project(SimpleNull_cidl_gen) : ciaocidldefaults, taoidldefaults {
-  avoids += ace_for_tao
-  custom_only = 1
-  cidlflags += --svnt-export-macro SIMPLENULL_SVNT_Export \
-               --svnt-export-include SimpleNull_svnt_export.h
-  idlflags += -Wb,export_macro=SIMPLENULL_EXEC_Export \
-              -Wb,export_include=SimpleNull_exec_export.h \
-              -SS
-              
-  CIDL_Files {
-    SimpleNull.cidl
-  }
-  
-  IDL_Files {
-    SimpleNullE.idl
-  }
-}
-
-project(SimpleNull_stub) : ccm_stub {
-  avoids += ace_for_tao
-  after += SimpleNull_idl_gen 
-  libs  += 
-  
-  sharedname = SimpleNull_stub
-  dynamicflags   = SIMPLENULL_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SimpleNullC.cpp
-  }
-
-  Header_Files {
-    SimpleNullC.h
-    SimpleNull_stub_export.h
-  }
-
-  Inline_Files {
-    SimpleNullC.inl
-  }
-}
-
-project(SimpleNull_exec) : ciao_executor {
-  avoids += ace_for_tao
-  after   += SimpleNull_cidl_gen SimpleNull_stub
-  sharedname = SimpleNull_exec
-  libs += SimpleNull_stub 
-  
-  dynamicflags   = SIMPLENULL_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SimpleNullEC.cpp
-    SimpleNull_exec.cpp
-  }
-  
-  Header_Files {
-    SimpleNullEC.h
-    SimpleNull_exec.h
-    SimpleNull_exec_export.h
-  }
-  
-  Inline_Files {
-    SimpleNullEC.inl
-  }
-}
-
-
-project(SimpleNull_svnt) : ciao_servant {
-  avoids += ace_for_tao
-  after      +=  SimpleNull_exec
-  sharedname  = SimpleNull_svnt
-  libs       += SimpleNull_exec \
-                SimpleNull_stub 
-  
-  dynamicflags = SIMPLENULL_SVNT_BUILD_DLL
-  
-  CIDL_Files {
-  }
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SimpleNullS.cpp
-    SimpleNull_svnt.cpp
-  }
-  
-  Header_Files {
-    SimpleNullS.h
-    SimpleNull_svnt.h
-    SimpleNull_svnt_export.h
-  }
-  
-  Inline_Files {
-    SimpleNullS.inl
-  }
-}
-
-
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_exec.cpp b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_exec.cpp
deleted file mode 100644
index 449981e53ec..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_exec.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
-
-#include "SimpleNull_exec.h"
-#include "ciao/CIAO_common.h"
-
-namespace CIDL_SimpleNull_Impl
-{
-  //==================================================================
-  // Component Executor Implementation Class:   SimpleNull_exec_i
-  //==================================================================
-
-  SimpleNull_exec_i::SimpleNull_exec_i (void)
-  {
-    CIAO_TRACE ("SimpleNull_exec_i::SimpleNull_exec_i (void)");
-    CIAO_DEBUG ((LM_EMERGENCY, "SimpleNull - Test - Lifecycle event - SimpleNull_exec_i::SimpleNull_exec_i (void)\n"));
-  }
-
-  SimpleNull_exec_i::~SimpleNull_exec_i (void)
-  {
-    CIAO_TRACE ("SimpleNull_exec_i::~SimpleNull_exec_i");
-    CIAO_DEBUG ((LM_EMERGENCY, "SimpleNull - Test - Lifecycle event - SimpleNull_exec_i::~SimpleNull_exec_i\n"));
-  }
-
-  // Supported or inherited operations.
-
-  // Attribute operations.
-
-  // Port operations.
-
-  // Operations from Components::SessionComponent
-
-  void
-  SimpleNull_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    CIAO_TRACE ("SimpleNull_exec_i::set_session_context");
-    CIAO_DEBUG ((LM_EMERGENCY, "SimpleNull - Test - Lifecycle event - SimpleNull_exec_i::set_session_context\n"));
-    this->context_ =
-      ::Simple::CCM_SimpleNull_Context::_narrow (ctx);
-
-    if (CORBA::is_nil (this->context_.in ()))
-    {
-      throw ::CORBA::INTERNAL ();
-    }
-  }
-
-  void
-  SimpleNull_exec_i::configuration_complete ()
-  {
-    CIAO_TRACE ("SimpleNull_exec_i::configuration_complete\n");
-    CIAO_DEBUG ((LM_EMERGENCY, "SimpleNull - Test - Lifecycle event - SimpleNull_exec_i::configuration_complete\n"));
-    // Your code here.
-  }
-
-  void
-  SimpleNull_exec_i::ccm_activate ()
-  {
-    CIAO_TRACE ("SimpleNull_exec_i::ccm_activate");
-    CIAO_DEBUG ((LM_EMERGENCY, "SimpleNull - Test - Lifecycle event - SimpleNull_exec_i::ccm_activate\n"));
-    // Your code here.
-  }
-
-  void
-  SimpleNull_exec_i::ccm_passivate ()
-  {
-    CIAO_TRACE ("SimpleNull_exec_i::ccm_passivate");
-    CIAO_DEBUG ((LM_EMERGENCY, "SimpleNull - Test - Lifecycle event - SimpleNull_exec_i::ccm_passivate\n"));
-    // Your code here.
-  }
-
-  void
-  SimpleNull_exec_i::ccm_remove ()
-  {
-    CIAO_TRACE ("SimpleNull_exec_i::ccm_remove");
-    CIAO_DEBUG ((LM_EMERGENCY, "SimpleNull - Test - Lifecycle event - SimpleNull_exec_i::ccm_remove\n"));
-    // Your code here.
-  }
-
-  //==================================================================
-  // Home Executor Implementation Class:   SimpleNullHome_exec_i
-  //==================================================================
-
-  SimpleNullHome_exec_i::SimpleNullHome_exec_i (void)
-  {
-    CIAO_TRACE ("SimpleNullHome_exec_i::SimpleNullHome_exec_i");
-    CIAO_DEBUG ((LM_EMERGENCY, "SimpleNull - Test - Lifecycle event - SimpleNullHome_exec_i::SimpleNullHome_exec_i\n"));
-  }
-
-  SimpleNullHome_exec_i::~SimpleNullHome_exec_i (void)
-  {
-    CIAO_TRACE ("SimpleNullHome_exec_i::~SimpleNullHome_exec_i");
-    CIAO_DEBUG ((LM_EMERGENCY, "SimpleNull - Test - Lifecycle event - SimpleNullHome_exec_i::~SimpleNullHome_exec_i\n"));
-  }
-
-  // Supported or inherited operations.
-
-  // Home operations.
-
-  // Factory and finder operations.
-
-  // Attribute operations.
-
-  // Implicit operations.
-
-  ::Components::EnterpriseComponent_ptr
-  SimpleNullHome_exec_i::create ()
-  {
-    CIAO_TRACE ("SimpleNullHome_exec_i::create");
-    CIAO_DEBUG ((LM_EMERGENCY, "SimpleNull - Test - Lifecycle event - SimpleNullHome_exec_i::create\n"));
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_THROW_EX (
-      retval,
-      SimpleNull_exec_i,
-      ::CORBA::NO_MEMORY ());
-
-    return retval;
-  }
-
-  extern "C" SIMPLENULL_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Simple_SimpleNullHome_Impl (void)
-  {
-    CIAO_TRACE ("create_Simple_SimpleNullHome_Impl");
-    CIAO_DEBUG ((LM_EMERGENCY, "SimpleNull - Test - Lifecycle event - create_Simple_SimpleNullHome_Impl\n"));
-    ::Components::HomeExecutorBase_ptr retval =
-      ::Components::HomeExecutorBase::_nil ();
-
-    ACE_NEW_RETURN (
-      retval,
-      SimpleNullHome_exec_i,
-      ::Components::HomeExecutorBase::_nil ());
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_exec.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_exec.h
deleted file mode 100644
index 00771543fb3..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_exec.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
-
-#ifndef CIAO_SIMPLENULL_EXEC_H
-#define CIAO_SIMPLENULL_EXEC_H
-
-#include /**/ "ace/pre.h"
-
-#include "SimpleNullEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "SimpleNull_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIDL_SimpleNull_Impl
-{
-  class SIMPLENULL_EXEC_Export SimpleNull_exec_i
-    : public virtual SimpleProvider_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-    public:
-    SimpleNull_exec_i (void);
-    virtual ~SimpleNull_exec_i (void);
-
-    // Supported or inherited operations.
-
-    // Attribute operations.
-
-    // Port operations.
-
-    // Operations from Components::SessionComponent
-
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete ();
-
-    virtual void ccm_activate ();
-
-    virtual void ccm_passivate ();
-
-    virtual void ccm_remove ();
-
-    private:
-    ::Simple::CCM_SimpleNull_Context_var context_;
-  };
-
-  class SIMPLENULL_EXEC_Export SimpleNullHome_exec_i
-    : public virtual SimpleNullHome_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-    public:
-    SimpleNullHome_exec_i (void);
-    virtual ~SimpleNullHome_exec_i (void);
-
-    // Supported or inherited operations.
-
-    // Home operations.
-
-    // Factory and finder operations.
-
-    // Attribute operations.
-
-    // Implicit operations.
-
-    virtual ::Components::EnterpriseComponent_ptr
-    create ();
-  };
-
-  extern "C" SIMPLENULL_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Simple_SimpleNullHome_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* CIAO_SIMPLENULL_EXEC_H */
-
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_exec_export.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_exec_export.h
deleted file mode 100644
index 5d0ff473419..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_exec_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SIMPLENULL_EXEC
-// ------------------------------
-#ifndef SIMPLENULL_EXEC_EXPORT_H
-#define SIMPLENULL_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLENULL_EXEC_HAS_DLL)
-#  define SIMPLENULL_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLENULL_EXEC_HAS_DLL */
-
-#if !defined (SIMPLENULL_EXEC_HAS_DLL)
-#  define SIMPLENULL_EXEC_HAS_DLL 1
-#endif /* ! SIMPLENULL_EXEC_HAS_DLL */
-
-#if defined (SIMPLENULL_EXEC_HAS_DLL) && (SIMPLENULL_EXEC_HAS_DLL == 1)
-#  if defined (SIMPLENULL_EXEC_BUILD_DLL)
-#    define SIMPLENULL_EXEC_Export ACE_Proper_Export_Flag
-#    define SIMPLENULL_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLENULL_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLENULL_EXEC_BUILD_DLL */
-#    define SIMPLENULL_EXEC_Export ACE_Proper_Import_Flag
-#    define SIMPLENULL_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLENULL_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLENULL_EXEC_BUILD_DLL */
-#else /* SIMPLENULL_EXEC_HAS_DLL == 1 */
-#  define SIMPLENULL_EXEC_Export
-#  define SIMPLENULL_EXEC_SINGLETON_DECLARATION(T)
-#  define SIMPLENULL_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLENULL_EXEC_HAS_DLL == 1 */
-
-// Set SIMPLENULL_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLENULL_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLENULL_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLENULL_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLENULL_EXEC_NTRACE */
-
-#if (SIMPLENULL_EXEC_NTRACE == 1)
-#  define SIMPLENULL_EXEC_TRACE(X)
-#else /* (SIMPLENULL_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLENULL_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLENULL_EXEC_NTRACE == 1) */
-
-#endif /* SIMPLENULL_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_stub_export.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_stub_export.h
deleted file mode 100644
index 17eef930019..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SIMPLENULL_STUB
-// ------------------------------
-#ifndef SIMPLENULL_STUB_EXPORT_H
-#define SIMPLENULL_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLENULL_STUB_HAS_DLL)
-#  define SIMPLENULL_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLENULL_STUB_HAS_DLL */
-
-#if !defined (SIMPLENULL_STUB_HAS_DLL)
-#  define SIMPLENULL_STUB_HAS_DLL 1
-#endif /* ! SIMPLENULL_STUB_HAS_DLL */
-
-#if defined (SIMPLENULL_STUB_HAS_DLL) && (SIMPLENULL_STUB_HAS_DLL == 1)
-#  if defined (SIMPLENULL_STUB_BUILD_DLL)
-#    define SIMPLENULL_STUB_Export ACE_Proper_Export_Flag
-#    define SIMPLENULL_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLENULL_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLENULL_STUB_BUILD_DLL */
-#    define SIMPLENULL_STUB_Export ACE_Proper_Import_Flag
-#    define SIMPLENULL_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLENULL_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLENULL_STUB_BUILD_DLL */
-#else /* SIMPLENULL_STUB_HAS_DLL == 1 */
-#  define SIMPLENULL_STUB_Export
-#  define SIMPLENULL_STUB_SINGLETON_DECLARATION(T)
-#  define SIMPLENULL_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLENULL_STUB_HAS_DLL == 1 */
-
-// Set SIMPLENULL_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLENULL_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLENULL_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLENULL_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLENULL_STUB_NTRACE */
-
-#if (SIMPLENULL_STUB_NTRACE == 1)
-#  define SIMPLENULL_STUB_TRACE(X)
-#else /* (SIMPLENULL_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLENULL_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLENULL_STUB_NTRACE == 1) */
-
-#endif /* SIMPLENULL_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_svnt_export.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_svnt_export.h
deleted file mode 100644
index 9afa614f9a4..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SIMPLENULL_SVNT
-// ------------------------------
-#ifndef SIMPLENULL_SVNT_EXPORT_H
-#define SIMPLENULL_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLENULL_SVNT_HAS_DLL)
-#  define SIMPLENULL_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLENULL_SVNT_HAS_DLL */
-
-#if !defined (SIMPLENULL_SVNT_HAS_DLL)
-#  define SIMPLENULL_SVNT_HAS_DLL 1
-#endif /* ! SIMPLENULL_SVNT_HAS_DLL */
-
-#if defined (SIMPLENULL_SVNT_HAS_DLL) && (SIMPLENULL_SVNT_HAS_DLL == 1)
-#  if defined (SIMPLENULL_SVNT_BUILD_DLL)
-#    define SIMPLENULL_SVNT_Export ACE_Proper_Export_Flag
-#    define SIMPLENULL_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLENULL_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLENULL_SVNT_BUILD_DLL */
-#    define SIMPLENULL_SVNT_Export ACE_Proper_Import_Flag
-#    define SIMPLENULL_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLENULL_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLENULL_SVNT_BUILD_DLL */
-#else /* SIMPLENULL_SVNT_HAS_DLL == 1 */
-#  define SIMPLENULL_SVNT_Export
-#  define SIMPLENULL_SVNT_SINGLETON_DECLARATION(T)
-#  define SIMPLENULL_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLENULL_SVNT_HAS_DLL == 1 */
-
-// Set SIMPLENULL_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLENULL_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLENULL_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLENULL_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLENULL_SVNT_NTRACE */
-
-#if (SIMPLENULL_SVNT_NTRACE == 1)
-#  define SIMPLENULL_SVNT_TRACE(X)
-#else /* (SIMPLENULL_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLENULL_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLENULL_SVNT_NTRACE == 1) */
-
-#endif /* SIMPLENULL_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider.cidl b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider.cidl
deleted file mode 100644
index cff76c14b89..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider.cidl
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-#include "SimpleProvider.idl"
-
-composition session SimpleProvider_Impl
-{
-  home executor SimpleProviderHome_Exec
-  {
-    implements Simple::SimpleProviderHome;
-    manages SimpleProvider_Exec;
-  };
-};
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider.idl b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider.idl
deleted file mode 100644
index 97e2c80984b..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-
-#ifndef SIMPLE_PROVIDER_IDL
-#define SIMPLE_PROVIDER_IDL
-
-#include "SimpleCommon.idl"
-#include "Components.idl"
-
-module Simple
-{
-  component SimpleProvider
-  {
-    provides Trigger trig;
-  };
-  
-  home SimpleProviderHome manages SimpleProvider
-  {
-  };
-};
-
-#endif /*SIMPLE_PROVIDER_IDL*/
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider.mpc b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider.mpc
deleted file mode 100644
index c917d235490..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider.mpc
+++ /dev/null
@@ -1,121 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -p SimpleCommon SimpleProvider"
-
-project(SimpleCommon_SimpleProvider_idl_gen) : taoidldefaults, anytypecode {
-  avoids += ace_for_tao
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SIMPLEPROVIDER_STUB_Export \
-              -Wb,stub_export_include=SimpleProvider_stub_export.h \
-              -Wb,skel_export_macro=SIMPLEPROVIDER_SVNT_Export \
-              -Wb,skel_export_include=SimpleProvider_svnt_export.h
-
-  IDL_Files {
-    SimpleProvider.idl
-  }
-}
-
-project(SimpleCommon_SimpleProvider_cidl_gen) : ciaocidldefaults, taoidldefaults {
-  avoids += ace_for_tao
-  custom_only = 1
-  cidlflags += --svnt-export-macro SIMPLEPROVIDER_SVNT_Export \
-               --svnt-export-include SimpleProvider_svnt_export.h
-  idlflags += -Wb,export_macro=SIMPLEPROVIDER_EXEC_Export \
-              -Wb,export_include=SimpleProvider_exec_export.h \
-              -SS
-              
-  CIDL_Files {
-    SimpleProvider.cidl
-  }
-  
-  IDL_Files {
-    SimpleProviderE.idl
-  }
-}
-
-project(SimpleCommon_SimpleProvider_stub) : ccm_stub {
-  avoids += ace_for_tao
-  after += SimpleCommon_SimpleProvider_idl_gen SimpleCommon_stub
-  libs  += SimpleCommon_stub
-  
-  sharedname = SimpleProvider_stub
-  dynamicflags   = SIMPLEPROVIDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SimpleProviderC.cpp
-  }
-
-  Header_Files {
-    SimpleProviderC.h
-    SimpleProvider_stub_export.h
-  }
-
-  Inline_Files {
-    SimpleProviderC.inl
-  }
-}
-
-project(SimpleCommon_SimpleProvider_exec) : ciao_executor {
-  avoids += ace_for_tao
-  after   += SimpleCommon_SimpleProvider_cidl_gen SimpleCommon_SimpleProvider_stub
-  sharedname = SimpleProvider_exec
-  libs += SimpleProvider_stub SimpleCommon_stub
-  
-  dynamicflags   = SIMPLEPROVIDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SimpleProviderEC.cpp
-    SimpleProvider_exec.cpp
-  }
-  
-  Header_Files {
-    SimpleProviderEC.h
-    SimpleProvider_exec.h
-    SimpleProvider_exec_export.h
-  }
-  
-  Inline_Files {
-    SimpleProviderEC.inl
-  }
-}
-
-
-project(SimpleCommon_SimpleProvider_svnt) : ciao_servant {
-  avoids += ace_for_tao
-  after      += SimpleCommon_skel SimpleCommon_SimpleProvider_exec
-  sharedname  = SimpleProvider_svnt
-  libs       += SimpleProvider_exec \
-                SimpleProvider_stub \
-                SimpleCommon_skel \
-                SimpleCommon_stub
-  
-  dynamicflags = SIMPLEPROVIDER_SVNT_BUILD_DLL
-  
-  CIDL_Files {
-  }
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SimpleProviderS.cpp
-    SimpleProvider_svnt.cpp
-  }
-  
-  Header_Files {
-    SimpleProviderS.h
-    SimpleProvider_svnt.h
-    SimpleProvider_svnt_export.h
-  }
-  
-  Inline_Files {
-    SimpleProviderS.inl
-  }
-}
-
-
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider_exec.cpp b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider_exec.cpp
deleted file mode 100644
index eb0d2819cd7..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider_exec.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
-
-#include "SimpleProvider_exec.h"
-#include "ciao/CIAO_common.h"
-
-namespace CIDL_SimpleProvider_Impl
-{
-  //==================================================================
-  // Facet Executor Implementation Class:   Trigger_exec_i
-  //==================================================================
-
-  Trigger_exec_i::Trigger_exec_i (void)
-  {
-    CIAO_TRACE ("Trigger_exec_i::Trigger_exec_i (void)");
-  }
-
-  Trigger_exec_i::~Trigger_exec_i (void)
-  {
-    CIAO_TRACE ("Trigger_exec_i::~Trigger_exec_i (void)");
-  }
-
-  // Operations from ::Simple::Trigger
-
-  void
-  Trigger_exec_i::hello (
-    const char * hello )
-  {
-    CIAO_TRACE ("Trigger_exec_i::hello ()");
-    // Your code here.
-    CIAO_DEBUG ((LM_NOTICE, CLINFO "Trigger_exec_i::hello - "
-                 "Got the following intofrmation from trig port: %s\n",
-                 hello));
-  }
-
-  //==================================================================
-  // Component Executor Implementation Class:   SimpleProvider_exec_i
-  //==================================================================
-
-  SimpleProvider_exec_i::SimpleProvider_exec_i (void)
-  {
-    CIAO_TRACE ("SimpleProvider_exec_i::SimpleProvider_exec_i (void)");
-  }
-
-  SimpleProvider_exec_i::~SimpleProvider_exec_i (void)
-  {
-    CIAO_TRACE ("SimpleProvider_exec_i::~SimpleProvider_exec_i (void)");
-  }
-
-  // Supported or inherited operations.
-
-  // Attribute operations.
-
-  // Port operations.
-
-  ::Simple::CCM_Trigger_ptr
-  SimpleProvider_exec_i::get_trig ()
-  {
-    CIAO_TRACE ("SimpleProvider_exec_i::get_trig ()");
-    return new Trigger_exec_i ();
-  }
-
-  // Operations from Components::SessionComponent
-
-  void
-  SimpleProvider_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    CIAO_TRACE ("SimpleProvider_exec_i::set_session_context ()");
-    this->context_ =
-      ::Simple::CCM_SimpleProvider_Context::_narrow (ctx);
-
-    if (CORBA::is_nil (this->context_.in ()))
-    {
-      throw ::CORBA::INTERNAL ();
-    }
-  }
-
-  void
-  SimpleProvider_exec_i::configuration_complete ()
-  {
-    CIAO_TRACE ("SimpleProvider_exec_i::configuration_complete ()");
-    // Your code here.
-  }
-
-  void
-  SimpleProvider_exec_i::ccm_activate ()
-  {
-    CIAO_TRACE ("SimpleProvider_exec_i::ccm_activate ()");
-    // Your code here.
-  }
-
-  void
-  SimpleProvider_exec_i::ccm_passivate ()
-  {
-    CIAO_TRACE ("SimpleProvider_exec_i::ccm_passivate ()");
-    // Your code here.
-  }
-
-  void
-  SimpleProvider_exec_i::ccm_remove ()
-  {
-    CIAO_TRACE ("SimpleProvider_exec_i::ccm_remove ()");
-    // Your code here.
-  }
-
-  //==================================================================
-  // Home Executor Implementation Class:   SimpleProviderHome_exec_i
-  //==================================================================
-
-  SimpleProviderHome_exec_i::SimpleProviderHome_exec_i (void)
-  {
-    CIAO_TRACE ("SimpleProviderHome_exec_i::SimpleProviderHome_exec_i (void)");
-  }
-
-  SimpleProviderHome_exec_i::~SimpleProviderHome_exec_i (void)
-  {
-    CIAO_TRACE ("SimpleProviderHome_exec_i::~SimpleProviderHome_exec_i (void)");
-  }
-
-  // Supported or inherited operations.
-
-  // Home operations.
-
-  // Factory and finder operations.
-
-  // Attribute operations.
-
-  // Implicit operations.
-
-  ::Components::EnterpriseComponent_ptr
-  SimpleProviderHome_exec_i::create ()
-  {
-    CIAO_TRACE ("SimpleProviderHome_exec_i::create ()");
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_THROW_EX (
-      retval,
-      SimpleProvider_exec_i,
-      ::CORBA::NO_MEMORY ());
-
-    return retval;
-  }
-
-  extern "C" SIMPLEPROVIDER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Simple_SimpleProviderHome_Impl (void)
-  {
-    CIAO_TRACE ("create_Simple_SimpleProviderHome_Impl (void)");
-    ::Components::HomeExecutorBase_ptr retval =
-      ::Components::HomeExecutorBase::_nil ();
-
-    ACE_NEW_RETURN (
-      retval,
-      SimpleProviderHome_exec_i,
-      ::Components::HomeExecutorBase::_nil ());
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider_exec.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider_exec.h
deleted file mode 100644
index 044c9aa56e3..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider_exec.h
+++ /dev/null
@@ -1,116 +0,0 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
-
-#ifndef CIAO_SIMPLEPROVIDER_EXEC_H
-#define CIAO_SIMPLEPROVIDER_EXEC_H
-
-#include /**/ "ace/pre.h"
-
-#include "SimpleProviderEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "SimpleProvider_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIDL_SimpleProvider_Impl
-{
-  class SIMPLEPROVIDER_EXEC_Export Trigger_exec_i
-    : public virtual ::Simple::CCM_Trigger,
-      public virtual ::CORBA::LocalObject
-  {
-    public:
-    Trigger_exec_i (void);
-    virtual ~Trigger_exec_i (void);
-
-    // Operations from ::Simple::Trigger
-
-    virtual void
-    hello (
-      const char * hello);
-  };
-
-  class SIMPLEPROVIDER_EXEC_Export SimpleProvider_exec_i
-    : public virtual SimpleProvider_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-    public:
-    SimpleProvider_exec_i (void);
-    virtual ~SimpleProvider_exec_i (void);
-
-    // Supported or inherited operations.
-
-    // Attribute operations.
-
-    // Port operations.
-
-    virtual ::Simple::CCM_Trigger_ptr
-    get_trig ();
-
-    // Operations from Components::SessionComponent
-
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete ();
-
-    virtual void ccm_activate ();
-
-    virtual void ccm_passivate ();
-
-    virtual void ccm_remove ();
-
-    private:
-    ::Simple::CCM_SimpleProvider_Context_var context_;
-  };
-
-  class SIMPLEPROVIDER_EXEC_Export SimpleProviderHome_exec_i
-    : public virtual SimpleProviderHome_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-    public:
-    SimpleProviderHome_exec_i (void);
-    virtual ~SimpleProviderHome_exec_i (void);
-
-    // Supported or inherited operations.
-
-    // Home operations.
-
-    // Factory and finder operations.
-
-    // Attribute operations.
-
-    // Implicit operations.
-
-    virtual ::Components::EnterpriseComponent_ptr
-    create ();
-  };
-
-  extern "C" SIMPLEPROVIDER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Simple_SimpleProviderHome_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* CIAO_SIMPLEPROVIDER_EXEC_H */
-
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider_exec_export.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider_exec_export.h
deleted file mode 100644
index c5e9182f61f..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider_exec_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SIMPLEPROVIDER_EXEC
-// ------------------------------
-#ifndef SIMPLEPROVIDER_EXEC_EXPORT_H
-#define SIMPLEPROVIDER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEPROVIDER_EXEC_HAS_DLL)
-#  define SIMPLEPROVIDER_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEPROVIDER_EXEC_HAS_DLL */
-
-#if !defined (SIMPLEPROVIDER_EXEC_HAS_DLL)
-#  define SIMPLEPROVIDER_EXEC_HAS_DLL 1
-#endif /* ! SIMPLEPROVIDER_EXEC_HAS_DLL */
-
-#if defined (SIMPLEPROVIDER_EXEC_HAS_DLL) && (SIMPLEPROVIDER_EXEC_HAS_DLL == 1)
-#  if defined (SIMPLEPROVIDER_EXEC_BUILD_DLL)
-#    define SIMPLEPROVIDER_EXEC_Export ACE_Proper_Export_Flag
-#    define SIMPLEPROVIDER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEPROVIDER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEPROVIDER_EXEC_BUILD_DLL */
-#    define SIMPLEPROVIDER_EXEC_Export ACE_Proper_Import_Flag
-#    define SIMPLEPROVIDER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEPROVIDER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEPROVIDER_EXEC_BUILD_DLL */
-#else /* SIMPLEPROVIDER_EXEC_HAS_DLL == 1 */
-#  define SIMPLEPROVIDER_EXEC_Export
-#  define SIMPLEPROVIDER_EXEC_SINGLETON_DECLARATION(T)
-#  define SIMPLEPROVIDER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEPROVIDER_EXEC_HAS_DLL == 1 */
-
-// Set SIMPLEPROVIDER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEPROVIDER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEPROVIDER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEPROVIDER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEPROVIDER_EXEC_NTRACE */
-
-#if (SIMPLEPROVIDER_EXEC_NTRACE == 1)
-#  define SIMPLEPROVIDER_EXEC_TRACE(X)
-#else /* (SIMPLEPROVIDER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEPROVIDER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEPROVIDER_EXEC_NTRACE == 1) */
-
-#endif /* SIMPLEPROVIDER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider_stub_export.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider_stub_export.h
deleted file mode 100644
index 795f3fec902..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SIMPLEPROVIDER_STUB
-// ------------------------------
-#ifndef SIMPLEPROVIDER_STUB_EXPORT_H
-#define SIMPLEPROVIDER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEPROVIDER_STUB_HAS_DLL)
-#  define SIMPLEPROVIDER_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEPROVIDER_STUB_HAS_DLL */
-
-#if !defined (SIMPLEPROVIDER_STUB_HAS_DLL)
-#  define SIMPLEPROVIDER_STUB_HAS_DLL 1
-#endif /* ! SIMPLEPROVIDER_STUB_HAS_DLL */
-
-#if defined (SIMPLEPROVIDER_STUB_HAS_DLL) && (SIMPLEPROVIDER_STUB_HAS_DLL == 1)
-#  if defined (SIMPLEPROVIDER_STUB_BUILD_DLL)
-#    define SIMPLEPROVIDER_STUB_Export ACE_Proper_Export_Flag
-#    define SIMPLEPROVIDER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEPROVIDER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEPROVIDER_STUB_BUILD_DLL */
-#    define SIMPLEPROVIDER_STUB_Export ACE_Proper_Import_Flag
-#    define SIMPLEPROVIDER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEPROVIDER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEPROVIDER_STUB_BUILD_DLL */
-#else /* SIMPLEPROVIDER_STUB_HAS_DLL == 1 */
-#  define SIMPLEPROVIDER_STUB_Export
-#  define SIMPLEPROVIDER_STUB_SINGLETON_DECLARATION(T)
-#  define SIMPLEPROVIDER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEPROVIDER_STUB_HAS_DLL == 1 */
-
-// Set SIMPLEPROVIDER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEPROVIDER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEPROVIDER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEPROVIDER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEPROVIDER_STUB_NTRACE */
-
-#if (SIMPLEPROVIDER_STUB_NTRACE == 1)
-#  define SIMPLEPROVIDER_STUB_TRACE(X)
-#else /* (SIMPLEPROVIDER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEPROVIDER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEPROVIDER_STUB_NTRACE == 1) */
-
-#endif /* SIMPLEPROVIDER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider_svnt_export.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider_svnt_export.h
deleted file mode 100644
index 5f6be2501b6..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SIMPLEPROVIDER_SVNT
-// ------------------------------
-#ifndef SIMPLEPROVIDER_SVNT_EXPORT_H
-#define SIMPLEPROVIDER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEPROVIDER_SVNT_HAS_DLL)
-#  define SIMPLEPROVIDER_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEPROVIDER_SVNT_HAS_DLL */
-
-#if !defined (SIMPLEPROVIDER_SVNT_HAS_DLL)
-#  define SIMPLEPROVIDER_SVNT_HAS_DLL 1
-#endif /* ! SIMPLEPROVIDER_SVNT_HAS_DLL */
-
-#if defined (SIMPLEPROVIDER_SVNT_HAS_DLL) && (SIMPLEPROVIDER_SVNT_HAS_DLL == 1)
-#  if defined (SIMPLEPROVIDER_SVNT_BUILD_DLL)
-#    define SIMPLEPROVIDER_SVNT_Export ACE_Proper_Export_Flag
-#    define SIMPLEPROVIDER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEPROVIDER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEPROVIDER_SVNT_BUILD_DLL */
-#    define SIMPLEPROVIDER_SVNT_Export ACE_Proper_Import_Flag
-#    define SIMPLEPROVIDER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEPROVIDER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEPROVIDER_SVNT_BUILD_DLL */
-#else /* SIMPLEPROVIDER_SVNT_HAS_DLL == 1 */
-#  define SIMPLEPROVIDER_SVNT_Export
-#  define SIMPLEPROVIDER_SVNT_SINGLETON_DECLARATION(T)
-#  define SIMPLEPROVIDER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEPROVIDER_SVNT_HAS_DLL == 1 */
-
-// Set SIMPLEPROVIDER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEPROVIDER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEPROVIDER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEPROVIDER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEPROVIDER_SVNT_NTRACE */
-
-#if (SIMPLEPROVIDER_SVNT_NTRACE == 1)
-#  define SIMPLEPROVIDER_SVNT_TRACE(X)
-#else /* (SIMPLEPROVIDER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEPROVIDER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEPROVIDER_SVNT_NTRACE == 1) */
-
-#endif /* SIMPLEPROVIDER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher.cidl b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher.cidl
deleted file mode 100644
index d5bae5c32ee..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher.cidl
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-#include "SimplePublisher.idl"
-
-composition session SimplePublisher_Impl
-{
-  home executor SimplePublisherHome_Exec
-  {
-    implements Simple::SimplePublisherHome;
-    manages SimplePublisher_Exec;
-  };
-};
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher.idl b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher.idl
deleted file mode 100644
index cee261fd15a..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-
-#ifndef SIMPLE_PUBLISHER_IDL
-#define SIMPLE_PUBLISHER_IDL
-
-#include "SimpleCommon.idl"
-#include "Components.idl"
-
-module Simple
-{
-  component SimplePublisher
-  {
-    publishes Hello hello;
-  };
-  
-  home SimplePublisherHome manages SimplePublisher
-  {
-  };
-};
-
-#endif /*SIMPLE_PUBLISHER_IDL*/
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher.mpc b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher.mpc
deleted file mode 100644
index 232a4d462be..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher.mpc
+++ /dev/null
@@ -1,121 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -p SimpleCommon SimplePublisher"
-
-project(SimpleCommon_SimplePublisher_idl_gen) : taoidldefaults, anytypecode {
-  avoids += ace_for_tao
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SIMPLEPUBLISHER_STUB_Export \
-              -Wb,stub_export_include=SimplePublisher_stub_export.h \
-              -Wb,skel_export_macro=SIMPLEPUBLISHER_SVNT_Export \
-              -Wb,skel_export_include=SimplePublisher_svnt_export.h
-
-  IDL_Files {
-    SimplePublisher.idl
-  }
-}
-
-project(SimpleCommon_SimplePublisher_cidl_gen) : ciaocidldefaults, taoidldefaults {
-  avoids += ace_for_tao
-  custom_only = 1
-  cidlflags += --svnt-export-macro SIMPLEPUBLISHER_SVNT_Export \
-               --svnt-export-include SimplePublisher_svnt_export.h
-  idlflags += -Wb,export_macro=SIMPLEPUBLISHER_EXEC_Export \
-              -Wb,export_include=SimplePublisher_exec_export.h \
-              -SS
-              
-  CIDL_Files {
-    SimplePublisher.cidl
-  }
-  
-  IDL_Files {
-    SimplePublisherE.idl
-  }
-}
-
-project(SimpleCommon_SimplePublisher_stub) : ccm_stub {
-  avoids += ace_for_tao
-  after += SimpleCommon_SimplePublisher_idl_gen SimpleCommon_stub
-  libs  += SimpleCommon_stub
-  
-  sharedname = SimplePublisher_stub
-  dynamicflags   = SIMPLEPUBLISHER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SimplePublisherC.cpp
-  }
-
-  Header_Files {
-    SimplePublisherC.h
-    SimplePublisher_stub_export.h
-  }
-
-  Inline_Files {
-    SimplePublisherC.inl
-  }
-}
-
-project(SimpleCommon_SimplePublisher_exec) : ciao_executor {
-  avoids += ace_for_tao
-  after   += SimpleCommon_SimplePublisher_cidl_gen SimpleCommon_SimplePublisher_stub
-  sharedname = SimplePublisher_exec
-  libs += SimplePublisher_stub SimpleCommon_stub
-  
-  dynamicflags   = SIMPLEPUBLISHER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SimplePublisherEC.cpp
-    SimplePublisher_exec.cpp
-  }
-  
-  Header_Files {
-    SimplePublisherEC.h
-    SimplePublisher_exec.h
-    SimplePublisher_exec_export.h
-  }
-  
-  Inline_Files {
-    SimplePublisherEC.inl
-  }
-}
-
-
-project(SimpleCommon_SimplePublisher_svnt) : ciao_servant {
-  avoids += ace_for_tao
-  after      += SimpleCommon_skel SimpleCommon_SimplePublisher_exec
-  sharedname  = SimplePublisher_svnt
-  libs       += SimplePublisher_exec \
-                SimplePublisher_stub \
-                SimpleCommon_skel \
-                SimpleCommon_stub
-  
-  dynamicflags = SIMPLEPUBLISHER_SVNT_BUILD_DLL
-  
-  CIDL_Files {
-  }
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SimplePublisherS.cpp
-    SimplePublisher_svnt.cpp
-  }
-  
-  Header_Files {
-    SimplePublisherS.h
-    SimplePublisher_svnt.h
-    SimplePublisher_svnt_export.h
-  }
-  
-  Inline_Files {
-    SimplePublisherS.inl
-  }
-}
-
-
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher_exec.cpp b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher_exec.cpp
deleted file mode 100644
index 8fe009f0ba2..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher_exec.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
-
-#include "SimplePublisher_exec.h"
-#include "ciao/CIAO_common.h"
-
-namespace CIDL_SimplePublisher_Impl
-{
-  //==================================================================
-  // Component Executor Implementation Class:   SimplePublisher_exec_i
-  //==================================================================
-
-  SimplePublisher_exec_i::SimplePublisher_exec_i (void)
-  {
-    CIAO_TRACE ("SimplePublisher_exec_i::SimplePublisher_exec_i (void)");
-  }
-
-  SimplePublisher_exec_i::~SimplePublisher_exec_i (void)
-  {
-    CIAO_TRACE ("SimplePublisher_exec_i::~SimplePublisher_exec_i (void)");
-  }
-
-  // Supported or inherited operations.
-
-  // Attribute operations.
-
-  // Port operations.
-
-  // Operations from Components::SessionComponent
-
-  void
-  SimplePublisher_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    CIAO_TRACE ("SimplePublisher_exec_i::set_session_context ()");
-    this->context_ =
-      ::Simple::CCM_SimplePublisher_Context::_narrow (ctx);
-
-    if (CORBA::is_nil (this->context_.in ()))
-    {
-      throw ::CORBA::INTERNAL ();
-    }
-  }
-
-  void
-  SimplePublisher_exec_i::configuration_complete ()
-  {
-    CIAO_TRACE ("SimplePublisher_exec_i::configuration_complete ()");
-    // Your code here.
-  }
-
-  void
-  SimplePublisher_exec_i::ccm_activate ()
-  {
-    CIAO_TRACE ("SimplePublisher_exec_i::ccm_activate ()");
-    ::Simple::Hello_var hello = new OBV_Simple::Hello ("Test successful, hello from SimplePublisher_exec_i");
-    
-    this->context_->push_hello (hello.in ());
-    // Your code here.
-  }
-
-  void
-  SimplePublisher_exec_i::ccm_passivate ()
-  {
-    CIAO_TRACE ("SimplePublisher_exec_i::ccm_passivate ()");
-    // Your code here.
-  }
-
-  void
-  SimplePublisher_exec_i::ccm_remove ()
-  {
-    CIAO_TRACE ("SimplePublisher_exec_i::ccm_remove ()");
-    // Your code here.
-  }
-
-  //==================================================================
-  // Home Executor Implementation Class:   SimplePublisherHome_exec_i
-  //==================================================================
-
-  SimplePublisherHome_exec_i::SimplePublisherHome_exec_i (void)
-  {
-    CIAO_TRACE ("SimplePublisherHome_exec_i::SimplePublisherHome_exec_i (void)");
-  }
-
-  SimplePublisherHome_exec_i::~SimplePublisherHome_exec_i (void)
-  {
-    CIAO_TRACE ("SimplePublisherHome_exec_i::~SimplePublisherHome_exec_i (void)");
-  }
-
-  // Supported or inherited operations.
-
-  // Home operations.
-
-  // Factory and finder operations.
-
-  // Attribute operations.
-
-  // Implicit operations.
-
-  ::Components::EnterpriseComponent_ptr
-  SimplePublisherHome_exec_i::create ()
-  {
-    CIAO_TRACE ("SimplePublisherHome_exec_i::create ()");
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_THROW_EX (
-      retval,
-      SimplePublisher_exec_i,
-      ::CORBA::NO_MEMORY ());
-
-    return retval;
-  }
-
-  extern "C" SIMPLEPUBLISHER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Simple_SimplePublisherHome_Impl (void)
-  {
-    CIAO_TRACE ("create_Simple_SimplePublisherHome_Impl (void)");
-    
-    ::Components::HomeExecutorBase_ptr retval =
-      ::Components::HomeExecutorBase::_nil ();
-
-    ACE_NEW_RETURN (
-      retval,
-      SimplePublisherHome_exec_i,
-      ::Components::HomeExecutorBase::_nil ());
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher_exec.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher_exec.h
deleted file mode 100644
index b25191f0a4a..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher_exec.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
-
-#ifndef CIAO_SIMPLEPUBLISHER_EXEC_H
-#define CIAO_SIMPLEPUBLISHER_EXEC_H
-
-#include /**/ "ace/pre.h"
-
-#include "SimplePublisherEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "SimplePublisher_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIDL_SimplePublisher_Impl
-{
-  class SIMPLEPUBLISHER_EXEC_Export SimplePublisher_exec_i
-    : public virtual SimplePublisher_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-    public:
-    SimplePublisher_exec_i (void);
-    virtual ~SimplePublisher_exec_i (void);
-
-    // Supported or inherited operations.
-
-    // Attribute operations.
-
-    // Port operations.
-
-    // Operations from Components::SessionComponent
-
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete ();
-
-    virtual void ccm_activate ();
-
-    virtual void ccm_passivate ();
-
-    virtual void ccm_remove ();
-
-    private:
-    ::Simple::CCM_SimplePublisher_Context_var context_;
-  };
-
-  class SIMPLEPUBLISHER_EXEC_Export SimplePublisherHome_exec_i
-    : public virtual SimplePublisherHome_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-    public:
-    SimplePublisherHome_exec_i (void);
-    virtual ~SimplePublisherHome_exec_i (void);
-
-    // Supported or inherited operations.
-
-    // Home operations.
-
-    // Factory and finder operations.
-
-    // Attribute operations.
-
-    // Implicit operations.
-
-    virtual ::Components::EnterpriseComponent_ptr
-    create ();
-  };
-
-  extern "C" SIMPLEPUBLISHER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Simple_SimplePublisherHome_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* CIAO_SIMPLEPUBLISHER_EXEC_H */
-
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher_exec_export.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher_exec_export.h
deleted file mode 100644
index 2f18677399f..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher_exec_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SIMPLEPUBLISHER_EXEC
-// ------------------------------
-#ifndef SIMPLEPUBLISHER_EXEC_EXPORT_H
-#define SIMPLEPUBLISHER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEPUBLISHER_EXEC_HAS_DLL)
-#  define SIMPLEPUBLISHER_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEPUBLISHER_EXEC_HAS_DLL */
-
-#if !defined (SIMPLEPUBLISHER_EXEC_HAS_DLL)
-#  define SIMPLEPUBLISHER_EXEC_HAS_DLL 1
-#endif /* ! SIMPLEPUBLISHER_EXEC_HAS_DLL */
-
-#if defined (SIMPLEPUBLISHER_EXEC_HAS_DLL) && (SIMPLEPUBLISHER_EXEC_HAS_DLL == 1)
-#  if defined (SIMPLEPUBLISHER_EXEC_BUILD_DLL)
-#    define SIMPLEPUBLISHER_EXEC_Export ACE_Proper_Export_Flag
-#    define SIMPLEPUBLISHER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEPUBLISHER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEPUBLISHER_EXEC_BUILD_DLL */
-#    define SIMPLEPUBLISHER_EXEC_Export ACE_Proper_Import_Flag
-#    define SIMPLEPUBLISHER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEPUBLISHER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEPUBLISHER_EXEC_BUILD_DLL */
-#else /* SIMPLEPUBLISHER_EXEC_HAS_DLL == 1 */
-#  define SIMPLEPUBLISHER_EXEC_Export
-#  define SIMPLEPUBLISHER_EXEC_SINGLETON_DECLARATION(T)
-#  define SIMPLEPUBLISHER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEPUBLISHER_EXEC_HAS_DLL == 1 */
-
-// Set SIMPLEPUBLISHER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEPUBLISHER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEPUBLISHER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEPUBLISHER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEPUBLISHER_EXEC_NTRACE */
-
-#if (SIMPLEPUBLISHER_EXEC_NTRACE == 1)
-#  define SIMPLEPUBLISHER_EXEC_TRACE(X)
-#else /* (SIMPLEPUBLISHER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEPUBLISHER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEPUBLISHER_EXEC_NTRACE == 1) */
-
-#endif /* SIMPLEPUBLISHER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher_stub_export.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher_stub_export.h
deleted file mode 100644
index 8ab3300c5ca..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SIMPLEPUBLISHER_STUB
-// ------------------------------
-#ifndef SIMPLEPUBLISHER_STUB_EXPORT_H
-#define SIMPLEPUBLISHER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEPUBLISHER_STUB_HAS_DLL)
-#  define SIMPLEPUBLISHER_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEPUBLISHER_STUB_HAS_DLL */
-
-#if !defined (SIMPLEPUBLISHER_STUB_HAS_DLL)
-#  define SIMPLEPUBLISHER_STUB_HAS_DLL 1
-#endif /* ! SIMPLEPUBLISHER_STUB_HAS_DLL */
-
-#if defined (SIMPLEPUBLISHER_STUB_HAS_DLL) && (SIMPLEPUBLISHER_STUB_HAS_DLL == 1)
-#  if defined (SIMPLEPUBLISHER_STUB_BUILD_DLL)
-#    define SIMPLEPUBLISHER_STUB_Export ACE_Proper_Export_Flag
-#    define SIMPLEPUBLISHER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEPUBLISHER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEPUBLISHER_STUB_BUILD_DLL */
-#    define SIMPLEPUBLISHER_STUB_Export ACE_Proper_Import_Flag
-#    define SIMPLEPUBLISHER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEPUBLISHER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEPUBLISHER_STUB_BUILD_DLL */
-#else /* SIMPLEPUBLISHER_STUB_HAS_DLL == 1 */
-#  define SIMPLEPUBLISHER_STUB_Export
-#  define SIMPLEPUBLISHER_STUB_SINGLETON_DECLARATION(T)
-#  define SIMPLEPUBLISHER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEPUBLISHER_STUB_HAS_DLL == 1 */
-
-// Set SIMPLEPUBLISHER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEPUBLISHER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEPUBLISHER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEPUBLISHER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEPUBLISHER_STUB_NTRACE */
-
-#if (SIMPLEPUBLISHER_STUB_NTRACE == 1)
-#  define SIMPLEPUBLISHER_STUB_TRACE(X)
-#else /* (SIMPLEPUBLISHER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEPUBLISHER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEPUBLISHER_STUB_NTRACE == 1) */
-
-#endif /* SIMPLEPUBLISHER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher_svnt_export.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher_svnt_export.h
deleted file mode 100644
index cbc5f4e56be..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SIMPLEPUBLISHER_SVNT
-// ------------------------------
-#ifndef SIMPLEPUBLISHER_SVNT_EXPORT_H
-#define SIMPLEPUBLISHER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEPUBLISHER_SVNT_HAS_DLL)
-#  define SIMPLEPUBLISHER_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEPUBLISHER_SVNT_HAS_DLL */
-
-#if !defined (SIMPLEPUBLISHER_SVNT_HAS_DLL)
-#  define SIMPLEPUBLISHER_SVNT_HAS_DLL 1
-#endif /* ! SIMPLEPUBLISHER_SVNT_HAS_DLL */
-
-#if defined (SIMPLEPUBLISHER_SVNT_HAS_DLL) && (SIMPLEPUBLISHER_SVNT_HAS_DLL == 1)
-#  if defined (SIMPLEPUBLISHER_SVNT_BUILD_DLL)
-#    define SIMPLEPUBLISHER_SVNT_Export ACE_Proper_Export_Flag
-#    define SIMPLEPUBLISHER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEPUBLISHER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEPUBLISHER_SVNT_BUILD_DLL */
-#    define SIMPLEPUBLISHER_SVNT_Export ACE_Proper_Import_Flag
-#    define SIMPLEPUBLISHER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEPUBLISHER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEPUBLISHER_SVNT_BUILD_DLL */
-#else /* SIMPLEPUBLISHER_SVNT_HAS_DLL == 1 */
-#  define SIMPLEPUBLISHER_SVNT_Export
-#  define SIMPLEPUBLISHER_SVNT_SINGLETON_DECLARATION(T)
-#  define SIMPLEPUBLISHER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEPUBLISHER_SVNT_HAS_DLL == 1 */
-
-// Set SIMPLEPUBLISHER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEPUBLISHER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEPUBLISHER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEPUBLISHER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEPUBLISHER_SVNT_NTRACE */
-
-#if (SIMPLEPUBLISHER_SVNT_NTRACE == 1)
-#  define SIMPLEPUBLISHER_SVNT_TRACE(X)
-#else /* (SIMPLEPUBLISHER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEPUBLISHER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEPUBLISHER_SVNT_NTRACE == 1) */
-
-#endif /* SIMPLEPUBLISHER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser.cidl b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser.cidl
deleted file mode 100644
index e3afe5e12f6..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser.cidl
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-#include "SimpleUser.idl"
-
-composition session SimpleUser_Impl
-{
-  home executor SimpleUserHome_Exec
-  {
-    implements Simple::SimpleUserHome;
-    manages SimpleUser_Exec;
-  };
-};
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser.idl b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser.idl
deleted file mode 100644
index 90d4e67e542..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-
-#ifndef SIMPLE_USER_IDL
-#define SIMPLE_USER_IDL
-
-#include "SimpleCommon.idl"
-#include "Components.idl"
-
-module Simple
-{
-  component SimpleUser
-  {
-    uses Trigger trig;
-  };
-  
-  home SimpleUserHome manages SimpleUser
-  {
-  };
-};
-
-#endif /*SIMPLE_USER_IDL*/
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser.mpc b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser.mpc
deleted file mode 100644
index c33c4120a77..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser.mpc
+++ /dev/null
@@ -1,121 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -p SimpleCommon SimpleUser"
-
-project(SimpleCommon_SimpleUser_idl_gen) : taoidldefaults, anytypecode {
-  avoids += ace_for_tao
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SIMPLEUSER_STUB_Export \
-              -Wb,stub_export_include=SimpleUser_stub_export.h \
-              -Wb,skel_export_macro=SIMPLEUSER_SVNT_Export \
-              -Wb,skel_export_include=SimpleUser_svnt_export.h
-
-  IDL_Files {
-    SimpleUser.idl
-  }
-}
-
-project(SimpleCommon_SimpleUser_cidl_gen) : ciaocidldefaults, taoidldefaults {
-  avoids += ace_for_tao
-  custom_only = 1
-  cidlflags += --svnt-export-macro SIMPLEUSER_SVNT_Export \
-               --svnt-export-include SimpleUser_svnt_export.h
-  idlflags += -Wb,export_macro=SIMPLEUSER_EXEC_Export \
-              -Wb,export_include=SimpleUser_exec_export.h \
-              -SS
-              
-  CIDL_Files {
-    SimpleUser.cidl
-  }
-  
-  IDL_Files {
-    SimpleUserE.idl
-  }
-}
-
-project(SimpleCommon_SimpleUser_stub) : ccm_stub {
-  avoids += ace_for_tao
-  after += SimpleCommon_SimpleUser_idl_gen SimpleCommon_stub
-  libs  += SimpleCommon_stub
-  
-  sharedname = SimpleUser_stub
-  dynamicflags   = SIMPLEUSER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SimpleUserC.cpp
-  }
-
-  Header_Files {
-    SimpleUserC.h
-    SimpleUser_stub_export.h
-  }
-
-  Inline_Files {
-    SimpleUserC.inl
-  }
-}
-
-project(SimpleCommon_SimpleUser_exec) : ciao_executor {
-  avoids += ace_for_tao
-  after   += SimpleCommon_SimpleUser_cidl_gen SimpleCommon_SimpleUser_stub
-  sharedname = SimpleUser_exec
-  libs += SimpleUser_stub SimpleCommon_stub
-  
-  dynamicflags   = SIMPLEUSER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SimpleUserEC.cpp
-    SimpleUser_exec.cpp
-  }
-  
-  Header_Files {
-    SimpleUserEC.h
-    SimpleUser_exec.h
-    SimpleUser_exec_export.h
-  }
-  
-  Inline_Files {
-    SimpleUserEC.inl
-  }
-}
-
-
-project(SimpleCommon_SimpleUser_svnt) : ciao_servant {
-  avoids += ace_for_tao
-  after      += SimpleCommon_skel SimpleCommon_SimpleUser_exec
-  sharedname  = SimpleUser_svnt
-  libs       += SimpleUser_exec \
-                SimpleUser_stub \
-                SimpleCommon_skel \
-                SimpleCommon_stub
-  
-  dynamicflags = SIMPLEUSER_SVNT_BUILD_DLL
-  
-  CIDL_Files {
-  }
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    SimpleUserS.cpp
-    SimpleUser_svnt.cpp
-  }
-  
-  Header_Files {
-    SimpleUserS.h
-    SimpleUser_svnt.h
-    SimpleUser_svnt_export.h
-  }
-  
-  Inline_Files {
-    SimpleUserS.inl
-  }
-}
-
-
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_exec.cpp b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_exec.cpp
deleted file mode 100644
index bf99e081d84..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_exec.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
-
-#include "SimpleUser_exec.h"
-#include "ciao/CIAO_common.h"
-
-namespace CIDL_SimpleUser_Impl
-{
-  //==================================================================
-  // Component Executor Implementation Class:   SimpleUser_exec_i
-  //==================================================================
-
-  SimpleUser_exec_i::SimpleUser_exec_i (void)
-  {
-    CIAO_TRACE ("SimpleUser_exec_i::SimpleUser_exec_i (void)");
-  }
-
-  SimpleUser_exec_i::~SimpleUser_exec_i (void)
-  {
-    CIAO_TRACE ("SimpleUser_exec_i::~SimpleUser_exec_i (void)");
-  }
-
-  // Supported or inherited operations.
-
-  // Attribute operations.
-
-  // Port operations.
-
-  // Operations from Components::SessionComponent
-
-  void
-  SimpleUser_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    CIAO_TRACE ("SimpleUser_exec_i::set_session_context ()");
-    this->context_ =
-      ::Simple::CCM_SimpleUser_Context::_narrow (ctx);
-
-    if (CORBA::is_nil (this->context_.in ()))
-    {
-      throw ::CORBA::INTERNAL ();
-    }
-  }
-
-  void
-  SimpleUser_exec_i::configuration_complete ()
-  {
-    CIAO_TRACE ("SimpleUser_exec_i::configuration_complete ()");
-    // Your code here.
-  }
-
-  void
-  SimpleUser_exec_i::ccm_activate ()
-  {
-    CIAO_TRACE ("SimpleUser_exec_i::ccm_activate ()");
-    
-    ::Simple::Trigger_var trig (this->context_->get_connection_trig ());
-    
-    if (CORBA::is_nil (trig.in ()))
-      {
-        CIAO_ERROR ((LM_ERROR, CLINFO "SimpleUser_exec_i::ccm_activate () - "
-                     "Error: Reference nil for port trig\n"));
-      }
-    
-    // Your code here.
-    try
-      {
-        trig->hello ("Test successful; hello from SimpleUser.");
-      }
-    catch (CORBA::Exception &ex)
-      {
-        CIAO_ERROR ((LM_ERROR, CLINFO "SimpleUser_exec_i::ccm_activate () - "
-                     "Caught CORBA exception, details follow:\n"));
-        ex._tao_print_exception (CLINFO "SimpleUser_exec_i::ccm_activate () - ");
-      }
-    catch (...)
-      {
-        CIAO_ERROR ((LM_ERROR, CLINFO "SimpleUser_exec_i::ccm_activate () - "
-                     "Error: Caught unknown exception whilst invoking reference for port trig.\n"));
-      }
-  }
-
-  void
-  SimpleUser_exec_i::ccm_passivate ()
-  {
-    CIAO_TRACE ("SimpleUser_exec_i::ccm_passivate ()");
-    // Your code here.
-  }
-
-  void
-  SimpleUser_exec_i::ccm_remove ()
-  {
-    CIAO_TRACE ("SimpleUser_exec_i::ccm_remove ()");
-    // Your code here.
-  }
-
-  //==================================================================
-  // Home Executor Implementation Class:   SimpleUserHome_exec_i
-  //==================================================================
-
-  SimpleUserHome_exec_i::SimpleUserHome_exec_i (void)
-  {
-    CIAO_TRACE ("SimpleUserHome_exec_i::SimpleUserHome_exec_i (void)");
-  }
-
-  SimpleUserHome_exec_i::~SimpleUserHome_exec_i (void)
-  {
-    CIAO_TRACE ("SimpleUserHome_exec_i::~SimpleUserHome_exec_i (void)");
-  }
-
-  // Supported or inherited operations.
-
-  // Home operations.
-
-  // Factory and finder operations.
-
-  // Attribute operations.
-
-  // Implicit operations.
-
-  ::Components::EnterpriseComponent_ptr
-  SimpleUserHome_exec_i::create ()
-  {
-    CIAO_TRACE ("SimpleUserHome_exec_i::create ()");
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_THROW_EX (
-      retval,
-      SimpleUser_exec_i,
-      ::CORBA::NO_MEMORY ());
-
-    return retval;
-  }
-
-  extern "C" SIMPLEUSER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Simple_SimpleUserHome_Impl (void)
-  {
-    CIAO_TRACE ("create_Simple_SimpleUserHome_Impl (void)");
-    ::Components::HomeExecutorBase_ptr retval =
-      ::Components::HomeExecutorBase::_nil ();
-
-    ACE_NEW_RETURN (
-      retval,
-      SimpleUserHome_exec_i,
-      ::Components::HomeExecutorBase::_nil ());
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_exec.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_exec.h
deleted file mode 100644
index 9b28f1e36f2..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_exec.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
-
-#ifndef CIAO_SIMPLEUSER_EXEC_H
-#define CIAO_SIMPLEUSER_EXEC_H
-
-#include /**/ "ace/pre.h"
-
-#include "SimpleUserEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "SimpleUser_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIDL_SimpleUser_Impl
-{
-  class SIMPLEUSER_EXEC_Export SimpleUser_exec_i
-    : public virtual SimpleUser_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-    public:
-    SimpleUser_exec_i (void);
-    virtual ~SimpleUser_exec_i (void);
-
-    // Supported or inherited operations.
-
-    // Attribute operations.
-
-    // Port operations.
-
-    // Operations from Components::SessionComponent
-
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete ();
-
-    virtual void ccm_activate ();
-
-    virtual void ccm_passivate ();
-
-    virtual void ccm_remove ();
-
-    private:
-    ::Simple::CCM_SimpleUser_Context_var context_;
-  };
-
-  class SIMPLEUSER_EXEC_Export SimpleUserHome_exec_i
-    : public virtual SimpleUserHome_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-    public:
-    SimpleUserHome_exec_i (void);
-    virtual ~SimpleUserHome_exec_i (void);
-
-    // Supported or inherited operations.
-
-    // Home operations.
-
-    // Factory and finder operations.
-
-    // Attribute operations.
-
-    // Implicit operations.
-
-    virtual ::Components::EnterpriseComponent_ptr
-    create ();
-  };
-
-  extern "C" SIMPLEUSER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Simple_SimpleUserHome_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* CIAO_SIMPLEUSER_EXEC_H */
-
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_exec_export.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_exec_export.h
deleted file mode 100644
index fcc935919a3..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_exec_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SIMPLEUSER_EXEC
-// ------------------------------
-#ifndef SIMPLEUSER_EXEC_EXPORT_H
-#define SIMPLEUSER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEUSER_EXEC_HAS_DLL)
-#  define SIMPLEUSER_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEUSER_EXEC_HAS_DLL */
-
-#if !defined (SIMPLEUSER_EXEC_HAS_DLL)
-#  define SIMPLEUSER_EXEC_HAS_DLL 1
-#endif /* ! SIMPLEUSER_EXEC_HAS_DLL */
-
-#if defined (SIMPLEUSER_EXEC_HAS_DLL) && (SIMPLEUSER_EXEC_HAS_DLL == 1)
-#  if defined (SIMPLEUSER_EXEC_BUILD_DLL)
-#    define SIMPLEUSER_EXEC_Export ACE_Proper_Export_Flag
-#    define SIMPLEUSER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEUSER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEUSER_EXEC_BUILD_DLL */
-#    define SIMPLEUSER_EXEC_Export ACE_Proper_Import_Flag
-#    define SIMPLEUSER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEUSER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEUSER_EXEC_BUILD_DLL */
-#else /* SIMPLEUSER_EXEC_HAS_DLL == 1 */
-#  define SIMPLEUSER_EXEC_Export
-#  define SIMPLEUSER_EXEC_SINGLETON_DECLARATION(T)
-#  define SIMPLEUSER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEUSER_EXEC_HAS_DLL == 1 */
-
-// Set SIMPLEUSER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEUSER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEUSER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEUSER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEUSER_EXEC_NTRACE */
-
-#if (SIMPLEUSER_EXEC_NTRACE == 1)
-#  define SIMPLEUSER_EXEC_TRACE(X)
-#else /* (SIMPLEUSER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEUSER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEUSER_EXEC_NTRACE == 1) */
-
-#endif /* SIMPLEUSER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_stub_export.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_stub_export.h
deleted file mode 100644
index a31d19d5614..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SIMPLEUSER_STUB
-// ------------------------------
-#ifndef SIMPLEUSER_STUB_EXPORT_H
-#define SIMPLEUSER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEUSER_STUB_HAS_DLL)
-#  define SIMPLEUSER_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEUSER_STUB_HAS_DLL */
-
-#if !defined (SIMPLEUSER_STUB_HAS_DLL)
-#  define SIMPLEUSER_STUB_HAS_DLL 1
-#endif /* ! SIMPLEUSER_STUB_HAS_DLL */
-
-#if defined (SIMPLEUSER_STUB_HAS_DLL) && (SIMPLEUSER_STUB_HAS_DLL == 1)
-#  if defined (SIMPLEUSER_STUB_BUILD_DLL)
-#    define SIMPLEUSER_STUB_Export ACE_Proper_Export_Flag
-#    define SIMPLEUSER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEUSER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEUSER_STUB_BUILD_DLL */
-#    define SIMPLEUSER_STUB_Export ACE_Proper_Import_Flag
-#    define SIMPLEUSER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEUSER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEUSER_STUB_BUILD_DLL */
-#else /* SIMPLEUSER_STUB_HAS_DLL == 1 */
-#  define SIMPLEUSER_STUB_Export
-#  define SIMPLEUSER_STUB_SINGLETON_DECLARATION(T)
-#  define SIMPLEUSER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEUSER_STUB_HAS_DLL == 1 */
-
-// Set SIMPLEUSER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEUSER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEUSER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEUSER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEUSER_STUB_NTRACE */
-
-#if (SIMPLEUSER_STUB_NTRACE == 1)
-#  define SIMPLEUSER_STUB_TRACE(X)
-#else /* (SIMPLEUSER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEUSER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEUSER_STUB_NTRACE == 1) */
-
-#endif /* SIMPLEUSER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_svnt_export.h b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_svnt_export.h
deleted file mode 100644
index 897f82c3081..00000000000
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SIMPLEUSER_SVNT
-// ------------------------------
-#ifndef SIMPLEUSER_SVNT_EXPORT_H
-#define SIMPLEUSER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEUSER_SVNT_HAS_DLL)
-#  define SIMPLEUSER_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEUSER_SVNT_HAS_DLL */
-
-#if !defined (SIMPLEUSER_SVNT_HAS_DLL)
-#  define SIMPLEUSER_SVNT_HAS_DLL 1
-#endif /* ! SIMPLEUSER_SVNT_HAS_DLL */
-
-#if defined (SIMPLEUSER_SVNT_HAS_DLL) && (SIMPLEUSER_SVNT_HAS_DLL == 1)
-#  if defined (SIMPLEUSER_SVNT_BUILD_DLL)
-#    define SIMPLEUSER_SVNT_Export ACE_Proper_Export_Flag
-#    define SIMPLEUSER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEUSER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEUSER_SVNT_BUILD_DLL */
-#    define SIMPLEUSER_SVNT_Export ACE_Proper_Import_Flag
-#    define SIMPLEUSER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEUSER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEUSER_SVNT_BUILD_DLL */
-#else /* SIMPLEUSER_SVNT_HAS_DLL == 1 */
-#  define SIMPLEUSER_SVNT_Export
-#  define SIMPLEUSER_SVNT_SINGLETON_DECLARATION(T)
-#  define SIMPLEUSER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEUSER_SVNT_HAS_DLL == 1 */
-
-// Set SIMPLEUSER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEUSER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEUSER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEUSER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEUSER_SVNT_NTRACE */
-
-#if (SIMPLEUSER_SVNT_NTRACE == 1)
-#  define SIMPLEUSER_SVNT_TRACE(X)
-#else /* (SIMPLEUSER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEUSER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEUSER_SVNT_NTRACE == 1) */
-
-#endif /* SIMPLEUSER_SVNT_EXPORT_H */
-
-// End of auto generated file.