Tue Feb 16 20:04:57 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        Simplified execution manager

        * DAnCE/ExecutionManager/DAnCE_ExecutionManager_Module_Export.h
        * DAnCE/ExecutionManager/Execution_Manager_Exec.cpp
        * DAnCE/ExecutionManager/ExecutionManager_Export.h
          Removed

        * DAnCE/ExecutionManager/Execution_Manager.cpp
        * DAnCE/ExecutionManager/ExecutionManager.mpc
        * DAnCE/ExecutionManager/ExecutionManager_Impl.h
        * DAnCE/ExecutionManager/ExecutionManager_Module.cpp
        * DAnCE/ExecutionManager/ExecutionManager_Module.h
          Simplified

        * DAnCE/Plan_Launcher/Plan_Launcher.cpp:
          Layout changes

8 files changed, 100 insertions, 184 deletions

diff --git a/CIAO/DAnCE/ExecutionManager/DAnCE_ExecutionManager_Module_Export.h b/CIAO/DAnCE/ExecutionManager/DAnCE_ExecutionManager_Module_Export.h
deleted file mode 100644
index 6ab710d4044..00000000000
--- a/CIAO/DAnCE/ExecutionManager/DAnCE_ExecutionManager_Module_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 DAnCE_ExecutionManager_Module
-// ------------------------------
-#ifndef DANCE_EXECUTIONMANAGER_MODULE_EXPORT_H
-#define DANCE_EXECUTIONMANAGER_MODULE_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (DANCE_EXECUTIONMANAGER_MODULE_HAS_DLL)
-#  define DANCE_EXECUTIONMANAGER_MODULE_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && DANCE_EXECUTIONMANAGER_MODULE_HAS_DLL */
-
-#if !defined (DANCE_EXECUTIONMANAGER_MODULE_HAS_DLL)
-#  define DANCE_EXECUTIONMANAGER_MODULE_HAS_DLL 1
-#endif /* ! DANCE_EXECUTIONMANAGER_MODULE_HAS_DLL */
-
-#if defined (DANCE_EXECUTIONMANAGER_MODULE_HAS_DLL) && (DANCE_EXECUTIONMANAGER_MODULE_HAS_DLL == 1)
-#  if defined (DANCE_EXECUTIONMANAGER_MODULE_BUILD_DLL)
-#    define DAnCE_ExecutionManager_Module_Export ACE_Proper_Export_Flag
-#    define DANCE_EXECUTIONMANAGER_MODULE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DANCE_EXECUTIONMANAGER_MODULE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* DANCE_EXECUTIONMANAGER_MODULE_BUILD_DLL */
-#    define DAnCE_ExecutionManager_Module_Export ACE_Proper_Import_Flag
-#    define DANCE_EXECUTIONMANAGER_MODULE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DANCE_EXECUTIONMANAGER_MODULE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* DANCE_EXECUTIONMANAGER_MODULE_BUILD_DLL */
-#else /* DANCE_EXECUTIONMANAGER_MODULE_HAS_DLL == 1 */
-#  define DAnCE_ExecutionManager_Module_Export
-#  define DANCE_EXECUTIONMANAGER_MODULE_SINGLETON_DECLARATION(T)
-#  define DANCE_EXECUTIONMANAGER_MODULE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* DANCE_EXECUTIONMANAGER_MODULE_HAS_DLL == 1 */
-
-// Set DANCE_EXECUTIONMANAGER_MODULE_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (DANCE_EXECUTIONMANAGER_MODULE_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define DANCE_EXECUTIONMANAGER_MODULE_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define DANCE_EXECUTIONMANAGER_MODULE_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !DANCE_EXECUTIONMANAGER_MODULE_NTRACE */
-
-#if (DANCE_EXECUTIONMANAGER_MODULE_NTRACE == 1)
-#  define DANCE_EXECUTIONMANAGER_MODULE_TRACE(X)
-#else /* (DANCE_EXECUTIONMANAGER_MODULE_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define DANCE_EXECUTIONMANAGER_MODULE_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (DANCE_EXECUTIONMANAGER_MODULE_NTRACE == 1) */
-
-#endif /* DANCE_EXECUTIONMANAGER_MODULE_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc b/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
index a9ec0a772d4..3eb61d9a278 100644
--- a/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
+++ b/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
@@ -1,23 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project(ExecutionManager_Module): dance_lib, taolib, iortable, dance_output, utils, strategies, naming, dance_executionmanager_skel, dance_domainapplicationmanager, dance_deployment_skel, avoids_minimum_corba {
-  sharedname = DAnCE_ExecutionManager
-  dynamicflags = EXECUTIONMANAGER_BUILD_DLL DANCE_EXECUTIONMANAGER_MODULE_BUILD_DLL
+project(Execution_Manager_Exec) : dance_exe, naming, \
+                                dance_domainapplicationmanager, dance_executionmanager_skel, utils, dance_logger, avoids_minimum_corba, iortable {
+  exename = dance_execution_manager
 
   Source_Files {
     ExecutionManager_Impl.cpp
     ExecutionManager_Module.cpp
-  }
-}
-
-project(Execution_Manager_Exec) : dance_exe, naming_serv, \
-                                dance_domainapplicationmanager, dance_executionmanager_skel, utils, dance_logger, avoids_minimum_corba  {
-  exename = dance_execution_manager
-  after += ExecutionManager_Module
-  libs += DAnCE_ExecutionManager
-
-  Source_Files {
-    Execution_Manager_Exec.cpp
+    Execution_Manager.cpp
   }
 }
diff --git a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Export.h b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Export.h
deleted file mode 100644
index 8633f5d5400..00000000000
--- a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Export.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl ExecutionManager
-// ------------------------------
-#ifndef EXECUTIONMANAGER_EXPORT_H
-#define EXECUTIONMANAGER_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (EXECUTIONMANAGER_HAS_DLL)
-#  define EXECUTIONMANAGER_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && EXECUTIONMANAGER_HAS_DLL */
-
-#if !defined (EXECUTIONMANAGER_HAS_DLL)
-#  define EXECUTIONMANAGER_HAS_DLL 1
-#endif /* ! EXECUTIONMANAGER_HAS_DLL */
-
-#if defined (EXECUTIONMANAGER_HAS_DLL) && (EXECUTIONMANAGER_HAS_DLL == 1)
-#  if defined (EXECUTIONMANAGER_BUILD_DLL)
-#    define ExecutionManager_Export ACE_Proper_Export_Flag
-#    define EXECUTIONMANAGER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define EXECUTIONMANAGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* EXECUTIONMANAGER_BUILD_DLL */
-#    define ExecutionManager_Export ACE_Proper_Import_Flag
-#    define EXECUTIONMANAGER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define EXECUTIONMANAGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* EXECUTIONMANAGER_BUILD_DLL */
-#else /* EXECUTIONMANAGER_HAS_DLL == 1 */
-#  define ExecutionManager_Export
-#  define EXECUTIONMANAGER_SINGLETON_DECLARATION(T)
-#  define EXECUTIONMANAGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* EXECUTIONMANAGER_HAS_DLL == 1 */
-
-// Set EXECUTIONMANAGER_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (EXECUTIONMANAGER_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define EXECUTIONMANAGER_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define EXECUTIONMANAGER_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !EXECUTIONMANAGER_NTRACE */
-
-#if (EXECUTIONMANAGER_NTRACE == 1)
-#  define EXECUTIONMANAGER_TRACE(X)
-#else /* (EXECUTIONMANAGER_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define EXECUTIONMANAGER_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (EXECUTIONMANAGER_NTRACE == 1) */
-
-#endif /* EXECUTIONMANAGER_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h
index 1d2f7fbdbe4..2d2f3f7d4f0 100644
--- a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h
+++ b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h
@@ -18,7 +18,6 @@
 #include "ace/Map_Manager.h"
 #include "ace/SStringfwd.h"
 #include "orbsvcs/orbsvcs/CosNamingC.h"
-#include "ExecutionManager_Export.h"
 #include "Deployment/Deployment_ExecutionManagerS.h"
 #include "Deployment/Deployment_NodeManagerC.h"
 #include "DomainApplicationManager/DomainApplicationManager_Impl.h"
@@ -26,7 +25,7 @@
 
 namespace DAnCE
   {
-  class ExecutionManager_Export ExecutionManager_Impl
+  class ExecutionManager_Impl
         : public virtual POA_Deployment::ExecutionManager
     {
     public:
diff --git a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp
index 8fc4172a6de..94702c170d4 100644
--- a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp
+++ b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp
@@ -3,7 +3,6 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
-
 #include "tao/StringSeqC.h"
 #include "tao/IORTable/IORTable.h"
 #include "tao/Utils/PolicyList_Destroyer.h"
@@ -175,36 +174,36 @@ DAnCE_ExecutionManager_Module::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 CORBA::Object_ptr
-DAnCE_ExecutionManager_Module::create_object (CORBA::ORB_ptr orb,
-                                              int argc,
-                                              ACE_TCHAR *argv[])
+DAnCE_ExecutionManager_Module::init (CORBA::ORB_ptr orb,
+                                      int argc,
+                                      ACE_TCHAR *argv[])
 {
-  DANCE_TRACE ("DAnCE_ExecutionManager_Module::create_object");
+  DANCE_TRACE ("DAnCE_ExecutionManager_Module::init");
 
   try
     {
       if (this->em_impl_ != 0)
         {
           DANCE_ERROR (1, (LM_ERROR,
-                         DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ")
+                         DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::init - ")
                          ACE_TEXT("Error: ExecutionManager already exists.\n")));
           return CORBA::Object::_nil ();
         }
 
-      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ")
+      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::init - ")
                     ACE_TEXT("before parsing arguments.\n")));
 
       if (!this->parse_args (argc, argv))
         return CORBA::Object::_nil ();
 
-      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ")
+      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::init - ")
                     ACE_TEXT("before creating value factory.\n")));
       CORBA::ValueFactory_var vf = new Components::Cookie_init();
-      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ")
+      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::init - ")
                     ACE_TEXT("before registering value factory.\n")));
       vf = orb->register_value_factory ("IDL:omg.org/Components/Cookie:1.0", vf.in());
 
