Thu Feb 14 16:00:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 205 insertions, 3 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 33b91385c34..a3ff35d493a 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,15 @@
+Thu Feb 14 16:00:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/CCM_CCMException.idl:
+          Enabled the QoS4CCM enums
+
+        * ciao/CCM_Core.mpc:
+          Added ExtensionContext.cpp
+
+        * ciao/ExtensionContext.{h,cpp}:
+          New file, just throw no implement in all the new methods, just
+          creating first the empty classes and infrastructure
+
 Thu Feb 14 13:05:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ciao/Context_Impl_Base.h:
diff --git a/CIAO/ciao/CCM_CCMException.idl b/CIAO/ciao/CCM_CCMException.idl
index 850de8f6d48..012f3dd24ff 100644
--- a/CIAO/ciao/CCM_CCMException.idl
+++ b/CIAO/ciao/CCM_CCMException.idl
@@ -26,11 +26,10 @@ module Components
     DUPLICATE_KEY,
     FIND_ERROR,
     OBJECT_NOT_FOUND,
-    NO_SUCH_ENTITY
-    /* extended by QoS4CCM
+    NO_SUCH_ENTITY,
     QOS_ERROR,
     REGISTRATION_ERROR,
-    SERVICE_INSTALLATION_ERROR */
+    SERVICE_INSTALLATION_ERROR
   };
 
   exception CCMException
