*** empty log message ***

19 files changed, 152 insertions, 77 deletions

diff --git a/TAO/CIAO/DAnCE/ciao/Container_Base.h b/TAO/CIAO/DAnCE/ciao/Container_Base.h
index 5277ef1e423..809cde90216 100644
--- a/TAO/CIAO/DAnCE/ciao/Container_Base.h
+++ b/TAO/CIAO/DAnCE/ciao/Container_Base.h
@@ -203,9 +203,13 @@ namespace CIAO
                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void update_servant_map (PortableServer::ObjectId &oid,
-                                     Dynamic_Component_Servant_Base* servant
-                                     ACE_ENV_ARG_DECL) = 0;
+    virtual void add_servant_map (PortableServer::ObjectId &oid,
+                                  Dynamic_Component_Servant_Base* servant
+                                  ACE_ENV_ARG_DECL) = 0;
+
+    virtual void delete_servant_map (PortableServer::ObjectId &oid,
+                                  Dynamic_Component_Servant_Base* servant
+                                  ACE_ENV_ARG_DECL) = 0;
 
     // Install a component servant.
     CORBA::Object_ptr install_component (PortableServer::Servant p,
diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.cpp b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.cpp
index cbb9932d089..2d8495334a1 100644
--- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.cpp
@@ -26,10 +26,11 @@ namespace CIAO
                      PortableServer::ForwardRequest))
   {
     Dynamic_Component_Servant_Base* servant = 0;
+    PortableServer::ObjectId new_oid (oid);
 
     if (this->servant_map_.find (oid, servant) == 0)
     {
-      return servant->create ();
+      return servant->create (new_oid);
     }
 
     return 0;
@@ -47,7 +48,15 @@ namespace CIAO
   {
   }
 
-  void Dynamic_Component_Activator::update_servant_map 
+  void Dynamic_Component_Activator::add_servant_map 
+    (PortableServer::ObjectId &oid,
+     Dynamic_Component_Servant_Base* servant
+     ACE_ENV_ARG_DECL)
+  {
+    this->servant_map_.bind (oid, servant);
+  }
+
+  void Dynamic_Component_Activator::delete_servant_map 
     (PortableServer::ObjectId &oid,
      Dynamic_Component_Servant_Base* servant
      ACE_ENV_ARG_DECL)
diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.h b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.h
index a48f800213e..0cf93eedc32 100644
--- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.h
+++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.h
@@ -77,7 +77,11 @@ namespace CIAO
                       ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void update_servant_map (PortableServer::ObjectId &oid,
+    void add_servant_map (PortableServer::ObjectId &oid,
+                          Dynamic_Component_Servant_Base* servant
+                          ACE_ENV_ARG_DECL);
+
+    void delete_servant_map (PortableServer::ObjectId &oid,
                              Dynamic_Component_Servant_Base* servant
                              ACE_ENV_ARG_DECL);
 
diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_Base.h b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_Base.h
index 58a10b7368d..4ca372d803b 100644
--- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_Base.h
+++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_Base.h
@@ -36,7 +36,10 @@ namespace CIAO
 
     virtual ~Dynamic_Component_Servant_Base (void);
 
-    virtual PortableServer::Servant create (void) = 0;
+    virtual PortableServer::Servant 
+      create (PortableServer::ObjectId &oid) = 0;
+
+    virtual void destroy (PortableServer::ObjectId &oid) = 0;
 
   protected:
     Session_Container *container_;
diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp
index fd70f42046e..976a43088b8 100644
--- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp
@@ -44,9 +44,28 @@ namespace CIAO
             typename EXEC,
             typename EXEC_VAR,
             typename COMP>
+  void Dynamic_Component_Servant
+    <COMP_SVNT, COMP_EXEC, COMP_EXEC_VAR, 
+     EXEC, EXEC_VAR, COMP>::destroy (PortableServer::ObjectId &oid)
+  {
+    ACE_DEBUG ((LM_DEBUG, "i am being called to destroy\n"));
+    COMP_SVNT *servant;
+    if (this->servant_map_.find (oid, servant) == 0)
+      {
+        ACE_DEBUG ((LM_DEBUG, "i found the servant\n"));
+        servant->remove ();
+      }
+  }
+
+  template <typename COMP_SVNT,
+            typename COMP_EXEC,
+            typename COMP_EXEC_VAR,
+            typename EXEC,
+            typename EXEC_VAR,
+            typename COMP>
   PortableServer::Servant Dynamic_Component_Servant
     <COMP_SVNT, COMP_EXEC, COMP_EXEC_VAR, 
-     EXEC, EXEC_VAR, COMP>::create (void)
+     EXEC, EXEC_VAR, COMP>::create (PortableServer::ObjectId &oid)
   {
     CIAO::Swap_Exec_var swap_exec = CIAO::Swap_Exec::_narrow
        (this->executor_.in ()
@@ -59,14 +78,12 @@ namespace CIAO
     COMP_EXEC_VAR ciao_comp = COMP_EXEC::_narrow (ciao_ec.in ()
                                                   ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (COMP::_nil ());
-
     
     COMP_SVNT *svt = new COMP_SVNT(ciao_comp.in (), this->home_.in (),
                                    this->home_servant_,
                                    this->container_);
-
-
     PortableServer::ServantBase_var safe (svt);
+    this->servant_map_.bind (oid, svt);
     return safe._retn ();
   }
 }
diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.h b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.h
index f11cf60030a..dabca16470f 100644
--- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.h
+++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.h
@@ -44,12 +44,21 @@ namespace CIAO
 
     virtual ~Dynamic_Component_Servant (void);
 
-    virtual PortableServer::Servant create (void);
+    virtual PortableServer::Servant 
+      create (PortableServer::ObjectId &oid);
+
+    virtual void destroy (PortableServer::ObjectId &oid);
 
   protected:
     Components::EnterpriseComponent_var executor_;
     Home_Servant_Impl_Base *home_servant_;
     Components::CCMHome_var home_;
+    ACE_Hash_Map_Manager_Ex<PortableServer::ObjectId,
+                            COMP_SVNT *,
+                            TAO_ObjectId_Hash,
+                            ACE_Equal_To<PortableServer::ObjectId>,
+                            ACE_SYNCH_MUTEX>
+      servant_map_;
   };
 }
 
diff --git a/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.cpp b/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.cpp
index aebfbef88c4..1fd923a8657 100644
--- a/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.cpp
@@ -49,11 +49,10 @@ namespace CIAO
                     COMP_EXEC_VAR,
                     COMP_SVNT>::~Home_Servant_Impl (void)
   {
-    // @@ JAI if you have tyedefed something, please use all CAPS.
-    const obj_iterator end =
+    const OBJ_ITERATOR end =
       this->objref_map_.end ();
 
-    for (obj_iterator iter =
+    for (OBJ_ITERATOR iter =
            this->objref_map_.begin ();
          iter != end; ++iter)
       {
diff --git a/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.h b/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.h
index 4264c16af55..7624ee69eb9 100644
--- a/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.h
+++ b/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.h
@@ -105,7 +105,7 @@ namespace CIAO
                             TAO_ObjectId_Hash,
                             ACE_Equal_To<PortableServer::ObjectId>,
                             ACE_SYNCH_MUTEX> OBJREF_MAP;
-    typedef OBJREF_MAP::iterator obj_iterator;
+    typedef OBJREF_MAP::iterator OBJ_ITERATOR;
     OBJREF_MAP objref_map_;
   };
 }
diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp
index ad111ae19e6..d3235e33d4d 100644
--- a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp
@@ -73,9 +73,12 @@ namespace CIAO
     CORBA::Object_var objref =
       this->container_->get_objref (this);
 
+    ACE_DEBUG ((LM_DEBUG, "got the object's reference\n"));
+
     Components::CCMObject_var ccmobjref =
       Components::CCMObject::_narrow (objref.in ()
                                       ACE_ENV_ARG_PARAMETER);
+    ACE_DEBUG ((LM_DEBUG, "got the ccm object's reference\n"));
     PortableServer::ObjectId_var oid;
 
     this->container_->uninstall_component ( ccmobjref.in (),
diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp b/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp
index 7d5c9b00559..3ca30bcf8fc 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp
@@ -47,8 +47,6 @@ namespace CIAO
                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-
-    ACE_DEBUG ((LM_DEBUG, "i am being used to start\n"));
     char buffer[MAXPATHLEN];
 
     if (name == 0)
@@ -104,12 +102,21 @@ namespace CIAO
   }
 
   void
-  Swapping_Container::update_servant_map
+  Swapping_Container::add_servant_map
+    (PortableServer::ObjectId &oid,
+     Dynamic_Component_Servant_Base* servant
+     ACE_ENV_ARG_DECL)
+  {
+    this->dsa_->add_servant_map (oid, servant);
+  }
+
+  void
+  Swapping_Container::delete_servant_map
     (PortableServer::ObjectId &oid,
      Dynamic_Component_Servant_Base* servant
      ACE_ENV_ARG_DECL)
   {
-    this->dsa_->update_servant_map (oid, servant);
+    this->dsa_->add_servant_map (oid, servant);
   }
 
   void
diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Container.h b/TAO/CIAO/DAnCE/ciao/Swapping_Container.h
index 83d3e5f47a7..94e9e2da45c 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Container.h
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Container.h
@@ -63,9 +63,13 @@ namespace CIAO
                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void update_servant_map (PortableServer::ObjectId &oid,
-                                     Dynamic_Component_Servant_Base* servant
-                                     ACE_ENV_ARG_DECL);
+    virtual void add_servant_map (PortableServer::ObjectId &oid,
+                                  Dynamic_Component_Servant_Base* servant
+                                  ACE_ENV_ARG_DECL);
+
+    virtual void delete_servant_map (PortableServer::ObjectId &oid,
+                                  Dynamic_Component_Servant_Base* servant
+                                  ACE_ENV_ARG_DECL);
 
     PortableServer::POA_ptr the_home_servant_POA (void) const;
 
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 a8605031fab..2003fca02fa 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
@@ -48,6 +48,18 @@ namespace CIAO
                     COMP_EXEC_VAR,
                     COMP_SVNT>::~Swapping_Servant_Home_Impl (void)
   {
+    const DYNAMIC_SERVANT_MAP_ITERATOR end = 
+      this->dynamic_servant_map_.end ();
+
+    PortableServer::ObjectId_var oid =
+      PortableServer::string_to_ObjectId (this->obj_id_);
+
+    for (DYNAMIC_SERVANT_MAP_ITERATOR iter = 
+           this->dynamic_servant_map_.begin ();
+         iter != end; ++iter)
+      {
+        (*iter).int_id_->destroy (oid);
+      }
   }
 
   // Operations for CCMHome interface.
@@ -75,23 +87,14 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::RemoveFailure))
   {
-    ACE_DEBUG ((LM_DEBUG, "i am being called to remove the component\n"));
-    COMP_VAR _ciao_comp = COMP::_narrow (comp
-                                         ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    PortableServer::ObjectId_var oid =
+      PortableServer::string_to_ObjectId (this->obj_id_);
 
-    if (CORBA::is_nil (_ciao_comp.in ()))
+    Dynamic_Component_Servant_Base *servant;
+    if (this->dynamic_servant_map_.find (oid, servant) == 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      servant->destroy (oid);
     }
-
-    _ciao_comp->remove (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-
-    ACE_DEBUG ((LM_DEBUG, "i am being called to passivate the components\n"));
-
-    this->_ciao_passivate_component (_ciao_comp.in ()
-                                     ACE_ENV_ARG_PARAMETER);
   }
 
   // Operations for keyless home interface.
@@ -156,12 +159,6 @@ 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_ec.in ()
                                            ACE_ENV_ARG_PARAMETER);
   }
