*** empty log message ***

10 files changed, 53 insertions, 17 deletions

diff --git a/TAO/CIAO/DAnCE/ciao/Container_Base.h b/TAO/CIAO/DAnCE/ciao/Container_Base.h
index f66b2282d16..2537189f21e 100644
--- a/TAO/CIAO/DAnCE/ciao/Container_Base.h
+++ b/TAO/CIAO/DAnCE/ciao/Container_Base.h
@@ -142,6 +142,8 @@ namespace CIAO
     HOMESERVANTCREATOR_FUNCPTR_MAP* home_servant_creator_funcptr_map_;
   };
 
+  class Dynamic_Component_Servant_Base;
+
   class CIAO_SERVER_Export Session_Container : public Container
   {
   public:
@@ -201,6 +203,10 @@ 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;
+
     // Install a component servant.
     CORBA::Object_ptr install_component (PortableServer::Servant p,
                                          PortableServer::ObjectId_out oid
diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_Base.cpp b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_Base.cpp
index 6344f493c64..e7a0daceadd 100644
--- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_Base.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_Base.cpp
@@ -15,7 +15,7 @@ namespace CIAO
   }
 
   Dynamic_Component_Servant_Base::Dynamic_Component_Servant_Base
-    (Swapping_Container * c)
+    (Session_Container * c)
     : container_ (c)
   {
   }
diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_Base.h b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_Base.h
index 562c91909f1..58a10b7368d 100644
--- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_Base.h
+++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_Base.h
@@ -26,20 +26,20 @@
 
 namespace CIAO
 {
-  class Swapping_Container;
+  class Session_Container;
   class CIAO_SERVER_Export Dynamic_Component_Servant_Base
   {
   public:
     explicit Dynamic_Component_Servant_Base (void);
 
-    Dynamic_Component_Servant_Base (Swapping_Container *c);
+    Dynamic_Component_Servant_Base (Session_Container *c);
 
     virtual ~Dynamic_Component_Servant_Base (void);
 
     virtual PortableServer::Servant create (void) = 0;
 
   protected:
-    Swapping_Container *container_;
+    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 dafbc8dbee9..fd70f42046e 100644
--- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp
@@ -18,9 +18,11 @@ namespace CIAO
     ::Dynamic_Component_Servant 
         (Components::EnterpriseComponent_ptr ec,
          Components::CCMHome_ptr home,
-         Swapping_Container *c)
+         Home_Servant_Impl_Base *home_servant,
+         Session_Container *c)
       :Dynamic_Component_Servant_Base (c),
        executor_ (Components::EnterpriseComponent::_duplicate (ec)),
+       home_servant_ (home_servant),
        home_ (Components::CCMHome::_duplicate (home))
   {
   }
@@ -60,6 +62,7 @@ namespace CIAO
 
     
     COMP_SVNT *svt = new COMP_SVNT(ciao_comp.in (), this->home_.in (),
+                                   this->home_servant_,
                                    this->container_);
 
 
diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.h b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.h
index f6f28ddf5fe..f11cf60030a 100644
--- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.h
+++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.h
@@ -39,7 +39,8 @@ namespace CIAO
   public:
     Dynamic_Component_Servant (Components::EnterpriseComponent_ptr ec,
                                Components::CCMHome_ptr home,
-                               Swapping_Container *c);
+                               Home_Servant_Impl_Base *home_servant,
+                               Session_Container *c);
 
     virtual ~Dynamic_Component_Servant (void);
 
@@ -47,6 +48,7 @@ namespace CIAO
 
   protected:
     Components::EnterpriseComponent_var executor_;
+    Home_Servant_Impl_Base *home_servant_;
     Components::CCMHome_var home_;
   };
 }