diff --git a/CIAO/ciao/CCM_Core.mpc b/CIAO/ciao/CCM_Core.mpc
index f32d7dedf51..494ff185b49 100644
--- a/CIAO/ciao/CCM_Core.mpc
+++ b/CIAO/ciao/CCM_Core.mpc
@@ -99,6 +99,7 @@ project (CIAO_DnC_Container) : orbsvcslib, portableserver, valuetype, ifr_client
   IDL_Files {
     idlflags += -SS -Sci
     CCM_Context.idl
+    CCM_ExtensionContext.idl
     CCM_CCMException.idl
     CCM_EntityComponent.idl
     CCM_EntityContext.idl
@@ -137,6 +138,7 @@ project (CIAO_DnC_Container) : orbsvcslib, portableserver, valuetype, ifr_client
     CCM_SessionSynchronizationC.cpp
     CCM_CCMExceptionC.cpp
     CCM_ContextC.cpp
+    CCM_ExtensionContextC.cpp
     SecurityC.cpp
     CCM_Container_ExC.cpp
     CCM_StateIdFactoryC.cpp
@@ -306,6 +308,7 @@ project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, naming, ifr_c
     Dynamic_Component_Servant_Base.cpp
     Port_Activator.cpp
     StandardConfigurator_Impl.cpp
+    ExtensionContext.cpp
   }
 
   Header_Files {
diff --git a/CIAO/ciao/ExtensionContext.cpp b/CIAO/ciao/ExtensionContext.cpp
new file mode 100644
index 00000000000..7592e2b97d2
--- /dev/null
+++ b/CIAO/ciao/ExtensionContext.cpp
@@ -0,0 +1,98 @@
+// $Id$
+
+#include "ExtensionContext.h"
+
+namespace CIAO
+{
+  ExtensionContext_Impl::ExtensionContext_Impl (Components::CCMHome_ptr home,
+                                                Session_Container * c)
+    : CIAO::Context_Impl_Base (home, c)
+  {
+  }
+
+  ExtensionContext_Impl::~ExtensionContext_Impl (void)
+  {
+  }
+
+  ::Components::ContainerPortableInterceptor::ClientContainerInterceptorRegistration_ptr
+  ExtensionContext_Impl::get_client_interceptor_registration (void)
+  {
+    throw CORBA::NO_IMPLEMENT ();
+  }
+
+  ::Components::ContainerPortableInterceptor::ServerContainerInterceptorRegistration_ptr
+  ExtensionContext_Impl::get_server_interceptor_registration (void)
+  {
+    throw CORBA::NO_IMPLEMENT ();
+  }
+
+  ::Components::ContainerPortableInterceptor::StubContainerInterceptorRegistration_ptr
+  ExtensionContext_Impl::get_stub_interceptor_registration (void)
+  {
+    throw CORBA::NO_IMPLEMENT ();
+  }
+
+  ::Components::ContainerPortableInterceptor::ServantContainerInterceptorRegistration_ptr
+  ExtensionContext_Impl::get_servant_interceptor_registration (void)
+  {
+    throw CORBA::NO_IMPLEMENT ();
+  }
+
+  ::Components::Cookie *
+  ExtensionContext_Impl::install_service_reference (
+        const char * /*service_id*/,
+        ::CORBA::Object_ptr /*objref*/)
+  {
+    throw CORBA::NO_IMPLEMENT ();
+  }
+
+  ::CORBA::Object_ptr
+  ExtensionContext_Impl::uninstall_service_reference (::Components::Cookie * /*ck*/)
+  {
+    throw CORBA::NO_IMPLEMENT ();
+  }
+
+  // Operations from ::Components::CCMContext.
+
+  Components::Principal_ptr
+  ExtensionContext_Impl::get_caller_principal (void)
+  {
+    return CIAO::Context_Impl_Base::get_caller_principal ();
+  }
+
+  Components::CCMHome_ptr
+  ExtensionContext_Impl::get_CCM_home (void)
+  {
+    return CIAO::Context_Impl_Base::get_CCM_home ();
+  }
+
+  CORBA::Boolean
+  ExtensionContext_Impl::get_rollback_only (void)
+  {
+    return CIAO::Context_Impl_Base::get_rollback_only ();
+  }
+
+  Components::Transaction::UserTransaction_ptr
+  ExtensionContext_Impl::get_user_transaction (void)
+  {
+    return CIAO::Context_Impl_Base::get_user_transaction ();
+  }
+
+  CORBA::Boolean
+  ExtensionContext_Impl::is_caller_in_role (const char * role)
+  {
+    return CIAO::Context_Impl_Base::is_caller_in_role (role);
+  }
+
+  void
+  ExtensionContext_Impl::set_rollback_only (void)
+  {
+    CIAO::Context_Impl_Base::set_rollback_only ();
+  }
+
+  CORBA::Object_ptr
+  ExtensionContext_Impl::resolve_service_reference(const char *service_id)
+  {
+    return CIAO::Context_Impl_Base::resolve_service_reference (service_id);
+  }
+}
diff --git a/CIAO/ciao/ExtensionContext.h b/CIAO/ciao/ExtensionContext.h
new file mode 100644
index 00000000000..d2ea1ee9948
--- /dev/null
+++ b/CIAO/ciao/ExtensionContext.h
@@ -0,0 +1,90 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    ExtensionContext.h
+ *
+ *  $Id$
+ *
+ *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+
+#ifndef CIAO_EXTENSIONCONTEXT_H
+#define CIAO_EXTENSIONCONTEXT_H
+
+#include /**/ "ace/pre.h"
+
+#include "CIAO_Server_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ciao/CCM_ExtensionContextC.h"
+#include "ciao/Context_Impl_Base.h"
+#include "tao/Objref_VarOut_T.h"
+
+namespace Components
+{
+  class CCMHome;
+  typedef CCMHome *CCMHome_ptr;
+
+  typedef
+    TAO_Objref_Var_T<
+        CCMHome
+      >
+    CCMHome_var;
+}
+
+namespace CIAO
+{
+  class CIAO_SERVER_Export ExtensionContext_Impl
+    : public virtual Components::ExtensionContext,
+      public virtual CIAO::Context_Impl_Base
+  {
+  public:
+    ExtensionContext_Impl(Components::CCMHome_ptr home, Session_Container * c);
+
+    virtual ~ExtensionContext_Impl (void);
+
+    // Operations from ::Components::CCMContext.
+
+    virtual Components::Principal_ptr get_caller_principal (void);
+
+    virtual Components::CCMHome_ptr get_CCM_home (void);
+
+    virtual CORBA::Boolean get_rollback_only (void);
+
+    virtual Components::Transaction::UserTransaction_ptr get_user_transaction (void);
+
+    virtual CORBA::Boolean is_caller_in_role (const char *role);
+
+    virtual void set_rollback_only (void);
+
+    virtual CORBA::Object_ptr resolve_service_reference(const char *service_id);
+
+    virtual ::Components::ContainerPortableInterceptor::ClientContainerInterceptorRegistration_ptr get_client_interceptor_registration (void);
+
+    virtual ::Components::ContainerPortableInterceptor::ServerContainerInterceptorRegistration_ptr get_server_interceptor_registration (void);
+
+    virtual ::Components::ContainerPortableInterceptor::StubContainerInterceptorRegistration_ptr get_stub_interceptor_registration (void);
+
+    virtual ::Components::ContainerPortableInterceptor::ServantContainerInterceptorRegistration_ptr get_servant_interceptor_registration (void);
+
+    virtual ::Components::Cookie * install_service_reference (
+        const char * service_id,
+        ::CORBA::Object_ptr objref);
+
+    virtual ::CORBA::Object_ptr uninstall_service_reference (
+        ::Components::Cookie * ck);
+
+  private:
+    ExtensionContext_Impl (void);
+  };
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* CIAO_CONTEXT_IMPL_BASE_H */