Tue Sep 21 07:06:44 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * ciao/Contexts/Context_Impl_Base.h:
        * ciao/Contexts/Context_Impl_Base.cpp:
        * ciao/Contexts/Session/Context_Impl_T.h:
        * ciao/Contexts/Session/Context_Impl_T.cpp:
        * ciao/Servants/Session/Servant_Impl_T.cpp:
          For the moment readded the instance id as ciao specific method, but
          this will go away at some moment again, resolve_service_reference
          is a much better way to get access to some new idl interface that
          delivers more meta data to a component

        * performance-tests/Protocols/Receiver/Receiver_exec.h:
        * performance-tests/Protocols/Receiver/Receiver_exec.cpp:
        * performance-tests/Protocols/Sender/Sender_exec.h:
        * performance-tests/Protocols/Sender/Sender_exec.cpp:
          Updated because of the removed ciao specific context

10 files changed, 50 insertions, 15 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index d874d805159..2a5f5e4e11c 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,8 +1,26 @@
+Tue Sep 21 07:06:44 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Contexts/Context_Impl_Base.h:
+        * ciao/Contexts/Context_Impl_Base.cpp:
+        * ciao/Contexts/Session/Context_Impl_T.h:
+        * ciao/Contexts/Session/Context_Impl_T.cpp:
+        * ciao/Servants/Session/Servant_Impl_T.cpp:
+          For the moment readded the instance id as ciao specific method, but
+          this will go away at some moment again, resolve_service_reference
+          is a much better way to get access to some new idl interface that
+          delivers more meta data to a component
+
+        * performance-tests/Protocols/Receiver/Receiver_exec.h:
+        * performance-tests/Protocols/Receiver/Receiver_exec.cpp:
+        * performance-tests/Protocols/Sender/Sender_exec.h:
+        * performance-tests/Protocols/Sender/Sender_exec.cpp:
+          Updated because of the removed ciao specific context
+
 Mon Sep 20 15:28:39 UTC 2010  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
 
         * connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.mpc:
-	Add missing lib.
-   
+        Add missing lib.
+
 Mon Sep 20 14:36:39 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ciao/Contexts/Context_Impl_Base.h:
diff --git a/CIAO/ciao/Contexts/Context_Impl_Base.cpp b/CIAO/ciao/Contexts/Context_Impl_Base.cpp
index 4902b5dde51..44f2ace6157 100644
--- a/CIAO/ciao/Contexts/Context_Impl_Base.cpp
+++ b/CIAO/ciao/Contexts/Context_Impl_Base.cpp
@@ -6,9 +6,11 @@
 namespace CIAO
 {
   Context_Impl_Base::Context_Impl_Base (Components::CCMHome_ptr home,
-                                        Container_ptr c)
+                                        Container_ptr c,
+                                        const char *instance_id)
     : home_ (Components::CCMHome::_duplicate (home)),
-      container_ (Container::_duplicate (c))
+      container_ (Container::_duplicate (c)),
+      ciao_instance_id_ (instance_id)
   {
   }
 
@@ -68,4 +70,10 @@ namespace CIAO
   {
     return this->container_->resolve_service_reference (service_id);
   }
+
+  const char *
+  Context_Impl_Base::_ciao_instance_id (void) const
+  {
+    return this->ciao_instance_id_.in ();
+  }
 }
diff --git a/CIAO/ciao/Contexts/Context_Impl_Base.h b/CIAO/ciao/Contexts/Context_Impl_Base.h
index cff3b8d2699..b58cb71c3b5 100644
--- a/CIAO/ciao/Contexts/Context_Impl_Base.h
+++ b/CIAO/ciao/Contexts/Context_Impl_Base.h
@@ -44,7 +44,9 @@ namespace CIAO
     : public virtual Components::CCMContext
   {
   public:
-    Context_Impl_Base (Components::CCMHome_ptr home, Container_ptr c);
+    Context_Impl_Base (Components::CCMHome_ptr home,
+                       Container_ptr c,
+                       const char *instance_id);
 
     virtual ~Context_Impl_Base (void);
 
@@ -74,13 +76,18 @@ namespace CIAO
 
     virtual CORBA::Object_ptr resolve_service_reference(const char *service_id);
 
-  protected:
+    /// Temporarily added back for a sponsor, this will be removed at some
+    /// moment in favor of a resolve_service_reference() call
+    const char *_ciao_instance_id (void) const;
+
+  private:
     Components::CCMHome_var home_;
+  protected:
     Container_var container_;
-
   private:
     /// Private constructor, not allowed to be called
     Context_Impl_Base (void);
+    CORBA::String_var ciao_instance_id_;
   };
 }
 
