Tue Nov 3 13:54:31 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * ccm/extension/*:
          Removed this from svn head for the moment. We don't support QoS4CCM at all
          at this moment, so let us only ship things we really need

20 files changed, 0 insertions, 625 deletions

diff --git a/CIAO/ccm/extension/CCM_ClientContainerInterceptor.idl b/CIAO/ccm/extension/CCM_ClientContainerInterceptor.idl
deleted file mode 100644
index 27a5fdc8929..00000000000
--- a/CIAO/ccm/extension/CCM_ClientContainerInterceptor.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-// $Id$
-
-#if !defined (CCM_CLIENTCONTAINERINTERCEPTOR_IDL)
-#define CCM_CLIENTCONTAINERINTERCEPTOR_IDL
-
-#include "ciao/CCM_ContainerInterceptor.idl"
-#include "ciao/CCM_ContainerClientRequestInfo.idl"
-#include "tao/PI/PIForwardRequest.pidl"
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    local interface ClientContainerInterceptor : ContainerInterceptor
-    {
-      void send_request (in ContainerClientRequestInfo info)
-        raises (PortableInterceptor::ForwardRequest);
-      void send_poll (in ContainerClientRequestInfo info);
-      void receive_reply (in ContainerClientRequestInfo info);
-      void receive_exception (in ContainerClientRequestInfo info)
-        raises (PortableInterceptor::ForwardRequest);
-      void receive_other (in ContainerClientRequestInfo info)
-        raises (PortableInterceptor::ForwardRequest);
-    };
-  };
-};
-#endif /* CCM_CLIENTCONTAINERINTERCEPTOR_IDL */
diff --git a/CIAO/ccm/extension/CCM_ClientContainerInterceptorRegistration.idl b/CIAO/ccm/extension/CCM_ClientContainerInterceptorRegistration.idl
deleted file mode 100644
index 031f06f1a0f..00000000000
--- a/CIAO/ccm/extension/CCM_ClientContainerInterceptorRegistration.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-// $Id$
-
-#if !defined (CCM_CLIENTCONTAINERINTERCEPTORREGISTRATION_IDL)
-#define CCM_CLIENTCONTAINERINTERCEPTORREGISTRATION_IDL
-
-#include "ciao/CCM_Cookie.idl"
-#include "ciao/CCM_InvalidRegistration.idl"
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    local interface ClientContainerInterceptor;
-
-    local interface ClientContainerInterceptorRegistration
-    {
-      Components::Cookie register_client_interceptor (in ClientContainerInterceptor ci);
-      ClientContainerInterceptor unregister_client_interceptor (in Components::Cookie cookie)
-        raises(InvalidRegistration);
-    };
-  };
-};
-
-#endif /* CCM_CLIENTCONTAINERINTERCEPTORREGISTRATION_IDL */
diff --git a/CIAO/ccm/extension/CCM_ContainerClientRequestInfo.idl b/CIAO/ccm/extension/CCM_ContainerClientRequestInfo.idl
deleted file mode 100644
index b44dac880b8..00000000000
--- a/CIAO/ccm/extension/CCM_ContainerClientRequestInfo.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-// $Id$
-
-#if !defined (CCM_CONTAINERCLIENTREQUESTINFO_IDL)
-#define CCM_CONTAINERCLIENTREQUESTINFO_IDL
-
-#include "ciao/CCM_ContainerRequestInfo.idl"
-#include "tao/PI/ClientRequestInfo.pidl"
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    local interface ContainerClientRequestInfo : ContainerRequestInfo
-    {
-      PortableInterceptor::ClientRequestInfo request_info();
-    };
-  };
-};
-
-#endif /* CCM_CONTAINERCLIENTREQUESTINFO_IDL */
diff --git a/CIAO/ccm/extension/CCM_ContainerInterceptor.idl b/CIAO/ccm/extension/CCM_ContainerInterceptor.idl
deleted file mode 100644
index b5ccdf52fae..00000000000
--- a/CIAO/ccm/extension/CCM_ContainerInterceptor.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-
-#if !defined (CCM_CONTAINERPORTABLEINTERCEPTOR_IDL)
-#define CCM_CONTAINERPORTABLEINTERCEPTOR_IDL
-
-#include "tao/PI_Forward.pidl"
-
-module Components {
-
-  module ContainerPortableInterceptor {
-
-    local interface ContainerInterceptor
-    {
-      readonly attribute string name;
-      void destroy ();
-      void set_slot_id(in PortableInterceptor::SlotId slot_id);
-    };
-  };
-};
-
-#endif /* CCM_CONTAINERPORTABLEINTERCEPTOR_IDL */
diff --git a/CIAO/ccm/extension/CCM_ContainerRequestInfo.idl b/CIAO/ccm/extension/CCM_ContainerRequestInfo.idl
deleted file mode 100644
index 3fb590acc16..00000000000
--- a/CIAO/ccm/extension/CCM_ContainerRequestInfo.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-// $Id$
-
-#if !defined (CCM_CONTAINERREQUESTINFO_IDL)
-#define CCM_CONTAINERREQUESTINFO_IDL
-
-#include "ciao/CCM_Navigation.idl"
-#include "tao/OctetSeq.pidl"
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    local interface ContainerRequestInfo
-    {
-      readonly attribute CORBA::OctetSeq origin_id;
-      readonly attribute CORBA::OctetSeq target_id;
-      readonly attribute FeatureName name;
-    };
-  };
-};
-
-#endif /* CCM_CONTAINERREQUESTINFO_IDL */
diff --git a/CIAO/ccm/extension/CCM_ContainerServantRequestInfo.idl b/CIAO/ccm/extension/CCM_ContainerServantRequestInfo.idl
deleted file mode 100644
index 0a3348b8f7e..00000000000
--- a/CIAO/ccm/extension/CCM_ContainerServantRequestInfo.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-#if !defined (CCM_CONTAINERSERVANTREQUESTINFO_IDL)
-#define CCM_CONTAINERSERVANTREQUESTINFO_IDL
-
-#include "ciao/CCM_ContainerRequestInfo.idl"
-#include "ciao/CCM_EnterpriseComponent.idl"
-#include "tao/AnyTypeCode/Dynamic.pidl"
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    local interface ContainerServantRequestInfo : ContainerRequestInfo
-    {
-      attribute Dynamic::ParameterList arguments;
-      readonly attribute string operation;
-      attribute any result;
-      attribute Components::EnterpriseComponent target;
-      attribute any the_exception;
-    };
-  };
-};
-
-#endif /* CCM_CONTAINERSERVANTREQUESTINFO_IDL */
diff --git a/CIAO/ccm/extension/CCM_ContainerServerRequestInfo.idl b/CIAO/ccm/extension/CCM_ContainerServerRequestInfo.idl
deleted file mode 100644
index 4868e6a2e8d..00000000000
--- a/CIAO/ccm/extension/CCM_ContainerServerRequestInfo.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-// $Id$
-
-#if !defined (CCM_CONTAINERSERVERREQUESTINFO_IDL)
-#define CCM_CONTAINERSERVERREQUESTINFO_IDL
-
-#include "ciao/CCM_ContainerRequestInfo.idl"
-#include "tao/PI_Server/ServerRequestInfo.pidl"
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    local interface ContainerServerRequestInfo : ContainerRequestInfo
-    {
-      PortableInterceptor::ServerRequestInfo request_info();
-    };
-  };
-};
-
-#endif /* CCM_CONTAINERSERVERREQUESTINFO_IDL */
diff --git a/CIAO/ccm/extension/CCM_ContainerStubRequestInfo.idl b/CIAO/ccm/extension/CCM_ContainerStubRequestInfo.idl
deleted file mode 100644
index da14afa9e08..00000000000
--- a/CIAO/ccm/extension/CCM_ContainerStubRequestInfo.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-// $Id$
-
-#if !defined (CCM_CONTAINERSTUBREQUESTINFO_IDL)
-#define CCM_CONTAINERSTUBREQUESTINFO_IDL
-
-#include "ciao/CCM_ContainerRequestInfo.idl"
-#include "tao/AnyTypeCode/Dynamic.pidl"
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    local interface ContainerStubRequestInfo : ContainerRequestInfo
-    {
-      attribute Dynamic::ParameterList arguments;
-      readonly attribute string operation;
-      attribute any result;
-      attribute Object target;
-      attribute any the_exception;
-    };
-  };
-};
-
-#endif /* CCM_CONTAINERSTUBREQUESTINFO_IDL */
diff --git a/CIAO/ccm/extension/CCM_ExtensionComponent.idl b/CIAO/ccm/extension/CCM_ExtensionComponent.idl
deleted file mode 100644
index 585e5e85f64..00000000000
--- a/CIAO/ccm/extension/CCM_ExtensionComponent.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-// $Id$
-
-#if !defined (CCM_EXTENSIONCOMPONENT_IDL)
-#define CCM_EXTENSIONCOMPONENT_IDL
-
-#include "ciao/CCM_EnterpriseComponent.idl"
-#include "ciao/CCM_ExtensionContext.idl"
-
-module Components
-{
-  local interface ExtensionComponent : EnterpriseComponent
-  {
-    void set_extension_context (in ExtensionContext ctx)
-      raises (CCMException);
-    void ccm_remove ()
-      raises (CCMException);
-  };
-};
-
-#endif /* CCM_EXTENSIONCOMPONENT_IDL */
diff --git a/CIAO/ccm/extension/CCM_ExtensionContext.idl b/CIAO/ccm/extension/CCM_ExtensionContext.idl
deleted file mode 100644
index 33fa969b436..00000000000
--- a/CIAO/ccm/extension/CCM_ExtensionContext.idl
+++ /dev/null
@@ -1,37 +0,0 @@
-// $Id$
-
-#if !defined (CCM_EXTENSIONCONTEXT_IDL)
-#define CCM_EXTENSIONCONTEXT_IDL
-
-#include "ciao/CCM_Context.idl"
-#include "ciao/CCM_ClientContainerInterceptorRegistration.idl"
-#include "ciao/CCM_ServerContainerInterceptorRegistration.idl"
-#include "ciao/CCM_StubContainerInterceptorRegistration.idl"
-#include "ciao/CCM_ServantContainerInterceptorRegistration.idl"
-#include "ciao/CCM_CCMException.idl"
-
-module Components
-{
-  local interface ExtensionContext : CCMContext
-  {
-    Components::ContainerPortableInterceptor::ClientContainerInterceptorRegistration
-      get_client_interceptor_registration ()
-        raises (CCMException);
-    Components::ContainerPortableInterceptor::ServerContainerInterceptorRegistration
-      get_server_interceptor_registration ()
-        raises (CCMException);
-    Components::ContainerPortableInterceptor::StubContainerInterceptorRegistration
-      get_stub_interceptor_registration()
-        raises (CCMException);
-    Components::ContainerPortableInterceptor::ServantContainerInterceptorRegistration
-      get_servant_interceptor_registration()
-        raises (CCMException);
-
-    Cookie install_service_reference(in string service_id, in Object objref)
-      raises (CCMException);
-    Object uninstall_service_reference(in Cookie ck)
-      raises (CCMException);
-  };
-};
-
-#endif /* CCM_EXTENSIONCONTEXT_IDL */
diff --git a/CIAO/ccm/extension/CCM_InvalidRegistration.idl b/CIAO/ccm/extension/CCM_InvalidRegistration.idl
deleted file mode 100644
index a5dc36c640e..00000000000
--- a/CIAO/ccm/extension/CCM_InvalidRegistration.idl
+++ /dev/null
@@ -1,14 +0,0 @@
-// $Id$
-
-#if !defined (CCM_INVALIDREGISTRATION_IDL)
-#define CCM_INVALIDREGISTRATION_IDL
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    exception InvalidRegistration { };
-  };
-};
-
-#endif /* CCM_INVALIDREGISTRATION_IDL */
diff --git a/CIAO/ccm/extension/CCM_QoS.idl b/CIAO/ccm/extension/CCM_QoS.idl
deleted file mode 100644
index f78f98d3665..00000000000
--- a/CIAO/ccm/extension/CCM_QoS.idl
+++ /dev/null
@@ -1,31 +0,0 @@
-// $Id$
-
-#if !defined (CCM_QOS_IDL)
-#define CCM_QOS_IDL
-
-#include "ciao/CCM_Cookie.idl"
-#include "ciao/CCM_CCMException.idl"
-
-module Components
-{
-  module QoS {
-    struct QoSInstance {
-      string dimension;
-      any value;
-    };
-    typedef sequence<QoSInstance> QoSInstances;
-    struct QoSConstraint {
-      string characteristic;
-      QoSInstances instances;
-    };
-    typedef sequence<QoSConstraint> QoSConstraints;
-    interface Negotiation
-    {
-      Components::Cookie require_qos(in QoSConstraint requirements, in string client_id)
-        raises (CCMException);
-      void release_qos (in Components::Cookie ck);
-    };
-  };
-};
-
-#endif /* CCM_QOS_IDL */
diff --git a/CIAO/ccm/extension/CCM_ServantContainerInterceptor.idl b/CIAO/ccm/extension/CCM_ServantContainerInterceptor.idl
deleted file mode 100644
index 884a1af2599..00000000000
--- a/CIAO/ccm/extension/CCM_ServantContainerInterceptor.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-
-#if !defined (CCM_SERVANTCONTAINERINTERCEPTOR_IDL)
-#define CCM_SERVANTCONTAINERINTERCEPTOR_IDL
-
-#include "ciao/CCM_ContainerInterceptor.idl"
-#include "ciao/CCM_ContainerServantRequestInfo.idl"
-#include "tao/PI/PIForwardRequest.pidl"
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    local interface ServantContainerInterceptor : ContainerInterceptor
-    {
-      void servant_receive_request (in ContainerServantRequestInfo info, out boolean proceed_call)
-        raises (PortableInterceptor::ForwardRequest);
-      void servant_send_reply (in ContainerServantRequestInfo info, out boolean proceed_call);
-      void servant_send_exception (in ContainerServantRequestInfo info, out boolean proceed_call)
-        raises (PortableInterceptor::ForwardRequest);
-      void servant_send_other (in ContainerServantRequestInfo info)
-        raises (PortableInterceptor::ForwardRequest);
-    };
-  };
-};
-#endif /* CCM_SERVANTCONTAINERINTERCEPTOR_IDL */
diff --git a/CIAO/ccm/extension/CCM_ServantContainerInterceptorRegistration.idl b/CIAO/ccm/extension/CCM_ServantContainerInterceptorRegistration.idl
deleted file mode 100644
index 39448de9a58..00000000000
--- a/CIAO/ccm/extension/CCM_ServantContainerInterceptorRegistration.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-// $Id$
-
-#if !defined (CCM_SERVANTCONTAINERINTERCEPTORREGISTRATION_IDL)
-#define CCM_SERVANTCONTAINERINTERCEPTORREGISTRATION_IDL
-
-#include "ciao/CCM_Cookie.idl"
-#include "ciao/CCM_InvalidRegistration.idl"
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    local interface ServantContainerInterceptor;
-
-    local interface ServantContainerInterceptorRegistration
-    {
-      Components::Cookie register_servant_interceptor (in ServantContainerInterceptor ci);
-      ServantContainerInterceptor unregister_servant_interceptor (in Components::Cookie cookie)
-        raises(InvalidRegistration);
-    };
-  };
-};
-
-#endif /* CCM_SERVANTCONTAINERINTERCEPTORREGISTRATION_IDL */
diff --git a/CIAO/ccm/extension/CCM_ServerContainerInterceptor.idl b/CIAO/ccm/extension/CCM_ServerContainerInterceptor.idl
deleted file mode 100644
index 58ce5cc69a7..00000000000
--- a/CIAO/ccm/extension/CCM_ServerContainerInterceptor.idl
+++ /dev/null
@@ -1,28 +0,0 @@
-// $Id$
-
-#if !defined (CCM_SERVERCONTAINERINTERCEPTOR_IDL)
-#define CCM_SERVERCONTAINERINTERCEPTOR_IDL
-
-#include "ciao/CCM_ContainerInterceptor.idl"
-#include "ciao/CCM_ContainerServerRequestInfo.idl"
-#include "tao/PI/PIForwardRequest.pidl"
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    local interface ServerContainerInterceptor : ContainerInterceptor
-    {
-      void receive_request_service_contexts (in ContainerServerRequestInfo info)
-        raises (PortableInterceptor::ForwardRequest);
-      void receive_request (in ContainerServerRequestInfo info)
-        raises (PortableInterceptor::ForwardRequest);
-      void send_reply (in ContainerServerRequestInfo info);
-      void send_exception (in ContainerServerRequestInfo info)
-        raises (PortableInterceptor::ForwardRequest);
-      void send_other (in ContainerServerRequestInfo info)
-       raises (PortableInterceptor::ForwardRequest);
-    };
-  };
-};
-#endif /* CCM_SERVERCONTAINERINTERCEPTOR_IDL */
diff --git a/CIAO/ccm/extension/CCM_ServerContainerInterceptorRegistration.idl b/CIAO/ccm/extension/CCM_ServerContainerInterceptorRegistration.idl
deleted file mode 100644
index b4a3dafac26..00000000000
--- a/CIAO/ccm/extension/CCM_ServerContainerInterceptorRegistration.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-// $Id$
-
-#if !defined (CCM_SERVERCONTAINERINTERCEPTORREGISTRATION_IDL)
-#define CCM_SERVERCONTAINERINTERCEPTORREGISTRATION_IDL
-
-#include "ciao/CCM_Cookie.idl"
-#include "ciao/CCM_InvalidRegistration.idl"
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    local interface ServerContainerInterceptor;
-
-    local interface ServerContainerInterceptorRegistration
-    {
-      Components::Cookie register_server_interceptor (in ServerContainerInterceptor ci);
-      ServerContainerInterceptor unregister_client_interceptor (in Components::Cookie cookie)
-        raises(InvalidRegistration);
-    };
-  };
-};
-
-#endif /* CCM_SERVERCONTAINERINTERCEPTORREGISTRATION_IDL */
diff --git a/CIAO/ccm/extension/CCM_StubContainerInterceptor.idl b/CIAO/ccm/extension/CCM_StubContainerInterceptor.idl
deleted file mode 100644
index c183801af86..00000000000
--- a/CIAO/ccm/extension/CCM_StubContainerInterceptor.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-
-#if !defined (CCM_STUBCONTAINERINTERCEPTOR_IDL)
-#define CCM_STUBCONTAINERINTERCEPTOR_IDL
-
-#include "ciao/CCM_ContainerInterceptor.idl"
-#include "ciao/CCM_ContainerStubRequestInfo.idl"
-#include "tao/PI/PIForwardRequest.pidl"
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    local interface StubContainerInterceptor : ContainerInterceptor
-    {
-      void stub_send_request (in ContainerStubRequestInfo info, out boolean con)
-        raises (PortableInterceptor::ForwardRequest);
-      void stub_receive_reply (in ContainerStubRequestInfo info, out boolean con);
-      void stub_receive_exception (in ContainerStubRequestInfo info, out boolean con)
-        raises(PortableInterceptor::ForwardRequest);
-      void stub_receive_other (in ContainerStubRequestInfo info)
-        raises(PortableInterceptor::ForwardRequest);
-    };
-  };
-};
-#endif /* CCM_STUBCONTAINERINTERCEPTOR_IDL */
diff --git a/CIAO/ccm/extension/CCM_StubContainerInterceptorRegistration.idl b/CIAO/ccm/extension/CCM_StubContainerInterceptorRegistration.idl
deleted file mode 100644
index 61ae62f51fa..00000000000
--- a/CIAO/ccm/extension/CCM_StubContainerInterceptorRegistration.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-// $Id$
-
-#if !defined (CCM_STUBCONTAINERINTERCEPTORREGISTRATION_IDL)
-#define CCM_STUBCONTAINERINTERCEPTORREGISTRATION_IDL
-
-#include "ciao/CCM_Cookie.idl"
-#include "ciao/CCM_InvalidRegistration.idl"
-
-module Components
-{
-  module ContainerPortableInterceptor
-  {
-    local interface StubContainerInterceptor;
-
-    local interface StubContainerInterceptorRegistration
-    {
-      Components::Cookie register_stub_interceptor (in StubContainerInterceptor ci);
-      StubContainerInterceptor unregister_stub_interceptor (in Components::Cookie cookie)
-        raises(InvalidRegistration);
-    };
-  };
-};
-
-#endif /* CCM_STUBCONTAINERINTERCEPTORREGISTRATION_IDL */
diff --git a/CIAO/ccm/extension/ExtensionContext.cpp b/CIAO/ccm/extension/ExtensionContext.cpp
deleted file mode 100644
index 7592e2b97d2..00000000000
--- a/CIAO/ccm/extension/ExtensionContext.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-// $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/ccm/extension/ExtensionContext.h b/CIAO/ccm/extension/ExtensionContext.h
deleted file mode 100644
index d2ea1ee9948..00000000000
--- a/CIAO/ccm/extension/ExtensionContext.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// -*- 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 */