-      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ")
+      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::init - ")
                     ACE_TEXT("after creating value factory.\n")));
       // Get reference to Root POA.
       CORBA::Object_var poa_obj
@@ -219,7 +218,7 @@ DAnCE_ExecutionManager_Module::create_object (CORBA::ORB_ptr orb,
       policies.length (2);
       try
         {
-          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ")
+          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::init - ")
                         ACE_TEXT("before creating the \"Managers\" POA.\n")));
 
           policies[0] = poa->create_id_assignment_policy (PortableServer::USER_ID);
@@ -240,7 +239,7 @@ DAnCE_ExecutionManager_Module::create_object (CORBA::ORB_ptr orb,
         {
           if (this->options_.domain_nc_)
             {
-              DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ")
+              DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::init - ")
                             ACE_TEXT("before resolving \"DomainNC\".\n")));
               CORBA::Object_var domain_obj = orb->string_to_object (this->options_.domain_nc_);
               if (!CORBA::is_nil (domain_obj.in ()))
@@ -276,7 +275,7 @@ DAnCE_ExecutionManager_Module::create_object (CORBA::ORB_ptr orb,
         }
 
       // Create and install the DAnCE Daemon servant on child POA
-      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - before creating EM servant.\n")));
+      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::init - before creating EM servant.\n")));
       ACE_NEW_RETURN (this->em_impl_,
                       DAnCE::ExecutionManager_Impl (orb,
                                                     poa.in (),
@@ -316,7 +315,7 @@ DAnCE_ExecutionManager_Module::create_object (CORBA::ORB_ptr orb,
       // End ExecutionManager initialization part
 
       // Initializing NodeManagers
-      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ")
+      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::init - ")
                     ACE_TEXT("before processing --node-mgr options(%u).\n"), this->options_.node_managers_.size()));
       for (size_t i = 0; i < this->options_.node_managers_.size(); ++i)
         {
@@ -326,7 +325,7 @@ DAnCE_ExecutionManager_Module::create_object (CORBA::ORB_ptr orb,
 
           if (ACE_CString::npos == pos)
             {
-              DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ")
+              DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::init - ")
                             ACE_TEXT("Execution manager received --node-mgr without IOR\n")));
               continue;
             }
@@ -340,7 +339,7 @@ DAnCE_ExecutionManager_Module::create_object (CORBA::ORB_ptr orb,
 
       if (this->options_.node_map_ != 0)
         {
-          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ")
+          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::init - ")
                         ACE_TEXT("Parsing node map %C\n"),
                         this->options_.node_map_));
           this->em_impl_->load_node_map (this->options_.node_map_);
@@ -358,7 +357,3 @@ DAnCE_ExecutionManager_Module::create_object (CORBA::ORB_ptr orb,
     }
 }
 
-ACE_FACTORY_DEFINE (DAnCE_ExecutionManager_Module, DAnCE_ExecutionManager_Module)
-
-
-
diff --git a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h
index eebe3f5f52a..9fa1c375e7e 100644
--- a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h
+++ b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h
@@ -17,15 +17,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "DAnCE_ExecutionManager_Module_Export.h"
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Service_Config.h"
 #include "ace/Vector_T.h"
-#include "tao/Object_Loader.h"
 
 namespace DAnCE
 {
@@ -35,15 +32,25 @@ namespace DAnCE
 /**
  * @class Execution_Manager_Module
  *
- * @brief The shared object that is instantiated when the execution manager
- *        module/library is dynamically loaded.
- *
- * This class runs the execution manager instance
+ * This class implements the execution manager instance
  */
-class DAnCE_ExecutionManager_Module_Export DAnCE_ExecutionManager_Module
-      : public TAO_Object_Loader
+class DAnCE_ExecutionManager_Module
   {
   public:
+    /// Constructor.
+    DAnCE_ExecutionManager_Module (void);
+
+    /// Destructor.
+    ~DAnCE_ExecutionManager_Module (void);
+
+    /// Setup our infrastructure
+    CORBA::Object_ptr init (CORBA::ORB_ptr orb,
+                            int argc,
+                            ACE_TCHAR *argv []);
+
+  private:
+    bool parse_args (int argc, ACE_TCHAR *argv []);
+
     struct SOptions
       {
         const ACE_TCHAR* exec_mgr_file_;
@@ -74,28 +81,12 @@ class DAnCE_ExecutionManager_Module_Export DAnCE_ExecutionManager_Module
         }
     };
 
-    /// Constructor.
-    DAnCE_ExecutionManager_Module (void);
-
-    /// Destructor.
-    ~DAnCE_ExecutionManager_Module (void);
-
-    /// Overload the base class method to create a new instance
-    /// of a DAnCE_NodeManager_Module object.
-    virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
-                                             int argc,
-                                             ACE_TCHAR *argv []);
-
-    virtual bool parse_args (int argc, ACE_TCHAR *argv []);
-
     SOptions options_;
-  private:
+
     /// Storage for ExecutionManager servant.
     DAnCE::ExecutionManager_Impl * em_impl_;
   };
 