@@ -210,20 +207,15 @@ 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, this->container_);
 
-    this->container_->update_servant_map (oid, svt);
+    this->container_->add_servant_map (oid, svt);
 
+    this->dynamic_servant_map_.bind (oid, svt);
 
     COMP_VAR ho = COMP::_narrow (objref.in ()
                                  ACE_ENV_ARG_PARAMETER);
@@ -249,8 +241,16 @@ namespace CIAO
                     COMP_EXEC,
                     COMP_EXEC_VAR,
                     COMP_SVNT>::update_component_map (
-    PortableServer::ObjectId &)
+    PortableServer::ObjectId &oid)
   {
+    Dynamic_Component_Servant_Base *servant;
+    if (dynamic_servant_map_.unbind (oid, servant) != 0)
+      {
+        ACE_DEBUG ((LM_DEBUG, "Invalid component object reference\n"));
+        return;
+      }
+    ACE_DEBUG ((LM_DEBUG, "updated the map\n"));
+    return;
   }
 
   template <typename BASE_SKEL,
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 547fd19472e..6834c2050b9 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.h
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.h
@@ -26,6 +26,7 @@
 
 #include "tao/PortableServer/Key_Adapters.h"
 #include "ace/Hash_Map_Manager_T.h"
+#include "Dynamic_Component_Servant_Base.h"
 
 namespace CIAO
 {
@@ -107,6 +108,15 @@ namespace CIAO
                             ACE_SYNCH_MUTEX>
       component_map_;
 
+    typedef ACE_Hash_Map_Manager_Ex<PortableServer::ObjectId,
+                            Dynamic_Component_Servant_Base *,
+                            TAO_ObjectId_Hash,
+                            ACE_Equal_To<PortableServer::ObjectId>,
+                            ACE_SYNCH_MUTEX> DYNAMIC_SERVANT_MAP;
+
+    typedef DYNAMIC_SERVANT_MAP::iterator DYNAMIC_SERVANT_MAP_ITERATOR;
+    DYNAMIC_SERVANT_MAP dynamic_servant_map_;
+
     const char* obj_id_;
     const char* repo_id_;
   };
