Wed Sep 22 09:20:33 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * ciao/Containers/Container_Base_T.h:
        * ciao/Containers/Session/Session_Container.h:
        * ciao/Contexts/Extension/ExtensionContext_T.h:
        * ciao/Contexts/Extension/ExtensionContext_T.cpp:
        * ciao/Servants/Home_Servant_Impl_Base.h:
        * ciao/Servants/Home_Servant_Impl_Base.cpp:
        * ciao/Servants/Home_Servant_Impl_T.h:
        * ciao/Servants/Home_Servant_Impl_T.cpp:
          Changes for Session_Container

9 files changed, 29 insertions, 26 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 982c06a088d..24b19c2eadb 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,15 @@
+Wed Sep 22 09:20:33 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Containers/Container_Base_T.h:
+        * ciao/Containers/Session/Session_Container.h:
+        * ciao/Contexts/Extension/ExtensionContext_T.h:
+        * ciao/Contexts/Extension/ExtensionContext_T.cpp:
+        * ciao/Servants/Home_Servant_Impl_Base.h:
+        * ciao/Servants/Home_Servant_Impl_Base.cpp:
+        * ciao/Servants/Home_Servant_Impl_T.h:
+        * ciao/Servants/Home_Servant_Impl_T.cpp:
+          Changes for Session_Container
+
 Wed Sep 22 08:52:54 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ciao/Containers/Container_Base_T.h:
diff --git a/CIAO/ciao/Containers/Container_Base_T.h b/CIAO/ciao/Containers/Container_Base_T.h
index 027940550fa..0e04df10757 100644
--- a/CIAO/ciao/Containers/Container_Base_T.h
+++ b/CIAO/ciao/Containers/Container_Base_T.h
@@ -49,7 +49,7 @@ namespace CIAO
     virtual ~Container_i (void);
 
     /// Initialize the container with a name.