diff --git a/CIAO/ciao/Contexts/Session/Context_Impl_T.cpp b/CIAO/ciao/Contexts/Session/Context_Impl_T.cpp
index 94a374cd8f7..f0a38977746 100644
--- a/CIAO/ciao/Contexts/Session/Context_Impl_T.cpp
+++ b/CIAO/ciao/Contexts/Session/Context_Impl_T.cpp
@@ -10,8 +10,9 @@ namespace CIAO
   Session_Context_Impl<BASE_CTX, COMP>::Session_Context_Impl (
       Components::CCMHome_ptr the_home,
       Container_ptr c,
-      PortableServer::Servant sv)
-    : Context_Impl_Base (the_home, c),
+      PortableServer::Servant sv,
+      const char* id)
+    : Context_Impl_Base (the_home, c, id),
       servant_ (sv)
   {
   }
diff --git a/CIAO/ciao/Contexts/Session/Context_Impl_T.h b/CIAO/ciao/Contexts/Session/Context_Impl_T.h
index 1c1b257154d..2a0b0ea5e12 100644
--- a/CIAO/ciao/Contexts/Session/Context_Impl_T.h
+++ b/CIAO/ciao/Contexts/Session/Context_Impl_T.h
@@ -54,7 +54,8 @@ namespace CIAO
 
     Session_Context_Impl (Components::CCMHome_ptr the_home,
                           Container_ptr c,
-                          PortableServer::Servant sv);
+                          PortableServer::Servant sv,
+                          const char* id);
 
     virtual ~Session_Context_Impl (void);
 
diff --git a/CIAO/ciao/Servants/Session/Servant_Impl_T.cpp b/CIAO/ciao/Servants/Session/Servant_Impl_T.cpp
index 151e9f3fd18..f1b0c047ed7 100644
--- a/CIAO/ciao/Servants/Session/Servant_Impl_T.cpp
+++ b/CIAO/ciao/Servants/Session/Servant_Impl_T.cpp
@@ -22,7 +22,7 @@ namespace CIAO
       ins_name_ (ins_name)
   {
     ACE_NEW (this->context_,
-             CONTEXT (home, c, this));
+             CONTEXT (home, c, this, ins_name));
 
     ::Components::SessionComponent_var scom =
       ::Components::SessionComponent::_narrow (exe);
diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp b/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp
index baa926d17b0..3da37cccb6b 100644
--- a/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp
+++ b/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp
@@ -241,7 +241,7 @@ namespace CIDL_ReceiverImpl
     ACE_DEBUG ((LM_DEBUG, "ReceiverExec_i::set_session_context\n"));
 
     this->context_ =
-      ::CIAO_Protocols_Receiver_Impl::Receiver_Exec_Context::_narrow (ctx);
+      ::Protocols::CCM_Receiver_Context::_narrow (ctx);
 
     if (CORBA::is_nil (this->context_.in ()))
       throw CORBA::INTERNAL ();
diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.h b/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.h
index c2698966857..827492ce119 100644
--- a/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.h
+++ b/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.h
@@ -33,7 +33,7 @@ namespace CIDL_ReceiverImpl
 
   protected:
 
-    ::CIAO_Protocols_Receiver_Impl::Receiver_Exec_Context_var context_;
+    ::Protocols::CCM_Receiver_Context_var context_;
 
     CORBA::ORB_var orb_;
 
diff --git a/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp b/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
index 7b6cfc49112..66034b91ce4 100644
--- a/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
+++ b/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
@@ -651,7 +651,7 @@ CIDL_SenderImpl::SenderExec_i::set_session_context (
   ACE_DEBUG ((LM_DEBUG, "CIDL_SenderImpl::SenderExec_i::set_session_context\n"));
 
   this->context_ =
-    ::CIAO_Protocols_Sender_Impl::Sender_Exec_Context::_narrow (ctx);
+    ::Protocols::CCM_Sender_Context::_narrow (ctx);
 
   if (CORBA::is_nil (this->context_.in ()))
     throw CORBA::INTERNAL ();
diff --git a/CIAO/performance-tests/Protocols/Sender/Sender_exec.h b/CIAO/performance-tests/Protocols/Sender/Sender_exec.h
index 9d2d307a406..d6e38abefb5 100644
--- a/CIAO/performance-tests/Protocols/Sender/Sender_exec.h
+++ b/CIAO/performance-tests/Protocols/Sender/Sender_exec.h
@@ -42,7 +42,7 @@ namespace CIDL_SenderImpl
     void configuration_complete (void);
 
   protected:
-    ::CIAO_Protocols_Sender_Impl::Sender_Exec_Context_var context_;
+    ::Protocols::CCM_Sender_Context_var context_;
 
     CORBA::ORB_var orb_;