*** empty log message ***

6 files changed, 38 insertions, 12 deletions

diff --git a/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc b/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc
index 781d49a271a..eb998961c46 100644
--- a/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc
+++ b/TAO/CIAO/DAnCE/ciao/CCM_Core.mpc
@@ -44,6 +44,7 @@ project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, valuetype,
     CosPersistentState.idl
     CCM_Container.idl
     CCM_Container_Ex.idl
+    SwapExec.idl
   }
 
   Source_Files {
@@ -54,6 +55,7 @@ project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, valuetype,
     CCM_BaseS.cpp
     CCM_EventS.cpp
     CCM_ComponentS.cpp
+    SwapExecC.cpp
     Cookies.cpp
   }
 
diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp
index b56500cd27f..dafbc8dbee9 100644
--- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp
@@ -16,10 +16,11 @@ namespace CIAO
   Dynamic_Component_Servant<COMP_SVNT, COMP_EXEC, COMP_EXEC_VAR, 
                             EXEC, EXEC_VAR, COMP>
     ::Dynamic_Component_Servant 
-        (EXEC *exe, Components::CCMHome_ptr home,
+        (Components::EnterpriseComponent_ptr ec,
+         Components::CCMHome_ptr home,
          Swapping_Container *c)
       :Dynamic_Component_Servant_Base (c),
-       executor_ (EXEC::_duplicate (exe)),
+       executor_ (Components::EnterpriseComponent::_duplicate (ec)),
        home_ (Components::CCMHome::_duplicate (home))
   {
   }
@@ -45,8 +46,12 @@ namespace CIAO
     <COMP_SVNT, COMP_EXEC, COMP_EXEC_VAR, 
      EXEC, EXEC_VAR, COMP>::create (void)
   {
+    CIAO::Swap_Exec_var swap_exec = CIAO::Swap_Exec::_narrow
+       (this->executor_.in ()
+        ACE_ENV_ARG_PARAMETER);
+
     ::Components::EnterpriseComponent_var ciao_ec =
-      this->executor_->create (ACE_ENV_SINGLE_ARG_PARAMETER);
+      swap_exec->incarnate (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (COMP::_nil ());
 
     COMP_EXEC_VAR ciao_comp = COMP_EXEC::_narrow (ciao_ec.in ()
diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.h b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.h
index a09361ce987..f6f28ddf5fe 100644
--- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.h
+++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.h
@@ -19,6 +19,7 @@
 #include /**/ "ace/pre.h"
 
 #include "Dynamic_Component_Servant_Base.h"
+#include "SwapExecC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -36,7 +37,8 @@ namespace CIAO
     : public virtual Dynamic_Component_Servant_Base
   {
   public:
-    Dynamic_Component_Servant (EXEC *exe, Components::CCMHome_ptr home,
+    Dynamic_Component_Servant (Components::EnterpriseComponent_ptr ec,
+                               Components::CCMHome_ptr home,
                                Swapping_Container *c);
 
     virtual ~Dynamic_Component_Servant (void);
@@ -44,8 +46,7 @@ namespace CIAO
     virtual PortableServer::Servant create (void);
 
   protected:
-    EXEC_VAR executor_;
-
+    Components::EnterpriseComponent_var executor_;
     Components::CCMHome_var home_;
   };
 }
diff --git a/TAO/CIAO/DAnCE/ciao/SwapExec.idl b/TAO/CIAO/DAnCE/ciao/SwapExec.idl
new file mode 100644
index 00000000000..566781019e3
--- /dev/null
+++ b/TAO/CIAO/DAnCE/ciao/SwapExec.idl
@@ -0,0 +1,12 @@
+// $Id$
+
+#include "CCM_Container.idl"
+
+module CIAO
+{
+  local interface Swap_Exec : ::Components::EnterpriseComponent
+  {
+    Components::EnterpriseComponent incarnate ();
+    Components::EnterpriseComponent etherealize ();
+  };
+};
diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
index a9356fa7472..f0506d4058c 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
@@ -153,13 +153,13 @@ namespace CIAO
       this->executor_->create (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (COMP::_nil ());
 
-
+/*
     COMP_EXEC_VAR _ciao_comp =
       COMP_EXEC::_narrow (_ciao_ec.in ()
                           ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (COMP::_nil ());
-
-    return this->_ciao_activate_component (_ciao_comp.in ()
+*/
+    return this->_ciao_activate_component (_ciao_ec.in ()
                                            ACE_ENV_ARG_PARAMETER);
   }
 
@@ -182,7 +182,7 @@ namespace CIAO
                     COMP_EXEC,
                     COMP_EXEC_VAR,
                     COMP_SVNT>::_ciao_activate_component (
-      COMP_EXEC *exe
+      ::Components::EnterpriseComponent_ptr ec
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
@@ -207,11 +207,17 @@ namespace CIAO
         Container::Component
         ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
+/*
     Dynamic_Component_Servant_Base *svt =
       new Dynamic_Component_Servant
        <COMP_SVNT, COMP_EXEC, COMP_EXEC_VAR, EXEC, EXEC_VAR, COMP>
           (this->executor_.in (), home, this->container_);
+*/
+
+    Dynamic_Component_Servant_Base *svt =
+      new Dynamic_Component_Servant
+       <COMP_SVNT, COMP_EXEC, COMP_EXEC_VAR, EXEC, EXEC_VAR, COMP>
+          (ec, home, this->container_);
 
     this->container_->update_servant_map (oid, svt);
 
diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.h b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.h
index 656fb41a0bc..85f4958b5bc 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.h
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.h
@@ -85,7 +85,7 @@ namespace CIAO
     // CIAO-specific operations.
 
     COMP *
-    _ciao_activate_component (COMP_EXEC *exe
+    _ciao_activate_component (::Components::EnterpriseComponent_ptr ec
                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));