diff --git a/TAO/CIAO/DAnCE/examples/Hello/Receiver/Receiver_exec.cpp b/TAO/CIAO/DAnCE/examples/Hello/Receiver/Receiver_exec.cpp
index 0e5a9a39f5a..a7a057f2ed3 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/Receiver/Receiver_exec.cpp
+++ b/TAO/CIAO/DAnCE/examples/Hello/Receiver/Receiver_exec.cpp
@@ -142,14 +142,14 @@ Receiver_Impl::ReceiverHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL)
                    Components::CCMException))
 {
   Components::EnterpriseComponent_ptr tmp;
-  /*
   ACE_NEW_THROW_EX (tmp,
                     Receiver_Impl::ReceiverSwap_exec_i,
                     CORBA::NO_MEMORY ());
-  */
+  /*
   ACE_NEW_THROW_EX (tmp,
                     Receiver_Impl::Receiver_exec_i,
                     CORBA::NO_MEMORY ());
+  */
   return tmp;
 }
 
diff --git a/TAO/CIAO/DAnCE/examples/Hello/Receiver/Receiver_svnt.cpp.with-connections b/TAO/CIAO/DAnCE/examples/Hello/Receiver/Receiver_svnt.cpp.with-connections
index 38d5c07e003..5adeef8a37d 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/Receiver/Receiver_svnt.cpp.with-connections
+++ b/TAO/CIAO/DAnCE/examples/Hello/Receiver/Receiver_svnt.cpp.with-connections
@@ -29,7 +29,7 @@ namespace Receiver_Impl
   {
     Receiver_Context::Receiver_Context (
     ::Components::CCMHome_ptr home,
-    ::CIAO::Swapping_Container *c,
+    ::CIAO::Session_Container *c,
     Receiver_Servant *sv)
       : ACE_NESTED_CLASS (CIAO, Context_Impl_Base (home, c)), 
       ctx_svnt_base (home, c, sv)
@@ -108,9 +108,10 @@ namespace Receiver_Impl
     Receiver_Servant::Receiver_Servant (
     ::Hello::CCM_Receiver_ptr exe,
     ::Components::CCMHome_ptr h,
-    ::CIAO::Swapping_Container *c)
-      : ACE_NESTED_CLASS (CIAO, Servant_Impl_Base (c)),
-      comp_svnt_base (exe, c)
+    ::CIAO::Home_Servant_Impl_Base *home_servant,
+    ::CIAO::Session_Container *c)
+      : ACE_NESTED_CLASS (CIAO, Servant_Impl_Base (h, home_servant, c)),
+      comp_svnt_base (exe, h, home_servant, c)
     {
       this->context_ = new Receiver_Context (h, c, this);
 
@@ -534,8 +535,8 @@ namespace Receiver_Impl
   {
     ReceiverHome_Servant::ReceiverHome_Servant (
     ::Hello::CCM_ReceiverHome_ptr exe,
-    ::CIAO::Swapping_Container *c)
-      : ACE_NESTED_CLASS (CIAO, Swapping_Servant_Home_Impl_Base (c)),
+    ::CIAO::Session_Container *c)
+      : ACE_NESTED_CLASS (CIAO, Home_Servant_Impl_Base (c)),
       home_svnt_base (exe, c, "Receiver_Impl_Hello_Receiver",
                       "Receiver_Impl_Hello_Receiver")
     {
@@ -557,7 +558,7 @@ namespace Receiver_Impl
   extern "C" RECEIVER_SVNT_Export ::PortableServer::Servant
   createReceiverHome_Servant (
   ::Components::HomeExecutorBase_ptr p,
-  CIAO::Swapping_Container *c
+  CIAO::Session_Container *c
   ACE_ENV_ARG_DECL)
   {
     if (p == 0)
diff --git a/TAO/CIAO/DAnCE/examples/Hello/Receiver/Receiver_svnt.h.with-connections b/TAO/CIAO/DAnCE/examples/Hello/Receiver/Receiver_svnt.h.with-connections
index 48adda24d03..6159600a4f1 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/Receiver/Receiver_svnt.h.with-connections
+++ b/TAO/CIAO/DAnCE/examples/Hello/Receiver/Receiver_svnt.h.with-connections
@@ -32,6 +32,7 @@
 #include "ciao/Container_Base.h"
 #include "ciao/Swapping_Container.h"
 #include "ciao/Servant_Impl_T.h"
+#include "ciao/Home_Servant_Impl_Base.h"
 #include "ciao/Context_Impl_T.h"
 #include "ciao/Home_Servant_Impl_T.h"
 #include "ciao/Swapping_Servant_Home_Impl_T.h"
@@ -67,7 +68,7 @@ namespace Receiver_Impl
 
       Receiver_Context (
       ::Components::CCMHome_ptr home,
-      ::CIAO::Swapping_Container *c,
+      ::CIAO::Session_Container *c,
       Receiver_Servant *sv);
 
       virtual ~Receiver_Context (void);
@@ -135,7 +136,8 @@ namespace Receiver_Impl
       Receiver_Servant (
       ::Hello::CCM_Receiver_ptr executor,
       ::Components::CCMHome_ptr home,
-      ::CIAO::Swapping_Container *c);
+      ::CIAO::Home_Servant_Impl_Base *home_servant,
+      ::CIAO::Session_Container *c);
 
       virtual ~Receiver_Servant (void);
 
@@ -331,7 +333,7 @@ namespace Receiver_Impl
 
       ReceiverHome_Servant (
       ::Hello::CCM_ReceiverHome_ptr exe,
-      ::CIAO::Swapping_Container *c);
+      ::CIAO::Session_Container *c);
 
       virtual ~ReceiverHome_Servant (void);
 
@@ -345,7 +347,7 @@ namespace Receiver_Impl
     extern "C" RECEIVER_SVNT_Export ::PortableServer::Servant
     createReceiverHome_Servant (
     ::Components::HomeExecutorBase_ptr p,
-    CIAO::Swapping_Container *c
+    CIAO::Session_Container *c
     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   }
 }
