ChangeLogTag:Wed Sep 29 19:20:19 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>

4 files changed, 8 insertions, 1785 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index f89a1251d35..a2d10d0a3dc 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,11 @@
+Wed Sep 29 19:20:19 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* DAnCE/examples/BasicSP/BMClosedED/BMClosedED_svnt.cpp:
+	* DAnCE/examples/BasicSP/EC/EC_svnt.cpp:
+	* DAnCE/examples/BasicSP/EC/EC_svnt.h:
+
+	  Removed them from the main trunk.
+
 Wed Sep 29 14:39:29 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	  The dump function was too complicated not compiling on many
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED_svnt.cpp b/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED_svnt.cpp
deleted file mode 100644
index d37f153e129..00000000000
--- a/TAO/CIAO/DAnCE/examples/BasicSP/BMClosedED/BMClosedED_svnt.cpp
+++ /dev/null
@@ -1,903 +0,0 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
-
-#include "BMClosedED_svnt.h"
-#include "Cookies.h"
-#include "ciao/Servant_Activator.h"
-#include "ciao/Port_Activator_T.h"
-
-namespace BMClosedED_Impl
-{
-  namespace CIAO_GLUE_BasicSP
-  {
-    template <typename T>
-    ReadData_Servant_T<T>::ReadData_Servant_T (
-    ::BasicSP::CCM_ReadData_ptr executor,
-    ::Components::CCMContext_ptr c)
-    : executor_ (::BasicSP::CCM_ReadData::_duplicate (executor)),
-    ctx_ (::Components::CCMContext::_duplicate (c))
-    {
-    }
-
-    template <typename T>
-    ReadData_Servant_T<T>::~ReadData_Servant_T (void)
-    {
-    }
-
-    template <typename T>
-    char *
-    ReadData_Servant_T<T>::get_data (
-    ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      return this->executor_->get_data (
-      ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-
-    template <typename T>
-    CORBA::Object_ptr
-    ReadData_Servant_T<T>::_get_component (
-    ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      ::Components::SessionContext_var sc =
-      ::Components::SessionContext::_narrow (
-      this->ctx_.in ()
-      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-      if (! CORBA::is_nil (sc.in ()))
-      {
-        return sc->get_CCM_object (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
-      }
-
-      ::Components::EntityContext_var ec =
-      ::Components::EntityContext::_narrow (
-      this->ctx_.in ()
-      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-      if (! CORBA::is_nil (ec.in ()))
-      {
-        return ec->get_CCM_object (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
-      }
-
-      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-    }
-  }
-
-  namespace CIAO_GLUE_BasicSP
-  {
-    BMClosedED_Context::BMClosedED_Context (
-    ::Components::CCMHome_ptr home,
-    ::CIAO::Session_Container *c,
-    BMClosedED_Servant *sv)
-      : Context_Impl_Base (home, c),
-        ctx_svnt_base (home, c, sv)
-    {
-    }
-
-    BMClosedED_Context::~BMClosedED_Context (void)
-    {
-    }
-
-    // Operations for BMClosedED receptacles and event sources,
-    // defined in ::BasicSP::CCM_BMClosedED_Context.
-
-    ::BasicSP::ReadData_ptr
-    BMClosedED_Context::get_connection_datain (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      return ::BasicSP::ReadData::_duplicate (
-      this->ciao_uses_datain_.in ());
-    }
-
-    void
-    BMClosedED_Context::connect_datain (
-    ::BasicSP::ReadData_ptr c
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::AlreadyConnected,
-    ::Components::InvalidConnection))
-    {
-      if (!CORBA::is_nil (this->ciao_uses_datain_.in ()))
-      {
-        ACE_THROW (::Components::AlreadyConnected ());
-      }
-
-      if (CORBA::is_nil (c))
-      {
-        ACE_THROW (::Components::InvalidConnection ());
-      }
-
-      this->ciao_uses_datain_ =
-      ::BasicSP::ReadData::_duplicate (c);
-    }
-
-    ::BasicSP::ReadData_ptr
-    BMClosedED_Context::disconnect_datain (
-    ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::NoConnection))
-    {
-      if (CORBA::is_nil (this->ciao_uses_datain_.in ()))
-      {
-        ACE_THROW_RETURN (
-        ::Components::NoConnection (),
-        ::BasicSP::ReadData::_nil ());
-      }
-
-      return this->ciao_uses_datain_._retn ();
-    }
-
-    void
-    BMClosedED_Context::push_out_avail (
-    ::BasicSP::DataAvailable *ev
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-
-      ACE_CString my_uuid = this->servant_->component_UUID (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      my_uuid += "_prepare_capture_publisher";
-
-      this->container_->push_event (ev,
-                                    my_uuid.c_str ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-      /*
-      ACE_Active_Map_Manager< 
-      ::BasicSP::DataAvailableConsumer_var>::iterator end =
-      this->ciao_publishes_out_avail_map_.end ();
-
-      for (ACE_Active_Map_Manager< 
-      ::BasicSP::DataAvailableConsumer_var>::iterator iter =
-      this->ciao_publishes_out_avail_map_.begin ();
-      iter != end;
-      ++iter)
-      {
-        ACE_Active_Map_Manager< 
-        ::BasicSP::DataAvailableConsumer_var>::ENTRY &entry = *iter;
-
-        ::BasicSP::DataAvailableConsumer_var c =
-        ::BasicSP::DataAvailableConsumer::_narrow (
-        entry.int_id_.in ()
-        ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-
-        entry.int_id_->push_DataAvailable (
-        ev
-        ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-      }
-      */
-    }
-
-    ::Components::Cookie *
-    BMClosedED_Context::subscribe_out_avail (
-    ::BasicSP::DataAvailableConsumer_ptr c
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::ExceededConnectionLimit))
-    {
-      if (CORBA::is_nil (c))
-      {
-        ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
-      }
-
-      ::BasicSP::DataAvailableConsumer_var sub =
-      ::BasicSP::DataAvailableConsumer::_duplicate (c);
-
-      ACE_Active_Map_Manager_Key key;
-      this->ciao_publishes_out_avail_map_.bind (sub.in (), key);
-      sub._retn ();
-
-      ::Components::Cookie_var retv = new ::CIAO::Map_Key_Cookie (key);
-      return retv._retn ();
-    }
-
-    ::BasicSP::DataAvailableConsumer_ptr
-    BMClosedED_Context::unsubscribe_out_avail (
-    ::Components::Cookie *ck
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::InvalidConnection))
-    {
-      ::BasicSP::DataAvailableConsumer_var retv;
-      ACE_Active_Map_Manager_Key key;
-
-      if (ck == 0 || ::CIAO::Map_Key_Cookie::extract (ck, key) == false)
-      {
-        ACE_THROW_RETURN (
-        ::Components::InvalidConnection (),
-        ::BasicSP::DataAvailableConsumer::_nil ());
-      }
-
-      if (this->ciao_publishes_out_avail_map_.unbind (key, retv) != 0)
-      {
-        ACE_THROW_RETURN (
-        ::Components::InvalidConnection (),
-        ::BasicSP::DataAvailableConsumer::_nil ());
-      }
-
-      return retv._retn ();
-    }
-
-    // CIAO-specific.
-
-    BMClosedED_Context *
-    BMClosedED_Context::_narrow (
-    ::Components::SessionContext_ptr p
-    ACE_ENV_ARG_DECL_NOT_USED)
-    {
-      return dynamic_cast<BMClosedED_Context *> (p);
-    }
-  }
-
-  namespace CIAO_GLUE_BasicSP
-  {
-    void
-    BMClosedED_Servant::component_UUID (
-    const char * new_component_UUID
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      this->component_UUID_ = new_component_UUID;
-    }
-
-    CIAO::CONNECTION_ID
-    BMClosedED_Servant::component_UUID (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      return CORBA::string_dup (this->component_UUID_.c_str ());
-    }
-
- 
-    BMClosedED_Servant::BMClosedED_Servant (
-    ::BasicSP::CCM_BMClosedED_ptr exe,
-    ::Components::CCMHome_ptr h,
-    ::CIAO::Session_Container *c)
-      : Servant_Impl_Base (c),
-        comp_svnt_base (exe, c)
-    {
-      this->context_ = new BMClosedED_Context (h, c, this);
-
-      CIAO_REGISTER_OBV_FACTORY (
-      ::BasicSP::DataAvailable_init,
-      ::BasicSP::DataAvailable);
-
-      ACE_TRY_NEW_ENV
-      {
-        ::Components::SessionComponent_var scom =
-        ::Components::SessionComponent::_narrow (
-        exe
-        ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        if (! ::CORBA::is_nil (scom.in ()))
-        {
-          scom->set_session_context (
-          this->context_
-          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-        this->populate_port_tables (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-
-      ACE_CATCHANY
-      {
-      }
-
-      ACE_ENDTRY;
-    }
-
-    BMClosedED_Servant::~BMClosedED_Servant (void)
-    {
-    }
-
-    void
-    BMClosedED_Servant::set_attributes (
-    const ::Components::ConfigValues &descr
-    ACE_ENV_ARG_DECL_NOT_USED)
-    {
-      for (CORBA::ULong i = 0;
-       i < descr.length ();
-       ++i)
-      {
-        const char *descr_name = descr[i]->name ();
-        ::CORBA::Any &descr_value = descr[i]->value ();
-
-        ACE_UNUSED_ARG (descr_name);
-        ACE_UNUSED_ARG (descr_value);
-      }
-    }
-
-    ::BasicSP::ReadData_ptr
-    BMClosedED_Servant::provide_dataout (
-    ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      if (! ::CORBA::is_nil (this->provide_dataout_.in ()))
-      {
-        return ::BasicSP::ReadData::_duplicate (this->provide_dataout_.in ());
-      }
-
-      ::CORBA::Object_var obj =
-      this->provide_dataout_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (::BasicSP::ReadData::_nil ());
-
-      ::BasicSP::ReadData_var fo =
-      ::BasicSP::ReadData::_narrow (
-      obj.in ()
-      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (::BasicSP::ReadData::_nil ());
-
-      this->provide_dataout_ = fo;
-      return ::BasicSP::ReadData::_duplicate (this->provide_dataout_.in ());
-    }
-
-    ::CORBA::Object_ptr
-    BMClosedED_Servant::provide_dataout_i (
-    ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      ::CORBA::Object_ptr ret =
-      this->lookup_facet ("dataout");
-
-      if (! ::CORBA::is_nil (ret))
-      {
-        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",
-      CIAO::Container::Facet_Consumer
-      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (::BasicSP::ReadData::_nil ());
-
-      this->add_facet (
-      "dataout",
-      obj.in ());
-
-      return obj._retn ();
-    }
-
-    ::Components::Cookie *
-    BMClosedED_Servant::subscribe_out_avail (
-    ::BasicSP::DataAvailableConsumer_ptr c
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::ExceededConnectionLimit))
-    {
-      return this->context_->subscribe_out_avail (
-      c
-      ACE_ENV_ARG_PARAMETER);
-    }
-
-    ::BasicSP::DataAvailableConsumer_ptr
-    BMClosedED_Servant::unsubscribe_out_avail (
-    ::Components::Cookie *ck
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::InvalidConnection))
-    {
-      return this->context_->unsubscribe_out_avail (
-      ck
-      ACE_ENV_ARG_PARAMETER);
-    }
-
-    BMClosedED_Servant::DataAvailableConsumer_in_avail_Servant::DataAvailableConsumer_in_avail_Servant (
-    ::BasicSP::CCM_BMClosedED_ptr executor,
-    ::BasicSP::CCM_BMClosedED_Context_ptr c)
-    : executor_ (::BasicSP::CCM_BMClosedED::_duplicate (executor)),
-    ctx_ (::BasicSP::CCM_BMClosedED_Context::_duplicate (c))
-    {
-    }
-
-    BMClosedED_Servant::DataAvailableConsumer_in_avail_Servant::~DataAvailableConsumer_in_avail_Servant (void)
-    {
-    }
-
-    CORBA::Object_ptr
-    BMClosedED_Servant::DataAvailableConsumer_in_avail_Servant::_get_component (
-    ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      return this->ctx_->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-
-    void
-    BMClosedED_Servant::DataAvailableConsumer_in_avail_Servant::push_DataAvailable (
-    ::BasicSP::DataAvailable *evt
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      this->executor_->push_in_avail (
-      evt
-      ACE_ENV_ARG_PARAMETER);
-    }
-
-    // Inherited from ::Components::EventConsumerBase.
-    void
-    BMClosedED_Servant::DataAvailableConsumer_in_avail_Servant::push_event (
-    ::Components::EventBase *ev
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::BadEventType))
-    {
-      ::BasicSP::DataAvailable_var ev_type =
-      ::BasicSP::DataAvailable::_downcast (ev);
-
-      if (ev_type != 0)
-      {
-        this->push_DataAvailable (
-        ev_type.in ()
-        ACE_ENV_ARG_PARAMETER);
-
-        return;
-      }
-
-      ACE_THROW (::Components::BadEventType ());
-    }
-
-    ::BasicSP::DataAvailableConsumer_ptr
-    BMClosedED_Servant::get_consumer_in_avail (
-    ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      if (! ::CORBA::is_nil (this->consumes_in_avail_.in ()))
-      {
-        return ::BasicSP::DataAvailableConsumer::_duplicate (this->consumes_in_avail_.in ());
-      }
-
-      ::Components::EventConsumerBase_var obj =
-      this->get_consumer_in_avail_i (
-      ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (::BasicSP::DataAvailableConsumer::_nil ());
-
-      ::BasicSP::DataAvailableConsumer_var eco =
-      ::BasicSP::DataAvailableConsumer::_narrow (
-      obj.in ()
-      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (::BasicSP::DataAvailableConsumer::_nil ());
-
-      this->consumes_in_avail_ = eco;
-      return ::BasicSP::DataAvailableConsumer::_duplicate (this->consumes_in_avail_.in ());
-    }
-
-    ::Components::EventConsumerBase_ptr
-    BMClosedED_Servant::get_consumer_in_avail_i (
-    ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      ::Components::EventConsumerBase_ptr ret =
-      this->lookup_consumer ("in_avail");
-
-      if (! ::CORBA::is_nil (ret))
-      {
-        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",
-      CIAO::Container::Facet_Consumer
-      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (::BasicSP::DataAvailableConsumer::_nil ());
-
-      ::Components::EventConsumerBase_var ecb =
-      ::Components::EventConsumerBase::_narrow (
-      obj.in ()
-      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (::BasicSP::DataAvailableConsumer::_nil ());
-
-      this->add_consumer (
-      "in_avail",
-      ecb.in ());
-
-      return ecb._retn ();
-    }
-
-    ::Components::Cookie *
-    BMClosedED_Servant::connect (
-    const char *name,
-    ::CORBA::Object_ptr connection
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::InvalidName,
-    ::Components::InvalidConnection,
-    ::Components::AlreadyConnected,
-    ::Components::ExceededConnectionLimit))
-    {
-      // If the component has no receptacles, this will be unused.
-      ACE_UNUSED_ARG (connection);
-
-      if (name == 0)
-      {
-        ACE_THROW_RETURN (::Components::InvalidName (), 0);
-      }
-
-      if (ACE_OS::strcmp (name, "datain") == 0)
-      {
-        ::BasicSP::ReadData_var _ciao_conn =
-        ::BasicSP::ReadData::_narrow (
-        connection
-        ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
-
-        if (::CORBA::is_nil (_ciao_conn.in ()))
-        {
-          ACE_THROW_RETURN (::Components::InvalidConnection (), 0);
-        }
-
-        // Simplex connect.
-        this->connect_datain (
-        _ciao_conn.in ()
-        ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
-
-        return 0;
-      }
-
-      ACE_THROW_RETURN (::Components::InvalidName (), 0);
-    }
-
-    CORBA::Object_ptr
-    BMClosedED_Servant::disconnect (
-    const char *name,
-    ::Components::Cookie * ck
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::InvalidName,
-    ::Components::InvalidConnection,
-    ::Components::CookieRequired,
-    ::Components::NoConnection))
-    {
-      if (name == 0)
-      {
-        ACE_THROW_RETURN (
-        ::Components::InvalidName (),
-        ::CORBA::Object::_nil ());
-      }
-
-      if (ACE_OS::strcmp (name, "datain") == 0)
-      {
-        // Simplex disconnect.
-        return this->disconnect_datain (ACE_ENV_SINGLE_ARG_PARAMETER);
-      }
-
-      ACE_THROW_RETURN (
-      ::Components::InvalidName (),
-      ::CORBA::Object::_nil ());
-
-      ACE_UNUSED_ARG (ck);
-    }
-
-    void
-    BMClosedED_Servant::connect_datain (
-    ::BasicSP::ReadData_ptr c
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::AlreadyConnected,
-    ::Components::InvalidConnection))
-    {
-      this->context_->connect_datain (
-      c
-      ACE_ENV_ARG_PARAMETER);
-    }
-
-    ::BasicSP::ReadData_ptr
-    BMClosedED_Servant::disconnect_datain (
-    ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::NoConnection))
-    {
-      return this->context_->disconnect_datain (
-      ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-
-    ::BasicSP::ReadData_ptr
-    BMClosedED_Servant::get_connection_datain (
-    ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      return this->context_->get_connection_datain (
-      ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-
-    void
-    BMClosedED_Servant::connect_consumer (
-    const char * emitter_name,
-    ::Components::EventConsumerBase_ptr consumer
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::InvalidName,
-    ::Components::AlreadyConnected,
-    ::Components::InvalidConnection))
-    {
-      if (emitter_name == 0)
-      {
-        ACE_THROW (::CORBA::BAD_PARAM ());
-      }
-
-      ACE_UNUSED_ARG (consumer);
-      ACE_THROW (::Components::InvalidName ());
-    }
-
-    ::Components::Cookie *
-    BMClosedED_Servant::subscribe (
-    const char *publisher_name,
-    ::Components::EventConsumerBase_ptr subscribe
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::InvalidName,
-    ::Components::InvalidConnection,
-    ::Components::ExceededConnectionLimit))
-    {
-      // Just in case there are no if blocks
-      ACE_UNUSED_ARG (subscribe);
-
-      if (publisher_name == 0)
-      {
-        ACE_THROW_RETURN (::Components::InvalidName (), 0);
-      }
-
-      if (ACE_OS::strcmp (publisher_name, "out_avail") == 0)
-      {
-        ::BasicSP::DataAvailableConsumer_var _ciao_consumer =
-        ::BasicSP::DataAvailableConsumer::_narrow (
-        subscribe
-        ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
-
-        if (::CORBA::is_nil (_ciao_consumer.in ()))
-        {
-          ACE_THROW_RETURN (::Components::InvalidConnection (), 0);
-        }
-
-        return this->subscribe_out_avail (
-        _ciao_consumer.in ()
-        ACE_ENV_ARG_PARAMETER);
-      }
-
-      ACE_THROW_RETURN (::Components::InvalidName (), 0);
-    }
-
-    ::Components::EventConsumerBase_ptr
-    BMClosedED_Servant::unsubscribe (
-    const char *publisher_name,
-    ::Components::Cookie *ck
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::InvalidName,
-    ::Components::InvalidConnection))
-    {
-      // Just in case there are no if blocks
-      ACE_UNUSED_ARG (ck);
-
-      if (publisher_name == 0)
-      {
-        ACE_THROW_RETURN (
-        ::Components::InvalidName (),
-        ::Components::EventConsumerBase::_nil ());
-      }
-
-      if (ACE_OS::strcmp (publisher_name, "out_avail") == 0)
-      {
-        return this->unsubscribe_out_avail (
-        ck
-        ACE_ENV_ARG_PARAMETER);
-      }
-
-      ACE_THROW_RETURN (
-      ::Components::InvalidName (),
-      ::Components::EventConsumerBase::_nil ());
-    }
-
-    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.
-
-    // Private method to populate the port tables.
-    void
-    BMClosedED_Servant::populate_port_tables (
-    ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      ::CORBA::Object_var obj_var;
-      ::Components::EventConsumerBase_var ecb_var;
-
-      obj_var =
-      this->provide_dataout_i (
-      ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ecb_var =
-      this->get_consumer_in_avail_i (
-      ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  }
-
-  namespace CIAO_GLUE_BasicSP
-  {
-    BMClosedEDHome_Servant::BMClosedEDHome_Servant (
-    ::BasicSP::CCM_BMClosedEDHome_ptr exe,
-    ::CIAO::Session_Container *c)
-      : CIAO::Home_Servant_Impl_Base (c),
-        home_svnt_base (exe, c)
-    {
-    }
-
-    BMClosedEDHome_Servant::~BMClosedEDHome_Servant (void)
-    {
-    }
-
-    // Home operations.
-
-    // Home supported interface operations.
-
-    // Home factory and finder operations.
-
-    // Home attribute operations.
-  }
-
-  extern "C" BMCLOSEDED_SVNT_Export ::PortableServer::Servant
-  createBMClosedEDHome_Servant (
-  ::Components::HomeExecutorBase_ptr p,
-  CIAO::Session_Container *c
-  ACE_ENV_ARG_DECL)
-  {
-    if (p == 0)
-    {
-      return 0;
-    }
-
-    ::BasicSP::CCM_BMClosedEDHome_var x =
-    ::BasicSP::CCM_BMClosedEDHome::_narrow (
-    p
-    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    if (::CORBA::is_nil (x.in ()))
-    {
-      return 0;
-    }
-
-    return new
-    CIAO_GLUE_BasicSP::BMClosedEDHome_Servant (
-    x.in (),
-    c);
-  }
-}
-
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_svnt.cpp b/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_svnt.cpp
deleted file mode 100644
index e78f7f1157e..00000000000
--- a/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_svnt.cpp
+++ /dev/null
@@ -1,549 +0,0 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
-
-#include "EC_svnt.h"
-#include "Cookies.h"
-#include "ciao/Servant_Activator.h"
-#include "ciao/Port_Activator_T.h"
-
-namespace EC_Impl
-{
-  namespace CIAO_GLUE_BasicSP
-  {
-    EC_Context::EC_Context (
-    ::Components::CCMHome_ptr home,
-    ::CIAO::Session_Container *c,
-    EC_Servant *sv)
-      : Context_Impl_Base (home, c),
-        ctx_svnt_base (home, c, sv)
-    {
-    }
-
-    EC_Context::~EC_Context (void)
-    {
-    }
-
-    // Operations for EC receptacles and event sources,
-    // defined in ::BasicSP::CCM_EC_Context.
-
-    void
-    EC_Context::push_timeout (
-    ::BasicSP::TimeOut *ev
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-
-      ACE_CString my_uuid = this->servant_->component_UUID (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      my_uuid += "_prepare_capture_publisher";
-
-      this->container_->push_event (ev,
-                                    my_uuid.c_str ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-      /*
-      ACE_Active_Map_Manager< 
-      ::BasicSP::TimeOutConsumer_var>::iterator end =
-      this->ciao_publishes_timeout_map_.end ();
-
-      for (ACE_Active_Map_Manager< 
-      ::BasicSP::TimeOutConsumer_var>::iterator iter =
-      this->ciao_publishes_timeout_map_.begin ();
-      iter != end;
-      ++iter)
-      {
-        ACE_Active_Map_Manager< 
-        ::BasicSP::TimeOutConsumer_var>::ENTRY &entry = *iter;
-
-        ::BasicSP::TimeOutConsumer_var c =
-        ::BasicSP::TimeOutConsumer::_narrow (
-        entry.int_id_.in ()
-        ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-
-        entry.int_id_->push_TimeOut (
-        ev
-        ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-      }
-      */
-    }
-
-    ::Components::Cookie *
-    EC_Context::subscribe_timeout (
-    ::BasicSP::TimeOutConsumer_ptr c
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::ExceededConnectionLimit))
-    {
-      if (CORBA::is_nil (c))
-      {
-        ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
-      }
-
-      ::BasicSP::TimeOutConsumer_var sub =
-      ::BasicSP::TimeOutConsumer::_duplicate (c);
-
-      ACE_Active_Map_Manager_Key key;
-      this->ciao_publishes_timeout_map_.bind (sub.in (), key);
-      sub._retn ();
-
-      ::Components::Cookie_var retv = new ::CIAO::Map_Key_Cookie (key);
-      return retv._retn ();
-    }
-
-    ::BasicSP::TimeOutConsumer_ptr
-    EC_Context::unsubscribe_timeout (
-    ::Components::Cookie *ck
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::InvalidConnection))
-    {
-      ::BasicSP::TimeOutConsumer_var retv;
-      ACE_Active_Map_Manager_Key key;
-
-      if (ck == 0 || ::CIAO::Map_Key_Cookie::extract (ck, key) == false)
-      {
-        ACE_THROW_RETURN (
-        ::Components::InvalidConnection (),
-        ::BasicSP::TimeOutConsumer::_nil ());
-      }
-
-      if (this->ciao_publishes_timeout_map_.unbind (key, retv) != 0)
-      {
-        ACE_THROW_RETURN (
-        ::Components::InvalidConnection (),
-        ::BasicSP::TimeOutConsumer::_nil ());
-      }
-
-      return retv._retn ();
-    }
-
-    // CIAO-specific.
-
-    EC_Context *
-    EC_Context::_narrow (
-    ::Components::SessionContext_ptr p
-    ACE_ENV_ARG_DECL_NOT_USED)
-    {
-      return dynamic_cast<EC_Context *> (p);
-    }
-  }
-
-  namespace CIAO_GLUE_BasicSP
-  {
-    void
-    EC_Servant::component_UUID (
-    const char * new_component_UUID
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      this->component_UUID_ = new_component_UUID;
-    }
-
-    CIAO::CONNECTION_ID
-    EC_Servant::component_UUID (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      return CORBA::string_dup (this->component_UUID_.c_str ());
-    }
-
- 
-    EC_Servant::EC_Servant (
-    ::BasicSP::CCM_EC_ptr exe,
-    ::Components::CCMHome_ptr h,
-    ::CIAO::Session_Container *c)
-      : Servant_Impl_Base (c),
-        comp_svnt_base (exe, c)
-    {
-      this->context_ = new EC_Context (h, c, this);
-
-      ACE_TRY_NEW_ENV
-      {
-        ::Components::SessionComponent_var scom =
-        ::Components::SessionComponent::_narrow (
-        exe
-        ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        if (! ::CORBA::is_nil (scom.in ()))
-        {
-          scom->set_session_context (
-          this->context_
-          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-        this->populate_port_tables (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-
-      ACE_CATCHANY
-      {
-      }
-
-      ACE_ENDTRY;
-    }
-
-    EC_Servant::~EC_Servant (void)
-    {
-    }
-
-    void
-    EC_Servant::set_attributes (
-    const ::Components::ConfigValues &descr
-    ACE_ENV_ARG_DECL_NOT_USED)
-    {
-      for (CORBA::ULong i = 0;
-       i < descr.length ();
-       ++i)
-      {
-        const char *descr_name = descr[i]->name ();
-        ::CORBA::Any &descr_value = descr[i]->value ();
-
-        if (ACE_OS::strcmp (descr_name, "hertz") == 0)
-        {
-          ::CORBA::Long _ciao_extract_val = 0;
-          descr_value >>= _ciao_extract_val;
-          this->hertz (_ciao_extract_val);
-          continue;
-        }
-
-        ACE_UNUSED_ARG (descr_name);
-        ACE_UNUSED_ARG (descr_value);
-      }
-    }
-
-    ::Components::Cookie *
-    EC_Servant::subscribe_timeout (
-    ::BasicSP::TimeOutConsumer_ptr c
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::ExceededConnectionLimit))
-    {
-      return this->context_->subscribe_timeout (
-      c
-      ACE_ENV_ARG_PARAMETER);
-    }
-
-    ::BasicSP::TimeOutConsumer_ptr
-    EC_Servant::unsubscribe_timeout (
-    ::Components::Cookie *ck
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::InvalidConnection))
-    {
-      return this->context_->unsubscribe_timeout (
-      ck
-      ACE_ENV_ARG_PARAMETER);
-    }
-
-    ::Components::Cookie *
-    EC_Servant::connect (
-    const char *name,
-    ::CORBA::Object_ptr connection
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::InvalidName,
-    ::Components::InvalidConnection,
-    ::Components::AlreadyConnected,
-    ::Components::ExceededConnectionLimit))
-    {
-      // If the component has no receptacles, this will be unused.
-      ACE_UNUSED_ARG (connection);
-
-      if (name == 0)
-      {
-        ACE_THROW_RETURN (::Components::InvalidName (), 0);
-      }
-
-      ACE_THROW_RETURN (::Components::InvalidName (), 0);
-    }
-
-    CORBA::Object_ptr
-    EC_Servant::disconnect (
-    const char *name,
-    ::Components::Cookie * ck
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::InvalidName,
-    ::Components::InvalidConnection,
-    ::Components::CookieRequired,
-    ::Components::NoConnection))
-    {
-      if (name == 0)
-      {
-        ACE_THROW_RETURN (
-        ::Components::InvalidName (),
-        ::CORBA::Object::_nil ());
-      }
-
-      ACE_THROW_RETURN (
-      ::Components::InvalidName (),
-      ::CORBA::Object::_nil ());
-
-      ACE_UNUSED_ARG (ck);
-    }
-
-    void
-    EC_Servant::connect_consumer (
-    const char * emitter_name,
-    ::Components::EventConsumerBase_ptr consumer
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::InvalidName,
-    ::Components::AlreadyConnected,
-    ::Components::InvalidConnection))
-    {
-      if (emitter_name == 0)
-      {
-        ACE_THROW (::CORBA::BAD_PARAM ());
-      }
-
-      ACE_UNUSED_ARG (consumer);
-      ACE_THROW (::Components::InvalidName ());
-    }
-
-    ::Components::Cookie *
-    EC_Servant::subscribe (
-    const char *publisher_name,
-    ::Components::EventConsumerBase_ptr subscribe
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::InvalidName,
-    ::Components::InvalidConnection,
-    ::Components::ExceededConnectionLimit))
-    {
-      // Just in case there are no if blocks
-      ACE_UNUSED_ARG (subscribe);
-
-      if (publisher_name == 0)
-      {
-        ACE_THROW_RETURN (::Components::InvalidName (), 0);
-      }
-
-      if (ACE_OS::strcmp (publisher_name, "timeout") == 0)
-      {
-        ::BasicSP::TimeOutConsumer_var _ciao_consumer =
-        ::BasicSP::TimeOutConsumer::_narrow (
-        subscribe
-        ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
-
-        if (::CORBA::is_nil (_ciao_consumer.in ()))
-        {
-          ACE_THROW_RETURN (::Components::InvalidConnection (), 0);
-        }
-
-        return this->subscribe_timeout (
-        _ciao_consumer.in ()
-        ACE_ENV_ARG_PARAMETER);
-      }
-
-      ACE_THROW_RETURN (::Components::InvalidName (), 0);
-    }
-
-    ::Components::EventConsumerBase_ptr
-    EC_Servant::unsubscribe (
-    const char *publisher_name,
-    ::Components::Cookie *ck
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::InvalidName,
-    ::Components::InvalidConnection))
-    {
-      // Just in case there are no if blocks
-      ACE_UNUSED_ARG (ck);
-
-      if (publisher_name == 0)
-      {
-        ACE_THROW_RETURN (
-        ::Components::InvalidName (),
-        ::Components::EventConsumerBase::_nil ());
-      }
-
-      if (ACE_OS::strcmp (publisher_name, "timeout") == 0)
-      {
-        return this->unsubscribe_timeout (
-        ck
-        ACE_ENV_ARG_PARAMETER);
-      }
-
-      ACE_THROW_RETURN (
-      ::Components::InvalidName (),
-      ::Components::EventConsumerBase::_nil ());
-    }
-
-    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
-    EC_Servant::start (
-    ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      this->executor_->start (
-      ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-
-    void
-    EC_Servant::stop (
-    ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      this->executor_->stop (
-      ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-
-    // Component attribute operations.
-
-    ::CORBA::Long
-    EC_Servant::hertz (
-    ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      return this->executor_->hertz (
-      ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-
-    void
-    EC_Servant::hertz (
-    ::CORBA::Long hertz
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      this->executor_->hertz (
-      hertz
-      ACE_ENV_ARG_PARAMETER);
-    }
-
-    // Private method to populate the port tables.
-    void
-    EC_Servant::populate_port_tables (
-    ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      ::CORBA::Object_var obj_var;
-      ::Components::EventConsumerBase_var ecb_var;
-    }
-  }
-
-  namespace CIAO_GLUE_BasicSP
-  {
-    ECHome_Servant::ECHome_Servant (
-    ::BasicSP::CCM_ECHome_ptr exe,
-    ::CIAO::Session_Container *c)
-      : CIAO::Home_Servant_Impl_Base (c),
-        home_svnt_base (exe, c)
-    {
-    }
-
-    ECHome_Servant::~ECHome_Servant (void)
-    {
-    }
-
-    // Home operations.
-
-    // Home supported interface operations.
-
-    // Home factory and finder operations.
-
-    ::BasicSP::EC_ptr
-    ECHome_Servant::new_EC (
-    ::CORBA::Long hertz
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      ::Components::EnterpriseComponent_var _ciao_ec =
-      this->executor_->new_EC (
-      hertz
-      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (::BasicSP::EC_ptr::_nil ());
-
-      ::BasicSP::CCM_EC_var _ciao_comp =
-      ::BasicSP::CCM_EC::_narrow (
-      _ciao_ec.in ()
-      ACE_ENV_ARG_PARAMETER);
-
-      ACE_CHECK_RETURN (::BasicSP::EC_ptr::_nil ());
-
-      return this->_ciao_activate_component (
-      _ciao_comp.in ()
-      ACE_ENV_ARG_PARAMETER);
-    }
-
-    // Home attribute operations.
-  }
-
-  extern "C" EC_SVNT_Export ::PortableServer::Servant
-  createECHome_Servant (
-  ::Components::HomeExecutorBase_ptr p,
-  CIAO::Session_Container *c
-  ACE_ENV_ARG_DECL)
-  {
-    if (p == 0)
-    {
-      return 0;
-    }
-
-    ::BasicSP::CCM_ECHome_var x =
-    ::BasicSP::CCM_ECHome::_narrow (
-    p
-    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    if (::CORBA::is_nil (x.in ()))
-    {
-      return 0;
-    }
-
-    return new
-    CIAO_GLUE_BasicSP::ECHome_Servant (
-    x.in (),
-    c);
-  }
-}
-
diff --git a/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_svnt.h b/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_svnt.h
deleted file mode 100644
index 3db4ddf95fa..00000000000
--- a/TAO/CIAO/DAnCE/examples/BasicSP/EC/EC_svnt.h
+++ /dev/null
@@ -1,333 +0,0 @@
-// $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
-
-#ifndef CIAO_GLUE_SESSION_EC_SVNT_H
-#define CIAO_GLUE_SESSION_EC_SVNT_H
-
-#include /**/ "ace/pre.h"
-
-#include "ECEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ciao/Container_Base.h"
-#include "ciao/Servant_Impl_T.h"
-#include "ciao/Context_Impl_T.h"
-#include "ciao/Home_Servant_Impl_T.h"
-#include "ace/Active_Map_Manager_T.h"
-
-#include "ECS.h"
-
-namespace EC_Impl
-{
-  namespace CIAO_GLUE_BasicSP
-  {
-    class EC_Servant;
-
-    class EC_SVNT_Export EC_Context
-      : public virtual CIAO::Context_Impl<
-          ::BasicSP::CCM_EC_Context,
-          EC_Servant,
-          ::BasicSP::EC,
-          ::BasicSP::EC_var
-        >
-    {
-      public:
-      // We will allow the servant glue code we generate to access our state.
-      friend class EC_Servant;
-
-      /// Hack for VC6.
-      typedef CIAO::Context_Impl<
-          ::BasicSP::CCM_EC_Context,
-          EC_Servant,
-          ::BasicSP::EC,
-          ::BasicSP::EC_var
-        > ctx_svnt_base;
-
-      EC_Context (
-      ::Components::CCMHome_ptr home,
-      ::CIAO::Session_Container *c,
-      EC_Servant *sv);
-
-      virtual ~EC_Context (void);
-
-      // Operations for EC receptacles and event sources,
-      // defined in ::BasicSP::CCM_EC_Context.
-
-      virtual void
-      push_timeout (
-      ::BasicSP::TimeOut *ev
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-      // CIAO-specific.
-
-      static EC_Context *
-      _narrow (
-      ::Components::SessionContext_ptr p
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-      protected:
-      // Methods that manage this component's connections and consumers.
-
-      virtual ::Components::Cookie *
-      subscribe_timeout (
-      ::BasicSP::TimeOutConsumer_ptr c
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::ExceededConnectionLimit));
-
-      virtual ::BasicSP::TimeOutConsumer_ptr
-      unsubscribe_timeout (
-      ::Components::Cookie *ck
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::InvalidConnection));
-
-      protected:
-      ACE_Active_Map_Manager<
-      ::BasicSP::TimeOutConsumer_var>
-      ciao_publishes_timeout_map_;
-    };
-  }
-
-  namespace CIAO_GLUE_BasicSP
-  {
-    class EC_SVNT_Export EC_Servant
-      : public virtual CIAO::Servant_Impl<
-          POA_BasicSP::EC,
-          ::BasicSP::CCM_EC,
-          ::BasicSP::CCM_EC_var,
-          EC_Context
-        >
-    {
-      public:
-      /// Hack for VC6.
-      typedef CIAO::Servant_Impl<
-          POA_BasicSP::EC,
-          ::BasicSP::CCM_EC,
-          ::BasicSP::CCM_EC_var,
-          EC_Context
-        > comp_svnt_base;
-
-      EC_Servant (
-      ::BasicSP::CCM_EC_ptr executor,
-      ::Components::CCMHome_ptr home,
-      ::CIAO::Session_Container *c);
-
-      virtual ~EC_Servant (void);
-
-      virtual void
-      set_attributes (
-      const ::Components::ConfigValues &descr
-      ACE_ENV_ARG_DECL);
-
-      // Supported operations.
-      virtual void
-      component_UUID (
-      const char * new_component_UUID
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CIAO::CONNECTION_ID
-      component_UUID (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual void
-      start (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-      virtual void
-      stop (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-      // Public port operations.
-
-      virtual ::Components::Cookie *
-      subscribe_timeout (
-      ::BasicSP::TimeOutConsumer_ptr c
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::ExceededConnectionLimit));
-
-      virtual ::BasicSP::TimeOutConsumer_ptr
-      unsubscribe_timeout (
-      ::Components::Cookie *ck
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::InvalidConnection));
-
-      // Component attribute operations.
-
-      virtual ::CORBA::Long
-      hertz (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual void
-      hertz (
-      ::CORBA::Long
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-      // Operations for Receptacles interface.
-
-      virtual ::Components::Cookie *
-      connect (
-      const char *name,
-      CORBA::Object_ptr connection
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::InvalidName,
-      ::Components::InvalidConnection,
-      ::Components::AlreadyConnected,
-      ::Components::ExceededConnectionLimit));
-
-      virtual CORBA::Object_ptr
-      disconnect (
-      const char *name,
-      ::Components::Cookie *ck
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::InvalidName,
-      ::Components::InvalidConnection,
-      ::Components::CookieRequired,
-      ::Components::NoConnection));
-
-      // Operations for Events interface.
-
-      virtual ::Components::Cookie *
-      subscribe (
-      const char *publisher_name,
-      ::Components::EventConsumerBase_ptr subscriber
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::InvalidName,
-      ::Components::InvalidConnection,
-      ::Components::ExceededConnectionLimit));
-
-      virtual ::Components::EventConsumerBase_ptr
-      unsubscribe (
-      const char *publisher_name,
-      ::Components::Cookie *ck
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::InvalidName,
-      ::Components::InvalidConnection));
-
-      virtual void
-      connect_consumer (
-      const char *emitter_name,
-      ::Components::EventConsumerBase_ptr consumer
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((
-      ::CORBA::SystemException,
-      ::Components::InvalidName,
-      ::Components::AlreadyConnected,
-      ::Components::InvalidConnection));
-
-      // 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:
-      ACE_CString component_UUID_;
-
-      private:
-
-      void
-      populate_port_tables (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    };
-  }
-
-  namespace CIAO_GLUE_BasicSP
-  {
-    class EC_SVNT_Export ECHome_Servant
-      : public virtual CIAO::Home_Servant_Impl<
-          POA_BasicSP::ECHome,
-          ::BasicSP::CCM_ECHome,
-          ::BasicSP::CCM_ECHome_var,
-          ::BasicSP::EC,
-          ::BasicSP::EC_var,
-          ::BasicSP::CCM_EC,
-          ::BasicSP::CCM_EC_var,
-          EC_Servant
-        >
-    {
-      public:
-      /// Hack for VC6.
-      typedef CIAO::Home_Servant_Impl<
-          POA_BasicSP::ECHome,
-          ::BasicSP::CCM_ECHome,
-          ::BasicSP::CCM_ECHome_var,
-          ::BasicSP::EC,
-          ::BasicSP::EC_var,
-          ::BasicSP::CCM_EC,
-          ::BasicSP::CCM_EC_var,
-          EC_Servant
-        > home_svnt_base;
-
-      ECHome_Servant (
-      ::BasicSP::CCM_ECHome_ptr exe,
-      ::CIAO::Session_Container *c);
-
-      virtual ~ECHome_Servant (void);
-
-      // Home operations.
-
-      // Home factory and finder operations.
-
-      virtual ::BasicSP::EC_ptr
-      new_EC (
-      ::CORBA::Long hertz
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-      // Attribute operations.
-    };
-
-    extern "C" EC_SVNT_Export ::PortableServer::Servant
-    createECHome_Servant (
-    ::Components::HomeExecutorBase_ptr p,
-    CIAO::Session_Container *c
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* CIAO_GLUE_SESSION_EC_SVNT_H */
-