diff --git a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
index 8a30ff0e873..9a50c53e26f 100644
--- a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
+++ b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
@@ -391,7 +391,7 @@ CIAO::NodeApplication_Impl::init (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW_THROW_EX (this->container_,
-                    CIAO::Session_Container (this->orb_.in (), 0, 0),
+                    CIAO::Swapping_Container (this->orb_.in ()),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (-1);
 
diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp b/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp
index 830e0c12cb3..ac863b8d18a 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp
@@ -39,6 +39,7 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
 
+    ACE_DEBUG ((LM_DEBUG, "i am being used to start\n"));
     char buffer[MAXPATHLEN];
 
     if (name == 0)
diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Container.h b/TAO/CIAO/DAnCE/ciao/Swapping_Container.h
index 300f9d7cdb9..f6c79773ca3 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Container.h
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Container.h
@@ -59,9 +59,9 @@ namespace CIAO
                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void update_servant_map (PortableServer::ObjectId &oid,
-                             Dynamic_Component_Servant_Base* servant
-                             ACE_ENV_ARG_DECL);
+    virtual void update_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 6420f7905f9..8a1882d05d9 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
@@ -25,8 +25,8 @@ namespace CIAO
                     COMP_EXEC_VAR,
                     COMP_SVNT>::Swapping_Servant_Home_Impl (
       EXEC * exe,
-      Swapping_Container * c, const char* obj_id, const char* repo_id)
-    : Swapping_Servant_Home_Impl_Base (c),
+      Session_Container * c, const char* obj_id, const char* repo_id)
+    : Home_Servant_Impl_Base (c),
       executor_ (EXEC::_duplicate (exe)), obj_id_ (obj_id), repo_id_ (repo_id)
   {
   }
@@ -217,7 +217,7 @@ namespace CIAO
     Dynamic_Component_Servant_Base *svt =
       new Dynamic_Component_Servant
        <COMP_SVNT, COMP_EXEC, COMP_EXEC_VAR, EXEC, EXEC_VAR, COMP>
-          (ec, home, this->container_);
+          (ec, home, this, this->container_);
 
     this->container_->update_servant_map (oid, svt);
 
@@ -245,6 +245,27 @@ namespace CIAO
                     COMP_VAR,
                     COMP_EXEC,
                     COMP_EXEC_VAR,
+                    COMP_SVNT>::update_component_map (
+    PortableServer::ObjectId &)
+  {
+  }
+
+  template <typename BASE_SKEL,
+            typename EXEC,
+            typename EXEC_VAR,
+            typename COMP,
+            typename COMP_VAR,
+            typename COMP_EXEC,
+            typename COMP_EXEC_VAR,
+            typename COMP_SVNT>
+  void
+  Swapping_Servant_Home_Impl<BASE_SKEL,
+                    EXEC,
+                    EXEC_VAR,
+                    COMP,
+                    COMP_VAR,
+                    COMP_EXEC,
+                    COMP_EXEC_VAR,
                     COMP_SVNT>::_ciao_passivate_component (
       COMP *comp
       ACE_ENV_ARG_DECL
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 85f4958b5bc..547fd19472e 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.h
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Swapping_Servant_Home_Impl_Base.h"
+#include "Home_Servant_Impl_Base.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -29,7 +29,7 @@
 
 namespace CIAO
 {
-  class Swapping_Container;
+  class Session_Container;
 
   /**
    * @class Swapping_Servant_Impl
@@ -49,12 +49,12 @@ namespace CIAO
             typename COMP_SVNT>
   class Swapping_Servant_Home_Impl
     : public virtual BASE_SKEL,
-      public virtual Swapping_Servant_Home_Impl_Base,
+      public virtual Home_Servant_Impl_Base,
       public virtual PortableServer::RefCountServantBase
   {
   public:
     Swapping_Servant_Home_Impl (EXEC * exe,
-                       Swapping_Container * c,
+                       Session_Container * c,
                        const char* obj_id, const char* repo_id);
 
     virtual ~Swapping_Servant_Home_Impl (void);
@@ -81,6 +81,9 @@ namespace CIAO
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CreateFailure));
 
+    virtual void
+    update_component_map (PortableServer::ObjectId &oid);
+
   protected:
     // CIAO-specific operations.