diff --git a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.cpp b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.cpp
index 50dba358901..893266b4dec 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.cpp
+++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.cpp
@@ -144,8 +144,8 @@ Sender_Impl::SenderHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
                    Components::CCMException))
 {
   ACE_DEBUG ((LM_DEBUG, "%P|%t) creating SenderHome \n")); 
-  // return new Sender_Impl::SenderSwap_exec_i;
-  return new Sender_Impl::Sender_exec_i;
+  return new Sender_Impl::SenderSwap_exec_i;
+  // return new Sender_Impl::Sender_exec_i;
 }
 
 extern "C" SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr
diff --git a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_svnt.cpp.with-connections b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_svnt.cpp.with-connections
index a04d2e3d79a..21a01b2b0ab 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_svnt.cpp.with-connections
+++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_svnt.cpp.with-connections
@@ -90,7 +90,7 @@ namespace Sender_Impl
   {
     Sender_Context::Sender_Context (
     ::Components::CCMHome_ptr home,
-    ::CIAO::Swapping_Container *c,
+    ::CIAO::Session_Container *c,
     Sender_Servant *sv)
       : ACE_NESTED_CLASS (CIAO, Context_Impl_Base (home, c)), 
       ctx_svnt_base (home, c, sv)
@@ -204,9 +204,10 @@ namespace Sender_Impl
     Sender_Servant::Sender_Servant (
     ::Hello::CCM_Sender_ptr exe,
     ::Components::CCMHome_ptr h,
-    ::CIAO::Swapping_Container *c)
-      : ACE_NESTED_CLASS (CIAO, Servant_Impl_Base (c)),
-      comp_svnt_base (exe, c)
+    ::CIAO::Home_Servant_Impl_Base *home_servant,
+    ::CIAO::Session_Container *c)
+      : ACE_NESTED_CLASS (CIAO, Servant_Impl_Base (h, home_servant, c)),
+      comp_svnt_base (exe, h, home_servant, c)
     {
       this->context_ = new Sender_Context (h, c, this);
 
@@ -603,8 +604,8 @@ namespace Sender_Impl
   {
     SenderHome_Servant::SenderHome_Servant (
     ::Hello::CCM_SenderHome_ptr exe,
-    ::CIAO::Swapping_Container *c)
-      : ACE_NESTED_CLASS (CIAO, Swapping_Servant_Home_Impl_Base (c)),
+    ::CIAO::Session_Container *c)
+      : ACE_NESTED_CLASS (CIAO, Home_Servant_Impl_Base (c)),
       home_svnt_base (exe, c, "Sender_Impl_Hello_Sender",
                       "Sender_Impl_Hello_Sender")
     {
@@ -626,7 +627,7 @@ namespace Sender_Impl
   extern "C" SENDER_SVNT_Export ::PortableServer::Servant
   createSenderHome_Servant (
   ::Components::HomeExecutorBase_ptr p,
-  CIAO::Swapping_Container *c
+  CIAO::Session_Container *c
   ACE_ENV_ARG_DECL)
   {
     if (p == 0)
diff --git a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_svnt.h.with-connections b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_svnt.h.with-connections
index ae87dc17a60..8257c1902e3 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_svnt.h.with-connections
+++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_svnt.h.with-connections
@@ -34,6 +34,7 @@
 #include "ciao/Servant_Impl_T.h"
 #include "ciao/Context_Impl_T.h"
 #include "ciao/Home_Servant_Impl_T.h"
+#include "ciao/Home_Servant_Impl_Base.h"
 #include "ciao/Swapping_Servant_Home_Impl_T.h"
 #include "ace/Active_Map_Manager_T.h"
 
@@ -105,7 +106,7 @@ namespace Sender_Impl
 
       Sender_Context (
       ::Components::CCMHome_ptr home,
-      ::CIAO::Swapping_Container *c,
+      ::CIAO::Session_Container *c,
       Sender_Servant *sv);
 
       virtual ~Sender_Context (void);
@@ -174,7 +175,8 @@ namespace Sender_Impl
       Sender_Servant (
       ::Hello::CCM_Sender_ptr executor,
       ::Components::CCMHome_ptr home,
-      ::CIAO::Swapping_Container *c);
+      ::CIAO::Home_Servant_Impl_Base *home_servant,
+      ::CIAO::Session_Container *c);
 
       virtual ~Sender_Servant (void);
 
@@ -341,7 +343,7 @@ namespace Sender_Impl
 
       SenderHome_Servant (
       ::Hello::CCM_SenderHome_ptr exe,
-      ::CIAO::Swapping_Container *c);
+      ::CIAO::Session_Container *c);
 
       virtual ~SenderHome_Servant (void);
 
@@ -355,7 +357,7 @@ namespace Sender_Impl
     extern "C" SENDER_SVNT_Export ::PortableServer::Servant
     createSenderHome_Servant (
     ::Components::HomeExecutorBase_ptr p,
-    CIAO::Swapping_Container *c
+    CIAO::Session_Container *c
     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   }
 }