Tue Sep 14 23:17:00 2004 Gan Deng <gan.deng@vanderbilt.edu>

8 files changed, 283 insertions, 130 deletions

diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED_svnt.cpp b/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED_svnt.cpp
index 678d5b5d306..145b82dfa53 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED_svnt.cpp
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED_svnt.cpp
@@ -20,6 +20,8 @@
 
 #include "BMClosedED_svnt.h"
 #include "Cookies.h"
+#include "ciao/Servant_Activator.h"
+#include "ciao/Port_Activator_T.h"
 
 namespace BMClosedED_Impl
 {
@@ -431,41 +433,10 @@ namespace BMClosedED_Impl
         return ::BasicSP::ReadData::_duplicate (this->provide_dataout_.in ());
       }
 
-      ::BasicSP::CCM_ReadData_var fexe =
-      this->executor_->get_dataout (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (::BasicSP::ReadData::_nil ());
-
-      if (::CORBA::is_nil (fexe.in ()))
-      {
-        ACE_THROW_RETURN (
-        ::CORBA::INTERNAL (),
-        ::BasicSP::ReadData::_nil ());
-      }
-
       ::CORBA::Object_var obj =
       this->provide_dataout_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (::BasicSP::ReadData::_nil ());
 
-      CIAO_GLUE_BasicSP::ReadData_Servant *svt = 0;
-
-      ACE_NEW_RETURN (
-      svt,
-      CIAO_GLUE_BasicSP::ReadData_Servant (
-      fexe.in (),
-      this->context_),
-      ::BasicSP::ReadData::_nil ());
-
-      PortableServer::ServantBase_var safe_servant (svt);
-
-      PortableServer::ObjectId_var oid =
-      PortableServer::string_to_ObjectId ("BasicSP_BMClosedED_dataout");
-
-      this->container_->_ciao_the_POA ()->activate_object_with_id (
-      oid.in (),
-      svt
-      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (::BasicSP::ReadData::_nil ());
-
       ::BasicSP::ReadData_var fo =
       ::BasicSP::ReadData::_narrow (
       obj.in ()
@@ -489,10 +460,42 @@ namespace BMClosedED_Impl
         return ret;
       }
 
+      CIAO::Port_Activator_T< CIAO_GLUE_BasicSP::ReadData_Servant,
+      ::BasicSP::CCM_ReadData,
+       ::Components::CCMContext,
+      BMClosedED_Servant > *tmp = 0;
+
+      typedef  CIAO::Port_Activator_T<
+      CIAO_GLUE_BasicSP::ReadData_Servant,
+      ::BasicSP::CCM_ReadData,
+       ::Components::CCMContext,
+      BMClosedED_Servant >
+       MACRO_MADNESS_TYPEDEF;
+
+
+      ACE_NEW_THROW_EX ( 
+        tmp,
+        MACRO_MADNESS_TYPEDEF (
+      "BasicSP_BMClosedED_dataout",
+      "dataout",
+      CIAO::Port_Activator::Facet,
+      0,
+      this->context_,
+      this),
+      CORBA::NO_MEMORY ());
+
+
+      CIAO::Servant_Activator *sa = 
+      this->container_->ports_servant_activator ();
+
+      if (!sa->register_port_activator (tmp))
+      return 0;
+
       ::CORBA::Object_var obj =
       this->container_->generate_reference (
       "BasicSP_BMClosedED_dataout",
-      "IDL:BasicSP/ReadData:1.0"
+      "IDL:BasicSP/ReadData:1.0",
+      CIAO::Container::Facet_Consumer
       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (::BasicSP::ReadData::_nil ());
 
@@ -656,25 +659,6 @@ namespace BMClosedED_Impl
       ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (::BasicSP::DataAvailableConsumer::_nil ());
 
-      BMClosedED_Servant::DataAvailableConsumer_in_avail_Servant *svt = 0;
-      ACE_NEW_RETURN (
-      svt,
-      BMClosedED_Servant::DataAvailableConsumer_in_avail_Servant (
-      this->executor_.in (),
-      this->context_),
-      ::BasicSP::DataAvailableConsumer::_nil ());
-
-      PortableServer::ServantBase_var safe_servant (svt);
-
-      PortableServer::ObjectId_var oid =
-      PortableServer::string_to_ObjectId ("BasicSP_BMClosedED_in_avail");
-
-      this->container_->_ciao_the_POA ()->activate_object_with_id (
-      oid.in (),
-      svt
-      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (::BasicSP::DataAvailableConsumer::_nil ());
-
       ::BasicSP::DataAvailableConsumer_var eco =
       ::BasicSP::DataAvailableConsumer::_narrow (
       obj.in ()
@@ -698,10 +682,43 @@ namespace BMClosedED_Impl
         return ret;
       }
 
+      CIAO::Port_Activator_T<
+      BMClosedED_Servant::DataAvailableConsumer_in_avail_Servant,
+      ::BasicSP::CCM_BMClosedED,
+      ::BasicSP::CCM_BMClosedED_Context,
+      BMClosedED_Servant > *tmp = 0;
+
+      typedef  CIAO::Port_Activator_T<
+      BMClosedED_Servant::DataAvailableConsumer_in_avail_Servant,
+      ::BasicSP::CCM_BMClosedED,
+      ::BasicSP::CCM_BMClosedED_Context, 
+      BMClosedED_Servant > 
+       MACRO_MADNESS_TYPEDEF;
+
+
+      ACE_NEW_THROW_EX ( 
+        tmp,
+        MACRO_MADNESS_TYPEDEF (
+      "BasicSP_BMClosedED_in_avail",
+      "in_avail",
+      CIAO::Port_Activator::Sink,
+      this->executor_.in (),
+      this->context_,
+      this),
+      CORBA::NO_MEMORY ());
+
+
+      CIAO::Servant_Activator *sa = 
+      this->container_->ports_servant_activator ();
+
+      if (!sa->register_port_activator (tmp))
+      return 0;
+
       ::CORBA::Object_var obj =
       this->container_->generate_reference (
       "BasicSP_BMClosedED_in_avail",
-      "IDL:BasicSP/DataAvailableConsumer:1.0"
+      "IDL:BasicSP/DataAvailableConsumer:1.0",
+      CIAO::Container::Facet_Consumer
       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (::BasicSP::DataAvailableConsumer::_nil ());
 
@@ -1067,6 +1084,27 @@ namespace BMClosedED_Impl
       // CIAO to-do
     }
 
+    CORBA::Object_ptr
+    BMClosedED_Servant::get_facet_executor (const char *name
+    ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((
+    ::CORBA::SystemException))
+    {
+      if (name == 0)
+      {
+        ACE_THROW_RETURN (
+        ::CORBA::BAD_PARAM (),
+        ::CORBA::Object::_nil ());
+      }
+
+      if (ACE_OS::strcmp (name, "dataout") == 0)
+      {
+        return this->executor_->get_dataout (ACE_ENV_SINGLE_ARG_PARAMETER);
+      }
+
+       return CORBA::Object::_nil ();
+    }
+
     // Supported operations.
 
     // Component attribute operations.
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED_svnt.h b/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED_svnt.h
index 4772366ddb8..4126c7ec2e9 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED_svnt.h
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED_svnt.h
@@ -65,6 +65,7 @@ namespace BMClosedED_Impl
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
+
       protected:
       // Facet executor.
       ::BasicSP::CCM_ReadData_var executor_;
@@ -504,7 +505,6 @@ namespace BMClosedED_Impl
       component_UUID (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
       virtual CORBA::IRObject_ptr
       get_component_def (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
@@ -524,6 +524,13 @@ namespace BMClosedED_Impl
       ::CORBA::SystemException,
       ::Components::RemoveFailure));
 
+      // CIAO specific operations on the servant 
+      CORBA::Object_ptr
+      get_facet_executor (const char *name
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((
+      ::CORBA::SystemException));
+
       private:
 
       ::BasicSP::ReadData_var
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice_svnt.cpp b/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice_svnt.cpp
index 453fd726b1c..527fc86d5f7 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice_svnt.cpp
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice_svnt.cpp
@@ -20,6 +20,8 @@
 
 #include "BMDevice_svnt.h"
 #include "Cookies.h"
+#include "ciao/Servant_Activator.h"
+#include "ciao/Port_Activator_T.h"
 
 namespace BMDevice_Impl
 {
@@ -382,41 +384,10 @@ namespace BMDevice_Impl
         return ::BasicSP::ReadData::_duplicate (this->provide_data_read_.in ());
       }
 
-      ::BasicSP::CCM_ReadData_var fexe =
-      this->executor_->get_data_read (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (::BasicSP::ReadData::_nil ());
-
-      if (::CORBA::is_nil (fexe.in ()))
-      {
-        ACE_THROW_RETURN (
-        ::CORBA::INTERNAL (),
-        ::BasicSP::ReadData::_nil ());
-      }
-
       ::CORBA::Object_var obj =
       this->provide_data_read_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (::BasicSP::ReadData::_nil ());
 
-      CIAO_GLUE_BasicSP::ReadData_Servant *svt = 0;
-
-      ACE_NEW_RETURN (
-      svt,
-      CIAO_GLUE_BasicSP::ReadData_Servant (
-      fexe.in (),
-      this->context_),
-      ::BasicSP::ReadData::_nil ());
-
-      PortableServer::ServantBase_var safe_servant (svt);
-
-      PortableServer::ObjectId_var oid =
-      PortableServer::string_to_ObjectId ("BasicSP_BMDevice_data_read");
-
-      this->container_->_ciao_the_POA ()->activate_object_with_id (
-      oid.in (),
-      svt
-      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (::BasicSP::ReadData::_nil ());
-
       ::BasicSP::ReadData_var fo =
       ::BasicSP::ReadData::_narrow (
       obj.in ()
@@ -440,10 +411,42 @@ namespace BMDevice_Impl
         return ret;
       }
 
+      CIAO::Port_Activator_T< CIAO_GLUE_BasicSP::ReadData_Servant,
+      ::BasicSP::CCM_ReadData,
+       ::Components::CCMContext,
+      BMDevice_Servant > *tmp = 0;
+
+      typedef  CIAO::Port_Activator_T<
+      CIAO_GLUE_BasicSP::ReadData_Servant,
+      ::BasicSP::CCM_ReadData,
+       ::Components::CCMContext,
+      BMDevice_Servant >
+       MACRO_MADNESS_TYPEDEF;
+
+
+      ACE_NEW_THROW_EX ( 
+        tmp,
+        MACRO_MADNESS_TYPEDEF (
+      "BasicSP_BMDevice_data_read",
+      "data_read",
+      CIAO::Port_Activator::Facet,
+      0,
+      this->context_,
+      this),
+      CORBA::NO_MEMORY ());
+
+
+      CIAO::Servant_Activator *sa = 
+      this->container_->ports_servant_activator ();
+
+      if (!sa->register_port_activator (tmp))
+      return 0;
+
       ::CORBA::Object_var obj =
       this->container_->generate_reference (
       "BasicSP_BMDevice_data_read",
-      "IDL:BasicSP/ReadData:1.0"
+      "IDL:BasicSP/ReadData:1.0",
+      CIAO::Container::Facet_Consumer
       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (::BasicSP::ReadData::_nil ());
 
@@ -607,25 +610,6 @@ namespace BMDevice_Impl
       ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (::BasicSP::TimeOutConsumer::_nil ());
 
-      BMDevice_Servant::TimeOutConsumer_timeout_Servant *svt = 0;
-      ACE_NEW_RETURN (
-      svt,
-      BMDevice_Servant::TimeOutConsumer_timeout_Servant (
-      this->executor_.in (),
-      this->context_),
-      ::BasicSP::TimeOutConsumer::_nil ());
-
-      PortableServer::ServantBase_var safe_servant (svt);
-
-      PortableServer::ObjectId_var oid =
-      PortableServer::string_to_ObjectId ("BasicSP_BMDevice_timeout");
-
-      this->container_->_ciao_the_POA ()->activate_object_with_id (
-      oid.in (),
-      svt
-      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (::BasicSP::TimeOutConsumer::_nil ());
-
       ::BasicSP::TimeOutConsumer_var eco =
       ::BasicSP::TimeOutConsumer::_narrow (
       obj.in ()
@@ -649,10 +633,43 @@ namespace BMDevice_Impl
         return ret;
       }
 
+      CIAO::Port_Activator_T<
+      BMDevice_Servant::TimeOutConsumer_timeout_Servant,
+      ::BasicSP::CCM_BMDevice,
+      ::BasicSP::CCM_BMDevice_Context,
+      BMDevice_Servant > *tmp = 0;
+
+      typedef  CIAO::Port_Activator_T<
+      BMDevice_Servant::TimeOutConsumer_timeout_Servant,
+      ::BasicSP::CCM_BMDevice,
+      ::BasicSP::CCM_BMDevice_Context, 
+      BMDevice_Servant > 
+       MACRO_MADNESS_TYPEDEF;
+
+
+      ACE_NEW_THROW_EX ( 
+        tmp,
+        MACRO_MADNESS_TYPEDEF (
+      "BasicSP_BMDevice_timeout",
+      "timeout",
+      CIAO::Port_Activator::Sink,
+      this->executor_.in (),
+      this->context_,
+      this),
+      CORBA::NO_MEMORY ());
+
+
+      CIAO::Servant_Activator *sa = 
+      this->container_->ports_servant_activator ();
+
+      if (!sa->register_port_activator (tmp))
+      return 0;
+
       ::CORBA::Object_var obj =
       this->container_->generate_reference (
       "BasicSP_BMDevice_timeout",
-      "IDL:BasicSP/TimeOutConsumer:1.0"
+      "IDL:BasicSP/TimeOutConsumer:1.0",
+      CIAO::Container::Facet_Consumer
       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (::BasicSP::TimeOutConsumer::_nil ());
 
@@ -956,6 +973,27 @@ namespace BMDevice_Impl
       // CIAO to-do
     }
 
+    CORBA::Object_ptr
+    BMDevice_Servant::get_facet_executor (const char *name
+    ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((
+    ::CORBA::SystemException))
+    {
+      if (name == 0)
+      {
+        ACE_THROW_RETURN (
+        ::CORBA::BAD_PARAM (),
+        ::CORBA::Object::_nil ());
+      }
+
+      if (ACE_OS::strcmp (name, "data_read") == 0)
+      {
+        return this->executor_->get_data_read (ACE_ENV_SINGLE_ARG_PARAMETER);
+      }
+
+       return CORBA::Object::_nil ();
+    }
+
     // Supported operations.
 
     // Component attribute operations.
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice_svnt.h b/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice_svnt.h
index 056d4f7f19d..c5c3e2f506e 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice_svnt.h
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/BMDevice/BMDevice_svnt.h
@@ -65,6 +65,7 @@ namespace BMDevice_Impl
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
+
       protected:
       // Facet executor.
       ::BasicSP::CCM_ReadData_var executor_;
@@ -458,7 +459,7 @@ namespace BMDevice_Impl
       component_UUID (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+      
       virtual CORBA::IRObject_ptr
       get_component_def (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
@@ -478,6 +479,13 @@ namespace BMDevice_Impl
       ::CORBA::SystemException,
       ::Components::RemoveFailure));
 
+      // CIAO specific operations on the servant 
+      CORBA::Object_ptr
+      get_facet_executor (const char *name
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((
+      ::CORBA::SystemException));
+
       private:
 
       ::BasicSP::ReadData_var
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay_svnt.cpp b/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay_svnt.cpp
index 2121b24b7a5..827c8e867bb 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay_svnt.cpp
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay_svnt.cpp
@@ -20,6 +20,8 @@
 
 #include "BMDisplay_svnt.h"
 #include "Cookies.h"
+#include "ciao/Servant_Activator.h"
+#include "ciao/Port_Activator_T.h"
 
 namespace BMDisplay_Impl
 {
@@ -389,25 +391,6 @@ namespace BMDisplay_Impl
       ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (::BasicSP::DataAvailableConsumer::_nil ());
 
-      BMDisplay_Servant::DataAvailableConsumer_data_ready_Servant *svt = 0;
-      ACE_NEW_RETURN (
-      svt,
-      BMDisplay_Servant::DataAvailableConsumer_data_ready_Servant (
-      this->executor_.in (),
-      this->context_),
-      ::BasicSP::DataAvailableConsumer::_nil ());
-
-      PortableServer::ServantBase_var safe_servant (svt);
-
-      PortableServer::ObjectId_var oid =
-      PortableServer::string_to_ObjectId ("BasicSP_BMDisplay_data_ready");
-
-      this->container_->_ciao_the_POA ()->activate_object_with_id (
-      oid.in (),
-      svt
-      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (::BasicSP::DataAvailableConsumer::_nil ());
-
       ::BasicSP::DataAvailableConsumer_var eco =
       ::BasicSP::DataAvailableConsumer::_narrow (
       obj.in ()
@@ -431,10 +414,43 @@ namespace BMDisplay_Impl
         return ret;
       }
 
+      CIAO::Port_Activator_T<
+      BMDisplay_Servant::DataAvailableConsumer_data_ready_Servant,
+      ::BasicSP::CCM_BMDisplay,
+      ::BasicSP::CCM_BMDisplay_Context,
+      BMDisplay_Servant > *tmp = 0;
+
+      typedef  CIAO::Port_Activator_T<
+      BMDisplay_Servant::DataAvailableConsumer_data_ready_Servant,
+      ::BasicSP::CCM_BMDisplay,
+      ::BasicSP::CCM_BMDisplay_Context, 
+      BMDisplay_Servant > 
+       MACRO_MADNESS_TYPEDEF;
+
+
+      ACE_NEW_THROW_EX ( 
+        tmp,
+        MACRO_MADNESS_TYPEDEF (
+      "BasicSP_BMDisplay_data_ready",
+      "data_ready",
+      CIAO::Port_Activator::Sink,
+      this->executor_.in (),
+      this->context_,
+      this),
+      CORBA::NO_MEMORY ());
+
+
+      CIAO::Servant_Activator *sa = 
+      this->container_->ports_servant_activator ();
+
+      if (!sa->register_port_activator (tmp))
+      return 0;
+
       ::CORBA::Object_var obj =
       this->container_->generate_reference (
       "BasicSP_BMDisplay_data_ready",
-      "IDL:BasicSP/DataAvailableConsumer:1.0"
+      "IDL:BasicSP/DataAvailableConsumer:1.0",
+      CIAO::Container::Facet_Consumer
       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (::BasicSP::DataAvailableConsumer::_nil ());
 
@@ -775,6 +791,22 @@ namespace BMDisplay_Impl
       // CIAO to-do
     }
 
+    CORBA::Object_ptr
+    BMDisplay_Servant::get_facet_executor (const char *name
+    ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((
+    ::CORBA::SystemException))
+    {
+      if (name == 0)
+      {
+        ACE_THROW_RETURN (
+        ::CORBA::BAD_PARAM (),
+        ::CORBA::Object::_nil ());
+      }
+
+       return CORBA::Object::_nil ();
+    }
+
     // Supported operations.
 
     // Component attribute operations.
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay_svnt.h b/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay_svnt.h
index 1d82bfd14bb..e8147858390 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay_svnt.h
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/BMDisplay/BMDisplay_svnt.h
@@ -420,8 +420,7 @@ namespace BMDisplay_Impl
       component_UUID (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
-       virtual CORBA::IRObject_ptr
+      virtual CORBA::IRObject_ptr
       get_component_def (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
@@ -440,6 +439,13 @@ namespace BMDisplay_Impl
       ::CORBA::SystemException,
       ::Components::RemoveFailure));
 
+      // CIAO specific operations on the servant 
+      CORBA::Object_ptr
+      get_facet_executor (const char *name
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((
+      ::CORBA::SystemException));
+
       private:
 
       ::BasicSP::DataAvailableConsumer_var
@@ -456,7 +462,6 @@ namespace BMDisplay_Impl
       get_consumer_data_ready_i (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
-
       ACE_CString component_UUID_;
     };
   }
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_svnt.cpp b/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_svnt.cpp
index 7cff4733aaa..9a4ae0acd0a 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_svnt.cpp
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_svnt.cpp
@@ -20,6 +20,8 @@
 
 #include "EC_svnt.h"
 #include "Cookies.h"
+#include "ciao/Servant_Activator.h"
+#include "ciao/Port_Activator_T.h"
 
 namespace EC_Impl
 {
@@ -676,6 +678,22 @@ namespace EC_Impl
       // CIAO to-do
     }
 
+    CORBA::Object_ptr
+    EC_Servant::get_facet_executor (const char *name
+    ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((
+    ::CORBA::SystemException))
+    {
+      if (name == 0)
+      {
+        ACE_THROW_RETURN (
+        ::CORBA::BAD_PARAM (),
+        ::CORBA::Object::_nil ());
+      }
+
+       return CORBA::Object::_nil ();
+    }
+
     // Supported operations.
 
     void
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_svnt.h b/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_svnt.h
index bce768688ff..cbdaea362b3 100644
--- a/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_svnt.h
+++ b/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_svnt.h
@@ -391,7 +391,7 @@ namespace EC_Impl
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-       virtual CORBA::IRObject_ptr
+      virtual CORBA::IRObject_ptr
       get_component_def (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
@@ -410,6 +410,13 @@ namespace EC_Impl
       ::CORBA::SystemException,
       ::Components::RemoveFailure));
 
+      // CIAO specific operations on the servant 
+      CORBA::Object_ptr
+      get_facet_executor (const char *name
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((
+      ::CORBA::SystemException));
+
       private:
 
       private: