Thu Nov 2 17:48:07 UTC 2006 Nishanth Shankaran <nshanka@nospam.com>

15 files changed, 810 insertions, 76 deletions

diff --git a/ChangeLog b/ChangeLog
index 9de3e43bdab..37d0747a87b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+Thu Nov  2 17:48:07 UTC 2006  Nishanth Shankaran  <nshanka@nospam.com>
+
+        * Controller/Component/Poller.cpp: Fixed compiler warnings.
+
+        * Output_Adapters/Component/Output_Manager_exec.cpp:
+        * Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.h:
+        * Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.cpp:
+
+        Make some cosmetic changes.
+
+        * Output_Adapters/XML_Output_Adapter:
+        * Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.cidl:
+        * Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.idl:
+        * Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc:
+        * Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.h:
+        * Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.cpp:
+        * Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec_export.h:
+        * Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_stub_export.h:
+        * Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_svnt_export.h:
+
+        Added the XML output adapter.
+
+        * RACE.mwc: Create a new project file.
+
+        * descriptors/RACE.cdp: Modified the descriptor to include the XML
+          output adapter.
 Wed Nov  1 19:24:27 UTC 2006  Nishanth Shankaran  <nshankar@nospam.com>
 
         * descriptors/run_all.pl:
diff --git a/Controller/Component/Poller.cpp b/Controller/Component/Poller.cpp
index 4bbdf9cc830..5f3ec344380 100644
--- a/Controller/Component/Poller.cpp
+++ b/Controller/Component/Poller.cpp
@@ -15,10 +15,8 @@ namespace CIAO
       : TM_ (CIAO::TargetManagerExt::_duplicate (TM_ptr)),
         monitor_ (::CIAO::RACE::Execution_Time_Monitor::_duplicate (monitor)),
         orb_reactor_ (reactor),
-        //        interval_ (interval),
-        interval_ (20),
-        start_time_ (110),
-        //        start_time_ (20),
+        interval_ (interval),
+        start_time_ (interval * 5),
         active_ (false),
         initialized_ (false),
         stack_ (20),
diff --git a/Output_Adapters/Component/Output_Manager_exec.cpp b/Output_Adapters/Component/Output_Manager_exec.cpp
index bb6cbce8552..5ec78e26696 100644
--- a/Output_Adapters/Component/Output_Manager_exec.cpp
+++ b/Output_Adapters/Component/Output_Manager_exec.cpp
@@ -42,7 +42,8 @@ namespace CIAO
               }
 	    catch (...)
 	      {
-                ACE_ERROR ((LM_ERROR, "Output_Manager: Caught unknown exception while pushing plan\n"));
+                ACE_ERROR ((LM_ERROR, "Output_Manager: Caught unknown "
+                            "exception while pushing plan\n"));
 	      }
           }
 
diff --git a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.cpp b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.cpp
index 0be5ad11698..f1486d0f7b1 100644
--- a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.cpp
+++ b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.cpp
@@ -1,23 +1,3 @@
-// $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 "DAnCE_Output_Adapter_exec.h"
 #include "ciao/CIAO_common.h"
 #include "common/RACE_Log_Msg.h"
diff --git a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.h b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.h
index 5706848e1d1..18e47a4819e 100644
--- a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.h
+++ b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.h
@@ -58,8 +58,6 @@ namespace CIAO
                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
           ACE_THROW_SPEC ((CORBA::SystemException));
       private:
-        //::CORBA::Boolean launch_helper (const ::Deployment::DeploymentPlan &plan,
-        //                                const ::Deployment::PackageConfiguration &package);
         ::CORBA::Boolean launch_helper (const ::CIAO::RACE::Plan_Action& plan_action );
         ::CORBA::Boolean teardown_helper (const ::CIAO::RACE::Plan_Action& plan_action );
 
@@ -199,4 +197,3 @@ namespace CIAO
 #include /**/ "ace/post.h"
 
 #endif /* CIAO_DANCE_OUTPUT_ADAPTER_EXEC_H */
