Tue Sep 6 11:39:15 2005 William Otte <wotte@dre.vanderbilt.edu>

80 files changed, 6931 insertions, 2 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 8221584561a..dd75f41b7cd 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,13 @@
+Tue Sep  6 11:39:15 2005  William Otte  <wotte@dre.vanderbilt.edu>
+
+	* ciao/Deployment_Data.idl
+
+	Commented out IDL that is unsupported by CIDLC.
+
+	* RACE
+
+	Added IDL for RACE.
+
 Tue Sep  6 09:58:12 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
 	* examples/Hello/descriptors/run_test.pl
diff --git a/TAO/CIAO/RACE/Input_Adapters/Base/Input_Adapter.idl b/TAO/CIAO/RACE/Input_Adapters/Base/Input_Adapter.idl
new file mode 100644
index 00000000000..b1c3f7f0ddb
--- /dev/null
+++ b/TAO/CIAO/RACE/Input_Adapters/Base/Input_Adapter.idl
@@ -0,0 +1,21 @@
+//$Id$
+//Input_Adapter.idl
+
+#ifndef RACE_INPUT_ADAPTER_IDL
+#define RACE_INPUT_ADAPTER_IDL
+
+#include <Components.idl>
+#include "../../Plan_Analyzer/Interface/PlanIngress.idl"
+
+module CIAO
+{
+  module RACE
+  {
+    component Input_Adapter
+    {
+      uses PlanIngress ingress;
+    };
+  };
+};
+
+#endif /* RACE_INPUT_ADAPTER_IDL */
diff --git a/TAO/CIAO/RACE/Input_Adapters/Base/Input_Adapter.mpc b/TAO/CIAO/RACE/Input_Adapters/Base/Input_Adapter.mpc
new file mode 100644
index 00000000000..689df3b1ec6
--- /dev/null
+++ b/TAO/CIAO/RACE/Input_Adapters/Base/Input_Adapter.mpc
@@ -0,0 +1,61 @@
+// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
+// This file is generated with "generate_component_mpc.pl -n Input_Adapter"
+
+project(Input_Adapter_stub): ciao_deployment_stub {
+
+  after += Plan_Analyzer_Interface_stub
+  sharedname = Input_Adapter_stub
+  idlflags += -Sc \
+              -Wb,stub_export_macro=INPUT_ADAPTER_STUB_Export \
+              -Wb,stub_export_include=Input_Adapter_stub_export.h \
+              -Wb,skel_export_macro=INPUT_ADAPTER_SVNT_Export \
+              -Wb,skel_export_include=Input_Adapter_svnt_export.h
+  dynamicflags   = INPUT_ADAPTER_STUB_BUILD_DLL
+  libs += Plan_Analyzer_Interface_stub
+
+  IDL_Files {
+    Input_Adapter.idl
+  }
+
+  Source_Files {
+    Input_AdapterC.cpp
+  }
+
+  Header_Files {
+    Input_AdapterC.h
+  }
+
+  Inline_Files {
+    Input_AdapterC.inl
+  }
+}
+
+project(Input_Adapter_svnt) : ciao_servant_dnc {
+
+  after +=  Input_Adapter_stub
+  sharedname  = Input_Adapter_svnt
+  libs    += Input_Adapter_stub Plan_Analyzer_Interface_stub
+
+  idlflags += -Sc \
+              -Wb,stub_export_macro=INPUT_ADAPTER_STUB_Export \
+              -Wb,stub_export_include=Input_Adapter_stub_export.h \
+              -Wb,skel_export_macro=INPUT_ADAPTER_SVNT_Export \
+              -Wb,skel_export_include=Input_Adapter_svnt_export.h
+  dynamicflags = INPUT_ADAPTER_SVNT_BUILD_DLL
+
+  IDL_Files {
+    Input_Adapter.idl
+  }
+
+  Source_Files {
+    Input_AdapterS.cpp
+  }
+
+  Header_Files {
+    Input_AdapterS.h
+  }
+
+  Inline_Files {
+    Input_AdapterS.inl
+  }
+}
diff --git a/TAO/CIAO/RACE/Input_Adapters/Base/Input_Adapter_stub_export.h b/TAO/CIAO/RACE/Input_Adapters/Base/Input_Adapter_stub_export.h
new file mode 100644
index 00000000000..546b8e64659
--- /dev/null
+++ b/TAO/CIAO/RACE/Input_Adapters/Base/Input_Adapter_stub_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl INPUT_ADAPTER_STUB
+// ------------------------------
+#ifndef INPUT_ADAPTER_STUB_EXPORT_H
+#define INPUT_ADAPTER_STUB_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (INPUT_ADAPTER_STUB_HAS_DLL)
+#  define INPUT_ADAPTER_STUB_HAS_DLL 1
+#endif /* ! INPUT_ADAPTER_STUB_HAS_DLL */
+
+#if defined (INPUT_ADAPTER_STUB_HAS_DLL) && (INPUT_ADAPTER_STUB_HAS_DLL == 1)
+#  if defined (INPUT_ADAPTER_STUB_BUILD_DLL)
+#    define INPUT_ADAPTER_STUB_Export ACE_Proper_Export_Flag
+#    define INPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define INPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* INPUT_ADAPTER_STUB_BUILD_DLL */
+#    define INPUT_ADAPTER_STUB_Export ACE_Proper_Import_Flag
+#    define INPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define INPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* INPUT_ADAPTER_STUB_BUILD_DLL */
+#else /* INPUT_ADAPTER_STUB_HAS_DLL == 1 */
+#  define INPUT_ADAPTER_STUB_Export
+#  define INPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T)
+#  define INPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* INPUT_ADAPTER_STUB_HAS_DLL == 1 */
+
+// Set INPUT_ADAPTER_STUB_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (INPUT_ADAPTER_STUB_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define INPUT_ADAPTER_STUB_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define INPUT_ADAPTER_STUB_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !INPUT_ADAPTER_STUB_NTRACE */
+
+#if (INPUT_ADAPTER_STUB_NTRACE == 1)
+#  define INPUT_ADAPTER_STUB_TRACE(X)
+#else /* (INPUT_ADAPTER_STUB_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define INPUT_ADAPTER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (INPUT_ADAPTER_STUB_NTRACE == 1) */
+
+#endif /* INPUT_ADAPTER_STUB_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Input_Adapters/Base/Input_Adapter_svnt_export.h b/TAO/CIAO/RACE/Input_Adapters/Base/Input_Adapter_svnt_export.h
new file mode 100644
index 00000000000..0d7bf2fc787
--- /dev/null
+++ b/TAO/CIAO/RACE/Input_Adapters/Base/Input_Adapter_svnt_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl INPUT_ADAPTER_SVNT
+// ------------------------------
+#ifndef INPUT_ADAPTER_SVNT_EXPORT_H
+#define INPUT_ADAPTER_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (INPUT_ADAPTER_SVNT_HAS_DLL)
+#  define INPUT_ADAPTER_SVNT_HAS_DLL 1
+#endif /* ! INPUT_ADAPTER_SVNT_HAS_DLL */
+
+#if defined (INPUT_ADAPTER_SVNT_HAS_DLL) && (INPUT_ADAPTER_SVNT_HAS_DLL == 1)
+#  if defined (INPUT_ADAPTER_SVNT_BUILD_DLL)
+#    define INPUT_ADAPTER_SVNT_Export ACE_Proper_Export_Flag
+#    define INPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define INPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* INPUT_ADAPTER_SVNT_BUILD_DLL */
+#    define INPUT_ADAPTER_SVNT_Export ACE_Proper_Import_Flag
+#    define INPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define INPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* INPUT_ADAPTER_SVNT_BUILD_DLL */
+#else /* INPUT_ADAPTER_SVNT_HAS_DLL == 1 */
+#  define INPUT_ADAPTER_SVNT_Export
+#  define INPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T)
+#  define INPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* INPUT_ADAPTER_SVNT_HAS_DLL == 1 */
+
+// Set INPUT_ADAPTER_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (INPUT_ADAPTER_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define INPUT_ADAPTER_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define INPUT_ADAPTER_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !INPUT_ADAPTER_SVNT_NTRACE */
+
+#if (INPUT_ADAPTER_SVNT_NTRACE == 1)
+#  define INPUT_ADAPTER_SVNT_TRACE(X)
+#else /* (INPUT_ADAPTER_SVNT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define INPUT_ADAPTER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (INPUT_ADAPTER_SVNT_NTRACE == 1) */
+
+#endif /* INPUT_ADAPTER_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.cidl b/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.cidl
new file mode 100644
index 00000000000..2bbbe6037c6
--- /dev/null
+++ b/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.cidl
@@ -0,0 +1,25 @@
+//$Id$
+//Interactive_Input_Adapter.cidl
+
+#ifndef RACE_INTERACTIVE_INPUT_ADAPTER_CIDL
+#define RACE_INTERACTIVE_INPUT_ADAPTER_CIDL
+
+#include "Interactive_Input_Adapter.idl"
+
+module CIAO
+{
+  module RACE
+  {
+    composition session Interactive_Input_Adapter_Impl
+    {
+      home executor Interactive_Input_Adapter_Home_Exec
+        {
+          implements RACE::Interactive_Input_Adapter_Home;
+          manages    Interactive_Input_Adapter_Exec;
+        };
+    };
+  };
+};
+
+
+#endif /* RACE_INTERACTIVE_INPUT_ADAPTER_CIDL */
diff --git a/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.idl b/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.idl
new file mode 100644
index 00000000000..d027b608c8b
--- /dev/null
+++ b/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.idl
@@ -0,0 +1,22 @@
+//$Id$
+#ifndef RACE_INTERACTIVE_INPUT_ADAPTER_IDL
+#define RACE_INTERACTIVE_INPUT_ADAPTER_IDL
+
+#include <Components.idl>
+#include "../Base/Input_Adapter.idl"
+
+module CIAO
+{
+  module RACE
+  {
+    component Interactive_Input_Adapter : Input_Adapter
+    {
+    };
+    
+    home Interactive_Input_Adapter_Home manages Interactive_Input_Adapter
+    {
+    };
+  };
+};
+
+#endif /* RACE_INTERACTIVE_INPUT_ADAPTER_IDL */
diff --git a/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc b/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc
new file mode 100644
index 00000000000..88492754eb9
--- /dev/null
+++ b/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc
@@ -0,0 +1,97 @@
+// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
+
+project(Interactive_Input_Adapter_stub): ciao_deployment_stub {
+  after += Input_Adapter_stub
+  sharedname = Interactive_Input_Adapter_stub
+  idlflags += -Sc \
+              -Wb,stub_export_macro=INTERACTIVE_INPUT_ADAPTER_STUB_Export \
+              -Wb,stub_export_include=Interactive_Input_Adapter_stub_export.h \
+              -Wb,skel_export_macro=INTERACTIVE_INPUT_ADAPTER_SVNT_Export \
+              -Wb,skel_export_include=Interactive_Input_Adapter_svnt_export.h
+  dynamicflags   = INTERACTIVE_INPUT_ADAPTER_STUB_BUILD_DLL
+  libs += Input_Adapter_stub \
+          Plan_Analyzer_Interface_stub
+
+  IDL_Files {
+    Interactive_Input_Adapter.idl
+  }
+
+  Source_Files {
+    Interactive_Input_AdapterC.cpp
+  }
+
+  Header_Files {
+    Interactive_Input_AdapterC.h
+  }
+
+  Inline_Files {
+    Interactive_Input_AdapterC.inl
+  }
+}
+
+project(Interactive_Input_Adapter_svnt) : ciao_servant_dnc {
+  after += Interactive_Input_Adapter_stub \
+           Input_Adapter_svnt
+  sharedname  = Interactive_Input_Adapter_svnt
+  libs    += Interactive_Input_Adapter_stub \
+             Input_Adapter_stub \
+             Input_Adapter_svnt \
+             Plan_Analyzer_Interface_stub
+
+  idlflags  +=  -Sc \
+                -Wb,export_macro=INTERACTIVE_INPUT_ADAPTER_SVNT_Export \
+                -Wb,export_include=Interactive_Input_Adapter_svnt_export.h
+
+  dynamicflags = INTERACTIVE_INPUT_ADAPTER_SVNT_BUILD_DLL
+
+  CIDL_Files {
+    Interactive_Input_Adapter.cidl
+  }
+
+  IDL_Files {
+    Interactive_Input_AdapterE.idl
+  }
+
+  Source_Files {
+    Interactive_Input_AdapterEC.cpp
+    Interactive_Input_AdapterS.cpp
+    Interactive_Input_Adapter_svnt.cpp
+  }
+
+  Header_Files {
+    Interactive_Input_AdapterEC.h
+    Interactive_Input_AdapterS.h
+    Interactive_Input_Adapter_svnt.h
+  }
+
+  Inline_Files {
+    Interactive_Input_AdapterEC.inl
+    Interactive_Input_AdapterS.inl
+    Interactive_Input_Adapter_svnt.inl
+  }
+}
+
+
+project(Interactive_Input_Adapter_exec) : ciao_component_dnc {
+  after   += Interactive_Input_Adapter_svnt
+  sharedname = Interactive_Input_Adapter_exec
+  libs    += Interactive_Input_Adapter_stub \
+             Interactive_Input_Adapter_svnt \
+             Input_Adapter_stub \
+             Input_Adapter_svnt \
+             Plan_Analyzer_Interface_stub \
+             XSC_Config_Handlers
+  
+  idlflags  +=  -Sc \
+                -Wb,export_macro=INTERACTIVE_INPUT_ADAPTER_EXEC_Export \
+                -Wb,export_include=Interactive_Input_Adapter_exec_export.h
+  dynamicflags   = INTERACTIVE_INPUT_ADAPTER_EXEC_BUILD_DLL
+
+  IDL_Files {
+    
+  }
+
+  Source_Files {
+    Interactive_Input_Adapter_exec.cpp
+  }
+}
diff --git a/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.cpp b/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.cpp
new file mode 100644
index 00000000000..2d53a15e48c
--- /dev/null
+++ b/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.cpp
@@ -0,0 +1,177 @@
+// $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 "Interactive_Input_Adapter_exec.h"
+#include "ciao/CIAO_common.h"
+
+namespace CIAO
+{
+  namespace RACE
+  {
+    namespace CIDL_Interactive_Input_Adapter_Impl
+    {
+      //==================================================================
+      // Component Executor Implementation Class:   Interactive_Input_Adapter_exec_i
+      //==================================================================
+
+      Interactive_Input_Adapter_exec_i::Interactive_Input_Adapter_exec_i (void)
+      {
+      }
+
+      Interactive_Input_Adapter_exec_i::~Interactive_Input_Adapter_exec_i (void)
+      {
+      }
+
+      // Supported or inherited operations.
+
+      // Attribute operations.
+
+      // Port operations.
+
+      // Operations from Components::SessionComponent
+
+      void
+      Interactive_Input_Adapter_exec_i::set_session_context (
+      ::Components::SessionContext_ptr ctx
+      ACE_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((
+      ::CORBA::SystemException,
+      ::Components::CCMException))
+      {
+        this->context_ =
+        Interactive_Input_Adapter_Context::_narrow (
+        ctx
+        ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK;
+
+        if (this->context_ == 0)
+        {
+          ACE_THROW (CORBA::INTERNAL ());
+        }
+      }
+
+      void
+      Interactive_Input_Adapter_exec_i::ciao_preactivate (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((
+      ::CORBA::SystemException,
+      ::Components::CCMException))
+      {
+        // Your code here.
+      }
+
+      void
+      Interactive_Input_Adapter_exec_i::ciao_postactivate (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((
+      ::CORBA::SystemException,
+      ::Components::CCMException))
+      {
+        // Your code here.
+      }
+
+      void
+      Interactive_Input_Adapter_exec_i::ccm_activate (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((
+      ::CORBA::SystemException,
+      ::Components::CCMException))
+      {
+        // Your code here.
+      }
+
+      void
+      Interactive_Input_Adapter_exec_i::ccm_passivate (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((
+      ::CORBA::SystemException,
+      ::Components::CCMException))
+      {
+        // Your code here.
+      }
+
+      void
+      Interactive_Input_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:   Interactive_Input_Adapter_Home_exec_i
+      //==================================================================
+
+      Interactive_Input_Adapter_Home_exec_i::Interactive_Input_Adapter_Home_exec_i (void)
+      {
+      }
+
+      Interactive_Input_Adapter_Home_exec_i::~Interactive_Input_Adapter_Home_exec_i (void)
+      {
+      }
+
+      // Supported or inherited operations.
+
+      // Home operations.
+
+      // Factory and finder operations.
+
+      // Attribute operations.
+
+      // Implicit operations.
+
+      ::Components::EnterpriseComponent_ptr
+      Interactive_Input_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,
+        Interactive_Input_Adapter_exec_i,
+        CORBA::NO_MEMORY ());
+        ACE_CHECK_RETURN (::Components::EnterpriseComponent::_nil ());
+
+        return retval;
+      }
+
+      extern "C" INTERACTIVE_INPUT_ADAPTER_EXEC_Export ::Components::HomeExecutorBase_ptr
+      createInteractive_Input_Adapter_Home_Impl (void)
+      {
+        ::Components::HomeExecutorBase_ptr retval =
+        ::Components::HomeExecutorBase::_nil ();
+
+        ACE_NEW_RETURN (
+        retval,
+        Interactive_Input_Adapter_Home_exec_i,
+        ::Components::HomeExecutorBase::_nil ());
+
+        return retval;
+      }
+    }
+  }
+}
+
diff --git a/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.h b/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.h
new file mode 100644
index 00000000000..d272dbb5865
--- /dev/null
+++ b/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.h
@@ -0,0 +1,139 @@
+// $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_INTERACTIVE_INPUT_ADAPTER_EXEC_H
+#define CIAO_INTERACTIVE_INPUT_ADAPTER_EXEC_H
+
+#include /**/ "ace/pre.h"
+
+#include "Interactive_Input_Adapter_svnt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "Interactive_Input_Adapter_exec_export.h"
+#include "tao/LocalObject.h"
+
+namespace CIAO
+{
+  namespace RACE
+  {
+    namespace CIDL_Interactive_Input_Adapter_Impl
+    {
+      class INTERACTIVE_INPUT_ADAPTER_EXEC_Export Interactive_Input_Adapter_exec_i
+      : public virtual Interactive_Input_Adapter_Exec,
+      public virtual TAO_Local_RefCounted_Object
+      {
+        public:
+        Interactive_Input_Adapter_exec_i (void);
+        virtual ~Interactive_Input_Adapter_exec_i (void);
+
+        // Supported or inherited operations.
+
+        // Attribute operations.
+
+        // Port operations.
+
+        // 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:
+        Interactive_Input_Adapter_Context *context_;
+      };
+
+      class INTERACTIVE_INPUT_ADAPTER_EXEC_Export Interactive_Input_Adapter_Home_exec_i
+      : public virtual Interactive_Input_Adapter_Home_Exec,
+      public virtual TAO_Local_RefCounted_Object
+      {
+        public:
+        Interactive_Input_Adapter_Home_exec_i (void);
+        virtual ~Interactive_Input_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" INTERACTIVE_INPUT_ADAPTER_EXEC_Export ::Components::HomeExecutorBase_ptr
+      createInteractive_Input_Adapter_Home_Impl (void);
+    }
+  }
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* CIAO_INTERACTIVE_INPUT_ADAPTER_EXEC_H */
+
diff --git a/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec_export.h b/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec_export.h
new file mode 100644
index 00000000000..147e914cb7c
--- /dev/null
+++ b/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl INTERACTIVE_INPUT_ADAPTER_EXEC
+// ------------------------------
+#ifndef INTERACTIVE_INPUT_ADAPTER_EXEC_EXPORT_H
+#define INTERACTIVE_INPUT_ADAPTER_EXEC_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (INTERACTIVE_INPUT_ADAPTER_EXEC_HAS_DLL)
+#  define INTERACTIVE_INPUT_ADAPTER_EXEC_HAS_DLL 1
+#endif /* ! INTERACTIVE_INPUT_ADAPTER_EXEC_HAS_DLL */
+
+#if defined (INTERACTIVE_INPUT_ADAPTER_EXEC_HAS_DLL) && (INTERACTIVE_INPUT_ADAPTER_EXEC_HAS_DLL == 1)
+#  if defined (INTERACTIVE_INPUT_ADAPTER_EXEC_BUILD_DLL)
+#    define INTERACTIVE_INPUT_ADAPTER_EXEC_Export ACE_Proper_Export_Flag
+#    define INTERACTIVE_INPUT_ADAPTER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define INTERACTIVE_INPUT_ADAPTER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* INTERACTIVE_INPUT_ADAPTER_EXEC_BUILD_DLL */
+#    define INTERACTIVE_INPUT_ADAPTER_EXEC_Export ACE_Proper_Import_Flag
+#    define INTERACTIVE_INPUT_ADAPTER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define INTERACTIVE_INPUT_ADAPTER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* INTERACTIVE_INPUT_ADAPTER_EXEC_BUILD_DLL */
+#else /* INTERACTIVE_INPUT_ADAPTER_EXEC_HAS_DLL == 1 */
+#  define INTERACTIVE_INPUT_ADAPTER_EXEC_Export
+#  define INTERACTIVE_INPUT_ADAPTER_EXEC_SINGLETON_DECLARATION(T)
+#  define INTERACTIVE_INPUT_ADAPTER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* INTERACTIVE_INPUT_ADAPTER_EXEC_HAS_DLL == 1 */
+
+// Set INTERACTIVE_INPUT_ADAPTER_EXEC_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (INTERACTIVE_INPUT_ADAPTER_EXEC_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define INTERACTIVE_INPUT_ADAPTER_EXEC_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define INTERACTIVE_INPUT_ADAPTER_EXEC_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !INTERACTIVE_INPUT_ADAPTER_EXEC_NTRACE */
+
+#if (INTERACTIVE_INPUT_ADAPTER_EXEC_NTRACE == 1)
+#  define INTERACTIVE_INPUT_ADAPTER_EXEC_TRACE(X)
+#else /* (INTERACTIVE_INPUT_ADAPTER_EXEC_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define INTERACTIVE_INPUT_ADAPTER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (INTERACTIVE_INPUT_ADAPTER_EXEC_NTRACE == 1) */
+
+#endif /* INTERACTIVE_INPUT_ADAPTER_EXEC_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_stub_export.h b/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_stub_export.h
new file mode 100644
index 00000000000..381f5d69197
--- /dev/null
+++ b/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_stub_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl INTERACTIVE_INPUT_ADAPTER_STUB
+// ------------------------------
+#ifndef INTERACTIVE_INPUT_ADAPTER_STUB_EXPORT_H
+#define INTERACTIVE_INPUT_ADAPTER_STUB_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (INTERACTIVE_INPUT_ADAPTER_STUB_HAS_DLL)
+#  define INTERACTIVE_INPUT_ADAPTER_STUB_HAS_DLL 1
+#endif /* ! INTERACTIVE_INPUT_ADAPTER_STUB_HAS_DLL */
+
+#if defined (INTERACTIVE_INPUT_ADAPTER_STUB_HAS_DLL) && (INTERACTIVE_INPUT_ADAPTER_STUB_HAS_DLL == 1)
+#  if defined (INTERACTIVE_INPUT_ADAPTER_STUB_BUILD_DLL)
+#    define INTERACTIVE_INPUT_ADAPTER_STUB_Export ACE_Proper_Export_Flag
+#    define INTERACTIVE_INPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define INTERACTIVE_INPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* INTERACTIVE_INPUT_ADAPTER_STUB_BUILD_DLL */
+#    define INTERACTIVE_INPUT_ADAPTER_STUB_Export ACE_Proper_Import_Flag
+#    define INTERACTIVE_INPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define INTERACTIVE_INPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* INTERACTIVE_INPUT_ADAPTER_STUB_BUILD_DLL */
+#else /* INTERACTIVE_INPUT_ADAPTER_STUB_HAS_DLL == 1 */
+#  define INTERACTIVE_INPUT_ADAPTER_STUB_Export
+#  define INTERACTIVE_INPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T)
+#  define INTERACTIVE_INPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* INTERACTIVE_INPUT_ADAPTER_STUB_HAS_DLL == 1 */
+
+// Set INTERACTIVE_INPUT_ADAPTER_STUB_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (INTERACTIVE_INPUT_ADAPTER_STUB_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define INTERACTIVE_INPUT_ADAPTER_STUB_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define INTERACTIVE_INPUT_ADAPTER_STUB_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !INTERACTIVE_INPUT_ADAPTER_STUB_NTRACE */
+
+#if (INTERACTIVE_INPUT_ADAPTER_STUB_NTRACE == 1)
+#  define INTERACTIVE_INPUT_ADAPTER_STUB_TRACE(X)
+#else /* (INTERACTIVE_INPUT_ADAPTER_STUB_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define INTERACTIVE_INPUT_ADAPTER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (INTERACTIVE_INPUT_ADAPTER_STUB_NTRACE == 1) */
+
+#endif /* INTERACTIVE_INPUT_ADAPTER_STUB_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_svnt_export.h b/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_svnt_export.h
new file mode 100644
index 00000000000..e50838b8e2f
--- /dev/null
+++ b/TAO/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_svnt_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl INTERACTIVE_INPUT_ADAPTER_SVNT
+// ------------------------------
+#ifndef INTERACTIVE_INPUT_ADAPTER_SVNT_EXPORT_H
+#define INTERACTIVE_INPUT_ADAPTER_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (INTERACTIVE_INPUT_ADAPTER_SVNT_HAS_DLL)
+#  define INTERACTIVE_INPUT_ADAPTER_SVNT_HAS_DLL 1
+#endif /* ! INTERACTIVE_INPUT_ADAPTER_SVNT_HAS_DLL */
+
+#if defined (INTERACTIVE_INPUT_ADAPTER_SVNT_HAS_DLL) && (INTERACTIVE_INPUT_ADAPTER_SVNT_HAS_DLL == 1)
+#  if defined (INTERACTIVE_INPUT_ADAPTER_SVNT_BUILD_DLL)
+#    define INTERACTIVE_INPUT_ADAPTER_SVNT_Export ACE_Proper_Export_Flag
+#    define INTERACTIVE_INPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define INTERACTIVE_INPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* INTERACTIVE_INPUT_ADAPTER_SVNT_BUILD_DLL */
+#    define INTERACTIVE_INPUT_ADAPTER_SVNT_Export ACE_Proper_Import_Flag
+#    define INTERACTIVE_INPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define INTERACTIVE_INPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* INTERACTIVE_INPUT_ADAPTER_SVNT_BUILD_DLL */
+#else /* INTERACTIVE_INPUT_ADAPTER_SVNT_HAS_DLL == 1 */
+#  define INTERACTIVE_INPUT_ADAPTER_SVNT_Export
+#  define INTERACTIVE_INPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T)
+#  define INTERACTIVE_INPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* INTERACTIVE_INPUT_ADAPTER_SVNT_HAS_DLL == 1 */
+
+// Set INTERACTIVE_INPUT_ADAPTER_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (INTERACTIVE_INPUT_ADAPTER_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define INTERACTIVE_INPUT_ADAPTER_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define INTERACTIVE_INPUT_ADAPTER_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !INTERACTIVE_INPUT_ADAPTER_SVNT_NTRACE */
+
+#if (INTERACTIVE_INPUT_ADAPTER_SVNT_NTRACE == 1)
+#  define INTERACTIVE_INPUT_ADAPTER_SVNT_TRACE(X)
+#else /* (INTERACTIVE_INPUT_ADAPTER_SVNT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define INTERACTIVE_INPUT_ADAPTER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (INTERACTIVE_INPUT_ADAPTER_SVNT_NTRACE == 1) */
+
+#endif /* INTERACTIVE_INPUT_ADAPTER_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Output_Adapters/Base/Output_Adapter.idl b/TAO/CIAO/RACE/Output_Adapters/Base/Output_Adapter.idl
new file mode 100644
index 00000000000..61235b33959
--- /dev/null
+++ b/TAO/CIAO/RACE/Output_Adapters/Base/Output_Adapter.idl
@@ -0,0 +1,19 @@
+//$Id$
+#ifndef RACE_OUTPUT_ADAPTER_IDL
+#define RACE_OUTPUT_ADAPTER_IDL
+
+#include <Components.idl>
+#include "../Interface/PlanEgress.idl"
+
+module CIAO
+{
+  module RACE
+  {
+    component Output_Adapter
+    {
+      provides PlanEgress plan_egress;
+    };
+  };
+};
+
+#endif /* RACE_OUTPUT_ADAPTER_IDL */
diff --git a/TAO/CIAO/RACE/Output_Adapters/Base/Output_Adapter.mpc b/TAO/CIAO/RACE/Output_Adapters/Base/Output_Adapter.mpc
new file mode 100644
index 00000000000..8ce885d9e10
--- /dev/null
+++ b/TAO/CIAO/RACE/Output_Adapters/Base/Output_Adapter.mpc
@@ -0,0 +1,61 @@
+// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
+// This file is generated with "generate_component_mpc.pl -n Planner"
+
+project(Output_Adapter_stub): ciao_deployment_stub {
+
+  after += Output_Adapter_Interface_stub
+  sharedname = Output_Adapter_stub
+  idlflags += -Sc \
+              -Wb,stub_export_macro=OUTPUT_ADAPTER_STUB_Export \
+              -Wb,stub_export_include=Output_Adapter_stub_export.h \
+              -Wb,skel_export_macro=OUTPUT_ADAPTER_SVNT_Export \
+              -Wb,skel_export_include=Output_Adapter_svnt_export.h
+  dynamicflags   = OUTPUT_ADAPTER_STUB_BUILD_DLL
+  libs += Output_Adapter_Interface_stub
+
+  IDL_Files {
+    Output_Adapter.idl
+  }
+
+  Source_Files {
+    Output_AdapterC.cpp
+  }
+
+  Header_Files {
+    Output_AdapterC.h
+  }
+
+  Inline_Files {
+    Output_AdapterC.inl
+  }
+}
+
+project(Output_Adapter_svnt) : ciao_servant_dnc {
+
+  after +=  Output_Adapter_stub Output_Adapter_Interface_svnt
+  sharedname  = Output_Adapter_svnt
+  libs  +=  Output_Adapter_stub Output_Adapter_Interface_svnt
+
+  idlflags += -Sc \
+              -Wb,stub_export_macro=OUTPUT_ADAPTER_STUB_Export \
+              -Wb,stub_export_include=Output_Adapter_stub_export.h \
+              -Wb,skel_export_macro=OUTPUT_ADAPTER_SVNT_Export \
+              -Wb,skel_export_include=Output_Adapter_svnt_export.h
+  dynamicflags = OUTPUT_ADAPTER_SVNT_BUILD_DLL
+
+  IDL_Files {
+    Output_Adapter.idl
+  }
+
+  Source_Files {
+    Output_AdapterS.cpp
+  }
+
+  Header_Files {
+    Output_AdapterS.h
+  }
+
+  Inline_Files {
+    Output_AdapterS.inl
+  }
+}
diff --git a/TAO/CIAO/RACE/Output_Adapters/Base/Output_Adapter_stub_export.h b/TAO/CIAO/RACE/Output_Adapters/Base/Output_Adapter_stub_export.h
new file mode 100644
index 00000000000..2956242afb3
--- /dev/null
+++ b/TAO/CIAO/RACE/Output_Adapters/Base/Output_Adapter_stub_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl OUTPUT_ADAPTER_STUB
+// ------------------------------
+#ifndef OUTPUT_ADAPTER_STUB_EXPORT_H
+#define OUTPUT_ADAPTER_STUB_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (OUTPUT_ADAPTER_STUB_HAS_DLL)
+#  define OUTPUT_ADAPTER_STUB_HAS_DLL 1
+#endif /* ! OUTPUT_ADAPTER_STUB_HAS_DLL */
+
+#if defined (OUTPUT_ADAPTER_STUB_HAS_DLL) && (OUTPUT_ADAPTER_STUB_HAS_DLL == 1)
+#  if defined (OUTPUT_ADAPTER_STUB_BUILD_DLL)
+#    define OUTPUT_ADAPTER_STUB_Export ACE_Proper_Export_Flag
+#    define OUTPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define OUTPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* OUTPUT_ADAPTER_STUB_BUILD_DLL */
+#    define OUTPUT_ADAPTER_STUB_Export ACE_Proper_Import_Flag
+#    define OUTPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define OUTPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* OUTPUT_ADAPTER_STUB_BUILD_DLL */
+#else /* OUTPUT_ADAPTER_STUB_HAS_DLL == 1 */
+#  define OUTPUT_ADAPTER_STUB_Export
+#  define OUTPUT_ADAPTER_STUB_SINGLETON_DECLARATION(T)
+#  define OUTPUT_ADAPTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* OUTPUT_ADAPTER_STUB_HAS_DLL == 1 */
+
+// Set OUTPUT_ADAPTER_STUB_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (OUTPUT_ADAPTER_STUB_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define OUTPUT_ADAPTER_STUB_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define OUTPUT_ADAPTER_STUB_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !OUTPUT_ADAPTER_STUB_NTRACE */
+
+#if (OUTPUT_ADAPTER_STUB_NTRACE == 1)
+#  define OUTPUT_ADAPTER_STUB_TRACE(X)
+#else /* (OUTPUT_ADAPTER_STUB_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define OUTPUT_ADAPTER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (OUTPUT_ADAPTER_STUB_NTRACE == 1) */
+
+#endif /* OUTPUT_ADAPTER_STUB_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Output_Adapters/Base/Output_Adapter_svnt_export.h b/TAO/CIAO/RACE/Output_Adapters/Base/Output_Adapter_svnt_export.h
new file mode 100644
index 00000000000..d64111d83d2
--- /dev/null
+++ b/TAO/CIAO/RACE/Output_Adapters/Base/Output_Adapter_svnt_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl OUTPUT_ADAPTER_SVNT
+// ------------------------------
+#ifndef OUTPUT_ADAPTER_SVNT_EXPORT_H
+#define OUTPUT_ADAPTER_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (OUTPUT_ADAPTER_SVNT_HAS_DLL)
+#  define OUTPUT_ADAPTER_SVNT_HAS_DLL 1
+#endif /* ! OUTPUT_ADAPTER_SVNT_HAS_DLL */
+
+#if defined (OUTPUT_ADAPTER_SVNT_HAS_DLL) && (OUTPUT_ADAPTER_SVNT_HAS_DLL == 1)
+#  if defined (OUTPUT_ADAPTER_SVNT_BUILD_DLL)
+#    define OUTPUT_ADAPTER_SVNT_Export ACE_Proper_Export_Flag
+#    define OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* OUTPUT_ADAPTER_SVNT_BUILD_DLL */
+#    define OUTPUT_ADAPTER_SVNT_Export ACE_Proper_Import_Flag
+#    define OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* OUTPUT_ADAPTER_SVNT_BUILD_DLL */
+#else /* OUTPUT_ADAPTER_SVNT_HAS_DLL == 1 */
+#  define OUTPUT_ADAPTER_SVNT_Export
+#  define OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARATION(T)
+#  define OUTPUT_ADAPTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* OUTPUT_ADAPTER_SVNT_HAS_DLL == 1 */
+
+// Set OUTPUT_ADAPTER_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (OUTPUT_ADAPTER_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define OUTPUT_ADAPTER_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define OUTPUT_ADAPTER_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !OUTPUT_ADAPTER_SVNT_NTRACE */
+
+#if (OUTPUT_ADAPTER_SVNT_NTRACE == 1)
+#  define OUTPUT_ADAPTER_SVNT_TRACE(X)
+#else /* (OUTPUT_ADAPTER_SVNT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define OUTPUT_ADAPTER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (OUTPUT_ADAPTER_SVNT_NTRACE == 1) */
+
+#endif /* OUTPUT_ADAPTER_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Output_Adapters/Component/Output_Manager.idl b/TAO/CIAO/RACE/Output_Adapters/Component/Output_Manager.idl
new file mode 100644
index 00000000000..6f0199494f5
--- /dev/null
+++ b/TAO/CIAO/RACE/Output_Adapters/Component/Output_Manager.idl
@@ -0,0 +1,18 @@
+//$Id$
+#ifndef RACE_OUTPUT_MANAGER_IDL
+#define RACE_OUTPUT_MANAGER_IDL
+
+#include <Components.idl>
+
+module CIAO
+{
+  module RACE
+  {
+    component Output_Manager
+    {
+      provides PlanEgress output;
+      uses multiple PlanEgress adapters;
+    };
+    
+  };
+};
diff --git a/TAO/CIAO/RACE/Output_Adapters/Interface/Output_Adapter_Interface.mpc b/TAO/CIAO/RACE/Output_Adapters/Interface/Output_Adapter_Interface.mpc
new file mode 100644
index 00000000000..47b9e7ba6b7
--- /dev/null
+++ b/TAO/CIAO/RACE/Output_Adapters/Interface/Output_Adapter_Interface.mpc
@@ -0,0 +1,59 @@
+// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
+// This file is generated with "generate_component_mpc.pl -n Output_Adapter_Interface"
+
+project(Output_Adapter_Interface_stub): ciao_deployment_stub {
+
+  sharedname = Output_Adapter_Interface_stub
+  idlflags += -Sc \
+              -Wb,stub_export_macro=OUTPUT_ADAPTER_INTERFACE_STUB_Export \
+              -Wb,stub_export_include=Output_Adapter_Interface_stub_export.h \
+              -Wb,skel_export_macro=OUTPUT_ADAPTER_INTERFACE_SVNT_Export \
+              -Wb,skel_export_include=Output_Adapter_Interface_svnt_export.h
+  dynamicflags   = OUTPUT_ADAPTER_INTERFACE_STUB_BUILD_DLL
+
+  IDL_Files {
+    PlanEgress.idl
+  }
+
+  Source_Files {
+    PlanEgressC.cpp
+  }
+
+  Header_Files {
+    PlanEgressC.h
+  }
+
+  Inline_Files {
+    PlanEgressC.inl
+  }
+}
+
+project(Output_Adapter_Interface_svnt) : ciao_servant_dnc {
+
+  after +=  Output_Adapter_Interface_stub
+  sharedname  = Output_Adapter_Interface_svnt
+  libs    += Output_Adapter_Interface_stub
+
+  idlflags += -Sc \
+              -Wb,stub_export_macro=OUTPUT_ADAPTER_INTERFACE_STUB_Export \
+              -Wb,stub_export_include=Output_Adapter_Interface_stub_export.h \
+              -Wb,skel_export_macro=OUTPUT_ADAPTER_INTERFACE_SVNT_Export \
+              -Wb,skel_export_include=Output_Adapter_Interface_svnt_export.h
+  dynamicflags = OUTPUT_ADAPTER_INTERFACE_SVNT_BUILD_DLL
+
+  IDL_Files {
+    PlanEgress.idl
+  }
+
+  Source_Files {
+    PlanEgressS.cpp
+  }
+
+  Header_Files {
+    PlanEgressS.h
+  }
+
+  Inline_Files {
+    PlanEgressS.inl
+  }
+}
diff --git a/TAO/CIAO/RACE/Output_Adapters/Interface/Output_Adapter_Interface_stub_export.h b/TAO/CIAO/RACE/Output_Adapters/Interface/Output_Adapter_Interface_stub_export.h
new file mode 100644
index 00000000000..3a36a07de87
--- /dev/null
+++ b/TAO/CIAO/RACE/Output_Adapters/Interface/Output_Adapter_Interface_stub_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl OUTPUT_ADAPTER_INTERFACE_STUB
+// ------------------------------
+#ifndef OUTPUT_ADAPTER_INTERFACE_STUB_EXPORT_H
+#define OUTPUT_ADAPTER_INTERFACE_STUB_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (OUTPUT_ADAPTER_INTERFACE_STUB_HAS_DLL)
+#  define OUTPUT_ADAPTER_INTERFACE_STUB_HAS_DLL 1
+#endif /* ! OUTPUT_ADAPTER_INTERFACE_STUB_HAS_DLL */
+
+#if defined (OUTPUT_ADAPTER_INTERFACE_STUB_HAS_DLL) && (OUTPUT_ADAPTER_INTERFACE_STUB_HAS_DLL == 1)
+#  if defined (OUTPUT_ADAPTER_INTERFACE_STUB_BUILD_DLL)
+#    define OUTPUT_ADAPTER_INTERFACE_STUB_Export ACE_Proper_Export_Flag
+#    define OUTPUT_ADAPTER_INTERFACE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define OUTPUT_ADAPTER_INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* OUTPUT_ADAPTER_INTERFACE_STUB_BUILD_DLL */
+#    define OUTPUT_ADAPTER_INTERFACE_STUB_Export ACE_Proper_Import_Flag
+#    define OUTPUT_ADAPTER_INTERFACE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define OUTPUT_ADAPTER_INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* OUTPUT_ADAPTER_INTERFACE_STUB_BUILD_DLL */
+#else /* OUTPUT_ADAPTER_INTERFACE_STUB_HAS_DLL == 1 */
+#  define OUTPUT_ADAPTER_INTERFACE_STUB_Export
+#  define OUTPUT_ADAPTER_INTERFACE_STUB_SINGLETON_DECLARATION(T)
+#  define OUTPUT_ADAPTER_INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* OUTPUT_ADAPTER_INTERFACE_STUB_HAS_DLL == 1 */
+
+// Set OUTPUT_ADAPTER_INTERFACE_STUB_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (OUTPUT_ADAPTER_INTERFACE_STUB_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define OUTPUT_ADAPTER_INTERFACE_STUB_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define OUTPUT_ADAPTER_INTERFACE_STUB_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !OUTPUT_ADAPTER_INTERFACE_STUB_NTRACE */
+
+#if (OUTPUT_ADAPTER_INTERFACE_STUB_NTRACE == 1)
+#  define OUTPUT_ADAPTER_INTERFACE_STUB_TRACE(X)
+#else /* (OUTPUT_ADAPTER_INTERFACE_STUB_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define OUTPUT_ADAPTER_INTERFACE_STUB_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (OUTPUT_ADAPTER_INTERFACE_STUB_NTRACE == 1) */
+
+#endif /* OUTPUT_ADAPTER_INTERFACE_STUB_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Output_Adapters/Interface/Output_Adapter_Interface_svnt_export.h b/TAO/CIAO/RACE/Output_Adapters/Interface/Output_Adapter_Interface_svnt_export.h
new file mode 100644
index 00000000000..f180492dceb
--- /dev/null
+++ b/TAO/CIAO/RACE/Output_Adapters/Interface/Output_Adapter_Interface_svnt_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl OUTPUT_ADAPTER_INTERFACE_SVNT
+// ------------------------------
+#ifndef OUTPUT_ADAPTER_INTERFACE_SVNT_EXPORT_H
+#define OUTPUT_ADAPTER_INTERFACE_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (OUTPUT_ADAPTER_INTERFACE_SVNT_HAS_DLL)
+#  define OUTPUT_ADAPTER_INTERFACE_SVNT_HAS_DLL 1
+#endif /* ! OUTPUT_ADAPTER_INTERFACE_SVNT_HAS_DLL */
+
+#if defined (OUTPUT_ADAPTER_INTERFACE_SVNT_HAS_DLL) && (OUTPUT_ADAPTER_INTERFACE_SVNT_HAS_DLL == 1)
+#  if defined (OUTPUT_ADAPTER_INTERFACE_SVNT_BUILD_DLL)
+#    define OUTPUT_ADAPTER_INTERFACE_SVNT_Export ACE_Proper_Export_Flag
+#    define OUTPUT_ADAPTER_INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define OUTPUT_ADAPTER_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* OUTPUT_ADAPTER_INTERFACE_SVNT_BUILD_DLL */
+#    define OUTPUT_ADAPTER_INTERFACE_SVNT_Export ACE_Proper_Import_Flag
+#    define OUTPUT_ADAPTER_INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define OUTPUT_ADAPTER_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* OUTPUT_ADAPTER_INTERFACE_SVNT_BUILD_DLL */
+#else /* OUTPUT_ADAPTER_INTERFACE_SVNT_HAS_DLL == 1 */
+#  define OUTPUT_ADAPTER_INTERFACE_SVNT_Export
+#  define OUTPUT_ADAPTER_INTERFACE_SVNT_SINGLETON_DECLARATION(T)
+#  define OUTPUT_ADAPTER_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* OUTPUT_ADAPTER_INTERFACE_SVNT_HAS_DLL == 1 */
+
+// Set OUTPUT_ADAPTER_INTERFACE_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (OUTPUT_ADAPTER_INTERFACE_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define OUTPUT_ADAPTER_INTERFACE_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define OUTPUT_ADAPTER_INTERFACE_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !OUTPUT_ADAPTER_INTERFACE_SVNT_NTRACE */
+
+#if (OUTPUT_ADAPTER_INTERFACE_SVNT_NTRACE == 1)
+#  define OUTPUT_ADAPTER_INTERFACE_SVNT_TRACE(X)
+#else /* (OUTPUT_ADAPTER_INTERFACE_SVNT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define OUTPUT_ADAPTER_INTERFACE_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (OUTPUT_ADAPTER_INTERFACE_SVNT_NTRACE == 1) */
+
+#endif /* OUTPUT_ADAPTER_INTERFACE_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Output_Adapters/Interface/PlanEgress.idl b/TAO/CIAO/RACE/Output_Adapters/Interface/PlanEgress.idl
new file mode 100644
index 00000000000..cd42287f4d2
--- /dev/null
+++ b/TAO/CIAO/RACE/Output_Adapters/Interface/PlanEgress.idl
@@ -0,0 +1,22 @@
+//$Id$
+#ifndef RACE_PLAN_EGRESS_IDL
+#define RACE_PLAN_EGRESS_IDL
+
+#ifndef INCLUDED_DEPLOYMENT_DATA
+#define INCLUDED_DEPLOYMENT_DATA
+#include "Deployment_Data.idl"
+#endif
+
+module CIAO
+{
+  
+  module RACE
+  {
+    interface PlanEgress
+    {
+      boolean output_plan (in Deployment::DeploymentPlan plan);
+    };
+  };
+};
+
+#endif /* RACE_PLAN_EGRESS_IDL */
diff --git a/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.cidl b/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.cidl
new file mode 100644
index 00000000000..bfd889a8dd3
--- /dev/null
+++ b/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.cidl
@@ -0,0 +1,25 @@
+//$Id$
+//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/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.idl b/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.idl
new file mode 100644
index 00000000000..818e1626111
--- /dev/null
+++ b/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.idl
@@ -0,0 +1,21 @@
+//$Id$
+#ifndef RACE_XML_OUTPUT_ADAPTER_IDL
+#define RACE_XML_OUTPUT_ADAPTER_IDL
+
+#include "../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/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc b/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc
new file mode 100644
index 00000000000..41e3a519e2b
--- /dev/null
+++ b/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc
@@ -0,0 +1,75 @@
+// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
+// This file is generated with "generate_component_mpc.pl -p Output_Adapter XML_Output_Adapter"
+
+project(XML_Output_Adapter_stub): ciao_deployment_stub {
+  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 {
+  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 {
+  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
+
+  IDL_Files {
+    
+  }
+
+  Source_Files {
+    
+    XML_Output_Adapter_exec.cpp
+  }
+}
diff --git a/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.cpp b/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.cpp
new file mode 100644
index 00000000000..8028afd2650
--- /dev/null
+++ b/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.cpp
@@ -0,0 +1,210 @@
+// $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 "XML_Output_Adapter_exec.h"
+#include "ciao/CIAO_common.h"
+
+namespace CIAO
+{
+  namespace RACE
+  {
+    namespace CIDL_XML_Output_Adapter_Impl
+    {
+      //==================================================================
+      // Facet Executor Implementation Class:   PlanEgress_exec_i
+      //==================================================================
+
+      PlanEgress_exec_i::PlanEgress_exec_i (void)
+      {
+      }
+
+      PlanEgress_exec_i::~PlanEgress_exec_i (void)
+      {
+      }
+
+      // Operations from ::CIAO::RACE::PlanEgress
+
+      ::CORBA::Boolean
+      PlanEgress_exec_i::output_plan (
+      const ::Deployment::DeploymentPlan & /* plan */
+      ACE_ENV_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+      {
+        // Your code here.
+        return false;
+      }
+
+      //==================================================================
+      // 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))
+      {
+        // Your code here.
+        return ::CIAO::RACE::CCM_PlanEgress::_nil ();
+      }
+
+      // 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
+      createXML_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/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.h b/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.h
new file mode 100644
index 00000000000..5f91f85fd0c
--- /dev/null
+++ b/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.h
@@ -0,0 +1,161 @@
+// $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_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_Export PlanEgress_exec_i
+      : public virtual ::CIAO::RACE::CCM_PlanEgress,
+      public virtual TAO_Local_RefCounted_Object
+      {
+        public:
+        PlanEgress_exec_i (void);
+        virtual ~PlanEgress_exec_i (void);
+
+        // Operations from ::CIAO::RACE::PlanEgress
+
+        virtual ::CORBA::Boolean
+        output_plan (
+        const ::Deployment::DeploymentPlan & plan
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+      };
+
+      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_;
+      };
+
+      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
+      createXML_Output_Adapter_Home_Impl (void);
+    }
+  }
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* CIAO_XML_OUTPUT_ADAPTER_EXEC_H */
+
diff --git a/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec_export.h b/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec_export.h
new file mode 100644
index 00000000000..6fdbd02c910
--- /dev/null
+++ b/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// 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/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_stub_export.h b/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_stub_export.h
new file mode 100644
index 00000000000..40bf6add478
--- /dev/null
+++ b/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_stub_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// 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/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_svnt_export.h b/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_svnt_export.h
new file mode 100644
index 00000000000..7c563fadf8a
--- /dev/null
+++ b/TAO/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_svnt_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// 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/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.cidl b/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.cidl
new file mode 100644
index 00000000000..abb90746baa
--- /dev/null
+++ b/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.cidl
@@ -0,0 +1,25 @@
+//$Id$
+//Plan_Analyzer.cidl
+
+#ifndef RACE_PLAN_ANALYZER_CIDL
+#define RACE_PLAN_ANALYZER_CIDL
+
+#include "Plan_Analyzer.idl"
+
+module CIAO
+{
+  module RACE
+  {
+    composition session Plan_Analyzer_Impl
+    {
+      home executor Plan_Analyzer_Home_Exec
+        {
+          implements RACE::Plan_Analyzer_Home;
+          manages    Plan_Analyzer_Exec;
+        };
+    };
+  };
+};
+
+
+#endif /* RACE_PLAN_ANALYZER_CIDL */
diff --git a/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.idl b/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.idl
new file mode 100644
index 00000000000..9f4fdd4668d
--- /dev/null
+++ b/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.idl
@@ -0,0 +1,32 @@
+//$Id$
+#ifndef RACE_PLAN_ANALYZER_IDL
+#define RACE_PLAN_ANALYZER_IDL
+
+#include <Components.idl>
+#include "../Interface/PlanIngress.idl"
+#include "../../Planner_Manager/Interface/Planner_Manager_I.idl"
+
+module CIAO
+{
+  
+  module RACE
+  {
+    component Plan_Analyzer
+    {
+      provides PlanIngress plan_ingress;
+      uses Planner_Manager_I planner_manager_i;
+
+      readonly attribute RACE_Classifications classes;
+
+      // provides PlannerInfo pinfo;
+      // uses multiple Analyzer plugins;
+    };
+
+    home Plan_Analyzer_Home manages Plan_Analyzer
+    {
+    };
+  };
+};
+
+
+#endif /* RACE_PLAN_ANALYZER_IDL */
diff --git a/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc b/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc
new file mode 100644
index 00000000000..38c5cd01bd6
--- /dev/null
+++ b/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc
@@ -0,0 +1,102 @@
+// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
+// This file is generated with "generate_component_mpc.pl Plan_Analyzer"
+
+project(Plan_Analyzer_stub): ciao_deployment_stub {
+  after += Plan_Analyzer_Interface_stub \
+           RACE_common_stub \
+           Planner_Manager_Interface_stub
+  sharedname = Plan_Analyzer_stub
+  idlflags += -Sc \
+              -Wb,stub_export_macro=PLAN_ANALYZER_STUB_Export \
+              -Wb,stub_export_include=Plan_Analyzer_stub_export.h \
+              -Wb,skel_export_macro=PLAN_ANALYZER_SVNT_Export \
+              -Wb,skel_export_include=Plan_Analyzer_svnt_export.h
+  dynamicflags   = PLAN_ANALYZER_STUB_BUILD_DLL
+  libs += Plan_Analyzer_Interface_stub \
+          RACE_common_stub \
+          Planner_Manager_Interface_stub
+
+  IDL_Files {
+    Plan_Analyzer.idl
+  }
+
+  Source_Files {
+    Plan_AnalyzerC.cpp
+  }
+
+  Header_Files {
+    Plan_AnalyzerC.h
+  }
+
+  Inline_Files {
+    Plan_AnalyzerC.inl
+  }
+}
+
+project(Plan_Analyzer_svnt) : ciao_servant_dnc {
+  after += Plan_Analyzer_stub \
+           Plan_Analyzer_Interface_svnt
+  sharedname  = Plan_Analyzer_svnt
+  libs    += Plan_Analyzer_stub \
+             RACE_common_stub \
+             Plan_Analyzer_Interface_stub \
+             Plan_Analyzer_Interface_svnt \
+             Planner_Manager_Interface_stub
+
+  idlflags  +=  -Sc \
+                -Wb,export_macro=PLAN_ANALYZER_SVNT_Export \
+                -Wb,export_include=Plan_Analyzer_svnt_export.h
+
+  dynamicflags = PLAN_ANALYZER_SVNT_BUILD_DLL
+
+  CIDL_Files {
+    Plan_Analyzer.cidl
+  }
+
+  IDL_Files {
+    Plan_AnalyzerE.idl
+  }
+
+  Source_Files {
+    Plan_AnalyzerEC.cpp
+    Plan_AnalyzerS.cpp
+    Plan_Analyzer_svnt.cpp
+  }
+
+  Header_Files {
+    Plan_AnalyzerEC.h
+    Plan_AnalyzerS.h
+    Plan_Analyzer_svnt.h
+  }
+
+  Inline_Files {
+    Plan_AnalyzerEC.inl
+    Plan_AnalyzerS.inl
+    Plan_Analyzer_svnt.inl
+  }
+}
+
+
+project(Plan_Analyzer_exec) : ciao_component_dnc {
+  after   += Plan_Analyzer_svnt
+  sharedname = Plan_Analyzer_exec
+  libs    += Plan_Analyzer_stub \
+             Plan_Analyzer_svnt \
+             RACE_common_stub \
+             Plan_Analyzer_Interface_stub \
+             Plan_Analyzer_Interface_svnt \
+             Planner_Manager_Interface_stub
+
+  idlflags  +=  -Sc \
+                -Wb,export_macro=PLAN_ANALYZER_EXEC_Export \
+                -Wb,export_include=Plan_Analyzer_exec_export.h
+  dynamicflags   = PLAN_ANALYZER_EXEC_BUILD_DLL
+
+  IDL_Files {
+    
+  }
+
+  Source_Files {
+    Plan_Analyzer_exec.cpp
+  }
+}
diff --git a/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.cpp b/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.cpp
new file mode 100644
index 00000000000..b4faa13659e
--- /dev/null
+++ b/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.cpp
@@ -0,0 +1,218 @@
+// $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 "Plan_Analyzer_exec.h"
+#include "ciao/CIAO_common.h"
+
+namespace CIAO
+{
+  namespace RACE
+  {
+    namespace CIDL_Plan_Analyzer_Impl
+    {
+      //==================================================================
+      // Facet Executor Implementation Class:   PlanIngress_exec_i
+      //==================================================================
+
+      PlanIngress_exec_i::PlanIngress_exec_i (void)
+      {
+      }
+
+      PlanIngress_exec_i::~PlanIngress_exec_i (void)
+      {
+      }
+
+      // Operations from ::CIAO::RACE::PlanIngress
+
+      void
+      PlanIngress_exec_i::analyze_plan (
+      const ::Deployment::DeploymentPlan & /* plan */
+      ACE_ENV_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+      {
+        // Your code here.
+      }
+
+      //==================================================================
+      // Component Executor Implementation Class:   Plan_Analyzer_exec_i
+      //==================================================================
+
+      Plan_Analyzer_exec_i::Plan_Analyzer_exec_i (void)
+      {
+      }
+
+      Plan_Analyzer_exec_i::~Plan_Analyzer_exec_i (void)
+      {
+      }
+
+      // Supported or inherited operations.
+
+      // Attribute operations.
+
+      ::CIAO::RACE::RACE_Classifications *
+      Plan_Analyzer_exec_i::classes (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+      {
+        // Your code here.
+        return 0;
+      }
+
+      // Port operations.
+
+      ::CIAO::RACE::CCM_PlanIngress_ptr
+      Plan_Analyzer_exec_i::get_plan_ingress (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+      {
+        // Your code here.
+        return ::CIAO::RACE::CCM_PlanIngress::_nil ();
+      }
+
+      // Operations from Components::SessionComponent
+
+      void
+      Plan_Analyzer_exec_i::set_session_context (
+      ::Components::SessionContext_ptr ctx
+      ACE_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((
+      ::CORBA::SystemException,
+      ::Components::CCMException))
+      {
+        this->context_ =
+        Plan_Analyzer_Context::_narrow (
+        ctx
+        ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK;
+
+        if (this->context_ == 0)
+        {
+          ACE_THROW (CORBA::INTERNAL ());
+        }
+      }
+
+      void
+      Plan_Analyzer_exec_i::ciao_preactivate (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((
+      ::CORBA::SystemException,
+      ::Components::CCMException))
+      {
+        // Your code here.
+      }
+
+      void
+      Plan_Analyzer_exec_i::ciao_postactivate (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((
+      ::CORBA::SystemException,
+      ::Components::CCMException))
+      {
+        // Your code here.
+      }
+
+      void
+      Plan_Analyzer_exec_i::ccm_activate (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((
+      ::CORBA::SystemException,
+      ::Components::CCMException))
+      {
+        // Your code here.
+      }
+
+      void
+      Plan_Analyzer_exec_i::ccm_passivate (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((
+      ::CORBA::SystemException,
+      ::Components::CCMException))
+      {
+        // Your code here.
+      }
+
+      void
+      Plan_Analyzer_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:   Plan_Analyzer_Home_exec_i
+      //==================================================================
+
+      Plan_Analyzer_Home_exec_i::Plan_Analyzer_Home_exec_i (void)
+      {
+      }
+
+      Plan_Analyzer_Home_exec_i::~Plan_Analyzer_Home_exec_i (void)
+      {
+      }
+
+      // Supported or inherited operations.
+
+      // Home operations.
+
+      // Factory and finder operations.
+
+      // Attribute operations.
+
+      // Implicit operations.
+
+      ::Components::EnterpriseComponent_ptr
+      Plan_Analyzer_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,
+        Plan_Analyzer_exec_i,
+        CORBA::NO_MEMORY ());
+        ACE_CHECK_RETURN (::Components::EnterpriseComponent::_nil ());
+
+        return retval;
+      }
+
+      extern "C" PLAN_ANALYZER_EXEC_Export ::Components::HomeExecutorBase_ptr
+      createPlan_Analyzer_Home_Impl (void)
+      {
+        ::Components::HomeExecutorBase_ptr retval =
+        ::Components::HomeExecutorBase::_nil ();
+
+        ACE_NEW_RETURN (
+        retval,
+        Plan_Analyzer_Home_exec_i,
+        ::Components::HomeExecutorBase::_nil ());
+
+        return retval;
+      }
+    }
+  }
+}
+
diff --git a/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.h b/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.h
new file mode 100644
index 00000000000..39a77efb1f7
--- /dev/null
+++ b/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.h
@@ -0,0 +1,166 @@
+// $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_PLAN_ANALYZER_EXEC_H
+#define CIAO_PLAN_ANALYZER_EXEC_H
+
+#include /**/ "ace/pre.h"
+
+#include "Plan_Analyzer_svnt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "Plan_Analyzer_exec_export.h"
+#include "tao/LocalObject.h"
+
+namespace CIAO
+{
+  namespace RACE
+  {
+    namespace CIDL_Plan_Analyzer_Impl
+    {
+      class PLAN_ANALYZER_EXEC_Export PlanIngress_exec_i
+      : public virtual ::CIAO::RACE::CCM_PlanIngress,
+      public virtual TAO_Local_RefCounted_Object
+      {
+        public:
+        PlanIngress_exec_i (void);
+        virtual ~PlanIngress_exec_i (void);
+
+        // Operations from ::CIAO::RACE::PlanIngress
+
+        virtual void
+        analyze_plan (
+        const ::Deployment::DeploymentPlan & plan
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+      };
+
+      class PLAN_ANALYZER_EXEC_Export Plan_Analyzer_exec_i
+      : public virtual Plan_Analyzer_Exec,
+      public virtual TAO_Local_RefCounted_Object
+      {
+        public:
+        Plan_Analyzer_exec_i (void);
+        virtual ~Plan_Analyzer_exec_i (void);
+
+        // Supported or inherited operations.
+
+        // Attribute operations.
+
+        virtual ::CIAO::RACE::RACE_Classifications *
+        classes (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+        // Port operations.
+
+        virtual ::CIAO::RACE::CCM_PlanIngress_ptr
+        get_plan_ingress (
+        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:
+        Plan_Analyzer_Context *context_;
+      };
+
+      class PLAN_ANALYZER_EXEC_Export Plan_Analyzer_Home_exec_i
+      : public virtual Plan_Analyzer_Home_Exec,
+      public virtual TAO_Local_RefCounted_Object
+      {
+        public:
+        Plan_Analyzer_Home_exec_i (void);
+        virtual ~Plan_Analyzer_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" PLAN_ANALYZER_EXEC_Export ::Components::HomeExecutorBase_ptr
+      createPlan_Analyzer_Home_Impl (void);
+    }
+  }
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* CIAO_PLAN_ANALYZER_EXEC_H */
+
diff --git a/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec_export.h b/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec_export.h
new file mode 100644
index 00000000000..d2449edd9e7
--- /dev/null
+++ b/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl PLAN_ANALYZER_EXEC
+// ------------------------------
+#ifndef PLAN_ANALYZER_EXEC_EXPORT_H
+#define PLAN_ANALYZER_EXEC_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (PLAN_ANALYZER_EXEC_HAS_DLL)
+#  define PLAN_ANALYZER_EXEC_HAS_DLL 1
+#endif /* ! PLAN_ANALYZER_EXEC_HAS_DLL */
+
+#if defined (PLAN_ANALYZER_EXEC_HAS_DLL) && (PLAN_ANALYZER_EXEC_HAS_DLL == 1)
+#  if defined (PLAN_ANALYZER_EXEC_BUILD_DLL)
+#    define PLAN_ANALYZER_EXEC_Export ACE_Proper_Export_Flag
+#    define PLAN_ANALYZER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define PLAN_ANALYZER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* PLAN_ANALYZER_EXEC_BUILD_DLL */
+#    define PLAN_ANALYZER_EXEC_Export ACE_Proper_Import_Flag
+#    define PLAN_ANALYZER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define PLAN_ANALYZER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* PLAN_ANALYZER_EXEC_BUILD_DLL */
+#else /* PLAN_ANALYZER_EXEC_HAS_DLL == 1 */
+#  define PLAN_ANALYZER_EXEC_Export
+#  define PLAN_ANALYZER_EXEC_SINGLETON_DECLARATION(T)
+#  define PLAN_ANALYZER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* PLAN_ANALYZER_EXEC_HAS_DLL == 1 */
+
+// Set PLAN_ANALYZER_EXEC_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (PLAN_ANALYZER_EXEC_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define PLAN_ANALYZER_EXEC_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define PLAN_ANALYZER_EXEC_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !PLAN_ANALYZER_EXEC_NTRACE */
+
+#if (PLAN_ANALYZER_EXEC_NTRACE == 1)
+#  define PLAN_ANALYZER_EXEC_TRACE(X)
+#else /* (PLAN_ANALYZER_EXEC_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define PLAN_ANALYZER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (PLAN_ANALYZER_EXEC_NTRACE == 1) */
+
+#endif /* PLAN_ANALYZER_EXEC_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_stub_export.h b/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_stub_export.h
new file mode 100644
index 00000000000..90b041f89a8
--- /dev/null
+++ b/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_stub_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl PLAN_ANALYZER_STUB
+// ------------------------------
+#ifndef PLAN_ANALYZER_STUB_EXPORT_H
+#define PLAN_ANALYZER_STUB_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (PLAN_ANALYZER_STUB_HAS_DLL)
+#  define PLAN_ANALYZER_STUB_HAS_DLL 1
+#endif /* ! PLAN_ANALYZER_STUB_HAS_DLL */
+
+#if defined (PLAN_ANALYZER_STUB_HAS_DLL) && (PLAN_ANALYZER_STUB_HAS_DLL == 1)
+#  if defined (PLAN_ANALYZER_STUB_BUILD_DLL)
+#    define PLAN_ANALYZER_STUB_Export ACE_Proper_Export_Flag
+#    define PLAN_ANALYZER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define PLAN_ANALYZER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* PLAN_ANALYZER_STUB_BUILD_DLL */
+#    define PLAN_ANALYZER_STUB_Export ACE_Proper_Import_Flag
+#    define PLAN_ANALYZER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define PLAN_ANALYZER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* PLAN_ANALYZER_STUB_BUILD_DLL */
+#else /* PLAN_ANALYZER_STUB_HAS_DLL == 1 */
+#  define PLAN_ANALYZER_STUB_Export
+#  define PLAN_ANALYZER_STUB_SINGLETON_DECLARATION(T)
+#  define PLAN_ANALYZER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* PLAN_ANALYZER_STUB_HAS_DLL == 1 */
+
+// Set PLAN_ANALYZER_STUB_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (PLAN_ANALYZER_STUB_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define PLAN_ANALYZER_STUB_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define PLAN_ANALYZER_STUB_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !PLAN_ANALYZER_STUB_NTRACE */
+
+#if (PLAN_ANALYZER_STUB_NTRACE == 1)
+#  define PLAN_ANALYZER_STUB_TRACE(X)
+#else /* (PLAN_ANALYZER_STUB_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define PLAN_ANALYZER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (PLAN_ANALYZER_STUB_NTRACE == 1) */
+
+#endif /* PLAN_ANALYZER_STUB_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_svnt_export.h b/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_svnt_export.h
new file mode 100644
index 00000000000..13f0c025860
--- /dev/null
+++ b/TAO/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_svnt_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl PLAN_ANALYZER_SVNT
+// ------------------------------
+#ifndef PLAN_ANALYZER_SVNT_EXPORT_H
+#define PLAN_ANALYZER_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (PLAN_ANALYZER_SVNT_HAS_DLL)
+#  define PLAN_ANALYZER_SVNT_HAS_DLL 1
+#endif /* ! PLAN_ANALYZER_SVNT_HAS_DLL */
+
+#if defined (PLAN_ANALYZER_SVNT_HAS_DLL) && (PLAN_ANALYZER_SVNT_HAS_DLL == 1)
+#  if defined (PLAN_ANALYZER_SVNT_BUILD_DLL)
+#    define PLAN_ANALYZER_SVNT_Export ACE_Proper_Export_Flag
+#    define PLAN_ANALYZER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define PLAN_ANALYZER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* PLAN_ANALYZER_SVNT_BUILD_DLL */
+#    define PLAN_ANALYZER_SVNT_Export ACE_Proper_Import_Flag
+#    define PLAN_ANALYZER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define PLAN_ANALYZER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* PLAN_ANALYZER_SVNT_BUILD_DLL */
+#else /* PLAN_ANALYZER_SVNT_HAS_DLL == 1 */
+#  define PLAN_ANALYZER_SVNT_Export
+#  define PLAN_ANALYZER_SVNT_SINGLETON_DECLARATION(T)
+#  define PLAN_ANALYZER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* PLAN_ANALYZER_SVNT_HAS_DLL == 1 */
+
+// Set PLAN_ANALYZER_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (PLAN_ANALYZER_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define PLAN_ANALYZER_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define PLAN_ANALYZER_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !PLAN_ANALYZER_SVNT_NTRACE */
+
+#if (PLAN_ANALYZER_SVNT_NTRACE == 1)
+#  define PLAN_ANALYZER_SVNT_TRACE(X)
+#else /* (PLAN_ANALYZER_SVNT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define PLAN_ANALYZER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (PLAN_ANALYZER_SVNT_NTRACE == 1) */
+
+#endif /* PLAN_ANALYZER_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Plan_Analyzer/Interface/PlanIngress.idl b/TAO/CIAO/RACE/Plan_Analyzer/Interface/PlanIngress.idl
new file mode 100644
index 00000000000..1127e42c167
--- /dev/null
+++ b/TAO/CIAO/RACE/Plan_Analyzer/Interface/PlanIngress.idl
@@ -0,0 +1,22 @@
+//$Id$
+#ifndef RACE_PLAN_INGRESS_IDL
+#define RACE_PLAN_INGRESS_IDL
+
+#ifndef INCLUDED_DEPLOYMENT_DATA
+#define INCLUDED_DEPLOYMENT_DATA
+#include "Deployment_Data.idl"
+#endif
+
+module CIAO
+{
+  module RACE
+  {
+    interface PlanIngress
+    {
+      void analyze_plan (in Deployment::DeploymentPlan plan);
+    };
+  };
+};
+
+
+#endif /* RACE_PLAN_INGRESS_IDL */
diff --git a/TAO/CIAO/RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc b/TAO/CIAO/RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc
new file mode 100644
index 00000000000..7173e63e8b3
--- /dev/null
+++ b/TAO/CIAO/RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc
@@ -0,0 +1,59 @@
+// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
+// This file is generated with "generate_component_mpc.pl -n Planner_Manager_Interface"
+
+project(Plan_Analyzer_Interface_stub): ciao_deployment_stub {
+
+  sharedname = Plan_Analyzer_Interface_stub
+  idlflags += -Sc \
+              -Wb,stub_export_macro=PLAN_ANALYZER_INTERFACE_STUB_Export \
+              -Wb,stub_export_include=Plan_Analyzer_Interface_stub_export.h \
+              -Wb,skel_export_macro=PLAN_ANALYZER_INTERFACE_SVNT_Export \
+              -Wb,skel_export_include=Plan_Analyzer_Interface_svnt_export.h
+  dynamicflags   = PLAN_ANALYZER_INTERFACE_STUB_BUILD_DLL
+
+  IDL_Files {
+    PlanIngress.idl
+  }
+
+  Source_Files {
+    PlanIngressC.cpp
+  }
+
+  Header_Files {
+    PlanIngressC.h
+  }
+
+  Inline_Files {
+    PlanIngressC.inl
+  }
+}
+
+project(Plan_Analyzer_Interface_svnt) : ciao_servant_dnc {
+
+  after +=  Plan_Analyzer_Interface_stub
+  sharedname  = Plan_Analyzer_Interface_svnt
+  libs    += Plan_Analyzer_Interface_stub
+
+  idlflags += -Sc \
+              -Wb,stub_export_macro=PLAN_ANALYZER_INTERFACE_STUB_Export \
+              -Wb,stub_export_include=Plan_Analyzer_Interface_stub_export.h \
+              -Wb,skel_export_macro=PLAN_ANALYZER_INTERFACE_SVNT_Export \
+              -Wb,skel_export_include=Plan_Analyzer_Interface_svnt_export.h
+  dynamicflags = PLAN_ANALYZER_INTERFACE_SVNT_BUILD_DLL
+
+  IDL_Files {
+    PlanIngress.idl
+  }
+
+  Source_Files {
+    PlanIngressS.cpp
+  }
+
+  Header_Files {
+    PlanIngressS.h
+  }
+
+  Inline_Files {
+    PlanIngressS.inl
+  }
+}
diff --git a/TAO/CIAO/RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface_stub_export.h b/TAO/CIAO/RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface_stub_export.h
new file mode 100644
index 00000000000..7cbca0251fc
--- /dev/null
+++ b/TAO/CIAO/RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface_stub_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl PLAN_ANALYZER_INTERFACE_STUB
+// ------------------------------
+#ifndef PLAN_ANALYZER_INTERFACE_STUB_EXPORT_H
+#define PLAN_ANALYZER_INTERFACE_STUB_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (PLAN_ANALYZER_INTERFACE_STUB_HAS_DLL)
+#  define PLAN_ANALYZER_INTERFACE_STUB_HAS_DLL 1
+#endif /* ! PLAN_ANALYZER_INTERFACE_STUB_HAS_DLL */
+
+#if defined (PLAN_ANALYZER_INTERFACE_STUB_HAS_DLL) && (PLAN_ANALYZER_INTERFACE_STUB_HAS_DLL == 1)
+#  if defined (PLAN_ANALYZER_INTERFACE_STUB_BUILD_DLL)
+#    define PLAN_ANALYZER_INTERFACE_STUB_Export ACE_Proper_Export_Flag
+#    define PLAN_ANALYZER_INTERFACE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define PLAN_ANALYZER_INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* PLAN_ANALYZER_INTERFACE_STUB_BUILD_DLL */
+#    define PLAN_ANALYZER_INTERFACE_STUB_Export ACE_Proper_Import_Flag
+#    define PLAN_ANALYZER_INTERFACE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define PLAN_ANALYZER_INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* PLAN_ANALYZER_INTERFACE_STUB_BUILD_DLL */
+#else /* PLAN_ANALYZER_INTERFACE_STUB_HAS_DLL == 1 */
+#  define PLAN_ANALYZER_INTERFACE_STUB_Export
+#  define PLAN_ANALYZER_INTERFACE_STUB_SINGLETON_DECLARATION(T)
+#  define PLAN_ANALYZER_INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* PLAN_ANALYZER_INTERFACE_STUB_HAS_DLL == 1 */
+
+// Set PLAN_ANALYZER_INTERFACE_STUB_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (PLAN_ANALYZER_INTERFACE_STUB_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define PLAN_ANALYZER_INTERFACE_STUB_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define PLAN_ANALYZER_INTERFACE_STUB_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !PLAN_ANALYZER_INTERFACE_STUB_NTRACE */
+
+#if (PLAN_ANALYZER_INTERFACE_STUB_NTRACE == 1)
+#  define PLAN_ANALYZER_INTERFACE_STUB_TRACE(X)
+#else /* (PLAN_ANALYZER_INTERFACE_STUB_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define PLAN_ANALYZER_INTERFACE_STUB_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (PLAN_ANALYZER_INTERFACE_STUB_NTRACE == 1) */
+
+#endif /* PLAN_ANALYZER_INTERFACE_STUB_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface_svnt_export.h b/TAO/CIAO/RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface_svnt_export.h
new file mode 100644
index 00000000000..ceb90e37efb
--- /dev/null
+++ b/TAO/CIAO/RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface_svnt_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl PLAN_ANALYZER_INTERFACE_SVNT
+// ------------------------------
+#ifndef PLAN_ANALYZER_INTERFACE_SVNT_EXPORT_H
+#define PLAN_ANALYZER_INTERFACE_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (PLAN_ANALYZER_INTERFACE_SVNT_HAS_DLL)
+#  define PLAN_ANALYZER_INTERFACE_SVNT_HAS_DLL 1
+#endif /* ! PLAN_ANALYZER_INTERFACE_SVNT_HAS_DLL */
+
+#if defined (PLAN_ANALYZER_INTERFACE_SVNT_HAS_DLL) && (PLAN_ANALYZER_INTERFACE_SVNT_HAS_DLL == 1)
+#  if defined (PLAN_ANALYZER_INTERFACE_SVNT_BUILD_DLL)
+#    define PLAN_ANALYZER_INTERFACE_SVNT_Export ACE_Proper_Export_Flag
+#    define PLAN_ANALYZER_INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define PLAN_ANALYZER_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* PLAN_ANALYZER_INTERFACE_SVNT_BUILD_DLL */
+#    define PLAN_ANALYZER_INTERFACE_SVNT_Export ACE_Proper_Import_Flag
+#    define PLAN_ANALYZER_INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define PLAN_ANALYZER_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* PLAN_ANALYZER_INTERFACE_SVNT_BUILD_DLL */
+#else /* PLAN_ANALYZER_INTERFACE_SVNT_HAS_DLL == 1 */
+#  define PLAN_ANALYZER_INTERFACE_SVNT_Export
+#  define PLAN_ANALYZER_INTERFACE_SVNT_SINGLETON_DECLARATION(T)
+#  define PLAN_ANALYZER_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* PLAN_ANALYZER_INTERFACE_SVNT_HAS_DLL == 1 */
+
+// Set PLAN_ANALYZER_INTERFACE_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (PLAN_ANALYZER_INTERFACE_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define PLAN_ANALYZER_INTERFACE_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define PLAN_ANALYZER_INTERFACE_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !PLAN_ANALYZER_INTERFACE_SVNT_NTRACE */
+
+#if (PLAN_ANALYZER_INTERFACE_SVNT_NTRACE == 1)
+#  define PLAN_ANALYZER_INTERFACE_SVNT_TRACE(X)
+#else /* (PLAN_ANALYZER_INTERFACE_SVNT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define PLAN_ANALYZER_INTERFACE_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (PLAN_ANALYZER_INTERFACE_SVNT_NTRACE == 1) */
+
+#endif /* PLAN_ANALYZER_INTERFACE_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.cidl b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.cidl
new file mode 100644
index 00000000000..dcf42d8218c
--- /dev/null
+++ b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.cidl
@@ -0,0 +1,28 @@
+//$Id$
+//Planner_Manager.cidl
+
+#ifndef RACE_PLANNER_MANAGER_CIDL
+#define RACE_PLANNER_MANAGER_CIDL
+
+#include "Planner_Manager.idl"
+
+#include "../../Planners/Interface/Planner_I.idl"
+#include "../../Output_Adapters/Interface/PlanEgress.idl"
+
+module CIAO
+{
+  module RACE
+  {
+    
+    composition session Planner_Manager_Impl
+    {
+      home executor Planner_Manager_Home_Exec
+        {
+          implements RACE::Planner_Manager_Home;
+          manages    Planner_Manager_Exec;
+        };
+    };
+  };
+};
+
+#endif /* RACE_PLANNER_MANAGER_CIDL */
diff --git a/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.idl b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.idl
new file mode 100644
index 00000000000..81f2211af90
--- /dev/null
+++ b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.idl
@@ -0,0 +1,29 @@
+//$Id$
+#ifndef RACE_PLANNER_MANAGER_IDL
+#define RACE_PLANNER_MANAGER_IDL
+
+#include <Components.idl>
+#include "../Interface/Planner_Manager_I.idl"
+
+module CIAO
+{
+  module RACE
+  {
+    interface Planner_I;
+    interface PlanEgress;
+
+    component Planner_Manager
+    {
+      provides Planner_Manager_I planner_manager_i;
+      uses multiple Planner_I planners;
+      uses multiple PlanEgress outputs;
+      readonly attribute RACE_Classifications classes;
+    };
+
+    home Planner_Manager_Home manages Planner_Manager
+    {
+    };
+  };
+};
+
+#endif /* RACE_PLANNER_MANAGER_IDL */
diff --git a/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.mpc b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.mpc
new file mode 100644
index 00000000000..2991d0a4707
--- /dev/null
+++ b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.mpc
@@ -0,0 +1,105 @@
+// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
+// This file is generated with "generate_component_mpc.pl Planner_Manager"
+
+project(Planner_Manager_stub): ciao_deployment_stub {
+  after += Planner_Manager_Interface_stub \
+           Planner_Interface_stub \
+           Output_Adapter_Interface_stub
+  sharedname = Planner_Manager_stub
+  idlflags += -Sc \
+              -Wb,stub_export_macro=PLANNER_MANAGER_STUB_Export \
+              -Wb,stub_export_include=Planner_Manager_stub_export.h \
+              -Wb,skel_export_macro=PLANNER_MANAGER_SVNT_Export \
+              -Wb,skel_export_include=Planner_Manager_svnt_export.h
+  dynamicflags   = PLANNER_MANAGER_STUB_BUILD_DLL
+  libs += RACE_common_stub \
+          Planner_Manager_Interface_stub \
+          Planner_Interface_stub \
+          Output_Adapter_Interface_stub
+
+  IDL_Files {
+    Planner_Manager.idl
+  }
+
+  Source_Files {
+    Planner_ManagerC.cpp
+  }
+
+  Header_Files {
+    Planner_ManagerC.h
+  }
+
+  Inline_Files {
+    Planner_ManagerC.inl
+  }
+}
+
+project(Planner_Manager_svnt) : ciao_servant_dnc {
+  after += Planner_Manager_stub \
+           Planner_Manager_Interface_svnt
+  sharedname  = Planner_Manager_svnt
+  libs    += Planner_Manager_stub \
+             RACE_common_stub \
+             Planner_Manager_Interface_stub \
+             Planner_Manager_Interface_svnt \
+             Planner_Interface_stub \
+             Output_Adapter_Interface_stub
+  idlflags  +=  -Sc \
+                -Wb,export_macro=PLANNER_MANAGER_SVNT_Export \
+                -Wb,export_include=Planner_Manager_svnt_export.h
+
+  dynamicflags = PLANNER_MANAGER_SVNT_BUILD_DLL
+
+  CIDL_Files {
+    Planner_Manager.cidl
+  }
+
+  IDL_Files {
+    Planner_ManagerE.idl
+  }
+
+  Source_Files {
+    Planner_ManagerEC.cpp
+    Planner_ManagerS.cpp
+    Planner_Manager_svnt.cpp
+  }
+
+  Header_Files {
+    Planner_ManagerEC.h
+    Planner_ManagerS.h
+    Planner_Manager_svnt.h
+  }
+
+  Inline_Files {
+    Planner_ManagerEC.inl
+    Planner_ManagerS.inl
+    Planner_Manager_svnt.inl
+  }
+}
+
+
+project(Planner_Manager_exec) : ciao_component_dnc {
+  after   += Planner_Manager_svnt
+  sharedname = Planner_Manager_exec
+  libs    += Planner_Manager_stub \
+             Planner_Manager_svnt \
+             RACE_common_stub \
+             Planner_Manager_Interface_stub \
+             Planner_Manager_Interface_svnt \
+             Planner_Interface_stub \
+             Planner_stub \
+             Output_Adapter_Interface_stub
+  
+  idlflags  +=  -Sc \
+                -Wb,export_macro=PLANNER_MANAGER_EXEC_Export \
+                -Wb,export_include=Planner_Manager_exec_export.h
+  dynamicflags   = PLANNER_MANAGER_EXEC_BUILD_DLL
+
+  IDL_Files {
+    
+  }
+
+  Source_Files {
+    Planner_Manager_exec.cpp
+  }
+}
diff --git a/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.cpp b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.cpp
new file mode 100644
index 00000000000..6594d1a6271
--- /dev/null
+++ b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.cpp
@@ -0,0 +1,219 @@
+// $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 "Planner_Manager_exec.h"
+#include "ciao/CIAO_common.h"
+
+namespace CIAO
+{
+  namespace RACE
+  {
+    namespace CIDL_Planner_Manager_Impl
+    {
+      //==================================================================
+      // Facet Executor Implementation Class:   Planner_Manager_I_exec_i
+      //==================================================================
+
+      Planner_Manager_I_exec_i::Planner_Manager_I_exec_i (void)
+      {
+      }
+
+      Planner_Manager_I_exec_i::~Planner_Manager_I_exec_i (void)
+      {
+      }
+
+      // Operations from ::CIAO::RACE::Planner_Manager_I
+
+      void
+      Planner_Manager_I_exec_i::execute_planners (
+      const ::Deployment::DeploymentPlan & /* plan */,
+      const ::CIAO::RACE::PlannerFlow & /* flow */
+      ACE_ENV_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+      {
+        // Your code here.
+      }
+
+      //==================================================================
+      // Component Executor Implementation Class:   Planner_Manager_exec_i
+      //==================================================================
+
+      Planner_Manager_exec_i::Planner_Manager_exec_i (void)
+      {
+      }
+
+      Planner_Manager_exec_i::~Planner_Manager_exec_i (void)
+      {
+      }
+
+      // Supported or inherited operations.
+
+      // Attribute operations.
+
+      ::CIAO::RACE::RACE_Classifications *
+      Planner_Manager_exec_i::classes (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+      {
+        // Your code here.
+        return 0;
+      }
+
+      // Port operations.
+
+      ::CIAO::RACE::CCM_Planner_Manager_I_ptr
+      Planner_Manager_exec_i::get_planner_manager_i (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+      {
+        // Your code here.
+        return ::CIAO::RACE::CCM_Planner_Manager_I::_nil ();
+      }
+
+      // Operations from Components::SessionComponent
+
+      void
+      Planner_Manager_exec_i::set_session_context (
+      ::Components::SessionContext_ptr ctx
+      ACE_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((
+      ::CORBA::SystemException,
+      ::Components::CCMException))
+      {
+        this->context_ =
+        Planner_Manager_Context::_narrow (
+        ctx
+        ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK;
+
+        if (this->context_ == 0)
+        {
+          ACE_THROW (CORBA::INTERNAL ());
+        }
+      }
+
+      void
+      Planner_Manager_exec_i::ciao_preactivate (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((
+      ::CORBA::SystemException,
+      ::Components::CCMException))
+      {
+        // Your code here.
+      }
+
+      void
+      Planner_Manager_exec_i::ciao_postactivate (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((
+      ::CORBA::SystemException,
+      ::Components::CCMException))
+      {
+        // Your code here.
+      }
+
+      void
+      Planner_Manager_exec_i::ccm_activate (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((
+      ::CORBA::SystemException,
+      ::Components::CCMException))
+      {
+        // Your code here.
+      }
+
+      void
+      Planner_Manager_exec_i::ccm_passivate (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((
+      ::CORBA::SystemException,
+      ::Components::CCMException))
+      {
+        // Your code here.
+      }
+
+      void
+      Planner_Manager_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:   Planner_Manager_Home_exec_i
+      //==================================================================
+
+      Planner_Manager_Home_exec_i::Planner_Manager_Home_exec_i (void)
+      {
+      }
+
+      Planner_Manager_Home_exec_i::~Planner_Manager_Home_exec_i (void)
+      {
+      }
+
+      // Supported or inherited operations.
+
+      // Home operations.
+
+      // Factory and finder operations.
+
+      // Attribute operations.
+
+      // Implicit operations.
+
+      ::Components::EnterpriseComponent_ptr
+      Planner_Manager_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,
+        Planner_Manager_exec_i,
+        CORBA::NO_MEMORY ());
+        ACE_CHECK_RETURN (::Components::EnterpriseComponent::_nil ());
+
+        return retval;
+      }
+
+      extern "C" PLANNER_MANAGER_EXEC_Export ::Components::HomeExecutorBase_ptr
+      createPlanner_Manager_Home_Impl (void)
+      {
+        ::Components::HomeExecutorBase_ptr retval =
+        ::Components::HomeExecutorBase::_nil ();
+
+        ACE_NEW_RETURN (
+        retval,
+        Planner_Manager_Home_exec_i,
+        ::Components::HomeExecutorBase::_nil ());
+
+        return retval;
+      }
+    }
+  }
+}
+
diff --git a/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.h b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.h
new file mode 100644
index 00000000000..f3688075017
--- /dev/null
+++ b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.h
@@ -0,0 +1,167 @@
+// $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_PLANNER_MANAGER_EXEC_H
+#define CIAO_PLANNER_MANAGER_EXEC_H
+
+#include /**/ "ace/pre.h"
+
+#include "Planner_Manager_svnt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "Planner_Manager_exec_export.h"
+#include "tao/LocalObject.h"
+
+namespace CIAO
+{
+  namespace RACE
+  {
+    namespace CIDL_Planner_Manager_Impl
+    {
+      class PLANNER_MANAGER_EXEC_Export Planner_Manager_I_exec_i
+      : public virtual ::CIAO::RACE::CCM_Planner_Manager_I,
+      public virtual TAO_Local_RefCounted_Object
+      {
+        public:
+        Planner_Manager_I_exec_i (void);
+        virtual ~Planner_Manager_I_exec_i (void);
+
+        // Operations from ::CIAO::RACE::Planner_Manager_I
+
+        virtual void
+        execute_planners (
+        const ::Deployment::DeploymentPlan & plan,
+        const ::CIAO::RACE::PlannerFlow & flow
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+      };
+
+      class PLANNER_MANAGER_EXEC_Export Planner_Manager_exec_i
+      : public virtual Planner_Manager_Exec,
+      public virtual TAO_Local_RefCounted_Object
+      {
+        public:
+        Planner_Manager_exec_i (void);
+        virtual ~Planner_Manager_exec_i (void);
+
+        // Supported or inherited operations.
+
+        // Attribute operations.
+
+        virtual ::CIAO::RACE::RACE_Classifications *
+        classes (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+        // Port operations.
+
+        virtual ::CIAO::RACE::CCM_Planner_Manager_I_ptr
+        get_planner_manager_i (
+        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:
+        Planner_Manager_Context *context_;
+      };
+
+      class PLANNER_MANAGER_EXEC_Export Planner_Manager_Home_exec_i
+      : public virtual Planner_Manager_Home_Exec,
+      public virtual TAO_Local_RefCounted_Object
+      {
+        public:
+        Planner_Manager_Home_exec_i (void);
+        virtual ~Planner_Manager_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" PLANNER_MANAGER_EXEC_Export ::Components::HomeExecutorBase_ptr
+      createPlanner_Manager_Home_Impl (void);
+    }
+  }
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* CIAO_PLANNER_MANAGER_EXEC_H */
+
diff --git a/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec_export.h b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec_export.h
new file mode 100644
index 00000000000..776022c36d3
--- /dev/null
+++ b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl PLANNER_MANAGER_EXEC
+// ------------------------------
+#ifndef PLANNER_MANAGER_EXEC_EXPORT_H
+#define PLANNER_MANAGER_EXEC_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (PLANNER_MANAGER_EXEC_HAS_DLL)
+#  define PLANNER_MANAGER_EXEC_HAS_DLL 1
+#endif /* ! PLANNER_MANAGER_EXEC_HAS_DLL */
+
+#if defined (PLANNER_MANAGER_EXEC_HAS_DLL) && (PLANNER_MANAGER_EXEC_HAS_DLL == 1)
+#  if defined (PLANNER_MANAGER_EXEC_BUILD_DLL)
+#    define PLANNER_MANAGER_EXEC_Export ACE_Proper_Export_Flag
+#    define PLANNER_MANAGER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define PLANNER_MANAGER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* PLANNER_MANAGER_EXEC_BUILD_DLL */
+#    define PLANNER_MANAGER_EXEC_Export ACE_Proper_Import_Flag
+#    define PLANNER_MANAGER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define PLANNER_MANAGER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* PLANNER_MANAGER_EXEC_BUILD_DLL */
+#else /* PLANNER_MANAGER_EXEC_HAS_DLL == 1 */
+#  define PLANNER_MANAGER_EXEC_Export
+#  define PLANNER_MANAGER_EXEC_SINGLETON_DECLARATION(T)
+#  define PLANNER_MANAGER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* PLANNER_MANAGER_EXEC_HAS_DLL == 1 */
+
+// Set PLANNER_MANAGER_EXEC_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (PLANNER_MANAGER_EXEC_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define PLANNER_MANAGER_EXEC_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define PLANNER_MANAGER_EXEC_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !PLANNER_MANAGER_EXEC_NTRACE */
+
+#if (PLANNER_MANAGER_EXEC_NTRACE == 1)
+#  define PLANNER_MANAGER_EXEC_TRACE(X)
+#else /* (PLANNER_MANAGER_EXEC_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define PLANNER_MANAGER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (PLANNER_MANAGER_EXEC_NTRACE == 1) */
+
+#endif /* PLANNER_MANAGER_EXEC_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager_stub_export.h b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager_stub_export.h
new file mode 100644
index 00000000000..17a15f1cf30
--- /dev/null
+++ b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager_stub_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl PLANNER_MANAGER_STUB
+// ------------------------------
+#ifndef PLANNER_MANAGER_STUB_EXPORT_H
+#define PLANNER_MANAGER_STUB_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (PLANNER_MANAGER_STUB_HAS_DLL)
+#  define PLANNER_MANAGER_STUB_HAS_DLL 1
+#endif /* ! PLANNER_MANAGER_STUB_HAS_DLL */
+
+#if defined (PLANNER_MANAGER_STUB_HAS_DLL) && (PLANNER_MANAGER_STUB_HAS_DLL == 1)
+#  if defined (PLANNER_MANAGER_STUB_BUILD_DLL)
+#    define PLANNER_MANAGER_STUB_Export ACE_Proper_Export_Flag
+#    define PLANNER_MANAGER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define PLANNER_MANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* PLANNER_MANAGER_STUB_BUILD_DLL */
+#    define PLANNER_MANAGER_STUB_Export ACE_Proper_Import_Flag
+#    define PLANNER_MANAGER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define PLANNER_MANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* PLANNER_MANAGER_STUB_BUILD_DLL */
+#else /* PLANNER_MANAGER_STUB_HAS_DLL == 1 */
+#  define PLANNER_MANAGER_STUB_Export
+#  define PLANNER_MANAGER_STUB_SINGLETON_DECLARATION(T)
+#  define PLANNER_MANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* PLANNER_MANAGER_STUB_HAS_DLL == 1 */
+
+// Set PLANNER_MANAGER_STUB_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (PLANNER_MANAGER_STUB_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define PLANNER_MANAGER_STUB_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define PLANNER_MANAGER_STUB_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !PLANNER_MANAGER_STUB_NTRACE */
+
+#if (PLANNER_MANAGER_STUB_NTRACE == 1)
+#  define PLANNER_MANAGER_STUB_TRACE(X)
+#else /* (PLANNER_MANAGER_STUB_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define PLANNER_MANAGER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (PLANNER_MANAGER_STUB_NTRACE == 1) */
+
+#endif /* PLANNER_MANAGER_STUB_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager_svnt_export.h b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager_svnt_export.h
new file mode 100644
index 00000000000..bdc3cfac970
--- /dev/null
+++ b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager_svnt_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl PLANNER_MANAGER_SVNT
+// ------------------------------
+#ifndef PLANNER_MANAGER_SVNT_EXPORT_H
+#define PLANNER_MANAGER_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (PLANNER_MANAGER_SVNT_HAS_DLL)
+#  define PLANNER_MANAGER_SVNT_HAS_DLL 1
+#endif /* ! PLANNER_MANAGER_SVNT_HAS_DLL */
+
+#if defined (PLANNER_MANAGER_SVNT_HAS_DLL) && (PLANNER_MANAGER_SVNT_HAS_DLL == 1)
+#  if defined (PLANNER_MANAGER_SVNT_BUILD_DLL)
+#    define PLANNER_MANAGER_SVNT_Export ACE_Proper_Export_Flag
+#    define PLANNER_MANAGER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define PLANNER_MANAGER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* PLANNER_MANAGER_SVNT_BUILD_DLL */
+#    define PLANNER_MANAGER_SVNT_Export ACE_Proper_Import_Flag
+#    define PLANNER_MANAGER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define PLANNER_MANAGER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* PLANNER_MANAGER_SVNT_BUILD_DLL */
+#else /* PLANNER_MANAGER_SVNT_HAS_DLL == 1 */
+#  define PLANNER_MANAGER_SVNT_Export
+#  define PLANNER_MANAGER_SVNT_SINGLETON_DECLARATION(T)
+#  define PLANNER_MANAGER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* PLANNER_MANAGER_SVNT_HAS_DLL == 1 */
+
+// Set PLANNER_MANAGER_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (PLANNER_MANAGER_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define PLANNER_MANAGER_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define PLANNER_MANAGER_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !PLANNER_MANAGER_SVNT_NTRACE */
+
+#if (PLANNER_MANAGER_SVNT_NTRACE == 1)
+#  define PLANNER_MANAGER_SVNT_TRACE(X)
+#else /* (PLANNER_MANAGER_SVNT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define PLANNER_MANAGER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (PLANNER_MANAGER_SVNT_NTRACE == 1) */
+
+#endif /* PLANNER_MANAGER_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_I.idl b/TAO/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_I.idl
new file mode 100644
index 00000000000..560a2ad92b1
--- /dev/null
+++ b/TAO/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_I.idl
@@ -0,0 +1,24 @@
+//$Id$
+#ifndef RACE_PLANNER_MANAGER_I_IDL
+#define RACE_PLANNER_MANAGER_I_IDL
+
+#ifndef INCLUDED_DEPLOYMENT_DATA
+#define INCLUDED_DEPLOYMENT_DATA
+#include "Deployment_Data.idl"
+#endif
+
+#include "../../common/RACE_common.idl"
+
+module CIAO
+{
+  module RACE
+  {
+    interface Planner_Manager_I
+    {
+      void execute_planners (in Deployment::DeploymentPlan plan,
+                             in PlannerFlow flow);
+    };
+  };
+};
+
+#endif /* RACE_PLANNER_MANAGER_I_IDL */
diff --git a/TAO/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_Interface.mpc b/TAO/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_Interface.mpc
new file mode 100644
index 00000000000..211b9e2eb99
--- /dev/null
+++ b/TAO/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_Interface.mpc
@@ -0,0 +1,61 @@
+// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
+// This file is generated with "generate_component_mpc.pl -n Planner_Manager_Interface"
+
+project(Planner_Manager_Interface_stub): ciao_deployment_stub, anytypecode {
+
+  sharedname = Planner_Manager_Interface_stub
+  after += RACE_common_stub
+  idlflags += -Sc \
+              -Wb,stub_export_macro=PLANNER_MANAGER_INTERFACE_STUB_Export \
+              -Wb,stub_export_include=Planner_Manager_Interface_stub_export.h \
+              -Wb,skel_export_macro=PLANNER_MANAGER_INTERFACE_SVNT_Export \
+              -Wb,skel_export_include=Planner_Manager_Interface_svnt_export.h
+  dynamicflags   = PLANNER_MANAGER_INTERFACE_STUB_BUILD_DLL
+  libs += RACE_common_stub
+
+  IDL_Files {
+    Planner_Manager_I.idl
+  }
+
+  Source_Files {
+    Planner_Manager_IC.cpp
+  }
+
+  Header_Files {
+    Planner_Manager_IC.h
+  }
+
+  Inline_Files {
+    Planner_Manager_IC.inl
+  }
+}
+
+project(Planner_Manager_Interface_svnt) : ciao_servant_dnc {
+
+  after +=  Planner_Manager_Interface_stub
+  sharedname  = Planner_Manager_Interface_svnt
+  libs    += Planner_Manager_Interface_stub RACE_common_stub
+
+  idlflags += -Sc \
+              -Wb,stub_export_macro=PLANNER_MANAGER_INTERFACE_STUB_Export \
+              -Wb,stub_export_include=Planner_Manager_Interface_stub_export.h \
+              -Wb,skel_export_macro=PLANNER_MANAGER_INTERFACE_SVNT_Export \
+              -Wb,skel_export_include=Planner_Manager_Interface_svnt_export.h
+  dynamicflags = PLANNER_MANAGER_INTERFACE_SVNT_BUILD_DLL
+
+  IDL_Files {
+    Planner_Manager_I.idl
+  }
+
+  Source_Files {
+    Planner_Manager_IS.cpp
+  }
+
+  Header_Files {
+    Planner_Manager_IS.h
+  }
+
+  Inline_Files {
+    Planner_Manager_IS.inl
+  }
+}
diff --git a/TAO/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_Interface_stub_export.h b/TAO/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_Interface_stub_export.h
new file mode 100644
index 00000000000..32a583b5346
--- /dev/null
+++ b/TAO/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_Interface_stub_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl PLANNER_MANAGER_INTERFACE_STUB
+// ------------------------------
+#ifndef PLANNER_MANAGER_INTERFACE_STUB_EXPORT_H
+#define PLANNER_MANAGER_INTERFACE_STUB_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (PLANNER_MANAGER_INTERFACE_STUB_HAS_DLL)
+#  define PLANNER_MANAGER_INTERFACE_STUB_HAS_DLL 1
+#endif /* ! PLANNER_MANAGER_INTERFACE_STUB_HAS_DLL */
+
+#if defined (PLANNER_MANAGER_INTERFACE_STUB_HAS_DLL) && (PLANNER_MANAGER_INTERFACE_STUB_HAS_DLL == 1)
+#  if defined (PLANNER_MANAGER_INTERFACE_STUB_BUILD_DLL)
+#    define PLANNER_MANAGER_INTERFACE_STUB_Export ACE_Proper_Export_Flag
+#    define PLANNER_MANAGER_INTERFACE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define PLANNER_MANAGER_INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* PLANNER_MANAGER_INTERFACE_STUB_BUILD_DLL */
+#    define PLANNER_MANAGER_INTERFACE_STUB_Export ACE_Proper_Import_Flag
+#    define PLANNER_MANAGER_INTERFACE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define PLANNER_MANAGER_INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* PLANNER_MANAGER_INTERFACE_STUB_BUILD_DLL */
+#else /* PLANNER_MANAGER_INTERFACE_STUB_HAS_DLL == 1 */
+#  define PLANNER_MANAGER_INTERFACE_STUB_Export
+#  define PLANNER_MANAGER_INTERFACE_STUB_SINGLETON_DECLARATION(T)
+#  define PLANNER_MANAGER_INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* PLANNER_MANAGER_INTERFACE_STUB_HAS_DLL == 1 */
+
+// Set PLANNER_MANAGER_INTERFACE_STUB_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (PLANNER_MANAGER_INTERFACE_STUB_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define PLANNER_MANAGER_INTERFACE_STUB_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define PLANNER_MANAGER_INTERFACE_STUB_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !PLANNER_MANAGER_INTERFACE_STUB_NTRACE */
+
+#if (PLANNER_MANAGER_INTERFACE_STUB_NTRACE == 1)
+#  define PLANNER_MANAGER_INTERFACE_STUB_TRACE(X)
+#else /* (PLANNER_MANAGER_INTERFACE_STUB_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define PLANNER_MANAGER_INTERFACE_STUB_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (PLANNER_MANAGER_INTERFACE_STUB_NTRACE == 1) */
+
+#endif /* PLANNER_MANAGER_INTERFACE_STUB_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_Interface_svnt_export.h b/TAO/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_Interface_svnt_export.h
new file mode 100644
index 00000000000..6e554a1d5ed
--- /dev/null
+++ b/TAO/CIAO/RACE/Planner_Manager/Interface/Planner_Manager_Interface_svnt_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl PLANNER_MANAGER_INTERFACE_SVNT
+// ------------------------------
+#ifndef PLANNER_MANAGER_INTERFACE_SVNT_EXPORT_H
+#define PLANNER_MANAGER_INTERFACE_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (PLANNER_MANAGER_INTERFACE_SVNT_HAS_DLL)
+#  define PLANNER_MANAGER_INTERFACE_SVNT_HAS_DLL 1
+#endif /* ! PLANNER_MANAGER_INTERFACE_SVNT_HAS_DLL */
+
+#if defined (PLANNER_MANAGER_INTERFACE_SVNT_HAS_DLL) && (PLANNER_MANAGER_INTERFACE_SVNT_HAS_DLL == 1)
+#  if defined (PLANNER_MANAGER_INTERFACE_SVNT_BUILD_DLL)
+#    define PLANNER_MANAGER_INTERFACE_SVNT_Export ACE_Proper_Export_Flag
+#    define PLANNER_MANAGER_INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define PLANNER_MANAGER_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* PLANNER_MANAGER_INTERFACE_SVNT_BUILD_DLL */
+#    define PLANNER_MANAGER_INTERFACE_SVNT_Export ACE_Proper_Import_Flag
+#    define PLANNER_MANAGER_INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define PLANNER_MANAGER_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* PLANNER_MANAGER_INTERFACE_SVNT_BUILD_DLL */
+#else /* PLANNER_MANAGER_INTERFACE_SVNT_HAS_DLL == 1 */
+#  define PLANNER_MANAGER_INTERFACE_SVNT_Export
+#  define PLANNER_MANAGER_INTERFACE_SVNT_SINGLETON_DECLARATION(T)
+#  define PLANNER_MANAGER_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* PLANNER_MANAGER_INTERFACE_SVNT_HAS_DLL == 1 */
+
+// Set PLANNER_MANAGER_INTERFACE_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (PLANNER_MANAGER_INTERFACE_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define PLANNER_MANAGER_INTERFACE_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define PLANNER_MANAGER_INTERFACE_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !PLANNER_MANAGER_INTERFACE_SVNT_NTRACE */
+
+#if (PLANNER_MANAGER_INTERFACE_SVNT_NTRACE == 1)
+#  define PLANNER_MANAGER_INTERFACE_SVNT_TRACE(X)
+#else /* (PLANNER_MANAGER_INTERFACE_SVNT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define PLANNER_MANAGER_INTERFACE_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (PLANNER_MANAGER_INTERFACE_SVNT_NTRACE == 1) */
+
+#endif /* PLANNER_MANAGER_INTERFACE_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Planners/Base/Planner.idl b/TAO/CIAO/RACE/Planners/Base/Planner.idl
new file mode 100644
index 00000000000..ae81074d5e7
--- /dev/null
+++ b/TAO/CIAO/RACE/Planners/Base/Planner.idl
@@ -0,0 +1,24 @@
+// $Id$
+#ifndef RACE_PLANNER_IDL
+#define RACE_PLANNER_IDL
+
+#include <Components.idl>
+#include "../Interface/Planner_I.idl"
+#include "../../common/RACE_common.idl"
+
+module CIAO
+{
+  
+  module RACE
+  {
+    component Planner
+    {
+      provides Planner_I planner_i;
+      attribute string name;
+      attribute RACE_Classification type;
+    };
+  };
+  
+};
+
+#endif /* RACE_PLANNER_IDL */
diff --git a/TAO/CIAO/RACE/Planners/Base/Planner.mpc b/TAO/CIAO/RACE/Planners/Base/Planner.mpc
new file mode 100644
index 00000000000..841c845df85
--- /dev/null
+++ b/TAO/CIAO/RACE/Planners/Base/Planner.mpc
@@ -0,0 +1,61 @@
+// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
+// This file is generated with "generate_component_mpc.pl -n Planner"
+
+project(Planner_stub): ciao_deployment_stub {
+
+  after += Planner_Interface_stub RACE_common_stub
+  sharedname = Planner_stub
+  idlflags += -Sc \
+              -Wb,stub_export_macro=PLANNER_STUB_Export \
+              -Wb,stub_export_include=Planner_stub_export.h \
+              -Wb,skel_export_macro=PLANNER_SVNT_Export \
+              -Wb,skel_export_include=Planner_svnt_export.h
+  dynamicflags   = PLANNER_STUB_BUILD_DLL
+  libs += Planner_Interface_stub RACE_common_stub
+
+  IDL_Files {
+    Planner.idl
+  }
+
+  Source_Files {
+    PlannerC.cpp
+  }
+
+  Header_Files {
+    PlannerC.h
+  }
+
+  Inline_Files {
+    PlannerC.inl
+  }
+}
+
+project(Planner_svnt) : ciao_servant_dnc {
+
+  after +=  Planner_Interface_svnt Planner_stub
+  sharedname  = Planner_svnt
+  libs    += Planner_Interface_stub Planner_Interface_svnt Planner_stub RACE_common_stub
+
+  idlflags += -Sc \
+              -Wb,stub_export_macro=PLANNER_STUB_Export \
+              -Wb,stub_export_include=Planner_stub_export.h \
+              -Wb,skel_export_macro=PLANNER_SVNT_Export \
+              -Wb,skel_export_include=Planner_svnt_export.h
+  dynamicflags = PLANNER_SVNT_BUILD_DLL
+
+  IDL_Files {
+    Planner.idl
+  }
+
+  Source_Files {
+    PlannerS.cpp
+  }
+
+  Header_Files {
+    PlannerS.h
+  }
+
+  Inline_Files {
+    PlannerS.inl
+  }
+}
diff --git a/TAO/CIAO/RACE/Planners/Base/Planner_stub_export.h b/TAO/CIAO/RACE/Planners/Base/Planner_stub_export.h
new file mode 100644
index 00000000000..d9c9c352052
--- /dev/null
+++ b/TAO/CIAO/RACE/Planners/Base/Planner_stub_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl PLANNER_STUB
+// ------------------------------
+#ifndef PLANNER_STUB_EXPORT_H
+#define PLANNER_STUB_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (PLANNER_STUB_HAS_DLL)
+#  define PLANNER_STUB_HAS_DLL 1
+#endif /* ! PLANNER_STUB_HAS_DLL */
+
+#if defined (PLANNER_STUB_HAS_DLL) && (PLANNER_STUB_HAS_DLL == 1)
+#  if defined (PLANNER_STUB_BUILD_DLL)
+#    define PLANNER_STUB_Export ACE_Proper_Export_Flag
+#    define PLANNER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define PLANNER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* PLANNER_STUB_BUILD_DLL */
+#    define PLANNER_STUB_Export ACE_Proper_Import_Flag
+#    define PLANNER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define PLANNER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* PLANNER_STUB_BUILD_DLL */
+#else /* PLANNER_STUB_HAS_DLL == 1 */
+#  define PLANNER_STUB_Export
+#  define PLANNER_STUB_SINGLETON_DECLARATION(T)
+#  define PLANNER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* PLANNER_STUB_HAS_DLL == 1 */
+
+// Set PLANNER_STUB_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (PLANNER_STUB_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define PLANNER_STUB_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define PLANNER_STUB_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !PLANNER_STUB_NTRACE */
+
+#if (PLANNER_STUB_NTRACE == 1)
+#  define PLANNER_STUB_TRACE(X)
+#else /* (PLANNER_STUB_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define PLANNER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (PLANNER_STUB_NTRACE == 1) */
+
+#endif /* PLANNER_STUB_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Planners/Base/Planner_svnt_export.h b/TAO/CIAO/RACE/Planners/Base/Planner_svnt_export.h
new file mode 100644
index 00000000000..1773748e72b
--- /dev/null
+++ b/TAO/CIAO/RACE/Planners/Base/Planner_svnt_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl PLANNER_SVNT
+// ------------------------------
+#ifndef PLANNER_SVNT_EXPORT_H
+#define PLANNER_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (PLANNER_SVNT_HAS_DLL)
+#  define PLANNER_SVNT_HAS_DLL 1
+#endif /* ! PLANNER_SVNT_HAS_DLL */
+
+#if defined (PLANNER_SVNT_HAS_DLL) && (PLANNER_SVNT_HAS_DLL == 1)
+#  if defined (PLANNER_SVNT_BUILD_DLL)
+#    define PLANNER_SVNT_Export ACE_Proper_Export_Flag
+#    define PLANNER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define PLANNER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* PLANNER_SVNT_BUILD_DLL */
+#    define PLANNER_SVNT_Export ACE_Proper_Import_Flag
+#    define PLANNER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define PLANNER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* PLANNER_SVNT_BUILD_DLL */
+#else /* PLANNER_SVNT_HAS_DLL == 1 */
+#  define PLANNER_SVNT_Export
+#  define PLANNER_SVNT_SINGLETON_DECLARATION(T)
+#  define PLANNER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* PLANNER_SVNT_HAS_DLL == 1 */
+
+// Set PLANNER_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (PLANNER_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define PLANNER_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define PLANNER_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !PLANNER_SVNT_NTRACE */
+
+#if (PLANNER_SVNT_NTRACE == 1)
+#  define PLANNER_SVNT_TRACE(X)
+#else /* (PLANNER_SVNT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define PLANNER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (PLANNER_SVNT_NTRACE == 1) */
+
+#endif /* PLANNER_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Planners/Interface/Planner_I.idl b/TAO/CIAO/RACE/Planners/Interface/Planner_I.idl
new file mode 100644
index 00000000000..b947c132540
--- /dev/null
+++ b/TAO/CIAO/RACE/Planners/Interface/Planner_I.idl
@@ -0,0 +1,22 @@
+// $Id$
+#ifndef RACE_PLANNER_I_IDL
+#define RACE_PLANNER_I_IDL
+
+#ifndef INCLUDED_DEPLOYMENT_DATA
+#define INCLUDED_DEPLOYMENT_DATA
+#include "Deployment_Data.idl"
+#endif
+
+module CIAO
+{
+  
+  module RACE
+  {
+    interface Planner_I
+    {
+      boolean process_plan (inout Deployment::DeploymentPlan plan);
+    };
+  };
+};
+
+#endif /* RACE_PLANNER_I_IDL */
diff --git a/TAO/CIAO/RACE/Planners/Interface/Planner_Interface.mpc b/TAO/CIAO/RACE/Planners/Interface/Planner_Interface.mpc
new file mode 100644
index 00000000000..55f11d63cc4
--- /dev/null
+++ b/TAO/CIAO/RACE/Planners/Interface/Planner_Interface.mpc
@@ -0,0 +1,59 @@
+// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
+// This file is generated with "generate_component_mpc.pl -n Planner_I"
+
+project(Planner_Interface_stub): ciao_deployment_stub {
+
+  sharedname = Planner_Interface_stub
+  idlflags += -Sc \
+              -Wb,stub_export_macro=PLANNER_INTERFACE_STUB_Export \
+              -Wb,stub_export_include=Planner_Interface_stub_export.h \
+              -Wb,skel_export_macro=PLANNER_INTERFACE_SVNT_Export \
+              -Wb,skel_export_include=Planner_Interface_svnt_export.h
+  dynamicflags   = PLANNER_INTERFACE_STUB_BUILD_DLL
+
+  IDL_Files {
+    Planner_I.idl
+  }
+
+  Source_Files {
+    Planner_IC.cpp
+  }
+
+  Header_Files {
+    Planner_IC.h
+  }
+
+  Inline_Files {
+    Planner_IC.inl
+  }
+}
+
+project(Planner_Interface_svnt) : ciao_servant_dnc {
+
+  after +=  Planner_Interface_stub
+  sharedname  = Planner_Interface_svnt
+  libs    += Planner_Interface_stub
+
+  idlflags += -Sc \
+              -Wb,stub_export_macro=PLANNER_INTERFACE_STUB_Export \
+              -Wb,stub_export_include=Planner_Interface_stub_export.h \
+              -Wb,skel_export_macro=PLANNER_INTERFACE_SVNT_Export \
+              -Wb,skel_export_include=Planner_Interface_svnt_export.h
+  dynamicflags = PLANNER_INTERFACE_SVNT_BUILD_DLL
+
+  IDL_Files {
+    Planner_I.idl
+  }
+
+  Source_Files {
+    Planner_IS.cpp
+  }
+
+  Header_Files {
+    Planner_IS.h
+  }
+
+  Inline_Files {
+    Planner_IS.inl
+  }
+}
diff --git a/TAO/CIAO/RACE/Planners/Interface/Planner_Interface_stub_export.h b/TAO/CIAO/RACE/Planners/Interface/Planner_Interface_stub_export.h
new file mode 100644
index 00000000000..70e6da56ba0
--- /dev/null
+++ b/TAO/CIAO/RACE/Planners/Interface/Planner_Interface_stub_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl PLANNER_INTERFACE_STUB
+// ------------------------------
+#ifndef PLANNER_INTERFACE_STUB_EXPORT_H
+#define PLANNER_INTERFACE_STUB_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (PLANNER_INTERFACE_STUB_HAS_DLL)
+#  define PLANNER_INTERFACE_STUB_HAS_DLL 1
+#endif /* ! PLANNER_INTERFACE_STUB_HAS_DLL */
+
+#if defined (PLANNER_INTERFACE_STUB_HAS_DLL) && (PLANNER_INTERFACE_STUB_HAS_DLL == 1)
+#  if defined (PLANNER_INTERFACE_STUB_BUILD_DLL)
+#    define PLANNER_INTERFACE_STUB_Export ACE_Proper_Export_Flag
+#    define PLANNER_INTERFACE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define PLANNER_INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* PLANNER_INTERFACE_STUB_BUILD_DLL */
+#    define PLANNER_INTERFACE_STUB_Export ACE_Proper_Import_Flag
+#    define PLANNER_INTERFACE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define PLANNER_INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* PLANNER_INTERFACE_STUB_BUILD_DLL */
+#else /* PLANNER_INTERFACE_STUB_HAS_DLL == 1 */
+#  define PLANNER_INTERFACE_STUB_Export
+#  define PLANNER_INTERFACE_STUB_SINGLETON_DECLARATION(T)
+#  define PLANNER_INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* PLANNER_INTERFACE_STUB_HAS_DLL == 1 */
+
+// Set PLANNER_INTERFACE_STUB_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (PLANNER_INTERFACE_STUB_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define PLANNER_INTERFACE_STUB_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define PLANNER_INTERFACE_STUB_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !PLANNER_INTERFACE_STUB_NTRACE */
+
+#if (PLANNER_INTERFACE_STUB_NTRACE == 1)
+#  define PLANNER_INTERFACE_STUB_TRACE(X)
+#else /* (PLANNER_INTERFACE_STUB_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define PLANNER_INTERFACE_STUB_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (PLANNER_INTERFACE_STUB_NTRACE == 1) */
+
+#endif /* PLANNER_INTERFACE_STUB_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Planners/Interface/Planner_Interface_svnt_export.h b/TAO/CIAO/RACE/Planners/Interface/Planner_Interface_svnt_export.h
new file mode 100644
index 00000000000..5ff8283551c
--- /dev/null
+++ b/TAO/CIAO/RACE/Planners/Interface/Planner_Interface_svnt_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl PLANNER_INTERFACE_SVNT
+// ------------------------------
+#ifndef PLANNER_INTERFACE_SVNT_EXPORT_H
+#define PLANNER_INTERFACE_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (PLANNER_INTERFACE_SVNT_HAS_DLL)
+#  define PLANNER_INTERFACE_SVNT_HAS_DLL 1
+#endif /* ! PLANNER_INTERFACE_SVNT_HAS_DLL */
+
+#if defined (PLANNER_INTERFACE_SVNT_HAS_DLL) && (PLANNER_INTERFACE_SVNT_HAS_DLL == 1)
+#  if defined (PLANNER_INTERFACE_SVNT_BUILD_DLL)
+#    define PLANNER_INTERFACE_SVNT_Export ACE_Proper_Export_Flag
+#    define PLANNER_INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define PLANNER_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* PLANNER_INTERFACE_SVNT_BUILD_DLL */
+#    define PLANNER_INTERFACE_SVNT_Export ACE_Proper_Import_Flag
+#    define PLANNER_INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define PLANNER_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* PLANNER_INTERFACE_SVNT_BUILD_DLL */
+#else /* PLANNER_INTERFACE_SVNT_HAS_DLL == 1 */
+#  define PLANNER_INTERFACE_SVNT_Export
+#  define PLANNER_INTERFACE_SVNT_SINGLETON_DECLARATION(T)
+#  define PLANNER_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* PLANNER_INTERFACE_SVNT_HAS_DLL == 1 */
+
+// Set PLANNER_INTERFACE_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (PLANNER_INTERFACE_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define PLANNER_INTERFACE_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define PLANNER_INTERFACE_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !PLANNER_INTERFACE_SVNT_NTRACE */
+
+#if (PLANNER_INTERFACE_SVNT_NTRACE == 1)
+#  define PLANNER_INTERFACE_SVNT_TRACE(X)
+#else /* (PLANNER_INTERFACE_SVNT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define PLANNER_INTERFACE_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (PLANNER_INTERFACE_SVNT_NTRACE == 1) */
+
+#endif /* PLANNER_INTERFACE_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.cidl b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.cidl
new file mode 100644
index 00000000000..a3ddd75b824
--- /dev/null
+++ b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.cidl
@@ -0,0 +1,25 @@
+//SimpleBinPacker.cidl
+// $Id$
+
+#ifndef RACE_SIMPLE_BIN_PACKER_CIDL
+#define RACE_SIMPLE_BIN_PACKER_CIDL
+
+#include "SimpleBinPacker.idl"
+
+module CIAO
+{
+  module RACE
+  {
+    composition session SimpleBinPacker_Impl
+    {
+      home executor SimpleBinPacker_Home_Exec
+        {
+          implements RACE::SimpleBinPacker_Home;
+          manages    SimpleBinPacker_Exec;
+        };
+    };
+  };
+};
+
+
+#endif /* RACE_SIMPLE_BIN_PACKER_CIDL */
diff --git a/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.idl b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.idl
new file mode 100644
index 00000000000..bb1a67e4a79
--- /dev/null
+++ b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.idl
@@ -0,0 +1,23 @@
+//$Id$
+
+#ifndef RACE_SIMPLE_BIN_PACKER_IDL
+#define RACE_SIMPLE_BIN_PACKER_IDL
+
+#include <Components.idl>
+#include "../Base/Planner.idl"
+
+module CIAO
+{
+  module RACE
+  {
+    component SimpleBinPacker : Planner
+    {
+    };
+    
+    home SimpleBinPacker_Home manages SimpleBinPacker
+    {
+    };
+  };
+};
+
+#endif /* RACE_SIMPLE_BIN_PACKER_IDL */
diff --git a/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc
new file mode 100644
index 00000000000..eabe7447fd1
--- /dev/null
+++ b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc
@@ -0,0 +1,96 @@
+// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
+// This file is generated with "generate_component_mpc.pl -p Planner_Interface SimpleBinPacker"
+
+project(SimpleBinPacker_stub): ciao_deployment_stub {
+  after += Planner_Interface_stub Planner_stub
+  sharedname = SimpleBinPacker_stub
+  idlflags += -Sc \
+              -Wb,stub_export_macro=SIMPLEBINPACKER_STUB_Export \
+              -Wb,stub_export_include=SimpleBinPacker_stub_export.h \
+              -Wb,skel_export_macro=SIMPLEBINPACKER_SVNT_Export \
+              -Wb,skel_export_include=SimpleBinPacker_svnt_export.h
+  dynamicflags   = SIMPLEBINPACKER_STUB_BUILD_DLL
+  libs += Planner_Interface_stub Planner_stub
+
+  IDL_Files {
+    SimpleBinPacker.idl
+  }
+
+  Source_Files {
+    SimpleBinPackerC.cpp
+  }
+
+  Header_Files {
+    SimpleBinPackerC.h
+  }
+
+  Inline_Files {
+    SimpleBinPackerC.inl
+  }
+}
+
+project(SimpleBinPacker_svnt) : ciao_servant_dnc {
+  after += Planner_Interface_svnt \
+           SimpleBinPacker_stub \
+           Planner_svnt
+  sharedname  = SimpleBinPacker_svnt
+  libs    += SimpleBinPacker_stub \
+             Planner_Interface_stub \
+             Planner_Interface_svnt \
+             Planner_stub \
+             Planner_svnt
+  idlflags  +=  -Sc \
+                -Wb,export_macro=SIMPLEBINPACKER_SVNT_Export \
+                -Wb,export_include=SimpleBinPacker_svnt_export.h
+
+  dynamicflags = SIMPLEBINPACKER_SVNT_BUILD_DLL
+
+  CIDL_Files {
+    SimpleBinPacker.cidl
+  }
+
+  IDL_Files {
+    SimpleBinPackerE.idl
+  }
+
+  Source_Files {
+    SimpleBinPackerEC.cpp
+    SimpleBinPackerS.cpp
+    SimpleBinPacker_svnt.cpp
+  }
+
+  Header_Files {
+    SimpleBinPackerEC.h
+    SimpleBinPackerS.h
+    SimpleBinPacker_svnt.h
+  }
+
+  Inline_Files {
+    SimpleBinPackerEC.inl
+    SimpleBinPackerS.inl
+    SimpleBinPacker_svnt.inl
+  }
+}
+
+
+project(SimpleBinPacker_exec) : ciao_component_dnc {
+  after   += SimpleBinPacker_svnt
+  sharedname = SimpleBinPacker_exec
+  libs      += SimpleBinPacker_stub \
+               SimpleBinPacker_svnt \
+               Planner_Interface_stub \
+               Planner_Interface_svnt
+  
+  idlflags  +=  -Sc \
+                -Wb,export_macro=SIMPLEBINPACKER_EXEC_Export \
+                -Wb,export_include=SimpleBinPacker_exec_export.h
+  dynamicflags   = SIMPLEBINPACKER_EXEC_BUILD_DLL
+
+  IDL_Files {
+    
+  }
+
+  Source_Files {
+    SimpleBinPacker_exec.cpp
+  }
+}
diff --git a/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.cpp b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.cpp
new file mode 100644
index 00000000000..19b937706c1
--- /dev/null
+++ b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.cpp
@@ -0,0 +1,246 @@
+// $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 "SimpleBinPacker_exec.h"
+#include "ciao/CIAO_common.h"
+
+namespace CIAO
+{
+  namespace RACE
+  {
+    namespace CIDL_SimpleBinPacker_Impl
+    {
+      //==================================================================
+      // Facet Executor Implementation Class:   Planner_I_exec_i
+      //==================================================================
+
+      Planner_I_exec_i::Planner_I_exec_i (void)
+      {
+      }
+
+      Planner_I_exec_i::~Planner_I_exec_i (void)
+      {
+      }
+
+      // Operations from ::CIAO::RACE::Planner_I
+
+      ::CORBA::Boolean
+      Planner_I_exec_i::process_plan (
+      ::Deployment::DeploymentPlan & /* plan */
+      ACE_ENV_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+      {
+        // Your code here.
+        return false;
+      }
+
+      //==================================================================
+      // Component Executor Implementation Class:   SimpleBinPacker_exec_i
+      //==================================================================
+
+      SimpleBinPacker_exec_i::SimpleBinPacker_exec_i (void)
+      {
+      }
+
+      SimpleBinPacker_exec_i::~SimpleBinPacker_exec_i (void)
+      {
+      }
+
+      // Supported or inherited operations.
+
+      // Attribute operations.
+
+      char *
+      SimpleBinPacker_exec_i::name (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+      {
+        // Your code here.
+        return 0;
+      }
+
+      void
+      SimpleBinPacker_exec_i::name (
+      const char * /* name */
+      ACE_ENV_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+      {
+        // Your code here.
+      }
+
+      char *
+      SimpleBinPacker_exec_i::type (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+      {
+        // Your code here.
+        return 0;
+      }
+
+      void
+      SimpleBinPacker_exec_i::type (
+      const char * /* type */
+      ACE_ENV_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+      {
+        // Your code here.
+      }
+
+      // Port operations.
+
+      ::CIAO::RACE::CCM_Planner_I_ptr
+      SimpleBinPacker_exec_i::get_planner_i (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+      {
+        // Your code here.
+        return ::CIAO::RACE::CCM_Planner_I::_nil ();
+      }
+
+      // Operations from Components::SessionComponent
+
+      void
+      SimpleBinPacker_exec_i::set_session_context (
+      ::Components::SessionContext_ptr ctx
+      ACE_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((
+      ::CORBA::SystemException,
+      ::Components::CCMException))
+      {
+        this->context_ =
+        SimpleBinPacker_Context::_narrow (
+        ctx
+        ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK;
+
+        if (this->context_ == 0)
+        {
+          ACE_THROW (CORBA::INTERNAL ());
+        }
+      }
+
+      void
+      SimpleBinPacker_exec_i::ciao_preactivate (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((
+      ::CORBA::SystemException,
+      ::Components::CCMException))
+      {
+        // Your code here.
+      }
+
+      void
+      SimpleBinPacker_exec_i::ciao_postactivate (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((
+      ::CORBA::SystemException,
+      ::Components::CCMException))
+      {
+        // Your code here.
+      }
+
+      void
+      SimpleBinPacker_exec_i::ccm_activate (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((
+      ::CORBA::SystemException,
+      ::Components::CCMException))
+      {
+        // Your code here.
+      }
+
+      void
+      SimpleBinPacker_exec_i::ccm_passivate (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((
+      ::CORBA::SystemException,
+      ::Components::CCMException))
+      {
+        // Your code here.
+      }
+
+      void
+      SimpleBinPacker_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:   SimpleBinPacker_Home_exec_i
+      //==================================================================
+
+      SimpleBinPacker_Home_exec_i::SimpleBinPacker_Home_exec_i (void)
+      {
+      }
+
+      SimpleBinPacker_Home_exec_i::~SimpleBinPacker_Home_exec_i (void)
+      {
+      }
+
+      // Supported or inherited operations.
+
+      // Home operations.
+
+      // Factory and finder operations.
+
+      // Attribute operations.
+
+      // Implicit operations.
+
+      ::Components::EnterpriseComponent_ptr
+      SimpleBinPacker_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,
+        SimpleBinPacker_exec_i,
+        CORBA::NO_MEMORY ());
+        ACE_CHECK_RETURN (::Components::EnterpriseComponent::_nil ());
+
+        return retval;
+      }
+
+      extern "C" SIMPLEBINPACKER_EXEC_Export ::Components::HomeExecutorBase_ptr
+      createSimpleBinPacker_Home_Impl (void)
+      {
+        ::Components::HomeExecutorBase_ptr retval =
+        ::Components::HomeExecutorBase::_nil ();
+
+        ACE_NEW_RETURN (
+        retval,
+        SimpleBinPacker_Home_exec_i,
+        ::Components::HomeExecutorBase::_nil ());
+
+        return retval;
+      }
+    }
+  }
+}
+
diff --git a/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.h b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.h
new file mode 100644
index 00000000000..f71cac2a844
--- /dev/null
+++ b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.h
@@ -0,0 +1,183 @@
+// $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_SIMPLEBINPACKER_EXEC_H
+#define CIAO_SIMPLEBINPACKER_EXEC_H
+
+#include /**/ "ace/pre.h"
+
+#include "SimpleBinPacker_svnt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "SimpleBinPacker_exec_export.h"
+#include "tao/LocalObject.h"
+
+namespace CIAO
+{
+  namespace RACE
+  {
+    namespace CIDL_SimpleBinPacker_Impl
+    {
+      class SIMPLEBINPACKER_EXEC_Export Planner_I_exec_i
+      : public virtual ::CIAO::RACE::CCM_Planner_I,
+      public virtual TAO_Local_RefCounted_Object
+      {
+        public:
+        Planner_I_exec_i (void);
+        virtual ~Planner_I_exec_i (void);
+
+        // Operations from ::CIAO::RACE::Planner_I
+
+        virtual ::CORBA::Boolean
+        process_plan (
+        ::Deployment::DeploymentPlan & plan
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+      };
+
+      class SIMPLEBINPACKER_EXEC_Export SimpleBinPacker_exec_i
+      : public virtual SimpleBinPacker_Exec,
+      public virtual TAO_Local_RefCounted_Object
+      {
+        public:
+        SimpleBinPacker_exec_i (void);
+        virtual ~SimpleBinPacker_exec_i (void);
+
+        // Supported or inherited operations.
+
+        // Attribute operations.
+
+        virtual char *
+        name (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+        virtual void
+        name (
+        const char *
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+        virtual char *
+        type (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+        virtual void
+        type (
+        const char *
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+        // Port operations.
+
+        virtual ::CIAO::RACE::CCM_Planner_I_ptr
+        get_planner_i (
+        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:
+        SimpleBinPacker_Context *context_;
+      };
+
+      class SIMPLEBINPACKER_EXEC_Export SimpleBinPacker_Home_exec_i
+      : public virtual SimpleBinPacker_Home_Exec,
+      public virtual TAO_Local_RefCounted_Object
+      {
+        public:
+        SimpleBinPacker_Home_exec_i (void);
+        virtual ~SimpleBinPacker_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" SIMPLEBINPACKER_EXEC_Export ::Components::HomeExecutorBase_ptr
+      createSimpleBinPacker_Home_Impl (void);
+    }
+  }
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* CIAO_SIMPLEBINPACKER_EXEC_H */
+
diff --git a/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec_export.h b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec_export.h
new file mode 100644
index 00000000000..48c6c1ee4d3
--- /dev/null
+++ b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl SIMPLEBINPACKER_EXEC
+// ------------------------------
+#ifndef SIMPLEBINPACKER_EXEC_EXPORT_H
+#define SIMPLEBINPACKER_EXEC_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (SIMPLEBINPACKER_EXEC_HAS_DLL)
+#  define SIMPLEBINPACKER_EXEC_HAS_DLL 1
+#endif /* ! SIMPLEBINPACKER_EXEC_HAS_DLL */
+
+#if defined (SIMPLEBINPACKER_EXEC_HAS_DLL) && (SIMPLEBINPACKER_EXEC_HAS_DLL == 1)
+#  if defined (SIMPLEBINPACKER_EXEC_BUILD_DLL)
+#    define SIMPLEBINPACKER_EXEC_Export ACE_Proper_Export_Flag
+#    define SIMPLEBINPACKER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define SIMPLEBINPACKER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* SIMPLEBINPACKER_EXEC_BUILD_DLL */
+#    define SIMPLEBINPACKER_EXEC_Export ACE_Proper_Import_Flag
+#    define SIMPLEBINPACKER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define SIMPLEBINPACKER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* SIMPLEBINPACKER_EXEC_BUILD_DLL */
+#else /* SIMPLEBINPACKER_EXEC_HAS_DLL == 1 */
+#  define SIMPLEBINPACKER_EXEC_Export
+#  define SIMPLEBINPACKER_EXEC_SINGLETON_DECLARATION(T)
+#  define SIMPLEBINPACKER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* SIMPLEBINPACKER_EXEC_HAS_DLL == 1 */
+
+// Set SIMPLEBINPACKER_EXEC_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (SIMPLEBINPACKER_EXEC_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define SIMPLEBINPACKER_EXEC_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define SIMPLEBINPACKER_EXEC_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !SIMPLEBINPACKER_EXEC_NTRACE */
+
+#if (SIMPLEBINPACKER_EXEC_NTRACE == 1)
+#  define SIMPLEBINPACKER_EXEC_TRACE(X)
+#else /* (SIMPLEBINPACKER_EXEC_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define SIMPLEBINPACKER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (SIMPLEBINPACKER_EXEC_NTRACE == 1) */
+
+#endif /* SIMPLEBINPACKER_EXEC_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_stub_export.h b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_stub_export.h
new file mode 100644
index 00000000000..eae6bd3e06b
--- /dev/null
+++ b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_stub_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl SIMPLEBINPACKER_STUB
+// ------------------------------
+#ifndef SIMPLEBINPACKER_STUB_EXPORT_H
+#define SIMPLEBINPACKER_STUB_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (SIMPLEBINPACKER_STUB_HAS_DLL)
+#  define SIMPLEBINPACKER_STUB_HAS_DLL 1
+#endif /* ! SIMPLEBINPACKER_STUB_HAS_DLL */
+
+#if defined (SIMPLEBINPACKER_STUB_HAS_DLL) && (SIMPLEBINPACKER_STUB_HAS_DLL == 1)
+#  if defined (SIMPLEBINPACKER_STUB_BUILD_DLL)
+#    define SIMPLEBINPACKER_STUB_Export ACE_Proper_Export_Flag
+#    define SIMPLEBINPACKER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define SIMPLEBINPACKER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* SIMPLEBINPACKER_STUB_BUILD_DLL */
+#    define SIMPLEBINPACKER_STUB_Export ACE_Proper_Import_Flag
+#    define SIMPLEBINPACKER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define SIMPLEBINPACKER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* SIMPLEBINPACKER_STUB_BUILD_DLL */
+#else /* SIMPLEBINPACKER_STUB_HAS_DLL == 1 */
+#  define SIMPLEBINPACKER_STUB_Export
+#  define SIMPLEBINPACKER_STUB_SINGLETON_DECLARATION(T)
+#  define SIMPLEBINPACKER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* SIMPLEBINPACKER_STUB_HAS_DLL == 1 */
+
+// Set SIMPLEBINPACKER_STUB_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (SIMPLEBINPACKER_STUB_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define SIMPLEBINPACKER_STUB_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define SIMPLEBINPACKER_STUB_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !SIMPLEBINPACKER_STUB_NTRACE */
+
+#if (SIMPLEBINPACKER_STUB_NTRACE == 1)
+#  define SIMPLEBINPACKER_STUB_TRACE(X)
+#else /* (SIMPLEBINPACKER_STUB_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define SIMPLEBINPACKER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (SIMPLEBINPACKER_STUB_NTRACE == 1) */
+
+#endif /* SIMPLEBINPACKER_STUB_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_svnt_export.h b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_svnt_export.h
new file mode 100644
index 00000000000..1b97afc372e
--- /dev/null
+++ b/TAO/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_svnt_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl SIMPLEBINPACKER_SVNT
+// ------------------------------
+#ifndef SIMPLEBINPACKER_SVNT_EXPORT_H
+#define SIMPLEBINPACKER_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (SIMPLEBINPACKER_SVNT_HAS_DLL)
+#  define SIMPLEBINPACKER_SVNT_HAS_DLL 1
+#endif /* ! SIMPLEBINPACKER_SVNT_HAS_DLL */
+
+#if defined (SIMPLEBINPACKER_SVNT_HAS_DLL) && (SIMPLEBINPACKER_SVNT_HAS_DLL == 1)
+#  if defined (SIMPLEBINPACKER_SVNT_BUILD_DLL)
+#    define SIMPLEBINPACKER_SVNT_Export ACE_Proper_Export_Flag
+#    define SIMPLEBINPACKER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define SIMPLEBINPACKER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* SIMPLEBINPACKER_SVNT_BUILD_DLL */
+#    define SIMPLEBINPACKER_SVNT_Export ACE_Proper_Import_Flag
+#    define SIMPLEBINPACKER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define SIMPLEBINPACKER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* SIMPLEBINPACKER_SVNT_BUILD_DLL */
+#else /* SIMPLEBINPACKER_SVNT_HAS_DLL == 1 */
+#  define SIMPLEBINPACKER_SVNT_Export
+#  define SIMPLEBINPACKER_SVNT_SINGLETON_DECLARATION(T)
+#  define SIMPLEBINPACKER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* SIMPLEBINPACKER_SVNT_HAS_DLL == 1 */
+
+// Set SIMPLEBINPACKER_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (SIMPLEBINPACKER_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define SIMPLEBINPACKER_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define SIMPLEBINPACKER_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !SIMPLEBINPACKER_SVNT_NTRACE */
+
+#if (SIMPLEBINPACKER_SVNT_NTRACE == 1)
+#  define SIMPLEBINPACKER_SVNT_TRACE(X)
+#else /* (SIMPLEBINPACKER_SVNT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define SIMPLEBINPACKER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (SIMPLEBINPACKER_SVNT_NTRACE == 1) */
+
+#endif /* SIMPLEBINPACKER_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/common/RACE_common.idl b/TAO/CIAO/RACE/common/RACE_common.idl
new file mode 100644
index 00000000000..f5b1d9e59d8
--- /dev/null
+++ b/TAO/CIAO/RACE/common/RACE_common.idl
@@ -0,0 +1,15 @@
+//$Id$
+#ifndef RACE_COMMON_IDL
+#define RACE_COMMON_IDL
+
+module CIAO
+{  
+  module RACE
+    {
+      typedef string RACE_Classification;
+      typedef sequence <RACE_Classification> RACE_Classifications;
+      typedef sequence <string> PlannerFlow;
+    };
+};
+
+#endif /* RACE_COMMON_IDL */
diff --git a/TAO/CIAO/RACE/common/RACE_common.mpc b/TAO/CIAO/RACE/common/RACE_common.mpc
new file mode 100644
index 00000000000..44c77a4c0be
--- /dev/null
+++ b/TAO/CIAO/RACE/common/RACE_common.mpc
@@ -0,0 +1,58 @@
+// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
+// This file is generated with "generate_component_mpc.pl -n RACE_common"
+
+project(RACE_common_stub): taolib_with_idl, anytypecode {
+
+  sharedname = RACE_common_stub
+  idlflags += -Wb,stub_export_macro=RACE_COMMON_STUB_Export \
+              -Wb,stub_export_include=RACE_common_stub_export.h
+//               -Wb,skel_export_macro=RACE_COMMON_SVNT_Export \
+//               -Wb,skel_export_include=RACE_common_svnt_export.h
+  dynamicflags   = RACE_COMMON_STUB_BUILD_DLL
+
+  IDL_Files {
+    RACE_common.idl
+  }
+
+  Source_Files {
+    RACE_commonC.cpp
+  }
+
+  Header_Files {
+    RACE_commonC.h
+  }
+
+  Inline_Files {
+    RACE_commonC.inl
+  }
+}
+
+// project(RACE_common_svnt) : ciao_servant_dnc {
+
+//   after +=  RACE_common_stub
+//   sharedname  = RACE_common_svnt
+//   libs    += RACE_common_stub
+
+//   idlflags += -Sc \
+//               -Wb,stub_export_macro=RACE_COMMON_STUB_Export \
+//               -Wb,stub_export_include=RACE_common_stub_export.h \
+//               -Wb,skel_export_macro=RACE_COMMON_SVNT_Export \
+//               -Wb,skel_export_include=RACE_common_svnt_export.h
+//   dynamicflags = RACE_COMMON_SVNT_BUILD_DLL
+
+//   IDL_Files {
+//     RACE_common.idl
+//   }
+
+//   Source_Files {
+//     RACE_commonS.cpp
+//   }
+
+//   Header_Files {
+//     RACE_commonS.h
+//   }
+
+//   Inline_Files {
+//     RACE_commonS.inl
+//   }
+// }
diff --git a/TAO/CIAO/RACE/common/RACE_common_stub_export.h b/TAO/CIAO/RACE/common/RACE_common_stub_export.h
new file mode 100644
index 00000000000..d6c33fc61f6
--- /dev/null
+++ b/TAO/CIAO/RACE/common/RACE_common_stub_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl RACE_COMMON_STUB
+// ------------------------------
+#ifndef RACE_COMMON_STUB_EXPORT_H
+#define RACE_COMMON_STUB_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (RACE_COMMON_STUB_HAS_DLL)
+#  define RACE_COMMON_STUB_HAS_DLL 1
+#endif /* ! RACE_COMMON_STUB_HAS_DLL */
+
+#if defined (RACE_COMMON_STUB_HAS_DLL) && (RACE_COMMON_STUB_HAS_DLL == 1)
+#  if defined (RACE_COMMON_STUB_BUILD_DLL)
+#    define RACE_COMMON_STUB_Export ACE_Proper_Export_Flag
+#    define RACE_COMMON_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define RACE_COMMON_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* RACE_COMMON_STUB_BUILD_DLL */
+#    define RACE_COMMON_STUB_Export ACE_Proper_Import_Flag
+#    define RACE_COMMON_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define RACE_COMMON_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* RACE_COMMON_STUB_BUILD_DLL */
+#else /* RACE_COMMON_STUB_HAS_DLL == 1 */
+#  define RACE_COMMON_STUB_Export
+#  define RACE_COMMON_STUB_SINGLETON_DECLARATION(T)
+#  define RACE_COMMON_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* RACE_COMMON_STUB_HAS_DLL == 1 */
+
+// Set RACE_COMMON_STUB_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (RACE_COMMON_STUB_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define RACE_COMMON_STUB_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define RACE_COMMON_STUB_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !RACE_COMMON_STUB_NTRACE */
+
+#if (RACE_COMMON_STUB_NTRACE == 1)
+#  define RACE_COMMON_STUB_TRACE(X)
+#else /* (RACE_COMMON_STUB_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define RACE_COMMON_STUB_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (RACE_COMMON_STUB_NTRACE == 1) */
+
+#endif /* RACE_COMMON_STUB_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/common/RACE_common_svnt_export.h b/TAO/CIAO/RACE/common/RACE_common_svnt_export.h
new file mode 100644
index 00000000000..96790b41c7d
--- /dev/null
+++ b/TAO/CIAO/RACE/common/RACE_common_svnt_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl RACE_COMMON_SVNT
+// ------------------------------
+#ifndef RACE_COMMON_SVNT_EXPORT_H
+#define RACE_COMMON_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (RACE_COMMON_SVNT_HAS_DLL)
+#  define RACE_COMMON_SVNT_HAS_DLL 1
+#endif /* ! RACE_COMMON_SVNT_HAS_DLL */
+
+#if defined (RACE_COMMON_SVNT_HAS_DLL) && (RACE_COMMON_SVNT_HAS_DLL == 1)
+#  if defined (RACE_COMMON_SVNT_BUILD_DLL)
+#    define RACE_COMMON_SVNT_Export ACE_Proper_Export_Flag
+#    define RACE_COMMON_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define RACE_COMMON_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* RACE_COMMON_SVNT_BUILD_DLL */
+#    define RACE_COMMON_SVNT_Export ACE_Proper_Import_Flag
+#    define RACE_COMMON_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define RACE_COMMON_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* RACE_COMMON_SVNT_BUILD_DLL */
+#else /* RACE_COMMON_SVNT_HAS_DLL == 1 */
+#  define RACE_COMMON_SVNT_Export
+#  define RACE_COMMON_SVNT_SINGLETON_DECLARATION(T)
+#  define RACE_COMMON_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* RACE_COMMON_SVNT_HAS_DLL == 1 */
+
+// Set RACE_COMMON_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (RACE_COMMON_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define RACE_COMMON_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define RACE_COMMON_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !RACE_COMMON_SVNT_NTRACE */
+
+#if (RACE_COMMON_SVNT_NTRACE == 1)
+#  define RACE_COMMON_SVNT_TRACE(X)
+#else /* (RACE_COMMON_SVNT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define RACE_COMMON_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (RACE_COMMON_SVNT_NTRACE == 1) */
+
+#endif /* RACE_COMMON_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/RACE/descriptors/Deployment.xsd b/TAO/CIAO/RACE/descriptors/Deployment.xsd
new file mode 100644
index 00000000000..c8a6399730b
--- /dev/null
+++ b/TAO/CIAO/RACE/descriptors/Deployment.xsd
@@ -0,0 +1,776 @@
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:xmi="http://www.omg.org/XMI"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:Deployment="http://www.omg.org/Deployment"
+            targetNamespace="http://www.omg.org/Deployment">
+
+  <xsd:import namespace="http://www.omg.org/XMI" schemaLocation="XMI.xsd" />
+
+
+  <xsd:complexType name="Any">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="type" type="Deployment:DataType"/>
+      <xsd:element name="value" type="Deployment:DataValue"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="Any" type="Deployment:Any"/>
+  <xsd:complexType name="DataType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="kind" type="Deployment:TCKind"/>
+      <xsd:element name="enum" type="Deployment:EnumType"/>
+      <xsd:element name="objref" type="Deployment:ObjrefType"/>
+      <xsd:element name="boundedString" type="Deployment:BoundedStringType"/>
+      <xsd:element name="fixed" type="Deployment:FixedType"/>
+      <xsd:element name="array" type="Deployment:ArrayType"/>
+      <xsd:element name="sequence" type="Deployment:SequenceType"/>
+      <xsd:element name="alias" type="Deployment:AliasType"/>
+      <xsd:element name="struct" type="Deployment:StructType"/>
+      <xsd:element name="value" type="Deployment:ValueType"/>
+      <xsd:element name="union" type="Deployment:UnionType"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="DataType" type="Deployment:DataType"/>
+  <xsd:complexType name="DataValue">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="short" type="xsd:short"/>
+      <xsd:element name="long" type="xsd:int"/>
+      <xsd:element name="ushort" type="xsd:unsignedShort"/>
+      <xsd:element name="ulong" type="xsd:unsignedInt"/>
+      <xsd:element name="float" type="xsd:float"/>
+      <xsd:element name="double" type="xsd:double"/>
+      <xsd:element name="boolean" type="xsd:boolean"/>
+      <xsd:element name="octet" type="xsd:unsignedByte"/>
+      <xsd:element name="opaque" type="xsd:base64Binary"/>
+      <xsd:element name="objref" type="xsd:string"/>
+      <xsd:element name="enum" type="xsd:string"/>
+      <xsd:element name="string" type="xsd:string"/>
+      <xsd:element name="longlong" type="xsd:long"/>
+      <xsd:element name="ulonglong" type="xsd:unsignedLong"/>
+      <xsd:element name="longdouble" type="xsd:double"/>
+      <xsd:element name="fixed" type="xsd:string"/>
+      <xsd:element name="any" type="Deployment:Any"/>
+      <xsd:element name="typecode" type="Deployment:DataType"/>
+      <xsd:element name="element" type="Deployment:DataValue"/>
+      <xsd:element name="discriminator" type="Deployment:DataValue"/>
+      <xsd:element name="value" type="Deployment:DataValue"/>
+      <xsd:element name="boxedValue" type="Deployment:DataValue"/>
+      <xsd:element name="member" type="Deployment:NamedValue"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="DataValue" type="Deployment:DataValue"/>
+
+
+  <xsd:complexType name="EnumType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="typeId" type="xsd:string"/>
+      <xsd:element name="member" type="xsd:string"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="EnumType" type="Deployment:EnumType"/>
+  <xsd:complexType name="ObjrefType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="typeId" type="xsd:string"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+
+
+  <xsd:element name="ObjrefType" type="Deployment:ObjrefType"/>
+  <xsd:complexType name="BoundedStringType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="bound" type="xsd:string"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="BoundedStringType" type="Deployment:BoundedStringType"/>
+  <xsd:complexType name="FixedType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="digits" type="xsd:string"/>
+      <xsd:element name="scale" type="xsd:string"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="FixedType" type="Deployment:FixedType"/>
+  <xsd:complexType name="ArrayType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="length" type="xsd:string"/>
+      <xsd:element name="elementType" type="Deployment:DataType"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="ArrayType" type="Deployment:ArrayType"/>
+  <xsd:complexType name="SequenceType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="bound" type="xsd:string"/>
+      <xsd:element name="elementType" type="Deployment:DataType"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="SequenceType" type="Deployment:SequenceType"/>
+  <xsd:complexType name="AliasType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="typeId" type="xsd:string"/>
+      <xsd:element name="elementType" type="Deployment:DataType"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="AliasType" type="Deployment:AliasType"/>
+  <xsd:complexType name="StructType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="typeId" type="xsd:string"/>
+      <xsd:element name="member" type="Deployment:StructMemberType"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="StructType" type="Deployment:StructType"/>
+  <xsd:complexType name="StructMemberType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="type" type="Deployment:DataType"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="StructMemberType" type="Deployment:StructMemberType"/>
+  <xsd:complexType name="ValueType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="typeId" type="xsd:string"/>
+      <xsd:element name="modifier" type="xsd:string"/>
+      <xsd:element name="baseType" type="Deployment:DataType"/>
+      <xsd:element name="member" type="Deployment:ValueMemberType"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="ValueType" type="Deployment:ValueType"/>
+  <xsd:complexType name="ValueMemberType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="visibility" type="xsd:string"/>
+      <xsd:element name="type" type="Deployment:DataType"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="ValueMemberType" type="Deployment:ValueMemberType"/>
+  <xsd:complexType name="UnionType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="typeId" type="xsd:string"/>
+      <xsd:element name="default" type="Deployment:UnionMemberType"/>
+      <xsd:element name="discriminatorType" type="Deployment:DataType"/>
+      <xsd:element name="member" type="Deployment:UnionMemberType"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="UnionType" type="Deployment:UnionType"/>
+  <xsd:complexType name="UnionMemberType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="type" type="Deployment:DataType"/>
+      <xsd:element name="label" type="Deployment:DataValue"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="UnionMemberType" type="Deployment:UnionMemberType"/>
+  <xsd:complexType name="NamedValue">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="value" type="Deployment:DataValue"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="NamedValue" type="Deployment:NamedValue"/>
+  <xsd:complexType name="Bridge">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="label" type="xsd:string"/>
+      <xsd:element name="connect" type="Deployment:Interconnect"/>
+      <xsd:element name="resource" type="Deployment:Resource"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="Bridge" type="Deployment:Bridge"/>
+  <xsd:complexType name="Interconnect">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="label" type="xsd:string"/>
+      <xsd:element name="connection" type="Deployment:Bridge"/>
+      <xsd:element name="connect" type="Deployment:Node"/>
+      <xsd:element name="resource" type="Deployment:Resource"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="Interconnect" type="Deployment:Interconnect"/>
+  <xsd:complexType name="Node">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="label" type="xsd:string"/>
+      <xsd:element name="connection" type="Deployment:Interconnect"/>
+      <xsd:element name="sharedResource" type="Deployment:SharedResource"/>
+      <xsd:element name="resource" type="Deployment:Resource"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="Node" type="Deployment:Node"/>
+  <xsd:complexType name="Resource">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="resourceType" type="xsd:string"/>
+      <xsd:element name="property" type="Deployment:SatisfierProperty"/>
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="Resource" type="Deployment:Resource"/>
+  <xsd:complexType name="SharedResource">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="resourceType" type="xsd:string"/>
+      <xsd:element name="node" type="Deployment:Node"/>
+      <xsd:element name="property" type="Deployment:SatisfierProperty"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="SharedResource" type="Deployment:SharedResource"/>
+  <xsd:complexType name="Domain">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="UUID" type="xsd:string"/>  
+      <xsd:element name="label" type="xsd:string"/>
+      <xsd:element name="sharedResource" type="Deployment:SharedResource"/>
+      <xsd:element name="node" type="Deployment:Node"/>
+      <xsd:element name="interconnect" type="Deployment:Interconnect"/>
+      <xsd:element name="bridge" type="Deployment:Bridge"/>
+      <xsd:element name="infoProperty" type="Deployment:Property"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="Domain" type="Deployment:Domain"/>
+  <xsd:complexType name="PlanPropertyMapping">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="source" type="xsd:string"/>
+      <xsd:element name="externalName" type="xsd:string"/>
+      <xsd:element name="delegatesTo" type="Deployment:PlanSubcomponentPropertyReference"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="PlanPropertyMapping" type="Deployment:PlanPropertyMapping"/>
+  <xsd:complexType name="PlanSubcomponentPropertyReference">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="propertyName" type="xsd:string"/>
+      <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="PlanSubcomponentPropertyReference" type="Deployment:PlanSubcomponentPropertyReference"/>
+  <xsd:complexType name="PlanSubcomponentPortEndpoint">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="portName" type="xsd:string"/>
+      <xsd:element name="provider" type="xsd:string"/>
+      <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/>
+      <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="PlanSubcomponentPortEndpoint" type="Deployment:PlanSubcomponentPortEndpoint"/>
+  <xsd:complexType name="PlanConnectionDescription">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="source" type="xsd:string"/>
+      <xsd:element name="deployRequirement" type="Deployment:Requirement"/>
+      <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint"/>
+      <xsd:element name="internalEndpoint" type="Deployment:PlanSubcomponentPortEndpoint"/>
+      <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint"/>
+      <xsd:element name="deployedResource" type="Deployment:ConnectionResourceDeploymentDescription"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="PlanConnectionDescription" type="Deployment:PlanConnectionDescription"/>
+  <xsd:complexType name="InstanceDeploymentDescription">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="node" type="xsd:string"/>
+      <xsd:element name="source" type="xsd:string"/>
+      <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription"/>
+      <xsd:element name="configProperty" type="Deployment:Property"/>
+      <xsd:element name="deployedResource" type="Deployment:InstanceResourceDeploymentDescription"/>
+      <xsd:element name="deployedSharedResource" type="Deployment:InstanceResourceDeploymentDescription"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="InstanceDeploymentDescription" type="Deployment:InstanceDeploymentDescription"/>
+  <xsd:complexType name="MonolithicDeploymentDescription">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="source" type="xsd:string"/>
+      <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription"/>
+      <xsd:element name="execParameter" type="Deployment:Property"/>
+      <xsd:element name="deployRequirement" type="Deployment:Requirement"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="MonolithicDeploymentDescription" type="Deployment:MonolithicDeploymentDescription"/>
+  <xsd:complexType name="ArtifactDeploymentDescription">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="location" type="xsd:string"/>
+      <xsd:element name="node" type="xsd:string"/>
+      <xsd:element name="source" type="xsd:string"/>
+      <xsd:element name="execParameter" type="Deployment:Property"/>
+      <xsd:element name="deployRequirement" type="Deployment:Requirement"/>
+      <xsd:element name="deployedResource" type="Deployment:ResourceDeploymentDescription"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="ArtifactDeploymentDescription" type="Deployment:ArtifactDeploymentDescription"/>
+
+
+  <xsd:complexType name="DeploymentPlan">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+    <xsd:element name="UUID" type="xsd:string"/>
+      <xsd:element name="label" type="xsd:string"/>
+      <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription"/>
+      <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription"/>
+      <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/>
+      <xsd:element name="connection" type="Deployment:PlanConnectionDescription"/>
+      <xsd:element name="externalProperty" type="Deployment:PlanPropertyMapping"/>
+      <xsd:element name="dependsOn" type="Deployment:ImplementationDependency"/>
+      <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription"/>
+      <xsd:element name="infoProperty" type="Deployment:Property"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="DeploymentPlan" type="Deployment:DeploymentPlan"/>
+
+
+  <xsd:complexType name="ResourceDeploymentDescription">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="requirementName" type="xsd:string"/>
+      <xsd:element name="resourceName" type="xsd:string"/>
+      <xsd:element name="resourceValue" type="Deployment:Any"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="ResourceDeploymentDescription" type="Deployment:ResourceDeploymentDescription"/>
+  <xsd:complexType name="InstanceResourceDeploymentDescription">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/>
+      <xsd:element name="requirementName" type="xsd:string"/>
+      <xsd:element name="resourceName" type="xsd:string"/>
+      <xsd:element name="resourceValue" type="Deployment:Any"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="InstanceResourceDeploymentDescription" type="Deployment:InstanceResourceDeploymentDescription"/>
+  <xsd:complexType name="ConnectionResourceDeploymentDescription">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="targetName" type="xsd:string"/>
+      <xsd:element name="requirementName" type="xsd:string"/>
+      <xsd:element name="resourceName" type="xsd:string"/>
+      <xsd:element name="resourceValue" type="Deployment:Any"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="ConnectionResourceDeploymentDescription" type="Deployment:ConnectionResourceDeploymentDescription"/>
+  <xsd:complexType name="Capability">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="resourceType" type="xsd:string"/>
+      <xsd:element name="property" type="Deployment:SatisfierProperty"/>     
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="Capability" type="Deployment:Capability"/>
+  <xsd:complexType name="ComponentPropertyDescription">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="type" type="Deployment:DataType"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="ComponentPropertyDescription" type="Deployment:ComponentPropertyDescription"/>
+  <xsd:complexType name="ComponentPortDescription">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="specificType" type="xsd:string"/>
+      <xsd:element name="supportedType" type="xsd:string"/>
+      <xsd:element name="provider" type="xsd:string"/>
+      <xsd:element name="exclusiveProvider" type="xsd:string"/>
+      <xsd:element name="exclusiveUser" type="xsd:string"/>
+      <xsd:element name="optional" type="xsd:string"/>
+      <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="ComponentPortDescription" type="Deployment:ComponentPortDescription"/>
+  <xsd:complexType name="ComponentInterfaceDescription">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="label" type="xsd:string"/>
+      <xsd:element name="UUID" type="xsd:string"/>
+      <xsd:element name="specificType" type="xsd:string"/>
+      <xsd:element name="supportedType" type="xsd:string"/>
+      <xsd:element name="idlFile" type="xsd:string"/>
+      <xsd:element name="configProperty" type="Deployment:Property"/>
+      <xsd:element name="port" type="Deployment:ComponentPortDescription"/>
+      <xsd:element name="property" type="Deployment:ComponentPropertyDescription"/>
+      <xsd:element name="infoProperty" type="Deployment:Property"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="ComponentInterfaceDescription" type="Deployment:ComponentInterfaceDescription"/>
+  <xsd:complexType name="ImplementationArtifactDescription">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="label" type="xsd:string"/>
+      <xsd:element name="UUID" type="xsd:string"/>
+      <xsd:element name="location" type="xsd:string"/>
+      <xsd:element name="execParameter" type="Deployment:Property"/>
+      <xsd:element name="deployRequirement" type="Deployment:Requirement"/>
+      <xsd:element name="dependsOn" type="Deployment:NamedImplementationArtifact"/>
+      <xsd:element name="infoProperty" type="Deployment:Property"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="ImplementationArtifactDescription" type="Deployment:ImplementationArtifactDescription"/>
+  <xsd:complexType name="MonolithicImplementationDescription">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="execParameter" type="Deployment:Property"/>
+      <xsd:element name="primaryArtifact" type="Deployment:NamedImplementationArtifact"/>
+      <xsd:element name="deployRequirement" type="Deployment:ImplementationRequirement"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="MonolithicImplementationDescription" type="Deployment:MonolithicImplementationDescription"/>
+  <xsd:complexType name="AssemblyPropertyMapping">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="externalName" type="xsd:string"/>
+      <xsd:element name="delegatesTo" type="Deployment:SubcomponentPropertyReference"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="AssemblyPropertyMapping" type="Deployment:AssemblyPropertyMapping"/>
+  <xsd:complexType name="SubcomponentPropertyReference">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="propertyName" type="xsd:string"/>
+      <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="SubcomponentPropertyReference" type="Deployment:SubcomponentPropertyReference"/>
+  <xsd:complexType name="SubcomponentPortEndpoint">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="portName" type="xsd:string"/>
+      <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="SubcomponentPortEndpoint" type="Deployment:SubcomponentPortEndpoint"/>
+  <xsd:complexType name="AssemblyConnectionDescription">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="deployRequirement" type="Deployment:Requirement"/>
+      <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint"/>
+      <xsd:element name="internalEndpoint" type="Deployment:SubcomponentPortEndpoint"/>
+      <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="AssemblyConnectionDescription" type="Deployment:AssemblyConnectionDescription"/>
+  <xsd:complexType name="SubcomponentInstantiationDescription">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="package" type="Deployment:ComponentPackageDescription"/>
+      <xsd:element name="configProperty" type="Deployment:Property"/>
+      <xsd:element name="selectRequirement" type="Deployment:Requirement"/>
+      <xsd:element name="reference" type="Deployment:ComponentPackageReference"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="SubcomponentInstantiationDescription" type="Deployment:SubcomponentInstantiationDescription"/>
+  <xsd:complexType name="ComponentAssemblyDescription">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/>
+      <xsd:element name="connection" type="Deployment:AssemblyConnectionDescription"/>
+      <xsd:element name="externalProperty" type="Deployment:AssemblyPropertyMapping"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="ComponentAssemblyDescription" type="Deployment:ComponentAssemblyDescription"/>
+  <xsd:complexType name="ComponentImplementationDescription">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="label" type="xsd:string"/>
+      <xsd:element name="UUID" type="xsd:string"/>
+      <xsd:element name="implements" type="Deployment:ComponentInterfaceDescription"/>
+      <xsd:element name="assemblyImpl" type="Deployment:ComponentAssemblyDescription"/>
+      <xsd:element name="monolithicImpl" type="Deployment:MonolithicImplementationDescription"/>
+      <xsd:element name="configProperty" type="Deployment:Property"/>
+      <xsd:element name="capability" type="Deployment:Capability"/>
+      <xsd:element name="dependsOn" type="Deployment:ImplementationDependency"/>
+      <xsd:element name="infoProperty" type="Deployment:Property"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="ComponentImplementationDescription" type="Deployment:ComponentImplementationDescription"/>
+  <xsd:complexType name="ComponentPackageReference">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="requiredUUID" type="xsd:string"/>
+      <xsd:element name="requiredName" type="xsd:string"/>
+      <xsd:element name="requiredType" type="xsd:string"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="ComponentPackageReference" type="Deployment:ComponentPackageReference"/>
+  <xsd:complexType name="ComponentPackageDescription">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="label" type="xsd:string"/>
+      <xsd:element name="UUID" type="xsd:string"/>
+      <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription"/>
+      <xsd:element name="configProperty" type="Deployment:Property"/>
+      <xsd:element name="implementation" type="Deployment:PackagedComponentImplementation"/>
+      <xsd:element name="infoProperty" type="Deployment:Property"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="ComponentPackageDescription" type="Deployment:ComponentPackageDescription"/>
+  <xsd:complexType name="PackageConfiguration">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="label" type="xsd:string"/>
+      <xsd:element name="UUID" type="xsd:string"/>
+      <xsd:element name="specializedConfig" type="Deployment:PackageConfiguration"/>
+      <xsd:element name="basePackage" type="Deployment:ComponentPackageDescription"/>
+      <xsd:element name="reference" type="Deployment:ComponentPackageReference"/>
+      <xsd:element name="selectRequirement" type="Deployment:Requirement"/>
+      <xsd:element name="configProperty" type="Deployment:Property"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="PackageConfiguration" type="Deployment:PackageConfiguration"/>
+  <xsd:complexType name="PackagedComponentImplementation">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="referencedImplementation" type="Deployment:ComponentImplementationDescription"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="PackagedComponentImplementation" type="Deployment:PackagedComponentImplementation"/>
+  <xsd:complexType name="NamedImplementationArtifact">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="referencedArtifact" type="Deployment:ImplementationArtifactDescription"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="NamedImplementationArtifact" type="Deployment:NamedImplementationArtifact"/>
+  <xsd:complexType name="ImplementationRequirement">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/>
+      <xsd:element name="resourcePort" type="xsd:string"/>
+      <xsd:element name="componentPort" type="xsd:string"/>
+      <xsd:element name="resourceType" type="xsd:string"/>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="property" type="Deployment:Property"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="ImplementationRequirement" type="Deployment:ImplementationRequirement"/>
+  <xsd:complexType name="RequirementSatisfier">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="resourceType" type="xsd:string"/>
+      <xsd:element name="property" type="Deployment:SatisfierProperty"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="RequirementSatisfier" type="Deployment:RequirementSatisfier"/>
+  <xsd:complexType name="SatisfierProperty">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="kind" type="Deployment:SatisfierPropertyKind"/>
+      <xsd:element name="value" type="Deployment:Any"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="SatisfierProperty" type="Deployment:SatisfierProperty"/>
+  <xsd:complexType name="Requirement">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="resourceType" type="xsd:string"/>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="property" type="Deployment:Property"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="Requirement" type="Deployment:Requirement"/>
+  <xsd:complexType name="Property">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="value" type="Deployment:Any"/>    
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="Property" type="Deployment:Property"/>
+  <xsd:complexType name="ExternalReferenceEndpoint">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="location" type="xsd:string"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="ExternalReferenceEndpoint" type="Deployment:ExternalReferenceEndpoint"/>
+  <xsd:complexType name="ComponentExternalPortEndpoint">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="portName" type="xsd:string"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="ComponentExternalPortEndpoint" type="Deployment:ComponentExternalPortEndpoint"/>
+  <xsd:complexType name="ImplementationDependency">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="requiredType" type="xsd:string"/>     
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="ImplementationDependency" type="Deployment:ImplementationDependency"/>
+  <xsd:complexType name="TopLevelPackageDescription">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="package" type="Deployment:PackageConfiguration"/>      
+    </xsd:choice>
+    <xsd:attribute ref="xmi:id" use="optional"/>
+    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
+  </xsd:complexType>
+  <xsd:element name="TopLevelPackageDescription" type="Deployment:TopLevelPackageDescription"/>
+  <xsd:simpleType name="TCKind">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="tk_null"/>
+      <xsd:enumeration value="tk_void"/>
+      <xsd:enumeration value="tk_short"/>
+      <xsd:enumeration value="tk_long"/>
+      <xsd:enumeration value="tk_ushort"/>
+      <xsd:enumeration value="tk_ulong"/>
+      <xsd:enumeration value="tk_float"/>
+      <xsd:enumeration value="tk_double"/>
+      <xsd:enumeration value="tk_boolean"/>
+      <xsd:enumeration value="tk_char"/>
+      <xsd:enumeration value="tk_octet"/>
+      <xsd:enumeration value="tk_any"/>
+      <xsd:enumeration value="tk_TypeCode"/>
+      <xsd:enumeration value="tk_Principal"/>
+      <xsd:enumeration value="tk_objref"/>
+      <xsd:enumeration value="tk_struct"/>
+      <xsd:enumeration value="tk_union"/>
+      <xsd:enumeration value="tk_enum"/>
+      <xsd:enumeration value="tk_string"/>
+      <xsd:enumeration value="tk_sequence"/>
+      <xsd:enumeration value="tk_array"/>
+      <xsd:enumeration value="tk_alias"/>
+      <xsd:enumeration value="tk_except"/>
+      <xsd:enumeration value="tk_longlong"/>
+      <xsd:enumeration value="tk_ulonglong"/>
+      <xsd:enumeration value="tk_longdouble"/>
+      <xsd:enumeration value="tk_wchar"/>
+      <xsd:enumeration value="tk_wstring"/>
+      <xsd:enumeration value="tk_wfixed"/>
+      <xsd:enumeration value="tk_value"/>
+      <xsd:enumeration value="tk_value_box"/>
+      <xsd:enumeration value="tk_native"/>
+      <xsd:enumeration value="tk_abstract_interface"/>
+      <xsd:enumeration value="tk_local_interface"/>
+      <xsd:enumeration value="tk_component"/>
+      <xsd:enumeration value="tk_home"/>
+      <xsd:enumeration value="tk_event"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ResourceUsageKind">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="None"/>
+      <xsd:enumeration value="InstanceUsesResource"/>
+      <xsd:enumeration value="ResourceUsesInstance"/>
+      <xsd:enumeration value="PortUsesResource"/>
+      <xsd:enumeration value="ResourceUsesPort"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="CCMComponentPortKind">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="Facet"/>
+      <xsd:enumeration value="SimplexReceptacle"/>
+      <xsd:enumeration value="MultiplexReceptacle"/>
+      <xsd:enumeration value="EventEmitter"/>
+      <xsd:enumeration value="EventPublisher"/>
+      <xsd:enumeration value="EventConsumer"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="SatisfierPropertyKind">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="Quantity"/>
+      <xsd:enumeration value="Capacity"/>
+      <xsd:enumeration value="Minimum"/>
+      <xsd:enumeration value="Maximum"/>
+      <xsd:enumeration value="Attribute"/>
+      <xsd:enumeration value="Selection"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+</xsd:schema>
diff --git a/TAO/CIAO/RACE/descriptors/Modified_Deployment.xsd b/TAO/CIAO/RACE/descriptors/Modified_Deployment.xsd
new file mode 100644
index 00000000000..b73077b0980
--- /dev/null
+++ b/TAO/CIAO/RACE/descriptors/Modified_Deployment.xsd
@@ -0,0 +1,790 @@
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://www.w3.org/2001/XMLSchema XMLSchema.xsd"
+            xmlns:Deployment="http://www.omg.org/Deployment"
+            targetNamespace="http://www.omg.org/Deployment">
+
+
+  <xsd:simpleType name="TCKind">
+    <xsd:restriction base="xsd:NCName">
+      <xsd:enumeration value="tk_null"/>
+      <xsd:enumeration value="tk_void"/>
+      <xsd:enumeration value="tk_short"/>
+      <xsd:enumeration value="tk_long"/>
+      <xsd:enumeration value="tk_ushort"/>
+      <xsd:enumeration value="tk_ulong"/>
+      <xsd:enumeration value="tk_float"/>
+      <xsd:enumeration value="tk_double"/>
+      <xsd:enumeration value="tk_boolean"/>
+      <xsd:enumeration value="tk_char"/>
+      <xsd:enumeration value="tk_octet"/>
+      <xsd:enumeration value="tk_any"/>
+      <xsd:enumeration value="tk_TypeCode"/>
+      <xsd:enumeration value="tk_Principal"/>
+      <xsd:enumeration value="tk_objref"/>
+      <xsd:enumeration value="tk_struct"/>
+      <xsd:enumeration value="tk_union"/>
+      <xsd:enumeration value="tk_enum"/>
+      <xsd:enumeration value="tk_string"/>
+      <xsd:enumeration value="tk_sequence"/>
+      <xsd:enumeration value="tk_array"/>
+      <xsd:enumeration value="tk_alias"/>
+      <xsd:enumeration value="tk_except"/>
+      <xsd:enumeration value="tk_longlong"/>
+      <xsd:enumeration value="tk_ulonglong"/>
+      <xsd:enumeration value="tk_longdouble"/>
+      <xsd:enumeration value="tk_wchar"/>
+      <xsd:enumeration value="tk_wstring"/>
+      <xsd:enumeration value="tk_wfixed"/>
+      <xsd:enumeration value="tk_value"/>
+      <xsd:enumeration value="tk_value_box"/>
+      <xsd:enumeration value="tk_native"/>
+      <xsd:enumeration value="tk_abstract_interface"/>
+      <xsd:enumeration value="tk_local_interface"/>
+      <xsd:enumeration value="tk_component"/>
+      <xsd:enumeration value="tk_home"/>
+      <xsd:enumeration value="tk_event"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:complexType name="DataType">
+    <xsd:choice>
+      <xsd:element name="kind" type="Deployment:TCKind"/>
+<!--      
+@@ not used, what for?
+
+      <xsd:element name="enum" type="Deployment:EnumType"/>
+      <xsd:element name="objref" type="Deployment:ObjrefType"/>
+      <xsd:element name="boundedString" type="Deployment:BoundedStringType"/>
+      <xsd:element name="fixed" type="Deployment:FixedType"/>
+      <xsd:element name="array" type="Deployment:ArrayType"/>
+      <xsd:element name="sequence" type="Deployment:SequenceType"/>
+      <xsd:element name="alias" type="Deployment:AliasType"/>
+      <xsd:element name="struct" type="Deployment:StructType"/>
+      <xsd:element name="value" type="Deployment:ValueType"/>
+      <xsd:element name="union" type="Deployment:UnionType"/>
+-->
+    </xsd:choice>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="DataValue">
+    <xsd:choice>
+      <xsd:element name="short" type="xsd:short"/>
+      <xsd:element name="long" type="xsd:int"/>
+      <xsd:element name="ushort" type="xsd:unsignedShort"/>
+      <xsd:element name="ulong" type="xsd:unsignedInt"/>
+      <xsd:element name="float" type="xsd:float"/>
+      <xsd:element name="double" type="xsd:double"/>
+      <xsd:element name="boolean" type="xsd:boolean"/>
+      <xsd:element name="octet" type="xsd:unsignedByte"/>
+      <!-- xsd:element name="opaque" type="xsd:base64Binary"/ -->
+      <xsd:element name="objref" type="xsd:string"/>
+      <xsd:element name="enum" type="xsd:string"/>
+      <xsd:element name="string" type="xsd:string"/>
+      <xsd:element name="longlong" type="xsd:long"/>
+      <xsd:element name="ulonglong" type="xsd:unsignedLong"/>
+      <xsd:element name="longdouble" type="xsd:double"/>
+      <xsd:element name="fixed" type="xsd:string"/>
+
+<!--
+@@ recursive
+      <xsd:element name="any" type="Deployment:Any"/>
+-->
+
+      <xsd:element name="typecode" type="Deployment:DataType"/>
+
+<!--
+@@ recursive
+      <xsd:element name="element" type="Deployment:DataValue"/>
+      <xsd:element name="discriminator" type="Deployment:DataValue"/>
+      <xsd:element name="value" type="Deployment:DataValue"/>
+      <xsd:element name="boxedValue" type="Deployment:DataValue"/>
+      <xsd:element name="member" type="Deployment:NamedValue"/>
+-->
+    </xsd:choice>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="Any">
+    <xsd:sequence>
+      <xsd:element name="type" type="Deployment:DataType"/>
+      <xsd:element name="value" type="Deployment:DataValue"/>      
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="Property">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="value" type="Deployment:Any"/>    
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+<!-- End of base definitions. -->
+  
+  <xsd:complexType name="Node">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="label" type="xsd:string"/>
+<!--
+@@ recursive, not used
+      <xsd:element name="connection" type="Deployment:Interconnect"/>
+      <xsd:element name="sharedResource" type="Deployment:SharedResource"/>
+      <xsd:element name="resource" type="Deployment:Resource"/>      
+-->
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:simpleType name="SatisfierPropertyKind">
+    <xsd:restriction base="xsd:NCName">
+      <xsd:enumeration value="Quantity"/>
+      <xsd:enumeration value="Capacity"/>
+      <xsd:enumeration value="Minimum"/>
+      <xsd:enumeration value="Maximum"/>
+      <xsd:enumeration value="Attribute"/>
+      <xsd:enumeration value="Selection"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+
+  <xsd:complexType name="SatisfierProperty">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="kind" type="Deployment:SatisfierPropertyKind"/>
+      <xsd:element name="value" type="Deployment:Any"/>      
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="Resource">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="resourceType" type="xsd:string"/>
+      <xsd:element name="property" type="Deployment:SatisfierProperty"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="SharedResource">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="resourceType" type="xsd:string"/>
+      <xsd:element name="node" type="Deployment:Node"/>
+      <xsd:element name="property" type="Deployment:SatisfierProperty"/>      
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="Domain">
+    <xsd:sequence>
+      <xsd:element name="label" type="xsd:string"/>
+      <xsd:element name="UUID" type="xsd:string"/>       
+      <xsd:element name="sharedResource" type="Deployment:SharedResource" minOccurs="0"/>
+      <xsd:element name="node" type="Deployment:Node" maxOccurs="unbounded"/>
+<!--
+@@ recursive, not used
+      <xsd:element name="interconnect" type="Deployment:Interconnect"/>
+      <xsd:element name="bridge" type="Deployment:Bridge"/>
+-->
+      <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="Requirement">
+    <xsd:sequence>
+      <xsd:element name="resourceType" type="xsd:string"/>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="property" type="Deployment:Property"/>      
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+<!-- Deployment -->
+
+  <xsd:complexType name="ResourceDeploymentDescription">
+    <xsd:sequence>
+      <xsd:element name="requirementName" type="xsd:string"/>
+      <xsd:element name="resourceName" type="xsd:string"/>
+      <xsd:element name="resourceValue" type="Deployment:Any"/>      
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="ArtifactDeploymentDescription">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="source" type="xsd:string"/>
+      <xsd:element name="node" type="xsd:string" minOccurs="0"/>
+      <xsd:element name="location" type="xsd:string" maxOccurs="unbounded"/>
+      <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0"/>
+      <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0"/>
+      <xsd:element name="deployedResource" type="Deployment:ResourceDeploymentDescription" minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="MonolithicDeploymentDescription">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="source" type="xsd:string"/>
+      <xsd:element name="artifact" type="xsd:IDREF" maxOccurs="unbounded"/> <!-- ArtifactDeploymentDescription -->
+      <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0"/>
+      <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+  <xsd:simpleType name="ResourceUsageKind">
+    <xsd:restriction base="xsd:NCName">
+      <xsd:enumeration value="None"/>
+      <xsd:enumeration value="InstanceUsesResource"/>
+      <xsd:enumeration value="ResourceUsesInstance"/>
+      <xsd:enumeration value="PortUsesResource"/>
+      <xsd:enumeration value="ResourceUsesPort"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+
+  <xsd:complexType name="InstanceResourceDeploymentDescription">
+    <xsd:sequence>
+      <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/>
+      <xsd:element name="requirementName" type="xsd:string"/>
+      <xsd:element name="resourceName" type="xsd:string"/>
+      <xsd:element name="resourceValue" type="Deployment:Any"/>      
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="InstanceDeploymentDescription">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="node" type="xsd:string"/>
+      <xsd:element name="source" type="xsd:string"/>
+      <xsd:element name="implementation" type="xsd:IDREF"/> <!-- MonolithicDeploymentDescription -->
+      <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/>
+      <xsd:element name="deployedResource" type="Deployment:InstanceResourceDeploymentDescription" minOccurs="0"/>
+      <xsd:element name="deployedSharedResource" type="Deployment:InstanceResourceDeploymentDescription" minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+
+  <xsd:simpleType name="CCMComponentPortKind">
+    <xsd:restriction base="xsd:NCName">
+      <xsd:enumeration value="Facet"/>
+      <xsd:enumeration value="SimplexReceptacle"/>
+      <xsd:enumeration value="MultiplexReceptacle"/>
+      <xsd:enumeration value="EventEmitter"/>
+      <xsd:enumeration value="EventPublisher"/>
+      <xsd:enumeration value="EventConsumer"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+
+  <xsd:complexType name="ComponentPortDescription">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="specificType" type="xsd:string"/>
+      <xsd:element name="supportedType" type="xsd:string"/>
+      <xsd:element name="provider" type="xsd:string"/>
+      <xsd:element name="exclusiveProvider" type="xsd:string"/>
+      <xsd:element name="exclusiveUser" type="xsd:string"/>
+      <xsd:element name="optional" type="xsd:string"/>
+      <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="ComponentPropertyDescription">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="type" type="Deployment:DataType"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="ComponentInterfaceDescription">
+    <xsd:choice>
+      <xsd:sequence>
+        <xsd:element name="label" type="xsd:string"/>
+        <xsd:element name="UUID" type="xsd:string"/>
+        <xsd:element name="specificType" type="xsd:string"/>
+        <xsd:element name="supportedType" type="xsd:string" maxOccurs="unbounded" />
+        <xsd:element name="idlFile" type="xsd:string" minOccurs="0"/>
+        <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/>
+        <xsd:element name="port" type="Deployment:ComponentPortDescription" maxOccurs="unbounded"/>
+        <xsd:element name="property" type="Deployment:ComponentPropertyDescription" minOccurs="0"/>
+        <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/>
+      </xsd:sequence>
+      <xsd:element name="contentLocation" type="xsd:string"/>
+    </xsd:choice>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="ComponentExternalPortEndpoint">
+    <xsd:sequence>
+      <xsd:element name="portName" type="xsd:string"/>      
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="PlanSubcomponentPortEndpoint">
+    <xsd:sequence>
+      <xsd:element name="portName" type="xsd:string"/>
+      <xsd:element name="provider" type="xsd:string" minOccurs="0"/>
+      <xsd:element name="kind" type="Deployment:CCMComponentPortKind"/>
+      <xsd:element name="instance" type="xsd:IDREF"/> <!-- InstanceDeploymentDescription -->
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="ExternalReferenceEndpoint">
+    <xsd:sequence>
+      <xsd:element name="location" type="xsd:string"/>      
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="ConnectionResourceDeploymentDescription">
+    <xsd:sequence>
+      <xsd:element name="targetName" type="xsd:string"/>
+      <xsd:element name="requirementName" type="xsd:string"/>
+      <xsd:element name="resourceName" type="xsd:string"/>
+      <xsd:element name="resourceValue" type="Deployment:Any"/>      
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="PlanConnectionDescription">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="source" type="xsd:string" minOccurs="0"/>
+      <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0"/>
+      <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="internalEndpoint" type="Deployment:PlanSubcomponentPortEndpoint" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="deployedResource" type="Deployment:ConnectionResourceDeploymentDescription" minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="ImplementationDependency">
+    <xsd:sequence>
+      <xsd:element name="requiredType" type="xsd:string"/>     
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="DeploymentPlan">
+   <xsd:sequence>
+     <xsd:element name="label" type="xsd:string" minOccurs="0"/>
+     <xsd:element name="UUID" type="xsd:string" minOccurs="0"/>      
+     <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" minOccurs="0" maxOccurs="1"/>     
+     <xsd:element name="implementation" type="Deployment:MonolithicDeploymentDescription" maxOccurs="unbounded" />
+     <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/>
+     <xsd:element name="connection" type="Deployment:PlanConnectionDescription" minOccurs="0" maxOccurs="unbounded"/>
+     <!-- potentially recursive, not used
+          <xsd:element name="externalProperty" type="Deployment:PlanPropertyMapping"/>
+     -->
+     <xsd:element name="dependsOn" type="Deployment:ImplementationDependency" minOccurs="0" maxOccurs="unbounded"/>
+     <xsd:element name="artifact" type="Deployment:ArtifactDeploymentDescription" minOccurs="0" maxOccurs="unbounded"/>
+     <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  
+
+
+
+<!-- Implementation -->
+
+
+  <xsd:complexType name="Capability">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="resourceType" type="xsd:string"/>
+      <xsd:element name="property" type="Deployment:SatisfierProperty"/>     
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="NamedImplementationArtifact">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string"/>     
+      <!-- @@ recursive NIA->IAD->NIA -->
+      <xsd:element name="referencedArtifact" type="Deployment:ImplementationArtifactDescription"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="ImplementationArtifactDescription">
+    <xsd:choice>
+      <xsd:sequence>
+        <xsd:element name="label" type="xsd:string"/>
+        <xsd:element name="UUID" type="xsd:string"/>
+
+        <!-- @@ There probably should be only one location? -->
+        <xsd:element name="location" type="xsd:string" maxOccurs="unbounded"/>
+        <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0"/>
+        <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0"/>
+        <xsd:element name="dependsOn" type="Deployment:NamedImplementationArtifact" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/>      
+      </xsd:sequence>
+      <xsd:element name="contentLocation" type="xsd:string"/>
+    </xsd:choice>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="ImplementationRequirement">
+    <xsd:sequence>
+      <xsd:element name="resourceUsage" type="Deployment:ResourceUsageKind"/>
+      <xsd:element name="resourcePort" type="xsd:string"/>
+      <xsd:element name="componentPort" type="xsd:string"/>
+      <xsd:element name="resourceType" type="xsd:string"/>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="property" type="Deployment:Property"/>      
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="MonolithicImplementationDescription">
+    <xsd:sequence>
+      <xsd:element name="execParameter" type="Deployment:Property" minOccurs="0"/>
+      <xsd:element name="primaryArtifact" type="Deployment:NamedImplementationArtifact" maxOccurs="unbounded"/>
+      <xsd:element name="deployRequirement" type="Deployment:ImplementationRequirement" minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="PackagedComponentImplementation">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string"/>
+      <!-- @@ recursive CPD->PCI->CID->CAD->SID->CPD -->   
+      <xsd:element name="referencedImplementation" type="Deployment:ComponentImplementationDescription"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="ComponentPackageDescription">
+    <xsd:choice>
+      <xsd:sequence>
+        <xsd:element name="label" type="xsd:string"/>
+        <xsd:element name="UUID" type="xsd:string"/>
+        <xsd:element name="realizes" type="Deployment:ComponentInterfaceDescription" minOccurs="0"/>
+        <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/>
+        <xsd:element name="implementation" type="Deployment:PackagedComponentImplementation"/>
+        <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/>      
+      </xsd:sequence>
+      <xsd:element name="contentLocation" type="xsd:string"/>
+    </xsd:choice>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="ComponentPackageReference">
+    <xsd:sequence>
+      <xsd:element name="requiredUUID" type="xsd:string"/>
+      <xsd:element name="requiredName" type="xsd:string"/>
+      <xsd:element name="requiredType" type="xsd:string"/>      
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="SubcomponentInstantiationDescription">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="package" type="Deployment:ComponentPackageDescription"/>
+      <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/>
+      <xsd:element name="selectRequirement" type="Deployment:Requirement" minOccurs="0"/>
+      <xsd:element name="reference" type="Deployment:ComponentPackageReference" minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="SubcomponentPortEndpoint">
+    <xsd:sequence>
+      <xsd:element name="portName" type="xsd:string"/>
+      <xsd:element name="instance" type="xsd:IDREF"/> <!-- SubcomponentInstantiationDescription -->
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="AssemblyConnectionDescription">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="deployRequirement" type="Deployment:Requirement" minOccurs="0"/>
+      <xsd:element name="externalEndpoint" type="Deployment:ComponentExternalPortEndpoint" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="internalEndpoint" type="Deployment:SubcomponentPortEndpoint" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="externalReference" type="Deployment:ExternalReferenceEndpoint" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="SubcomponentPropertyReference">
+    <xsd:sequence>
+      <xsd:element name="propertyName" type="xsd:string"/>
+      <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="AssemblyPropertyMapping">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="externalName" type="xsd:string"/>
+      <xsd:element name="delegatesTo" type="Deployment:SubcomponentPropertyReference"/>      
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="ComponentAssemblyDescription">
+    <xsd:sequence>
+      <xsd:element name="instance" type="Deployment:SubcomponentInstantiationDescription" maxOccurs="unbounded"/>
+      <xsd:element name="connection" type="Deployment:AssemblyConnectionDescription" maxOccurs="unbounded"/>
+      <xsd:element name="externalProperty" type="Deployment:AssemblyPropertyMapping" minOccurs="0"/> 
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="ComponentImplementationDescription">
+    <xsd:choice>
+      <xsd:sequence>
+        <xsd:element name="label" type="xsd:string"/>
+        <xsd:element name="UUID" type="xsd:string"/>
+        <xsd:element name="implements" type="Deployment:ComponentInterfaceDescription" minOccurs="0"/>
+        <xsd:choice>
+          <xsd:element name="assemblyImpl" type="Deployment:ComponentAssemblyDescription"/>
+          <xsd:element name="monolithicImpl" type="Deployment:MonolithicImplementationDescription"/>
+        </xsd:choice>
+        <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/>
+        <xsd:element name="capability" type="Deployment:Capability" minOccurs="0"/>
+        <xsd:element name="dependsOn" type="Deployment:ImplementationDependency" minOccurs="0"/>
+        <xsd:element name="infoProperty" type="Deployment:Property" minOccurs="0"/>      
+      </xsd:sequence>
+      <xsd:element name="contentLocation" type="xsd:string"/>
+    </xsd:choice>
+  </xsd:complexType>
+
+
+<!-- Package -->
+
+
+  <xsd:complexType name="PackageConfiguration">
+    <xsd:choice>
+      <xsd:sequence>
+        <xsd:element name="label" type="xsd:string"/>
+        <xsd:element name="UUID" type="xsd:string"/>
+<!--
+@@ recursive, not used
+        <xsd:element name="specializedConfig" type="Deployment:PackageConfiguration"/>
+-->
+
+        <xsd:element name="basePackage" type="Deployment:ComponentPackageDescription"/>
+        <xsd:element name="reference" type="Deployment:ComponentPackageReference" minOccurs="0"/>
+        <xsd:element name="selectRequirement" type="Deployment:Requirement" minOccurs="0"/>
+        <xsd:element name="configProperty" type="Deployment:Property" minOccurs="0"/>
+      </xsd:sequence>
+      <xsd:element name="contentLocation" type="xsd:string"/>
+    </xsd:choice>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="TopLevelPackageDescription">
+    <xsd:sequence>
+      <xsd:element name="package" type="Deployment:PackageConfiguration" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+<!-- Top-level elements. -->
+
+
+  <xsd:element name="domain" type="Deployment:Domain"/>
+  <xsd:element name="deploymentPlan" type="Deployment:DeploymentPlan"/>
+  <xsd:element name="implementationArtifactDescription" type="Deployment:ImplementationArtifactDescription" />
+  <xsd:element name="componentInterfaceDescription" type="Deployment:ComponentInterfaceDescription"/>
+  <xsd:element name="componentImplementationDescription" type="Deployment:ComponentImplementationDescription"/>
+  <xsd:element name="componentPackageDescription" type="Deployment:ComponentPackageDescription"/>
+  <xsd:element name="packageConfiguration" type="Deployment:PackageConfiguration"/>
+  <xsd:element name="topLevelPackageDescription" type="Deployment:TopLevelPackageDescription"/>
+
+
+
+<!-- VAULT 
+
+Place for strange things. Nobody knows what they are for...
+
+-->
+
+<!--
+
+  <xsd:complexType name="EnumType">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="typeId" type="xsd:string"/>
+      <xsd:element name="member" type="xsd:string" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="ObjrefType">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="typeId" type="xsd:string"/>      
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="BoundedStringType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="bound" type="xsd:string"/>      
+    </xsd:choice>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="FixedType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="digits" type="xsd:string"/>
+      <xsd:element name="scale" type="xsd:string"/>      
+    </xsd:choice>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="ArrayType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="length" type="xsd:string"/>
+      <xsd:element name="elementType" type="Deployment:DataType"/>      
+    </xsd:choice>
+  </xsd:complexType>
+
+  <xsd:complexType name="SequenceType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="bound" type="xsd:string"/>
+      <xsd:element name="elementType" type="Deployment:DataType"/>      
+    </xsd:choice>
+  </xsd:complexType>
+
+  <xsd:complexType name="AliasType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="typeId" type="xsd:string"/>
+      <xsd:element name="elementType" type="Deployment:DataType"/>      
+    </xsd:choice>
+  </xsd:complexType>
+
+  <xsd:complexType name="StructType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="typeId" type="xsd:string"/>
+      <xsd:element name="member" type="Deployment:StructMemberType"/>      
+    </xsd:choice>
+  </xsd:complexType>
+
+  <xsd:complexType name="StructMemberType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="type" type="Deployment:DataType"/>      
+    </xsd:choice>
+  </xsd:complexType>
+
+  <xsd:complexType name="ValueType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="typeId" type="xsd:string"/>
+      <xsd:element name="modifier" type="xsd:string"/>
+      <xsd:element name="baseType" type="Deployment:DataType"/>
+      <xsd:element name="member" type="Deployment:ValueMemberType"/>      
+    </xsd:choice>
+  </xsd:complexType>
+
+  <xsd:complexType name="ValueMemberType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="visibility" type="xsd:string"/>
+      <xsd:element name="type" type="Deployment:DataType"/>      
+    </xsd:choice>
+  </xsd:complexType>
+
+  <xsd:complexType name="UnionType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="typeId" type="xsd:string"/>
+      <xsd:element name="default" type="Deployment:UnionMemberType"/>
+      <xsd:element name="discriminatorType" type="Deployment:DataType"/>
+      <xsd:element name="member" type="Deployment:UnionMemberType"/>      
+    </xsd:choice>
+  </xsd:complexType>
+
+  <xsd:complexType name="UnionMemberType">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="type" type="Deployment:DataType"/>
+      <xsd:element name="label" type="Deployment:DataValue"/>      
+    </xsd:choice>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="NamedValue">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="value" type="Deployment:DataValue"/>      
+    </xsd:choice>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="Bridge">
+    <xsd:sequence>
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="label" type="xsd:string"/>
+      <xsd:element name="connect" type="Deployment:Interconnect"/>
+      <xsd:element name="resource" type="Deployment:Resource"/>      
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="Interconnect">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="label" type="xsd:string"/>
+      <xsd:element name="connection" type="Deployment:Bridge"/>
+      <xsd:element name="connect" type="Deployment:Node"/>
+      <xsd:element name="resource" type="Deployment:Resource"/>      
+    </xsd:choice>
+  </xsd:complexType>
+
+  <xsd:complexType name="PlanPropertyMapping">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="source" type="xsd:string"/>
+      <xsd:element name="externalName" type="xsd:string"/>
+      <xsd:element name="delegatesTo" type="Deployment:PlanSubcomponentPropertyReference"/>
+    </xsd:choice>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="PlanSubcomponentPropertyReference">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="propertyName" type="xsd:string"/>
+      <xsd:element name="instance" type="Deployment:InstanceDeploymentDescription"/>
+    </xsd:choice>
+  </xsd:complexType>
+
+-->
+
+<!--
+
+  This type is not referenced anywhere. 
+
+  <xsd:complexType name="RequirementSatisfier">
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="name" type="xsd:string"/>
+      <xsd:element name="resourceType" type="xsd:string"/>
+      <xsd:element name="property" type="Deployment:SatisfierProperty"/>      
+    </xsd:choice>
+  </xsd:complexType>
+
+-->
+
+</xsd:schema>
diff --git a/TAO/CIAO/RACE/descriptors/XMI.xsd b/TAO/CIAO/RACE/descriptors/XMI.xsd
new file mode 100644
index 00000000000..f4adac91934
--- /dev/null
+++ b/TAO/CIAO/RACE/descriptors/XMI.xsd
@@ -0,0 +1,35 @@
+<?xml version="1.0" ?>
+<xsd:schema targetNamespace="http://www.omg.org/XMI" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation='http://www.w3.org/2001/XMLSchema XMLSchema.xsd'>
+	<xsd:attribute name="id" type="xsd:ID" />
+	<xsd:attributeGroup name="IdentityAttribs">
+		<xsd:attribute form="qualified" name="label" type="xsd:string" use="optional" />
+		<xsd:attribute form="qualified" name="uuid" type="xsd:string" use="optional" />
+	</xsd:attributeGroup>
+	<xsd:attributeGroup name="LinkAttribs">
+		<xsd:attribute name="href" type="xsd:string" use="optional" />
+		<xsd:attribute form="qualified" name="idref" type="xsd:IDREF" use="optional" />
+	</xsd:attributeGroup>
+	<xsd:attributeGroup name="ObjectAttribs">
+		<xsd:attributeGroup ref="xmi:IdentityAttribs" />
+		<xsd:attributeGroup ref="xmi:LinkAttribs" />
+		<xsd:attribute fixed="2.0" form="qualified" name="version" type="xsd:string" use="optional" />
+		<xsd:attribute form="qualified" name="type" type="xsd:QName" use="optional" />
+	</xsd:attributeGroup>
+	<xsd:complexType name="Extension">
+		<xsd:choice maxOccurs="unbounded" minOccurs="0">
+			<xsd:any processContents="lax" />
+		</xsd:choice>
+		<xsd:attribute ref="xmi:id" />
+		<xsd:attributeGroup ref="xmi:ObjectAttribs" />
+		<xsd:attribute name="extender" type="xsd:string" use="optional" />
+		<xsd:attribute name="extenderID" type="xsd:string" use="optional" />
+	</xsd:complexType>
+	<xsd:element name="Extension" type="xmi:Extension" />
+	<xsd:complexType name="Any">
+		<xsd:choice maxOccurs="unbounded" minOccurs="0">
+			<xsd:any processContents="skip" />
+		</xsd:choice>
+		<xsd:anyAttribute processContents="skip" />
+	</xsd:complexType>
+</xsd:schema>
diff --git a/TAO/CIAO/RACE/descriptors/deployment.dat b/TAO/CIAO/RACE/descriptors/deployment.dat
new file mode 100644
index 00000000000..d0aec354bad
--- /dev/null
+++ b/TAO/CIAO/RACE/descriptors/deployment.dat
@@ -0,0 +1 @@
+SoleNode      corbaloc:iiop:localhost:30000/NodeManager
diff --git a/TAO/CIAO/RACE/descriptors/flattened_deploymentplan.cdp b/TAO/CIAO/RACE/descriptors/flattened_deploymentplan.cdp
new file mode 100644
index 00000000000..0648c10eab8
--- /dev/null
+++ b/TAO/CIAO/RACE/descriptors/flattened_deploymentplan.cdp
@@ -0,0 +1,361 @@
+<Deployment:deploymentPlan
+ xmlns:Deployment="http://www.omg.org/Deployment"
+ xmlns:xmi="http://www.omg.org/XMI"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.omg.org/Deployment Modified_Deployment.xsd">
+
+  <label>DeploymentManager-DeploymentPlan</label>
+  <!-- Could be ZERO  -->
+  <realizes>
+    <label>BasicSP-realizes-cid</label>
+    <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
+    <specificType><!-- @@ What does here? --></specificType>
+    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
+    <port>
+      <name>deployment_stage_port</name>
+      <specificType>IDL:RACE/deployment_stage:1.0</specificType>
+      <supportedType>IDL:RACE/deployment_stage:1.0</supportedType>
+      <provider>false></provider>
+      <exclusiveProvider>false</exclusiveProvider>
+      <exclusiveUser>true</exclusiveUser>
+      <optional>false</optional>
+      <kind>SimplexReceptacle</kind>
+    </port>
+  </realizes>
+  
+  <implementation id="RACE-Interactive_Input_Adapter-mdd">
+    <name>RACE-Interactive_Input_Adapter-mdd</name>
+    <source><!-- @@ Don't know what goes here --></source>
+    <artifact>RACE-Interactive_Input_Adapter_exec</artifact>
+    <artifact>RACE-Interactive_Input_Adapter_svnt</artifact>
+    <!--
+    <execParameter></execParameter>
+    <deployRequirement></deployRequirement>
+    -->
+  </implementation>
+
+  <implementation id="RACE-Plan_Analyzer-mdd">
+    <name>RACE-Plan_Analyzer-mdd</name>
+    <source><!-- @@ Don't know what goes here --></source>
+    <artifact>RACE-Plan_Analyzer_exec</artifact>
+    <artifact>RACE-Plan_Analyzer_svnt</artifact>
+    <!--
+    <execParameter></execParameter>
+    <deployRequirement></deployRequirement>
+    -->
+  </implementation>
+
+  <implementation id="RACE-Planner_Manager-mdd">
+    <name>RACE-Planner_Manager-mdd</name>
+    <source><!-- @@ Don't know what goes here --></source>
+    <artifact>RACE-Planner_Manager_exec</artifact>
+    <artifact>RACE-Planner_Manager_svnt</artifact>
+    <!--
+    <execParameter></execParameter>
+    <deployRequirement></deployRequirement>
+    -->
+  </implementation>
+
+  <implementation id="RACE-SimpleBinPacker-mdd">
+    <name>RACE-SimpleBinPacker-mdd</name>
+    <source><!-- @@ Don't know what goes here --></source>
+    <artifact>RACE-SimpleBinPacker_exec</artifact>
+    <artifact>RACE-SimpleBinPacker_svnt</artifact>
+    <!--
+    <execParameter></execParameter>
+    <deployRequirement></deployRequirement>
+    -->
+  </implementation>
+
+  <implementation id="RACE-XML_Output_Adapter-mdd">
+    <name>RACE-XML_Output_Adapter-mdd</name>
+    <source><!-- @@ Don't know what goes here --></source>
+    <artifact>RACE-XML_Output_Adapter_exec</artifact>
+    <artifact>RACE-XML_Output_Adapter_svnt</artifact>
+    <!--
+    <execParameter></execParameter>
+    <deployRequirement></deployRequirement>
+    -->
+  </implementation>
+
+  <instance id="RACE-Interactive_Input_Adapter-idd">
+    <name>RACE-Interactive_Input_Adapter-idd</name>
+    <node>SoleNode</node>
+    <source><!-- @@ What goes here --></source>
+    <implementation>RACE-Interactive_Input_Adapter-mdd</implementation>
+  </instance>
+
+  <instance id="RACE-Plan_Analyzer-idd">
+    <name>RACE-Plan_Analyzer-idd</name>
+    <node>SoleNode</node>
+    <source><!-- @@ What goes here --></source>
+    <implementation>RACE-Plan_Analyzer-mdd</implementation>
+  </instance>
+
+  <instance id="RACE-Planner_Manager-idd">
+    <name>RACE-Planner_Manager-idd</name>
+    <node>SoleNode</node>
+    <source><!-- @@ What goes here --></source>
+    <implementation>RACE-Planner_Manager-mdd</implementation>
+  </instance>
+
+  <instance id="RACE-SimpleBinPacker-idd">
+    <name>RACE-SimpleBinPacker-idd</name>
+    <node>SoleNode</node>
+    <source><!-- @@ What goes here --></source>
+    <implementation>RACE-SimpleBinPacker-mdd</implementation>
+  </instance>
+
+  <instance id="RACE-XML_Output_Adapter-idd">
+    <name>RACE-XML_Output_Adapter-idd</name>
+    <node>SoleNode</node>
+    <source><!-- @@ What goes here --></source>
+    <implementation>RACE-XML_Output_Adapter-mdd</implementation>
+  </instance>
+
+  <!-- BEGIN Connections -->
+
+  <connection>
+    <name>forward_Plan_Analyzer</name>
+    <internalEndpoint>
+      <portName>plan_ingress</portName>
+      <kind>Facet</kind>
+      <instance>RACE-Plan_Analyzer-idd</instance>
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ingress</portName>
+      <kind>SimplexReceptacle</kind>
+      <instance>RACE-Interactive_Input_Adapter-idd</instance>
+    </internalEndpoint>
+  </connection>
+
+  <connection>
+    <name>forward_Planner_Manager</name>
+    <internalEndpoint>
+      <portName>planner_manager_i</portName>
+      <kind>Facet</kind>
+      <instance>RACE-Planner_Manager-idd</instance>
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>planner_manager_i</portName>
+      <kind>SimplexReceptacle</kind>
+      <instance>RACE-Plan_Analyzer-idd</instance>
+    </internalEndpoint>
+  </connection>
+
+  <connection>
+    <name>access_SimpleBinPacker</name>
+    <internalEndpoint>
+      <portName>planner_i</portName>
+      <kind>Facet</kind>
+      <instance>RACE-SimpleBinPacker-idd</instance>
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>planners</portName>
+      <kind>SimplexReceptacle</kind>
+      <instance>RACE-Planner_Manager-idd</instance>
+    </internalEndpoint>
+  </connection>
+
+  <connection>
+    <name>forward_XML_Output_Adapter</name>
+    <internalEndpoint>
+      <portName>plan_egress</portName>
+      <kind>Facet</kind>
+      <instance>RACE-XML_Output_Adapter-idd</instance>
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>outputs</portName>
+      <kind>SimplexReceptacle</kind>
+      <instance>RACE-Planner_Manager-idd</instance>
+    </internalEndpoint>
+  </connection>
+
+  <!-- END Connections -->
+
+  <!-- @@ Runtime library name must match exactly in "location" tag -->
+  <artifact id="RACE-Interactive_Input_Adapter_exec">
+    <name>Interactive_Input_Adapter_exec</name>
+    <source><!-- @@ Not sure about this--></source>
+    <node><!-- blank --></node>
+    <location>Interactive_Input_Adapter_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>createInteractive_Input_Adapter_Home_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <artifact id="RACE-Interactive_Input_Adapter_svnt">
+    <name>Interactive_Input_Adapter_svnt</name>
+    <source><!-- @@ Not sure --></source>
+    <node><!-- blank --></node>
+    <location>Interactive_Input_Adapter_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>createInteractive_Input_Adapter_Home_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <!-- @@ Runtime library name must match exactly in "location" tag -->
+  <artifact id="RACE-Plan_Analyzer_exec">
+    <name>Plan_Analyzer_exec</name>
+    <source><!-- @@ Not sure about this--></source>
+    <node><!-- blank --></node>
+    <location>Plan_Analyzer_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>createPlan_Analyzer_Home_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <artifact id="RACE-Plan_Analyzer_svnt">
+    <name>Plan_Analyzer_svnt</name>
+    <source><!-- @@ Not sure --></source>
+    <node><!-- blank --></node>
+    <location>Plan_Analyzer_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>createPlan_Analyzer_Home_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <!-- @@ Runtime library name must match exactly in "location" tag -->
+  <artifact id="RACE-Planner_Manager_exec">
+    <name>Planner_Manager_exec</name>
+    <source><!-- @@ Not sure about this--></source>
+    <node><!-- blank --></node>
+    <location>Planner_Manager_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>createPlanner_Manager_Home_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <artifact id="RACE-Planner_Manager_svnt">
+    <name>Planner_Manager_svnt</name>
+    <source><!-- @@ Not sure --></source>
+    <node><!-- blank --></node>
+    <location>Planner_Manager_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>createPlanner_Manager_Home_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <!-- @@ Runtime library name must match exactly in "location" tag -->
+  <artifact id="RACE-SimpleBinPacker_exec">
+    <name>SimpleBinPacker_exec</name>
+    <source><!-- @@ Not sure about this--></source>
+    <node><!-- blank --></node>
+    <location>SimpleBinPacker_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>createSimpleBinPacker_Home_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <artifact id="RACE-SimpleBinPacker_svnt">
+    <name>SimpleBinPacker_svnt</name>
+    <source><!-- @@ Not sure --></source>
+    <node><!-- blank --></node>
+    <location>SimpleBinPacker_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>createSimpleBinPacker_Home_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <!-- @@ Runtime library name must match exactly in "location" tag -->
+  <artifact id="RACE-XML_Output_Adapter_exec">
+    <name>XML_Output_Adapter_exec</name>
+    <source><!-- @@ Not sure about this--></source>
+    <node><!-- blank --></node>
+    <location>XML_Output_Adapter_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>createXML_Output_Adapter_Home_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  
+  <artifact id="RACE-XML_Output_Adapter_svnt">
+    <name>XML_Output_Adapter_svnt</name>
+    <source><!-- @@ Not sure --></source>
+    <node><!-- blank --></node>
+    <location>XML_Output_Adapter_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>createXML_Output_Adapter_Home_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+</Deployment:deploymentPlan>  
diff --git a/TAO/CIAO/ciao/Deployment_Data.idl b/TAO/CIAO/ciao/Deployment_Data.idl
index e56e2a1bf4e..6c5c6c15905 100644
--- a/TAO/CIAO/ciao/Deployment_Data.idl
+++ b/TAO/CIAO/ciao/Deployment_Data.idl
@@ -205,7 +205,7 @@ module Deployment {
 
   struct SubcomponentInstantiationDescription {
     string name;
-    ComponentPackageDescriptions package;
+    //    ComponentPackageDescriptions package;
     Properties configProperty;
     Requirements selectRequirement;
     ComponentPackageReferences reference;
@@ -263,7 +263,7 @@ module Deployment {
     ::CORBA::StringSeq location;
     Properties execParameter;
     Requirements deployRequirement;
-    NamedImplementationArtifacts dependsOn;
+    //NamedImplementationArtifacts dependsOn;
     Properties infoProperty;
   };