-ACE_FACTORY_DECLARE (DAnCE_ExecutionManager_Module, DAnCE_ExecutionManager_Module)
-
 #include /**/ "ace/post.h"
 
 #endif  /* EXECUTION_MANAGER_MODULE_H */
diff --git a/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp b/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
new file mode 100644
index 00000000000..878db84fffe
--- /dev/null
+++ b/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
@@ -0,0 +1,63 @@
+// $Id$
+
+#include "ace/Dynamic_Service.h"
+#include "tao/ORB.h"
+#include "tao/Object.h"
+#include "DAnCE/Logger/Log_Macros.h"
+#include "DAnCE/Logger/Logger_Service.h"
+#include "ExecutionManager_Module.h"
+
+int
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
+{
+  DANCE_DISABLE_TRACE ();
+
+  int retval = 0;
+
+  try
+    {
+      DAnCE::Logger_Service
+        * dlf = ACE_Dynamic_Service<DAnCE::Logger_Service>::instance ("DAnCE_Logger");
+
+      if (dlf)
+        {
+          dlf->init (argc, argv);
+        }
+
+      DANCE_DEBUG (6, (LM_TRACE, DLINFO
+                    ACE_TEXT("ExecutionManager - initializing ORB\n")));
+
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+
+      DANCE_DEBUG (6, (LM_TRACE, DLINFO
+                   ACE_TEXT("ExecutionManager - initializing module instance\n")));
+
+      DAnCE_ExecutionManager_Module em;
+      CORBA::Object_var obj = em.init (orb.in (), argc, argv);
+
+      if (!CORBA::is_nil (obj.in ()))
+        {
+          DANCE_DEBUG (6, (LM_TRACE, DLINFO
+                    ACE_TEXT("ExecutionManager - running ORB\n")));
+          orb->run ();
+        }
+
+      DANCE_DEBUG (6, (LM_TRACE, DLINFO
+                    ACE_TEXT("ExecutionManager - destroying ORB\n")));
+
+      orb->destroy ();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("ExecutionManager");
+      retval = -1;
+    }
+  catch (...)
+    {
+      DANCE_ERROR (1, (LM_ERROR, "ExecutionManager - Error: Unknown exception.\n"));
+      retval = -1;
+    }
+
+  return retval;
+}
+
diff --git a/CIAO/DAnCE/ExecutionManager/Execution_Manager_Exec.cpp b/CIAO/DAnCE/ExecutionManager/Execution_Manager_Exec.cpp
deleted file mode 100644
index e0871e75017..00000000000
--- a/CIAO/DAnCE/ExecutionManager/Execution_Manager_Exec.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-#include "ExecutionManager_Module.h"
-
-#define DANCE_MODULE_MAIN_CLASS_NAME DAnCE_ExecutionManager_Module
-#include "DAnCE/Module_Main.h"
-
-