-
diff --git a/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.cidl b/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.cidl
new file mode 100644
index 00000000000..cd0d8f07220
--- /dev/null
+++ b/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.cidl
@@ -0,0 +1,25 @@
+//XML_Output_Adapter.cidl,v 1.1 2005/09/06 19:57:22 wotte Exp
+//XML_Output_Adapter.cidl
+
+#ifndef RACE_XML_OUTPUT_ADAPTER_CIDL
+#define RACE_XML_OUTPUT_ADAPTER_CIDL
+
+#include "XML_Output_Adapter.idl"
+
+module CIAO
+{
+  module RACE
+  {
+    composition session XML_Output_Adapter_Impl
+    {
+      home executor XML_Output_Adapter_Home_Exec
+        {
+          implements RACE::XML_Output_Adapter_Home;
+          manages XML_Output_Adapter_Exec;
+        };
+    };
+  };
+};
+
+
+#endif /* RACE_XML_OUTPUT_ADAPTER_CIDL */
diff --git a/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.idl b/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.idl
new file mode 100644
index 00000000000..82d47ac194b
--- /dev/null
+++ b/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.idl
@@ -0,0 +1,21 @@
+//XML_Output_Adapter.idl,v 1.1 2005/09/06 19:57:22 wotte Exp
+#ifndef RACE_XML_OUTPUT_ADAPTER_IDL
+#define RACE_XML_OUTPUT_ADAPTER_IDL
+
+#include <Components.idl>
+#include "RACE/Output_Adapters/Base/Output_Adapter.idl"
+module CIAO
+{
+  module RACE
+  {
+    component XML_Output_Adapter : Output_Adapter
+    {
+    };
+
+    home XML_Output_Adapter_Home manages XML_Output_Adapter
+    {
+    };
+  };
+};
+
+#endif /* RACE_XML_OUTPUT_ADAPTER_IDL */
diff --git a/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc b/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc
new file mode 100644
index 00000000000..ee512c768ed
--- /dev/null
+++ b/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc
@@ -0,0 +1,76 @@
+project(XML_Output_Adapter_stub): ciao_deployment_stub, ciao_race_component  {
+  after += Output_Adapter_stub
+
+  sharedname = XML_Output_Adapter_stub
+
+  idlflags += -Wb,stub_export_macro=XML_OUTPUT_ADAPTER_STUB_Export \
+              -Wb,stub_export_include=XML_Output_Adapter_stub_export.h \
+              -Wb,skel_export_macro=XML_OUTPUT_ADAPTER_SVNT_Export \
+              -Wb,skel_export_include=XML_Output_Adapter_svnt_export.h
+
+  dynamicflags = XML_OUTPUT_ADAPTER_STUB_BUILD_DLL
+
+  libs += Output_Adapter_stub \
+          Output_Adapter_Interface_stub
+
+  IDL_Files {
+    XML_Output_Adapter.idl
+  }
+
+  Source_Files {
+    XML_Output_AdapterC.cpp
+  }
+}
+
+project(XML_Output_Adapter_svnt) : ciao_servant_dnc, ciao_race_component  {
+  after += Output_Adapter_svnt XML_Output_Adapter_stub
+  sharedname  = XML_Output_Adapter_svnt
+  libs    += XML_Output_Adapter_stub \
+             Output_Adapter_stub \
+             Output_Adapter_svnt \
+             Output_Adapter_Interface_stub \
+             Output_Adapter_Interface_svnt
+
+  idlflags  +=  -Wb,export_macro=XML_OUTPUT_ADAPTER_SVNT_Export \
+                -Wb,export_include=XML_Output_Adapter_svnt_export.h
+  dynamicflags = XML_OUTPUT_ADAPTER_SVNT_BUILD_DLL
+
+  CIDL_Files {
+    XML_Output_Adapter.cidl
+  }
+
+  IDL_Files {
+    XML_Output_AdapterE.idl
+  }
+
+  Source_Files {
+    XML_Output_AdapterEC.cpp
+    XML_Output_AdapterS.cpp
+    XML_Output_Adapter_svnt.cpp
+  }
+}
+
+
+project(XML_Output_Adapter_exec) : ciao_component_dnc, ciao_race_component, ciao_config_handlers  {
+  after   += XML_Output_Adapter_svnt
+  sharedname = XML_Output_Adapter_exec
+  libs    += XML_Output_Adapter_stub \
+             XML_Output_Adapter_svnt \
+             Output_Adapter_stub \
+             Output_Adapter_svnt \
+             Output_Adapter_Interface_stub \
+             Output_Adapter_Interface_svnt
+
+  idlflags  +=  -Wb,export_macro=XML_OUTPUT_ADAPTER_EXEC_Export \
+                -Wb,export_include=XML_Output_Adapter_exec_export.h
+  dynamicflags   = XML_OUTPUT_ADAPTER_EXEC_BUILD_DLL
+  includes += $(CIAO_ROOT)/tools/Config_Handlers
+  IDL_Files {
+
+  }
+
+  Source_Files {
+
+    XML_Output_Adapter_exec.cpp
+  }
+}
diff --git a/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.cpp b/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.cpp
new file mode 100644
index 00000000000..3e3441e397c
--- /dev/null
+++ b/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.cpp
@@ -0,0 +1,217 @@
+#include "XML_Output_Adapter_exec.h"
+#include "ciao/CIAO_common.h"
+#include "Config_Handlers/DP_Handler.h"
+#include "Config_Handlers/Utils/XML_Helper.h"
+#include "Config_Handlers/Deployment.hpp"
+#include <string>
+
+namespace CIAO
+{
+  namespace RACE
+  {
+    namespace CIDL_XML_Output_Adapter_Impl
+    {
+      //==================================================================
+      // Facet Executor Implementation Class:   PlanEgress_exec_i
+      //==================================================================
+
+      PlanEgress_exec_i::PlanEgress_exec_i (XML_Output_Adapter_exec_i &comp)
+        : comp_ (comp)
+      {
+      }
+
+      PlanEgress_exec_i::~PlanEgress_exec_i (void)
+      {
+      }
+
+      // Operations from ::CIAO::RACE::PlanEgress
+
+      ::CORBA::Boolean
+      PlanEgress_exec_i::output_plan (const ::CIAO::RACE::Plan_Actions &plan_seq)
+        ACE_THROW_SPEC ((CORBA::SystemException))
+      {
+        CIAO_TRACE ("XML_Output_Adapter_exec::PlanEgres_exec::output_plan");
+        for (size_t i = 0;i < plan_seq.length(); ++i)
+          {
+            if (!this->print_plan (plan_seq[i].plan))
+              {
+                return false;
+              }
+          }
+        return true;
+      }
+
+      bool
+      PlanEgress_exec_i::print_plan (const ::Deployment::DeploymentPlan &plan)
+      {
+        using namespace CIAO::Config_Handlers;
+
+        DP_Handler reverse_handler (plan);
+        xercesc::DOMDocument *the_xsc (XML_HELPER->create_dom (0));
+
+        deploymentPlan (*reverse_handler.xsc (), the_xsc);
+
+        std::string dom_out (plan.UUID.in ());
+        dom_out += ".cdp";
+        XML_HELPER->write_DOM (the_xsc, dom_out.c_str());
+
+        delete the_xsc;
+	ACE_DEBUG ((LM_DEBUG, "6\n"));
+        return true;
+      }
+
+      //==================================================================
+      // Component Executor Implementation Class:   XML_Output_Adapter_exec_i
+      //==================================================================
+
+      XML_Output_Adapter_exec_i::XML_Output_Adapter_exec_i (void)
+      {
+      }
+
+      XML_Output_Adapter_exec_i::~XML_Output_Adapter_exec_i (void)
+      {
+      }
+
+      // Supported or inherited operations.
+
+      // Attribute operations.
+
+      // Port operations.
+
+      ::CIAO::RACE::CCM_PlanEgress_ptr
+      XML_Output_Adapter_exec_i::get_plan_egress (
+        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+      {
+        return new PlanEgress_exec_i (*this);
+      }
+
+      // Operations from Components::SessionComponent
+
+      void
+      XML_Output_Adapter_exec_i::set_session_context (
+        ::Components::SessionContext_ptr ctx
+        ACE_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((
+                        ::CORBA::SystemException,
+                        ::Components::CCMException))
+      {
+        this->context_ =
+        XML_Output_Adapter_Context::_narrow (
+          ctx
+          ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK;
+
+        if (this->context_ == 0)
+        {
+          ACE_THROW (CORBA::INTERNAL ());
+        }
+      }
+
+      void
+      XML_Output_Adapter_exec_i::ciao_preactivate (
+        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((
+                        ::CORBA::SystemException,
+                        ::Components::CCMException))
+      {
+        // Your code here.
+      }
+
+      void
+      XML_Output_Adapter_exec_i::ciao_postactivate (
+        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((
+                        ::CORBA::SystemException,
+                        ::Components::CCMException))
+      {
+        // Your code here.
+      }
+
+      void
+      XML_Output_Adapter_exec_i::ccm_activate (
+        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((
+                        ::CORBA::SystemException,
+                        ::Components::CCMException))
+      {
+        // Your code here.
+      }
+
+      void
+      XML_Output_Adapter_exec_i::ccm_passivate (
+        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((
+                        ::CORBA::SystemException,
+                        ::Components::CCMException))
+      {
+        // Your code here.
+      }
+
+      void
+      XML_Output_Adapter_exec_i::ccm_remove (
+        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((
+                        ::CORBA::SystemException,
+                        ::Components::CCMException))
+      {
+        // Your code here.
+      }
+
+      //==================================================================
+      // Home Executor Implementation Class:   XML_Output_Adapter_Home_exec_i
+      //==================================================================
+
+      XML_Output_Adapter_Home_exec_i::XML_Output_Adapter_Home_exec_i (void)
+      {
+      }
+
+      XML_Output_Adapter_Home_exec_i::~XML_Output_Adapter_Home_exec_i (void)
+      {
+      }
+
+      // Supported or inherited operations.
+
+      // Home operations.
+
+      // Factory and finder operations.
+
+      // Attribute operations.
+
+      // Implicit operations.
+
+      ::Components::EnterpriseComponent_ptr
+      XML_Output_Adapter_Home_exec_i::create (
+        ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((
+                        ::CORBA::SystemException,
+                        ::Components::CCMException))
+      {
+        ::Components::EnterpriseComponent_ptr retval =
+        ::Components::EnterpriseComponent::_nil ();
+
+        ACE_NEW_THROW_EX (
+          retval,
+          XML_Output_Adapter_exec_i,
+          CORBA::NO_MEMORY ());
+        ACE_CHECK_RETURN (::Components::EnterpriseComponent::_nil ());
+
+        return retval;
+      }
+
+      extern "C" XML_OUTPUT_ADAPTER_EXEC_Export ::Components::HomeExecutorBase_ptr
+      create_CIAO_RACE_XML_Output_Adapter_Home_Impl (void)
+      {
+        ::Components::HomeExecutorBase_ptr retval =
+        ::Components::HomeExecutorBase::_nil ();
+
+        ACE_NEW_RETURN (
+          retval,
+          XML_Output_Adapter_Home_exec_i,
+          ::Components::HomeExecutorBase::_nil ());
+
+        return retval;
+      }
+    }
+  }
+}
diff --git a/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.h b/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.h
new file mode 100644
index 00000000000..21ee06f7518
--- /dev/null
+++ b/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.h
@@ -0,0 +1,149 @@
+#ifndef CIAO_XML_OUTPUT_ADAPTER_EXEC_H
+#define CIAO_XML_OUTPUT_ADAPTER_EXEC_H
+
+#include /**/ "ace/pre.h"
+
+#include "XML_Output_Adapter_svnt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "XML_Output_Adapter_exec_export.h"
+#include "tao/LocalObject.h"
+
+namespace CIAO
+{
+  namespace RACE
+  {
+    namespace CIDL_XML_Output_Adapter_Impl
+    {
+      class XML_Output_Adapter_exec_i;
+
+      class XML_OUTPUT_ADAPTER_EXEC_Export PlanEgress_exec_i
+      : public virtual ::CIAO::RACE::CCM_PlanEgress,
+      public virtual TAO_Local_RefCounted_Object
+      {
+        public:
+        PlanEgress_exec_i (XML_Output_Adapter_exec_i &);
+        virtual ~PlanEgress_exec_i (void);
+
+        // Operations from ::CIAO::RACE::PlanEgress
+
+       virtual ::CORBA::Boolean
+        output_plan (const ::CIAO::RACE::Plan_Actions &plan_seq)
+          ACE_THROW_SPEC ((CORBA::SystemException));
+
+        virtual bool
+          print_plan (const ::Deployment::DeploymentPlan &plan);
+
+
+      private:
+        XML_Output_Adapter_exec_i &comp_;
+      };
+
+      class XML_OUTPUT_ADAPTER_EXEC_Export XML_Output_Adapter_exec_i
+      : public virtual XML_Output_Adapter_Exec,
+      public virtual TAO_Local_RefCounted_Object
+      {
+        public:
+        XML_Output_Adapter_exec_i (void);
+        virtual ~XML_Output_Adapter_exec_i (void);
+
+        // Supported or inherited operations.
+
+        // Attribute operations.
+
+        // Port operations.
+
+        virtual ::CIAO::RACE::CCM_PlanEgress_ptr
+        get_plan_egress (
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+        // Operations from Components::SessionComponent
+
+        virtual void
+        set_session_context (
+          ::Components::SessionContext_ptr ctx
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((
+                          ::CORBA::SystemException,
+                          ::Components::CCMException));
+
+        virtual void
+        ciao_preactivate (
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((
+                          ::CORBA::SystemException,
+                          ::Components::CCMException));
+
+        virtual void
+        ciao_postactivate (
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((
+                          ::CORBA::SystemException,
+                          ::Components::CCMException));
+
+        virtual void
+        ccm_activate (
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((
+                          ::CORBA::SystemException,
+                          ::Components::CCMException));
+
+        virtual void
+        ccm_passivate (
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((
+                          ::CORBA::SystemException,
+                          ::Components::CCMException));
+
+        virtual void
+        ccm_remove (
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((
+                          ::CORBA::SystemException,
+                          ::Components::CCMException));
+
+        protected:
+        XML_Output_Adapter_Context *context_;
+
+        friend class PlanEgress_exec_i;
+      };
+
+      class XML_OUTPUT_ADAPTER_EXEC_Export XML_Output_Adapter_Home_exec_i
+      : public virtual XML_Output_Adapter_Home_Exec,
+      public virtual TAO_Local_RefCounted_Object
+      {
+        public:
+        XML_Output_Adapter_Home_exec_i (void);
+        virtual ~XML_Output_Adapter_Home_exec_i (void);
+
+        // Supported or inherited operations.
+
+        // Home operations.
+
+        // Factory and finder operations.
+
+        // Attribute operations.
+
+        // Implicit operations.
+
+        virtual ::Components::EnterpriseComponent_ptr
+        create (
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((
+                          ::CORBA::SystemException,
+                          ::Components::CCMException));
+      };
+
+      extern "C" XML_OUTPUT_ADAPTER_EXEC_Export ::Components::HomeExecutorBase_ptr
+      create_CIAO_RACE_XML_Output_Adapter_Home_Impl (void);
+    }
+  }
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* CIAO_XML_OUTPUT_ADAPTER_EXEC_H */
diff --git a/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec_export.h b/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec_export.h
new file mode 100644
index 00000000000..ebc1815441f
--- /dev/null
+++ b/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// XML_Output_Adapter_exec_export.h,v 1.1 2005/09/06 19:57:22 wotte Exp
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl XML_OUTPUT_ADAPTER_EXEC
+// ------------------------------
+#ifndef XML_OUTPUT_ADAPTER_EXEC_EXPORT_H
+#define XML_OUTPUT_ADAPTER_EXEC_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (XML_OUTPUT_ADAPTER_EXEC_HAS_DLL)
+#  define XML_OUTPUT_ADAPTER_EXEC_HAS_DLL 1
+#endif /* ! XML_OUTPUT_ADAPTER_EXEC_HAS_DLL */
+
+#if defined (XML_OUTPUT_ADAPTER_EXEC_HAS_DLL) && (XML_OUTPUT_ADAPTER_EXEC_HAS_DLL == 1)
+#  if defined (XML_OUTPUT_ADAPTER_EXEC_BUILD_DLL)
+#    define XML_OUTPUT_ADAPTER_EXEC_Export ACE_Proper_Export_Flag
+#    define XML_OUTPUT_ADAPTER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define XML_OUTPUT_ADAPTER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* XML_OUTPUT_ADAPTER_EXEC_BUILD_DLL */
+#    define XML_OUTPUT_ADAPTER_EXEC_Export ACE_Proper_Import_Flag
+#    define XML_OUTPUT_ADAPTER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define XML_OUTPUT_ADAPTER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* XML_OUTPUT_ADAPTER_EXEC_BUILD_DLL */
+#else /* XML_OUTPUT_ADAPTER_EXEC_HAS_DLL == 1 */
+#  define XML_OUTPUT_ADAPTER_EXEC_Export
+#  define XML_OUTPUT_ADAPTER_EXEC_SINGLETON_DECLARATION(T)
+#  define XML_OUTPUT_ADAPTER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* XML_OUTPUT_ADAPTER_EXEC_HAS_DLL == 1 */
+
+// Set XML_OUTPUT_ADAPTER_EXEC_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (XML_OUTPUT_ADAPTER_EXEC_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define XML_OUTPUT_ADAPTER_EXEC_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define XML_OUTPUT_ADAPTER_EXEC_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !XML_OUTPUT_ADAPTER_EXEC_NTRACE */
+
+#if (XML_OUTPUT_ADAPTER_EXEC_NTRACE == 1)
+#  define XML_OUTPUT_ADAPTER_EXEC_TRACE(X)
+#else /* (XML_OUTPUT_ADAPTER_EXEC_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define XML_OUTPUT_ADAPTER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (XML_OUTPUT_ADAPTER_EXEC_NTRACE == 1) */
+
+#endif /* XML_OUTPUT_ADAPTER_EXEC_EXPORT_H */
+
+// End of auto generated file.
diff --git a/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_stub_export.h b/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_stub_export.h
new file mode 100644
index 00000000000..17a96febcec
--- /dev/null
+++ b/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_stub_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// XML_Output_Adapter_stub_export.h,v 1.1 2005/09/06 19:57:22 wotte Exp
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl XML_OUTPUT_ADAPTER_STUB
+// ------------------------------
+#ifndef XML_OUTPUT_ADAPTER_STUB_EXPORT_H
+#define XML_OUTPUT_ADAPTER_STUB_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (XML_OUTPUT_ADAPTER_STUB_HAS_DLL)
+#  define XML_OUTPUT_ADAPTER_STUB_HAS_DLL 1
+#endif /* ! XML_OUTPUT_ADAPTER_STUB_HAS_DLL */
+
+#if defined (XML_OUTPUT_ADAPTER_STUB_HAS_DLL) && (XML_OUTPUT_ADAPTER_STUB_HAS_DLL == 1)
+#  if defined (XML_OUTPUT_ADAPTER_STUB_BUILD_DLL)
+#    define XML_OUTPUT_ADAPTER_STUB_Export ACE_Proper_Export_Flag
+#    define XML_OUTPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define XML_OUTPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* XML_OUTPUT_ADAPTER_STUB_BUILD_DLL */
+#    define XML_OUTPUT_ADAPTER_STUB_Export ACE_Proper_Import_Flag
+#    define XML_OUTPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define XML_OUTPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* XML_OUTPUT_ADAPTER_STUB_BUILD_DLL */
+#else /* XML_OUTPUT_ADAPTER_STUB_HAS_DLL == 1 */
+#  define XML_OUTPUT_ADAPTER_STUB_Export
+#  define XML_OUTPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T)
+#  define XML_OUTPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* XML_OUTPUT_ADAPTER_STUB_HAS_DLL == 1 */
+
+// Set XML_OUTPUT_ADAPTER_STUB_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (XML_OUTPUT_ADAPTER_STUB_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define XML_OUTPUT_ADAPTER_STUB_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define XML_OUTPUT_ADAPTER_STUB_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !XML_OUTPUT_ADAPTER_STUB_NTRACE */
+
+#if (XML_OUTPUT_ADAPTER_STUB_NTRACE == 1)
+#  define XML_OUTPUT_ADAPTER_STUB_TRACE(X)
+#else /* (XML_OUTPUT_ADAPTER_STUB_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define XML_OUTPUT_ADAPTER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (XML_OUTPUT_ADAPTER_STUB_NTRACE == 1) */
+
+#endif /* XML_OUTPUT_ADAPTER_STUB_EXPORT_H */
+
+// End of auto generated file.
diff --git a/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_svnt_export.h b/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_svnt_export.h
new file mode 100644
index 00000000000..68d1514573b
--- /dev/null
+++ b/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_svnt_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// XML_Output_Adapter_svnt_export.h,v 1.1 2005/09/06 19:57:22 wotte Exp
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl XML_OUTPUT_ADAPTER_SVNT
+// ------------------------------
+#ifndef XML_OUTPUT_ADAPTER_SVNT_EXPORT_H
+#define XML_OUTPUT_ADAPTER_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (XML_OUTPUT_ADAPTER_SVNT_HAS_DLL)
+#  define XML_OUTPUT_ADAPTER_SVNT_HAS_DLL 1
+#endif /* ! XML_OUTPUT_ADAPTER_SVNT_HAS_DLL */
+
+#if defined (XML_OUTPUT_ADAPTER_SVNT_HAS_DLL) && (XML_OUTPUT_ADAPTER_SVNT_HAS_DLL == 1)
+#  if defined (XML_OUTPUT_ADAPTER_SVNT_BUILD_DLL)
+#    define XML_OUTPUT_ADAPTER_SVNT_Export ACE_Proper_Export_Flag
+#    define XML_OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define XML_OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* XML_OUTPUT_ADAPTER_SVNT_BUILD_DLL */
+#    define XML_OUTPUT_ADAPTER_SVNT_Export ACE_Proper_Import_Flag
+#    define XML_OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define XML_OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* XML_OUTPUT_ADAPTER_SVNT_BUILD_DLL */
+#else /* XML_OUTPUT_ADAPTER_SVNT_HAS_DLL == 1 */
+#  define XML_OUTPUT_ADAPTER_SVNT_Export
+#  define XML_OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T)
+#  define XML_OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* XML_OUTPUT_ADAPTER_SVNT_HAS_DLL == 1 */
+
+// Set XML_OUTPUT_ADAPTER_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (XML_OUTPUT_ADAPTER_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define XML_OUTPUT_ADAPTER_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define XML_OUTPUT_ADAPTER_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !XML_OUTPUT_ADAPTER_SVNT_NTRACE */
+
+#if (XML_OUTPUT_ADAPTER_SVNT_NTRACE == 1)
+#  define XML_OUTPUT_ADAPTER_SVNT_TRACE(X)
+#else /* (XML_OUTPUT_ADAPTER_SVNT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define XML_OUTPUT_ADAPTER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (XML_OUTPUT_ADAPTER_SVNT_NTRACE == 1) */
+
+#endif /* XML_OUTPUT_ADAPTER_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/RACE.mwc b/RACE.mwc
new file mode 100644
index 00000000000..f01238d6123
--- /dev/null
+++ b/RACE.mwc
@@ -0,0 +1,10 @@
+workspace {
+  Monitor
+  Planner_Manager
+  common
+  Output_Adapters
+  Planners
+  Controller
+  Input_Adapters
+  Plan_Analyzer
+}
diff --git a/descriptors/RACE.cdp b/descriptors/RACE.cdp
index 205ed215e42..968288ec7e6 100644
--- a/descriptors/RACE.cdp
+++ b/descriptors/RACE.cdp
@@ -107,8 +107,16 @@
     <artifact>__BF4AE6A2-BE32-4B8E-9919-C812EC16BF00</artifact>
   </implementation>
 
-  <instance id="_RACE.ComponentImplementations.RACE.RACE.Interactive_Input_Adapter">
-    <name>_RACE.ComponentImplementations.RACE.RACE.Interactive_Input_Adapter</name>
+  <implementation id="_DF055B64-3713-4E0C-8CBB-7940347252CB">
+    <name>RACE.ComponentImplementations.XML_Output_AdapterImplementation.XML_Output_AdapterMonolithicImpl</name>
+    <source/>
+    <artifact>_51E98A22-D8B4-46FF-B531-9756A94B19B3</artifact>
+    <artifact>_BFEFFD00-977E-42C1-ACB4-873556C44F33</artifact>
+    <artifact>_A5A450AC-A314-45F4-9195-5A9EDFD8260F</artifact>
+  </implementation>
+
+  <instance id="RACE.ComponentImplementations.RACE.RACE.Interactive_Input_Adapter">
+    <name>RACE.ComponentImplementations.RACE.RACE.Interactive_Input_Adapter</name>
     <node>RACE</node>
     <source/>
     <implementation>_73898E70-9FB1-4881-9313-A2DE181EE48E</implementation>
@@ -147,8 +155,8 @@
     </configProperty>
   </instance>
 
-  <instance id="_RACE.ComponentImplementations.RACE.RACE.Controller">
-    <name>_RACE.ComponentImplementations.RACE.RACE.Controller</name>
+  <instance id="RACE.ComponentImplementations.RACE.RACE.Controller">
+    <name>RACE.ComponentImplementations.RACE.RACE.Controller</name>
     <node>RACE</node>
     <source/>
     <implementation>_D98AF36F-11FA-43A4-8FAD-C14A461437FF</implementation>
@@ -165,8 +173,8 @@
     </configProperty>
   </instance>
 
-  <instance id="_RACE.ComponentImplementations.RACE.RACE.TargetManagerImpl">
-    <name>_RACE.ComponentImplementations.RACE.RACE.TargetManagerImpl</name>
+  <instance id="RACE.ComponentImplementations.RACE.RACE.TargetManagerImpl">
+    <name>RACE.ComponentImplementations.RACE.RACE.TargetManagerImpl</name>
     <node>RACE</node>
     <source/>
     <implementation>_CA363CD1-4E23-4A4B-B25B-C38B939E2B25</implementation>
@@ -183,8 +191,8 @@
     </configProperty>
   </instance>
 
-  <instance id="_RACE.ComponentImplementations.RACE.RACE.Central_Monitor">
-    <name>_RACE.ComponentImplementations.RACE.RACE.Central_Monitor</name>
+  <instance id="RACE.ComponentImplementations.RACE.RACE.Central_Monitor">
+    <name>RACE.ComponentImplementations.RACE.RACE.Central_Monitor</name>
     <node>RACE</node>
     <source/>
     <implementation>_198AF36F-11FA-43A4-8FAD-C14A461437EE</implementation>
@@ -212,178 +220,199 @@
     </configProperty>
   </instance>
 
-  <instance id="_RACE.ComponentImplementations.RACE.RACE.OutputManager.Output_Manager">
-    <name>_RACE.ComponentImplementations.RACE.RACE.OutputManager.Output_Manager</name>
+  <instance id="RACE.ComponentImplementations.RACE.RACE.OutputManager.Output_Manager">
+    <name>RACE.ComponentImplementations.RACE.RACE.OutputManager.Output_Manager</name>
     <node>RACE</node>
     <source/>
     <implementation>_A22015F9-9BC9-4767-A861-FAFF737E074B</implementation>
   </instance>
 
-  <instance id="_RACE.ComponentImplementations.RACE.RACE.OutputManager.DAnCE_Output_Adapter">
-    <name>_RACE.ComponentImplementations.RACE.RACE.OutputManager.DAnCE_Output_Adapter</name>
+  <instance id="RACE.ComponentImplementations.RACE.RACE.OutputManager.DAnCE_Output_Adapter">
+    <name>RACE.ComponentImplementations.RACE.RACE.OutputManager.DAnCE_Output_Adapter</name>
     <node>RACE</node>
     <source/>
     <implementation>_219DB379-DB2E-44D2-8308-D91FC5A42A9D</implementation>
   </instance>
 
-  <instance id="_RACE.ComponentImplementations.RACE.RACE.PlanAnalyzerAssembly.Plan_Analyzer">
-    <name>_RACE.ComponentImplementations.RACE.RACE.PlanAnalyzerAssembly.Plan_Analyzer</name>
+  <instance id="RACE.ComponentImplementations.RACE.RACE.PlanAnalyzerAssembly.Plan_Analyzer">
+    <name>RACE.ComponentImplementations.RACE.RACE.PlanAnalyzerAssembly.Plan_Analyzer</name>
     <node>RACE</node>
     <source/>
     <implementation>_5D6641D2-640C-4F80-B055-10DC69C7A636</implementation>
   </instance>
 
-  <instance id="_RACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.Planner_ManagerImplementation">
-    <name>_RACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.Planner_ManagerImplementation</name>
+  <instance id="RACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.Planner_ManagerImplementation">
+    <name>RACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.Planner_ManagerImplementation</name>
     <node>RACE</node>
     <source/>
     <implementation>_FD120510-765E-4B02-803D-7DADF3F5E4E6</implementation>
   </instance>
 
-  <instance id="_RACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.SimpleBinPackerImplementation">
-    <name>_RACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.SimpleBinPackerImplementation</name>
+  <instance id="RACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.StaticPlannerImplementation">
+    <name>RACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.StaticPlannerImplementation</name>
     <node>RACE</node>
     <source/>
     <implementation>_38C5B64C-72FD-48FF-B095-260669E2A488</implementation>
   </instance>
 
+  <instance id="RACE.ComponentImplementations.RACE.RACE.OutputManager.XML_Output_Adapter">
+    <name>RACE.ComponentImplementations.RACE.RACE.OutputManager.XML_Output_Adapter</name>
+    <node>RACE</node>
+    <source/>
+    <implementation>_DF055B64-3713-4E0C-8CBB-7940347252CB</implementation>
+  </instance>
+
   <connection>
-    <name>ingress_plan_ingress_RACE.ComponentImplementations.RACE.RACE.Interactive_Input_Adapter_RACE.ComponentImplementations.RACE.RACE.PlanAnalyzerAssembly.Plan_Analyzer</name>
+    <name>ingress_plan_ingressRACE.ComponentImplementations.RACE.RACE.Interactive_Input_AdapterRACE.ComponentImplementations.RACE.RACE.PlanAnalyzerAssembly.Plan_Analyzer</name>
     <internalEndpoint>
       <portName>ingress</portName>
       <kind>SimplexReceptacle</kind>
-      <instance>_RACE.ComponentImplementations.RACE.RACE.Interactive_Input_Adapter</instance>
+      <instance>RACE.ComponentImplementations.RACE.RACE.Interactive_Input_Adapter</instance>
     </internalEndpoint>
     <internalEndpoint>
       <portName>plan_ingress</portName>
       <kind>Facet</kind>
-      <instance>_RACE.ComponentImplementations.RACE.RACE.PlanAnalyzerAssembly.Plan_Analyzer</instance>
+      <instance>RACE.ComponentImplementations.RACE.RACE.PlanAnalyzerAssembly.Plan_Analyzer</instance>
     </internalEndpoint>
   </connection>
 
   <connection>
-    <name>planner_manager_i_planner_manager_i_RACE.ComponentImplementations.RACE.RACE.PlanAnalyzerAssembly.Plan_Analyzer_RACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.Planner_ManagerImplementation</name>
+    <name>planner_manager_i_planner_manager_iRACE.ComponentImplementations.RACE.RACE.PlanAnalyzerAssembly.Plan_AnalyzerRACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.Planner_ManagerImplementation</name>
     <internalEndpoint>
       <portName>planner_manager_i</portName>
       <kind>SimplexReceptacle</kind>
-      <instance>_RACE.ComponentImplementations.RACE.RACE.PlanAnalyzerAssembly.Plan_Analyzer</instance>
+      <instance>RACE.ComponentImplementations.RACE.RACE.PlanAnalyzerAssembly.Plan_Analyzer</instance>
     </internalEndpoint>
     <internalEndpoint>
       <portName>planner_manager_i</portName>
       <kind>Facet</kind>
-      <instance>_RACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.Planner_ManagerImplementation</instance>
+      <instance>RACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.Planner_ManagerImplementation</instance>
     </internalEndpoint>
   </connection>
 
   <connection>
-    <name>outputs_output_RACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.Planner_ManagerImplementation_RACE.ComponentImplementations.RACE.RACE.OutputManager.Output_Manager</name>
+    <name>outputs_outputRACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.Planner_ManagerImplementationRACE.ComponentImplementations.RACE.RACE.OutputManager.Output_Manager</name>
     <internalEndpoint>
       <portName>outputs</portName>
       <kind>SimplexReceptacle</kind>
-      <instance>_RACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.Planner_ManagerImplementation</instance>
+      <instance>RACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.Planner_ManagerImplementation</instance>
     </internalEndpoint>
     <internalEndpoint>
       <portName>output</portName>
       <kind>Facet</kind>
-      <instance>_RACE.ComponentImplementations.RACE.RACE.OutputManager.Output_Manager</instance>
+      <instance>RACE.ComponentImplementations.RACE.RACE.OutputManager.Output_Manager</instance>
     </internalEndpoint>
   </connection>
 
   <connection>
-    <name>control_output_descriptors_RACE.ComponentImplementations.RACE.RACE.OutputManager.DAnCE_Output_Adapter_RACE.ComponentImplementations.RACE.RACE.Controller</name>
+    <name>control_output_descriptorsRACE.ComponentImplementations.RACE.RACE.OutputManager.DAnCE_Output_AdapterRACE.ComponentImplementations.RACE.RACE.Controller</name>
     <internalEndpoint>
       <portName>control_output</portName>
       <kind>SimplexReceptacle</kind>
-      <instance>_RACE.ComponentImplementations.RACE.RACE.OutputManager.DAnCE_Output_Adapter</instance>
+      <instance>RACE.ComponentImplementations.RACE.RACE.OutputManager.DAnCE_Output_Adapter</instance>
     </internalEndpoint>
     <internalEndpoint>
       <portName>descriptors</portName>
       <kind>Facet</kind>
-      <instance>_RACE.ComponentImplementations.RACE.RACE.Controller</instance>
+      <instance>RACE.ComponentImplementations.RACE.RACE.Controller</instance>
     </internalEndpoint>
   </connection>
 
   <connection>
-    <name>target_mgr_targetMgr_RACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.SimpleBinPackerImplementation_RACE.ComponentImplementations.RACE.RACE.TargetManagerImpl</name>
+    <name>target_mgr_targetMgrRACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.StaticPlannerImplementationRACE.ComponentImplementations.RACE.RACE.TargetManagerImpl</name>
     <internalEndpoint>
       <portName>target_mgr</portName>
       <kind>SimplexReceptacle</kind>
-      <instance>_RACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.SimpleBinPackerImplementation</instance>
+      <instance>RACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.StaticPlannerImplementation</instance>
     </internalEndpoint>
     <internalEndpoint>
       <portName>targetMgr</portName>
       <kind>Facet</kind>
-      <instance>_RACE.ComponentImplementations.RACE.RACE.TargetManagerImpl</instance>
+      <instance>RACE.ComponentImplementations.RACE.RACE.TargetManagerImpl</instance>
     </internalEndpoint>
   </connection>
 
   <connection>
-    <name>target_mgr_ext_target_manager_ext_RACE.ComponentImplementations.RACE.RACE.Controller_RACE.ComponentImplementations.RACE.RACE.TargetManagerImpl</name>
+    <name>target_mgr_ext_target_manager_extRACE.ComponentImplementations.RACE.RACE.ControllerRACE.ComponentImplementations.RACE.RACE.TargetManagerImpl</name>
     <internalEndpoint>
       <portName>target_mgr_ext</portName>
       <kind>SimplexReceptacle</kind>
-      <instance>_RACE.ComponentImplementations.RACE.RACE.Controller</instance>
+      <instance>RACE.ComponentImplementations.RACE.RACE.Controller</instance>
     </internalEndpoint>
     <internalEndpoint>
       <portName>target_manager_ext</portName>
       <kind>Facet</kind>
-      <instance>_RACE.ComponentImplementations.RACE.RACE.TargetManagerImpl</instance>
+      <instance>RACE.ComponentImplementations.RACE.RACE.TargetManagerImpl</instance>
     </internalEndpoint>
   </connection>
 
   <connection>
-    <name>target_mgr_targetMgr_RACE.ComponentImplementations.RACE.RACE.Controller_RACE.ComponentImplementations.RACE.RACE.TargetManagerImpl</name>
+    <name>target_mgr_targetMgrRACE.ComponentImplementations.RACE.RACE.ControllerRACE.ComponentImplementations.RACE.RACE.TargetManagerImpl</name>
     <internalEndpoint>
       <portName>target_mgr</portName>
       <kind>SimplexReceptacle</kind>
-      <instance>_RACE.ComponentImplementations.RACE.RACE.Controller</instance>
+      <instance>RACE.ComponentImplementations.RACE.RACE.Controller</instance>
     </internalEndpoint>
     <internalEndpoint>
       <portName>targetMgr</portName>
       <kind>Facet</kind>
-      <instance>_RACE.ComponentImplementations.RACE.RACE.TargetManagerImpl</instance>
+      <instance>RACE.ComponentImplementations.RACE.RACE.TargetManagerImpl</instance>
     </internalEndpoint>
   </connection>
 
   <connection>
-    <name>monitor_Monitor_RACE.ComponentImplementations.RACE.RACE.Controller_RACE.ComponentImplementations.RACE.RACE.Central_Monitor</name>
+    <name>monitor_MonitorRACE.ComponentImplementations.RACE.RACE.ControllerRACE.ComponentImplementations.RACE.RACE.Central_Monitor</name>
     <internalEndpoint>
       <portName>monitor</portName>
       <kind>SimplexReceptacle</kind>
-      <instance>_RACE.ComponentImplementations.RACE.RACE.Controller</instance>
+      <instance>RACE.ComponentImplementations.RACE.RACE.Controller</instance>
     </internalEndpoint>
     <internalEndpoint>
       <portName>Monitor</portName>
       <kind>Facet</kind>
-      <instance>_RACE.ComponentImplementations.RACE.RACE.Central_Monitor</instance>
+      <instance>RACE.ComponentImplementations.RACE.RACE.Central_Monitor</instance>
     </internalEndpoint>
   </connection>
 
   <connection>
-    <name>adapters_plan_egress_RACE.ComponentImplementations.RACE.RACE.OutputManager.Output_Manager_RACE.ComponentImplementations.RACE.RACE.OutputManager.DAnCE_Output_Adapter</name>
+    <name>adapters_plan_egressRACE.ComponentImplementations.RACE.RACE.OutputManager.Output_ManagerRACE.ComponentImplementations.RACE.RACE.OutputManager.DAnCE_Output_Adapter</name>
     <internalEndpoint>
       <portName>adapters</portName>
       <kind>SimplexReceptacle</kind>
-      <instance>_RACE.ComponentImplementations.RACE.RACE.OutputManager.Output_Manager</instance>
+      <instance>RACE.ComponentImplementations.RACE.RACE.OutputManager.Output_Manager</instance>
     </internalEndpoint>
     <internalEndpoint>
       <portName>plan_egress</portName>
       <kind>Facet</kind>
-      <instance>_RACE.ComponentImplementations.RACE.RACE.OutputManager.DAnCE_Output_Adapter</instance>
+      <instance>RACE.ComponentImplementations.RACE.RACE.OutputManager.DAnCE_Output_Adapter</instance>
     </internalEndpoint>
   </connection>
 
   <connection>
-    <name>planners_planner_i_RACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.Planner_ManagerImplementation_RACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.SimpleBinPackerImplementation</name>
+    <name>adapters_plan_egressRACE.ComponentImplementations.RACE.RACE.OutputManager.Output_ManagerRACE.ComponentImplementations.RACE.RACE.OutputManager.XML_Output_Adapter</name>
+    <internalEndpoint>
+      <portName>adapters</portName>
+      <kind>SimplexReceptacle</kind>
+      <instance>RACE.ComponentImplementations.RACE.RACE.OutputManager.Output_Manager</instance>
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>plan_egress</portName>
+      <kind>Facet</kind>
+      <instance>RACE.ComponentImplementations.RACE.RACE.OutputManager.XML_Output_Adapter</instance>
+    </internalEndpoint>
+  </connection>
+
+  <connection>
+    <name>planners_planner_iRACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.Planner_ManagerImplementationRACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.StaticPlannerImplementation</name>
     <internalEndpoint>
       <portName>planners</portName>
       <kind>SimplexReceptacle</kind>
-      <instance>_RACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.Planner_ManagerImplementation</instance>
+      <instance>RACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.Planner_ManagerImplementation</instance>
     </internalEndpoint>
     <internalEndpoint>
       <portName>planner_i</portName>
       <kind>Facet</kind>
-      <instance>_RACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.SimpleBinPackerImplementation</instance>
+      <instance>RACE.ComponentImplementations.RACE.RACE.AssemblyPlannerManager.StaticPlannerImplementation</instance>
     </internalEndpoint>
   </connection>
 
@@ -946,4 +975,47 @@
     </execParameter>
   </artifact>
 
+  <artifact id="_BFEFFD00-977E-42C1-ACB4-873556C44F33">
+    <name>RACE.ImplementationArtifacts.XML_Output_AdapterArtifacts.XML_Output_Adapter_stub</name>
+    <source/>
+    <node/>
+    <location>XML_Output_Adapter_stub</location>
+  </artifact>
+
+  <artifact id="_A5A450AC-A314-45F4-9195-5A9EDFD8260F">
+    <name>RACE.ImplementationArtifacts.XML_Output_AdapterArtifacts.XML_Output_Adapter_svnt</name>
+    <source/>
+    <node/>
+    <location>XML_Output_Adapter_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_CIAO_RACE_XML_Output_Adapter_Home_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact id="_51E98A22-D8B4-46FF-B531-9756A94B19B3">
+    <name>RACE.ImplementationArtifacts.XML_Output_AdapterArtifacts.XML_Output_Adapter_exec</name>
+    <source/>
+    <node/>
+    <location>XML_Output_Adapter_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_CIAO_RACE_XML_Output_Adapter_Home_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
 </Deployment:deploymentPlan>