-    virtual void init (const char *name = 0) = 0;
+    virtual void init (const char *name) = 0;
 
     /// Get component's POA.
     /**
diff --git a/CIAO/ciao/Containers/Session/Session_Container.h b/CIAO/ciao/Containers/Session/Session_Container.h
index 60ee939be82..bde0dbe3f4d 100644
--- a/CIAO/ciao/Containers/Session/Session_Container.h
+++ b/CIAO/ciao/Containers/Session/Session_Container.h
@@ -26,7 +26,6 @@
 
 #include "tao/PortableServer/Servant_Base.h"
 #include "ciao/Containers/Session/Session_ContainerC.h"
-#include "ciao/Containers/Container_Base_T.h"
 #include "ccm/CCM_HomeExecutorBaseC.h"
 #include "ccm/CCM_EnterpriseComponentC.h"
 
@@ -72,12 +71,12 @@ namespace CIAO
   COMPONENTSERVANTCREATOR_FUNCPTR_MAP;
 
 
-  class SESSION_CONTAINER_Export Session_Container_i : public Container_i < ::CIAO::Session_Container>
+  class SESSION_CONTAINER_Export Session_Container_i :
+    public Container_i < ::CIAO::Session_Container>
   {
   public:
     Session_Container_i (CORBA::ORB_ptr o,
-                       PortableServer::POA_ptr poa,
-                       const char *name = 0);
+                       PortableServer::POA_ptr poa);
 
     virtual ~Session_Container_i (void);
 
@@ -165,7 +164,7 @@ namespace CIAO
   private:
 
     /// Initialize the container with a name.
-    virtual void init (const char *name = 0);
+    virtual void init (const char *name);
 
     /// Create POA for the component.
     /**
diff --git a/CIAO/ciao/Contexts/Extension/ExtensionContext_T.cpp b/CIAO/ciao/Contexts/Extension/ExtensionContext_T.cpp
index 250c6d004d9..86b001e66c9 100644
--- a/CIAO/ciao/Contexts/Extension/ExtensionContext_T.cpp
+++ b/CIAO/ciao/Contexts/Extension/ExtensionContext_T.cpp
@@ -9,7 +9,7 @@ namespace CIAO
             typename COMP>
   ExtensionContext_Impl<BASE_CTX, COMP>::ExtensionContext_Impl (
       Components::CCMHome_ptr the_home,
-      Container_ptr c,
+      ::CIAO::Session_Container_ptr c,
       PortableServer::Servant sv,
       const char* id)
     : Context_Impl_Base (the_home, c, id),
diff --git a/CIAO/ciao/Contexts/Extension/ExtensionContext_T.h b/CIAO/ciao/Contexts/Extension/ExtensionContext_T.h
index d35ac575da7..4790cec4665 100644
--- a/CIAO/ciao/Contexts/Extension/ExtensionContext_T.h
+++ b/CIAO/ciao/Contexts/Extension/ExtensionContext_T.h
@@ -49,7 +49,7 @@ namespace CIAO
   {
   public:
     ExtensionContext_Impl(Components::CCMHome_ptr home,
-                          Session_Container * c,
+                          ::CIAO::Session_Container_ptr c,
                           PortableServer::Servant sv,
                           const char* id);
 
diff --git a/CIAO/ciao/Servants/Home_Servant_Impl_Base.cpp b/CIAO/ciao/Servants/Home_Servant_Impl_Base.cpp
index 632d65ac55b..0f3a6b660ed 100644
--- a/CIAO/ciao/Servants/Home_Servant_Impl_Base.cpp
+++ b/CIAO/ciao/Servants/Home_Servant_Impl_Base.cpp
@@ -1,12 +1,10 @@
 // $Id$
 
 #include "Home_Servant_Impl_Base.h"
-#include "ciao/Containers/Container_BaseC.h"
 
 namespace CIAO
 {
-  Home_Servant_Impl_Base::Home_Servant_Impl_Base (Container_ptr c)
-    : container_ (Container::_duplicate(c))
+  Home_Servant_Impl_Base::Home_Servant_Impl_Base (void)
   {
   }
 
diff --git a/CIAO/ciao/Servants/Home_Servant_Impl_Base.h b/CIAO/ciao/Servants/Home_Servant_Impl_Base.h
index a7a147f54a7..7486f03cafe 100644
--- a/CIAO/ciao/Servants/Home_Servant_Impl_Base.h
+++ b/CIAO/ciao/Servants/Home_Servant_Impl_Base.h
@@ -26,7 +26,6 @@
 
 #include "ccm/CCM_HomeS.h"
 #include "ccm/CCM_StandardConfiguratorC.h"
-#include "ciao/Containers/Container_BaseC.h"
 
 namespace CIAO
 {
@@ -42,7 +41,7 @@ namespace CIAO
     : public virtual POA_Components::CCMHome
   {
   public:
-    Home_Servant_Impl_Base (Container_ptr c);
+    Home_Servant_Impl_Base (void);
 
     virtual ~Home_Servant_Impl_Base (void);
 
@@ -60,13 +59,6 @@ namespace CIAO
     virtual void set_attributes (const Components::ConfigValues &descr);
 
     virtual void update_component_map (PortableServer::ObjectId &oid) = 0;
-
-  protected:
-    Container_var container_;
-
-  private:
-    /// Not to be used
-    Home_Servant_Impl_Base (void);
   };
 }
 
diff --git a/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp b/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp
index 6c7e48dd8e4..7cb36d922a6 100644
--- a/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp
+++ b/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp
@@ -18,13 +18,13 @@ namespace CIAO
                     EXEC,
                     COMP_SVNT>::Home_Servant_Impl (
       typename EXEC::_ptr_type exe,
-      Container_ptr c,
-      const char *ins_name
-    )
-    : Home_Servant_Impl_Base (c),
+      ::CIAO::Session_Container_ptr c,
+      const char *ins_name)
+    : Home_Servant_Impl_Base (),
       ins_name_ (ins_name),
       executor_ (EXEC::_duplicate (exe)),
-      serial_number_ (0)
+      serial_number_ (0),
+      container_ (::CIAO::Session_Container::_duplicate(c))
   {
     CIAO_DEBUG (9, (LM_TRACE, CLINFO "Home_Servant_Impl<>::Home_Servant_Impl - "
                  "Creating servant for home with ID %C\n",
diff --git a/CIAO/ciao/Servants/Home_Servant_Impl_T.h b/CIAO/ciao/Servants/Home_Servant_Impl_T.h
index b4ba99ba948..64bafc0524d 100644
--- a/CIAO/ciao/Servants/Home_Servant_Impl_T.h
+++ b/CIAO/ciao/Servants/Home_Servant_Impl_T.h
@@ -49,7 +49,7 @@ namespace CIAO
   {
   public:
     Home_Servant_Impl (typename EXEC::_ptr_type exe,
-                       Container_ptr c,
+                       ::CIAO::Session_Container_ptr c,
                        const char *ins_name);
 
     virtual ~Home_Servant_Impl (void);
@@ -89,6 +89,8 @@ namespace CIAO
     OBJREF_MAP objref_map_;
 
     ACE_Atomic_Op <TAO_SYNCH_MUTEX, unsigned long> serial_number_;
+
+    ::CIAO::Session_Container_var container_;
   };
 }