ChangeLogTag:Tue Apr 11 14:35:57 2000 Carlos O'Ryan <coryan@uci.edu>

72 files changed, 4475 insertions, 6242 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index e15f08aaf41..29371d9f869 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,101 @@
+Tue Apr 11 14:35:57 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+	* Changed the RTEC and the CosEC to use the components defined in
+	  the ESF directory.  In this pass i basically moved the classes
+	  from orbsvcs/Event/EC_* to orbsvcs/ESF/ESF_*
+	  But I also added components that simplify the implementation of
+	  the Consumer and Supplier admin classes.
+	  This new mini-framework is desgined to facilitate the task of
+	  implementing event services, such as the Real-time Event
+	  Service, the COS Event Service or the Notification Service.
+
+	* orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h:
+	* orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp:
+	* orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp:
+	* orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h:
+	* orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h:
+	* orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp:
+	  Fixed minor problems with the generic event service framework
+	  components.
+
+	* orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h:
+	* orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i:
+	* orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp:
+	  Add new iteration strategy to the framework.
+
+	* orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h:
+	* orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i:
+	* orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp:
+	* orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp:
+	* orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h:
+	* orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i:
+	* orbsvcs/orbsvcs/CosEvent/CEC_Factory.h:
+	* orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h:
+	* orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp:
+	* orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h:
+	* orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp:
+	* orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h:
+	* orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp:
+	* orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h:
+	* orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp:
+	* orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h:
+	* orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h:
+	* orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h:
+	* orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h:
+	* orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i:
+	* orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp:
+	* orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp:
+	* orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h:
+	* orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i:
+	* orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp:
+	* orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp:
+	* orbsvcs/orbsvcs/Event/EC_Event_Channel.h:
+	* orbsvcs/orbsvcs/Event/EC_Event_Channel.i:
+	* orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp:
+	* orbsvcs/orbsvcs/Event/EC_Factory.h:
+	* orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp:
+	* orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h:
+	* orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h:
+	* orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp:
+	* orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h:
+	* orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp:
+	* orbsvcs/orbsvcs/Event/EC_ProxySupplier.h:
+	* orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp:
+	* orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h:
+	* orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h:
+	* orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h:
+	* orbsvcs/orbsvcs/Event/EC_SupplierAdmin.i:
+	* orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp:
+	* orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h:
+	  Use the new components to implement the ConsumerAdmin and
+	  SupplierAdmin interfaces.
+	  Reuse the code in the framework for the collections.
+
+	* orbsvcs/orbsvcs/Event/EC_Command.h:
+	* orbsvcs/orbsvcs/Event/EC_Command.i:
+	* orbsvcs/orbsvcs/Event/EC_Command.cpp:
+	* orbsvcs/orbsvcs/Event/EC_Concrete_Proxy_Set.h:
+	* orbsvcs/orbsvcs/Event/EC_Concrete_Proxy_Set.i:
+	* orbsvcs/orbsvcs/Event/EC_Concrete_Proxy_Set.cpp:
+	* orbsvcs/orbsvcs/Event/EC_Copy_On_Write.h:
+	* orbsvcs/orbsvcs/Event/EC_Copy_On_Write.i:
+	* orbsvcs/orbsvcs/Event/EC_Copy_On_Write.cpp:
+	* orbsvcs/orbsvcs/Event/EC_Proxy_Collection.h:
+	* orbsvcs/orbsvcs/Event/EC_Proxy_Collection.i:
+	* orbsvcs/orbsvcs/Event/EC_Proxy_Collection.cpp:
+	* orbsvcs/orbsvcs/Event/EC_Worker.h:
+	* orbsvcs/orbsvcs/Event/EC_Worker.i:
+	* orbsvcs/orbsvcs/Event/EC_Worker.cpp:
+	  Removed, they are implemented in the ESF directory.
+
+	* orbsvcs/tests/Event/Basic/Makefile:
+	* orbsvcs/tests/Event/Performance/Makefile:
+	* orbsvcs/tests/Event/lib/Makefile:
+	* orbsvcs/CosEvent_Service/Makefile:
+	* orbsvcs/orbsvcs/Makefile.CosEvent:
+	* orbsvcs/orbsvcs/Makefile.RTEvent:
+	  Updated dependencies
+
 Tue Apr 11 16:00:00 2000  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
 
 	* tao/orbconf.h: Commented out AMI aupport as default thus
diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile b/TAO/orbsvcs/CosEvent_Service/Makefile
index 6b0480ffef1..6fd1eea8ad4 100644
--- a/TAO/orbsvcs/CosEvent_Service/Makefile
+++ b/TAO/orbsvcs/CosEvent_Service/Makefile
@@ -265,6 +265,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -359,7 +361,7 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
@@ -385,7 +387,7 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
@@ -401,7 +403,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
index c6b4be70e73..df3e61a9d9f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
@@ -13,13 +13,10 @@
 ACE_RCSID(CosEvent, CEC_ConsumerAdmin, "$Id$")
 
 TAO_CEC_ConsumerAdmin::TAO_CEC_ConsumerAdmin (TAO_CEC_EventChannel *ec)
-  :  event_channel_ (ec)
+  :  event_channel_ (ec),
+     push_admin_ (ec),
+     pull_admin_ (ec)
 {
-  this->push_collection_ =
-    this->event_channel_->create_proxy_push_supplier_collection ();
-  this->pull_collection_ =
-    this->event_channel_->create_proxy_pull_supplier_collection ();
-
   // @@
   // @@ this->collection_->busy_hwm (this->event_channel_->busy_hwm ());
   // @@ this->collection_->max_write_delay (
@@ -31,10 +28,6 @@ TAO_CEC_ConsumerAdmin::TAO_CEC_ConsumerAdmin (TAO_CEC_EventChannel *ec)
 
 TAO_CEC_ConsumerAdmin::~TAO_CEC_ConsumerAdmin (void)
 {
-  this->event_channel_->destroy_proxy_push_supplier_collection (this->push_collection_);
-  this->push_collection_ = 0;
-  this->event_channel_->destroy_proxy_pull_supplier_collection (this->pull_collection_);
-  this->pull_collection_ = 0;
 }
 
 void
@@ -43,74 +36,66 @@ TAO_CEC_ConsumerAdmin::push (const CORBA::Any &event,
 {
   TAO_CEC_Propagate_Event_Push push_worker (event);
 
-  this->push_collection_->for_each (&push_worker,
-                                    ACE_TRY_ENV);
+  this->push_admin_.for_each (&push_worker,
+                              ACE_TRY_ENV);
   ACE_CHECK;
 
   TAO_CEC_Propagate_Event_Pull pull_worker (event);
 
-  this->pull_collection_->for_each (&pull_worker,
-                                    ACE_TRY_ENV);
+  this->pull_admin_.for_each (&pull_worker,
+                              ACE_TRY_ENV);
   ACE_CHECK;
 }
 
 void
-TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPushSupplier * /*supplier*/,
-                                  CORBA::Environment & /*ACE_TRY_ENV*/)
+TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPushSupplier *supplier,
+                                  CORBA::Environment &ACE_TRY_ENV)
 {
-  // this->push_collection_->connected (supplier, ACE_TRY_ENV);
+  this->push_admin_.connected (supplier, ACE_TRY_ENV);
 }
 
 void
 TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPushSupplier *supplier,
                                     CORBA::Environment &ACE_TRY_ENV)
 {
-  this->push_collection_->reconnected (supplier, ACE_TRY_ENV);
+  this->push_admin_.reconnected (supplier, ACE_TRY_ENV);
 }
 
 void
 TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPushSupplier *supplier,
                                      CORBA::Environment &ACE_TRY_ENV)
 {
-  this->push_collection_->disconnected (supplier, ACE_TRY_ENV);
+  this->push_admin_.disconnected (supplier, ACE_TRY_ENV);
 }
 
 void
-TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPullSupplier * /*supplier*/,
-                                  CORBA::Environment & /*ACE_TRY_ENV*/)
+TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPullSupplier *supplier,
+                                  CORBA::Environment &ACE_TRY_ENV)
 {
-  // this->pull_collection_->connected (supplier, ACE_TRY_ENV);
+  this->pull_admin_.connected (supplier, ACE_TRY_ENV);
 }
 
 void
 TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPullSupplier *supplier,
                                    CORBA::Environment &ACE_TRY_ENV)
 {
-  this->pull_collection_->reconnected (supplier, ACE_TRY_ENV);
+  this->pull_admin_.reconnected (supplier, ACE_TRY_ENV);
 }
 
 void
 TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPullSupplier *supplier,
                                     CORBA::Environment &ACE_TRY_ENV)
 {
-  this->pull_collection_->disconnected (supplier, ACE_TRY_ENV);
+  this->pull_admin_.disconnected (supplier, ACE_TRY_ENV);
 }
 
 void
 TAO_CEC_ConsumerAdmin::shutdown (CORBA::Environment &ACE_TRY_ENV)
 {
-  TAO_CEC_Shutdown_Push_Supplier push_worker;
-
-  this->push_collection_->for_each (&push_worker, ACE_TRY_ENV);
+  this->push_admin_.shutdown (ACE_TRY_ENV);
   ACE_CHECK;
-  this->push_collection_->shutdown (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  TAO_CEC_Shutdown_Pull_Supplier pull_worker;
 
-  this->pull_collection_->for_each (&pull_worker, ACE_TRY_ENV);
-  ACE_CHECK;
-  this->pull_collection_->shutdown (ACE_TRY_ENV);
+  this->pull_admin_.shutdown (ACE_TRY_ENV);
   ACE_CHECK;
 }
 
@@ -118,38 +103,14 @@ CosEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_CEC_ConsumerAdmin::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_CEC_ProxyPushSupplier* supplier =
-    this->event_channel_->create_proxy_push_supplier ();
-
-  PortableServer::ServantBase_var holder = supplier;
-
-  CosEventChannelAdmin::ProxyPushSupplier_var result =
-    supplier->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPushSupplier::_nil ());
-
-  this->push_collection_->connected (supplier, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPushSupplier::_nil ());
-
-  return result._retn ();
+  return this->push_admin_.obtain (ACE_TRY_ENV);
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
 TAO_CEC_ConsumerAdmin::obtain_pull_supplier (CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_CEC_ProxyPullSupplier* supplier =
-    this->event_channel_->create_proxy_pull_supplier ();
-
-  PortableServer::ServantBase_var holder = supplier;
-
-  CosEventChannelAdmin::ProxyPullSupplier_var result =
-    supplier->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPullSupplier::_nil ());
-
-  this->pull_collection_->connected (supplier, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPullSupplier::_nil ());
-
-  return result._retn ();
+  return this->pull_admin_.obtain (ACE_TRY_ENV);
 }
 
 PortableServer::POA_ptr
@@ -161,42 +122,6 @@ TAO_CEC_ConsumerAdmin::_default_POA (CORBA::Environment&)
 // ****************************************************************
 
 void
-TAO_CEC_Shutdown_Push_Supplier::work (TAO_CEC_ProxyPushSupplier *supplier,
-                                 CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_TRY
-    {
-      supplier->shutdown (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // Ignore exceptions
-    }
-  ACE_ENDTRY;
-}
-
-// ****************************************************************
-
-void
-TAO_CEC_Shutdown_Pull_Supplier::work (TAO_CEC_ProxyPullSupplier *supplier,
-                                      CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_TRY
-    {
-      supplier->shutdown (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // Ignore exceptions
-    }
-  ACE_ENDTRY;
-}
-
-// ****************************************************************
-
-void
 TAO_CEC_Propagate_Event_Push::work (TAO_CEC_ProxyPushSupplier *supplier,
                                     CORBA::Environment &ACE_TRY_ENV)
 {
@@ -216,12 +141,22 @@ TAO_CEC_Propagate_Event_Pull::work (TAO_CEC_ProxyPullSupplier *supplier,
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_EC_Worker<TAO_CEC_ProxyPushSupplier>;
-template class TAO_EC_Worker<TAO_CEC_ProxyPullSupplier>;
+template class TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel,TAO_CEC_ProxyPushSupplier>;
+template class TAO_ESF_Shutdown_Proxy<TAO_CEC_ProxyPushSupplier>;
+template class TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier>;
+
+template class TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel,TAO_CEC_ProxyPullSupplier>;
+template class TAO_ESF_Shutdown_Proxy<TAO_CEC_ProxyPullSupplier>;
+template class TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier>;
 
 #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_EC_Worker<TAO_CEC_ProxyPushSupplier>
-#pragma instantiate TAO_EC_Worker<TAO_CEC_ProxyPullSupplier>
+#pragma instantiate TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel,TAO_CEC_ProxyPushSupplier>
+#pragma instantiate TAO_ESF_Shutdown_Proxy<TAO_CEC_ProxyPushSupplier>
+#pragma instantiate TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier>
+
+#pragma instantiate TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel,TAO_CEC_ProxyPullSupplier>
+#pragma instantiate TAO_ESF_Shutdown_Proxy<TAO_CEC_ProxyPullSupplier>
+#pragma instantiate TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
index ebd19ca751d..5c2fdd1e366 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
@@ -24,14 +24,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Event/EC_Proxy_Collection.h"
-#include "orbsvcs/Event/EC_Worker.h"
+#include "orbsvcs/ESF/ESF_Proxy_Admin.h"
+#include "CEC_ProxyPushSupplier.h"
+#include "CEC_ProxyPullSupplier.h"
 #include "event_export.h"
 
 class TAO_CEC_EventChannel;
-class TAO_CEC_ProxyPushSupplier;
-class TAO_CEC_ProxyPullSupplier;
-class TAO_CEC_ProxyPushConsumer;
 
 class TAO_Event_Export TAO_CEC_ConsumerAdmin : public POA_CosEventChannelAdmin::ConsumerAdmin
 {
@@ -62,9 +60,9 @@ public:
   virtual ~TAO_CEC_ConsumerAdmin (void);
   // destructor...
 
-  void for_each (TAO_EC_Worker<TAO_CEC_ProxyPushSupplier> *worker,
+  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker,
                  CORBA::Environment &ACE_TRY_ENV);
-  void for_each (TAO_EC_Worker<TAO_CEC_ProxyPullSupplier> *worker,
+  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier> *worker,
                  CORBA::Environment &ACE_TRY_ENV);
   // For each elements call <worker->work()>.
 
@@ -106,43 +104,20 @@ private:
   TAO_CEC_EventChannel *event_channel_;
   // The Event Channel we belong to
 
-  typedef TAO_EC_Proxy_Collection<TAO_CEC_ProxyPushSupplier> PushCollection;
-  PushCollection *push_collection_;
-  // The supplier container.
-
-  typedef TAO_EC_Proxy_Collection<TAO_CEC_ProxyPullSupplier> PullCollection;
-  PullCollection *pull_collection_;
-  // The supplier container.
-
   PortableServer::POA_var default_POA_;
   // Store the default POA.
-};
 
-// ****************************************************************
+  TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel,TAO_CEC_ProxyPushSupplier> push_admin_;
+  // Implement the push side of this class
 
-class TAO_CEC_Shutdown_Push_Supplier : public TAO_EC_Worker<TAO_CEC_ProxyPushSupplier>
-{
-public:
-  TAO_CEC_Shutdown_Push_Supplier (void);
+  TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel,TAO_CEC_ProxyPullSupplier> pull_admin_;
+  // Implement the pull side of this class
 
-  void work (TAO_CEC_ProxyPushSupplier *supplier,
-             CORBA::Environment &ACE_TRY_ENV);
-};
-
-// ****************************************************************
-
-class TAO_CEC_Shutdown_Pull_Supplier : public TAO_EC_Worker<TAO_CEC_ProxyPullSupplier>
-{
-public:
-  TAO_CEC_Shutdown_Pull_Supplier (void);
-
-  void work (TAO_CEC_ProxyPullSupplier *supplier,
-             CORBA::Environment &ACE_TRY_ENV);
 };
 
 // ****************************************************************
 
-class TAO_CEC_Propagate_Event_Push : public TAO_EC_Worker<TAO_CEC_ProxyPushSupplier>
+class TAO_CEC_Propagate_Event_Push : public TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier>
 {
 public:
   TAO_CEC_Propagate_Event_Push (const CORBA::Any& event);
@@ -157,7 +132,7 @@ private:
 
 // ****************************************************************
 
-class TAO_CEC_Propagate_Event_Pull : public TAO_EC_Worker<TAO_CEC_ProxyPullSupplier>
+class TAO_CEC_Propagate_Event_Pull : public TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier>
 {
 public:
   TAO_CEC_Propagate_Event_Pull (const CORBA::Any& event);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i
index f8a7aca4ba0..ea68daf0d87 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i
@@ -2,32 +2,18 @@
 
 ACE_INLINE void
 TAO_CEC_ConsumerAdmin::
-    for_each (TAO_EC_Worker<TAO_CEC_ProxyPushSupplier> *worker,
+    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker,
               CORBA::Environment &ACE_TRY_ENV)
 {
-  this->push_collection_->for_each (worker, ACE_TRY_ENV);
+  this->push_admin_.for_each (worker, ACE_TRY_ENV);
 }
 
 ACE_INLINE void
 TAO_CEC_ConsumerAdmin::
-    for_each (TAO_EC_Worker<TAO_CEC_ProxyPullSupplier> *worker,
+    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier> *worker,
               CORBA::Environment &ACE_TRY_ENV)
 {
-  this->pull_collection_->for_each (worker, ACE_TRY_ENV);
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_CEC_Shutdown_Push_Supplier::TAO_CEC_Shutdown_Push_Supplier (void)
-{
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_CEC_Shutdown_Pull_Supplier::TAO_CEC_Shutdown_Pull_Supplier (void)
-{
+  this->pull_admin_.for_each (worker, ACE_TRY_ENV);
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
index 1ade08a3c72..32b3299ebd1 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
@@ -12,9 +12,12 @@
 #include "CEC_EventChannel.h"
 #include "CEC_Reactive_ConsumerControl.h"
 #include "CEC_Reactive_SupplierControl.h"
-#include "orbsvcs/Event/EC_Proxy_Collection.h"
-#include "orbsvcs/Event/EC_Command.h" // Work around bug in GHS compiler
-#include "orbsvcs/Event/EC_Concrete_Proxy_Set.h"
+#include "orbsvcs/ESF/ESF_Immediate_Changes.h"
+#include "orbsvcs/ESF/ESF_Delayed_Changes.h"
+#include "orbsvcs/ESF/ESF_Copy_On_Write.h"
+#include "orbsvcs/ESF/ESF_Copy_On_Read.h"
+#include "orbsvcs/ESF/ESF_Proxy_List.h"
+#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/Sched_Params.h"
 
@@ -446,119 +449,111 @@ TAO_CEC_Default_Factory::destroy_proxy_pull_consumer (TAO_CEC_ProxyPullConsumer
 
 // These typedefs workaround a SunCC 4.2 bug
 typedef
-    TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>::Iterator
+    TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>::Iterator
     TAO_CEC_PushConsumer_List_Iterator;
 typedef
-    TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>::Iterator
+    TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>::Iterator
     TAO_CEC_PushConsumer_RB_Tree_Iterator;
 typedef
-    TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>::Iterator
+    TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>::Iterator
     TAO_CEC_PullConsumer_List_Iterator;
 typedef
-    TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>::Iterator
+    TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>::Iterator
     TAO_CEC_PullConsumer_RB_Tree_Iterator;
 typedef
-    TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>::Iterator
+    TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>::Iterator
     TAO_CEC_PushSupplier_List_Iterator;
 typedef
-    TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>::Iterator
+    TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>::Iterator
     TAO_CEC_PushSupplier_RB_Tree_Iterator;
 typedef
-    TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>::Iterator
+    TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>::Iterator
     TAO_CEC_PullSupplier_List_Iterator;
 typedef
-    TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>::Iterator
+    TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>::Iterator
     TAO_CEC_PullSupplier_RB_Tree_Iterator;
 
 TAO_CEC_ProxyPushConsumer_Collection*
 TAO_CEC_Default_Factory::create_proxy_push_consumer_collection (TAO_CEC_EventChannel *)
 {
   if (this->consumer_collection_ == 0x000)
-    return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+    return new TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_List_Iterator,
       ACE_SYNCH_MUTEX> ();
   else if (this->consumer_collection_ == 0x001)
-    return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+    return new TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_List_Iterator,
       ACE_SYNCH_MUTEX> ();
-  /*
   else if (this->consumer_collection_ == 0x002)
-    return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+    return new TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_List_Iterator,
-      ACE_SYNCH_MUTEX> ();
-  */
+      ACE_SYNCH> ();
   else if (this->consumer_collection_ == 0x003)
-    return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+    return new TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_List_Iterator,
       ACE_SYNCH> ();
   else if (this->consumer_collection_ == 0x010)
-    return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+    return new TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
       ACE_SYNCH_MUTEX> ();
   else if (this->consumer_collection_ == 0x011)
-    return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+    return new TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
       ACE_SYNCH_MUTEX> ();
-  /*
   else if (this->consumer_collection_ == 0x012)
-    return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+    return new TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
-      ACE_SYNCH_MUTEX> ();
-  */
+      ACE_SYNCH> ();
   else if (this->consumer_collection_ == 0x013)
-    return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+    return new TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
       ACE_SYNCH> ();
   else if (this->consumer_collection_ == 0x100)
-    return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+    return new TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_List_Iterator,
       ACE_Null_Mutex> ();
   else if (this->consumer_collection_ == 0x101)
-    return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+    return new TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_List_Iterator,
       ACE_Null_Mutex> ();
-  /*
   else if (this->consumer_collection_ == 0x102)
-    return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+    return new TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_List_Iterator,
-      ACE_Null_Mutex> ();
-  */
+      ACE_NULL_SYNCH> ();
   else if (this->consumer_collection_ == 0x103)
-    return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+    return new TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_List_Iterator,
       ACE_NULL_SYNCH> ();
   else if (this->consumer_collection_ == 0x110)
-    return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+    return new TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
       ACE_Null_Mutex> ();
   else if (this->consumer_collection_ == 0x111)
-    return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+    return new TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
       ACE_Null_Mutex> ();
-  /*
   else if (this->consumer_collection_ == 0x112)
-    return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+    return new TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
-      ACE_Null_Mutex> ();
-  */
+      ACE_NULL_SYNCH> ();
   else if (this->consumer_collection_ == 0x113)
-    return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+    return new TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
       ACE_NULL_SYNCH> ();
 
@@ -575,91 +570,83 @@ TAO_CEC_ProxyPullConsumer_Collection*
 TAO_CEC_Default_Factory::create_proxy_pull_consumer_collection (TAO_CEC_EventChannel *)
 {
   if (this->consumer_collection_ == 0x000)
-    return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+    return new TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_List_Iterator,
       ACE_SYNCH_MUTEX> ();
   else if (this->consumer_collection_ == 0x001)
-    return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+    return new TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_List_Iterator,
       ACE_SYNCH_MUTEX> ();
-  /*
   else if (this->consumer_collection_ == 0x002)
-    return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+    return new TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_List_Iterator,
-      ACE_SYNCH_MUTEX> ();
-  */
+      ACE_SYNCH> ();
   else if (this->consumer_collection_ == 0x003)
-    return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+    return new TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_List_Iterator,
       ACE_SYNCH> ();
   else if (this->consumer_collection_ == 0x010)
-    return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+    return new TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
       ACE_SYNCH_MUTEX> ();
   else if (this->consumer_collection_ == 0x011)
-    return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+    return new TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
       ACE_SYNCH_MUTEX> ();
-  /*
   else if (this->consumer_collection_ == 0x012)
-    return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+    return new TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
-      ACE_SYNCH_MUTEX> ();
-  */
+      ACE_SYNCH> ();
   else if (this->consumer_collection_ == 0x013)
-    return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+    return new TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
       ACE_SYNCH> ();
   else if (this->consumer_collection_ == 0x100)
-    return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+    return new TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_List_Iterator,
       ACE_Null_Mutex> ();
   else if (this->consumer_collection_ == 0x101)
-    return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+    return new TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_List_Iterator,
       ACE_Null_Mutex> ();
-  /*
   else if (this->consumer_collection_ == 0x102)
-    return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+    return new TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_List_Iterator,
-      ACE_Null_Mutex> ();
-  */
+      ACE_NULL_SYNCH> ();
   else if (this->consumer_collection_ == 0x103)
-    return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+    return new TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_List_Iterator,
       ACE_NULL_SYNCH> ();
   else if (this->consumer_collection_ == 0x110)
-    return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+    return new TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
       ACE_Null_Mutex> ();
   else if (this->consumer_collection_ == 0x111)
-    return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+    return new TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
       ACE_Null_Mutex> ();
-  /*
   else if (this->consumer_collection_ == 0x112)
-    return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+    return new TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
-      ACE_Null_Mutex> ();
-  */
+      ACE_NULL_SYNCH> ();
   else if (this->consumer_collection_ == 0x113)
-    return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+    return new TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
       ACE_NULL_SYNCH> ();
 
@@ -676,91 +663,83 @@ TAO_CEC_ProxyPushSupplier_Collection*
 TAO_CEC_Default_Factory::create_proxy_push_supplier_collection (TAO_CEC_EventChannel *)
 {
   if (this->supplier_collection_ == 0x000)
-    return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+    return new TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
       ACE_SYNCH_MUTEX> ();
   else if (this->supplier_collection_ == 0x001)
-    return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+    return new TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
       ACE_SYNCH_MUTEX> ();
-  /*
   else if (this->supplier_collection_ == 0x002)
-    return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+    return new TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
-      ACE_SYNCH_MUTEX> ();
-  */
+      ACE_SYNCH> ();
   else if (this->supplier_collection_ == 0x003)
-    return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+    return new TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
       ACE_SYNCH> ();
   else if (this->supplier_collection_ == 0x010)
-    return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+    return new TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
       ACE_SYNCH_MUTEX> ();
   else if (this->supplier_collection_ == 0x011)
-    return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+    return new TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
       ACE_SYNCH_MUTEX> ();
-  /*
   else if (this->supplier_collection_ == 0x012)
-    return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+    return new TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
-      ACE_SYNCH_MUTEX> ();
-  */
+      ACE_SYNCH> ();
   else if (this->supplier_collection_ == 0x013)
-    return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+    return new TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
       ACE_SYNCH> ();
   else if (this->supplier_collection_ == 0x100)
-    return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+    return new TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
       ACE_Null_Mutex> ();
   else if (this->supplier_collection_ == 0x101)
-    return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+    return new TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
       ACE_Null_Mutex> ();
-  /*
   else if (this->supplier_collection_ == 0x102)
-    return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+    return new TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
-      ACE_Null_Mutex> ();
-  */
+      ACE_NULL_SYNCH> ();
   else if (this->supplier_collection_ == 0x103)
-    return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+    return new TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
       ACE_NULL_SYNCH> ();
   else if (this->supplier_collection_ == 0x110)
-    return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+    return new TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
       ACE_Null_Mutex> ();
   else if (this->supplier_collection_ == 0x111)
-    return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+    return new TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
       ACE_Null_Mutex> ();
-  /*
   else if (this->supplier_collection_ == 0x112)
-    return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+    return new TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
-      ACE_Null_Mutex> ();
-  */
+      ACE_NULL_SYNCH> ();
   else if (this->supplier_collection_ == 0x113)
-    return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+    return new TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
       ACE_NULL_SYNCH> ();
 
@@ -777,91 +756,83 @@ TAO_CEC_ProxyPullSupplier_Collection*
 TAO_CEC_Default_Factory::create_proxy_pull_supplier_collection (TAO_CEC_EventChannel *)
 {
   if (this->supplier_collection_ == 0x000)
-    return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+    return new TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
       ACE_SYNCH_MUTEX> ();
   else if (this->supplier_collection_ == 0x001)
-    return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+    return new TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
       ACE_SYNCH_MUTEX> ();
-  /*
   else if (this->supplier_collection_ == 0x002)
-    return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+    return new TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
-      ACE_SYNCH_MUTEX> ();
-  */
+      ACE_SYNCH> ();
   else if (this->supplier_collection_ == 0x003)
-    return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+    return new TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
       ACE_SYNCH> ();
   else if (this->supplier_collection_ == 0x010)
-    return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+    return new TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
       ACE_SYNCH_MUTEX> ();
   else if (this->supplier_collection_ == 0x011)
-    return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+    return new TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
       ACE_SYNCH_MUTEX> ();
-  /*
   else if (this->supplier_collection_ == 0x012)
-    return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+    return new TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
-      ACE_SYNCH_MUTEX> ();
-  */
+      ACE_SYNCH> ();
   else if (this->supplier_collection_ == 0x013)
-    return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+    return new TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
       ACE_SYNCH> ();
   else if (this->supplier_collection_ == 0x100)
-    return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+    return new TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
       ACE_Null_Mutex> ();
   else if (this->supplier_collection_ == 0x101)
-    return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+    return new TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
       ACE_Null_Mutex> ();
-  /*
   else if (this->supplier_collection_ == 0x102)
-    return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+    return new TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
-      ACE_Null_Mutex> ();
-  */
+      ACE_NULL_SYNCH> ();
   else if (this->supplier_collection_ == 0x103)
-    return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+    return new TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
       ACE_NULL_SYNCH> ();
   else if (this->supplier_collection_ == 0x110)
-    return new TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+    return new TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
       ACE_Null_Mutex> ();
   else if (this->supplier_collection_ == 0x111)
-    return new TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+    return new TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
       ACE_Null_Mutex> ();
-  /*
   else if (this->supplier_collection_ == 0x112)
-    return new TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+    return new TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
-      ACE_Null_Mutex> ();
-  */
+      ACE_NULL_SYNCH> ();
   else if (this->supplier_collection_ == 0x113)
-    return new TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+    return new TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
       ACE_NULL_SYNCH> ();
 
@@ -978,9 +949,16 @@ template class ACE_Unbounded_Queue<ACE_Command_Base*>;
 template class ACE_Unbounded_Queue_Iterator<ACE_Command_Base*>;
 #endif /* ! TAO_ORBSVCS_HAS_Event2 */
 
-template class TAO_EC_Proxy_Collection<TAO_CEC_ProxyPushConsumer>;
-template class TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>;
-template class TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>;
+template class TAO_ESF_Copy_On_Write_Collection<
+    TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
+    TAO_CEC_PushConsumer_List_Iterator >;
+template class TAO_ESF_Copy_On_Write_Collection<
+    TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
+    TAO_CEC_PushConsumer_RB_Tree_Iterator >;
+
+template class TAO_ESF_Proxy_Collection<TAO_CEC_ProxyPushConsumer>;
+template class TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>;
+template class TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>;
 template class ACE_Unbounded_Set<TAO_CEC_ProxyPushConsumer *>;
 template class ACE_Node<TAO_CEC_ProxyPushConsumer *>;
 template class ACE_Unbounded_Set_Iterator<TAO_CEC_ProxyPushConsumer *>;
@@ -990,11 +968,18 @@ template class ACE_RB_Tree_Reverse_Iterator<TAO_CEC_ProxyPushConsumer *, int, AC
 template class ACE_RB_Tree_Iterator_Base<TAO_CEC_ProxyPushConsumer *, int, ACE_Less_Than<TAO_CEC_ProxyPushConsumer *>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Node<TAO_CEC_ProxyPushConsumer *, int>;
 template class ACE_Less_Than<TAO_CEC_ProxyPushConsumer *>;
-template class TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<TAO_CEC_ProxyPushConsumer>;
-
-template class TAO_EC_Proxy_Collection<TAO_CEC_ProxyPushSupplier>;
-template class TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>;
-template class TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>;
+template class TAO_ESF_Proxy_RB_Tree_Iterator<TAO_CEC_ProxyPushConsumer>;
+
+template class TAO_ESF_Copy_On_Write_Collection<
+    TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
+    TAO_CEC_PushSupplier_List_Iterator >;
+template class TAO_ESF_Copy_On_Write_Collection<
+    TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
+    TAO_CEC_PushSupplier_RB_Tree_Iterator >;
+
+template class TAO_ESF_Proxy_Collection<TAO_CEC_ProxyPushSupplier>;
+template class TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>;
+template class TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>;
 template class ACE_Unbounded_Set<TAO_CEC_ProxyPushSupplier *>;
 template class ACE_Node<TAO_CEC_ProxyPushSupplier *>;
 template class ACE_Unbounded_Set_Iterator<TAO_CEC_ProxyPushSupplier *>;
@@ -1004,11 +989,18 @@ template class ACE_RB_Tree_Iterator_Base<TAO_CEC_ProxyPushSupplier *, int, ACE_L
 template class ACE_RB_Tree_Reverse_Iterator<TAO_CEC_ProxyPushSupplier *, int, ACE_Less_Than<TAO_CEC_ProxyPushSupplier *>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Node<TAO_CEC_ProxyPushSupplier *, int>;
 template class ACE_Less_Than<TAO_CEC_ProxyPushSupplier *>;
-template class TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<TAO_CEC_ProxyPushSupplier>;
-
-template class TAO_EC_Proxy_Collection<TAO_CEC_ProxyPullConsumer>;
-template class TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>;
-template class TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>;
+template class TAO_ESF_Proxy_RB_Tree_Iterator<TAO_CEC_ProxyPushSupplier>;
+
+template class TAO_ESF_Copy_On_Write_Collection<
+    TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
+    TAO_CEC_PullConsumer_List_Iterator >;
+template class TAO_ESF_Copy_On_Write_Collection<
+    TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
+    TAO_CEC_PullConsumer_RB_Tree_Iterator >;
+
+template class TAO_ESF_Proxy_Collection<TAO_CEC_ProxyPullConsumer>;
+template class TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>;
+template class TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>;
 template class ACE_Unbounded_Set<TAO_CEC_ProxyPullConsumer *>;
 template class ACE_Node<TAO_CEC_ProxyPullConsumer *>;
 template class ACE_Unbounded_Set_Iterator<TAO_CEC_ProxyPullConsumer *>;
@@ -1018,11 +1010,18 @@ template class ACE_RB_Tree_Reverse_Iterator<TAO_CEC_ProxyPullConsumer *, int, AC
 template class ACE_RB_Tree_Iterator_Base<TAO_CEC_ProxyPullConsumer *, int, ACE_Less_Than<TAO_CEC_ProxyPullConsumer *>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Node<TAO_CEC_ProxyPullConsumer *, int>;
 template class ACE_Less_Than<TAO_CEC_ProxyPullConsumer *>;
-template class TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<TAO_CEC_ProxyPullConsumer>;
-
-template class TAO_EC_Proxy_Collection<TAO_CEC_ProxyPullSupplier>;
-template class TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>;
-template class TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>;
+template class TAO_ESF_Proxy_RB_Tree_Iterator<TAO_CEC_ProxyPullConsumer>;
+
+template class TAO_ESF_Copy_On_Write_Collection<
+    TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
+    TAO_CEC_PullSupplier_List_Iterator >;
+template class TAO_ESF_Copy_On_Write_Collection<
+    TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
+    TAO_CEC_PullSupplier_RB_Tree_Iterator >;
+
+template class TAO_ESF_Proxy_Collection<TAO_CEC_ProxyPullSupplier>;
+template class TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>;
+template class TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>;
 template class ACE_Unbounded_Set<TAO_CEC_ProxyPullSupplier *>;
 template class ACE_Node<TAO_CEC_ProxyPullSupplier *>;
 template class ACE_Unbounded_Set_Iterator<TAO_CEC_ProxyPullSupplier *>;
@@ -1032,7 +1031,7 @@ template class ACE_RB_Tree_Iterator_Base<TAO_CEC_ProxyPullSupplier *, int, ACE_L
 template class ACE_RB_Tree_Reverse_Iterator<TAO_CEC_ProxyPullSupplier *, int, ACE_Less_Than<TAO_CEC_ProxyPullSupplier *>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Node<TAO_CEC_ProxyPullSupplier *, int>;
 template class ACE_Less_Than<TAO_CEC_ProxyPullSupplier *>;
-template class TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<TAO_CEC_ProxyPullSupplier>;
+template class TAO_ESF_Proxy_RB_Tree_Iterator<TAO_CEC_ProxyPullSupplier>;
 
 #if defined (ACE_HAS_THREADS)
 //
@@ -1042,392 +1041,443 @@ template class TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<TAO_CEC_ProxyPullSupplier
 // We *cannot* use explicit ACE_Synch classes because that will not
 // compile in platforms without threads.
 //
-template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_List_Iterator,
       ACE_SYNCH_MUTEX>;
-template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
      TAO_CEC_PushConsumer_List_Iterator,
       ACE_SYNCH_MUTEX>;
-  /*
-template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_List_Iterator,
-      ACE_SYNCH_MUTEX>;
-  */
-template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+      ACE_SYNCH>;
+template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_List_Iterator,
       ACE_SYNCH>;
-template class TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_List_Iterator,
       ACE_SYNCH> >;
-template class ACE_Guard< TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_List_Iterator,
       ACE_SYNCH> > >;
-template class TAO_EC_Connected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Connected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_List_Iterator,
       ACE_SYNCH>,TAO_CEC_ProxyPushConsumer >;
-template class TAO_EC_Reconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Reconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_List_Iterator,
       ACE_SYNCH>,TAO_CEC_ProxyPushConsumer >;
-template class TAO_EC_Disconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Disconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_List_Iterator,
       ACE_SYNCH>,TAO_CEC_ProxyPushConsumer >;
-template class TAO_EC_Shutdown_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Shutdown_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_List_Iterator,
       ACE_SYNCH> >;
-template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
       ACE_SYNCH_MUTEX>;
-template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
       ACE_SYNCH_MUTEX>;
-  /*
-template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
-      ACE_SYNCH_MUTEX>;
-  */
-template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+      ACE_SYNCH>;
+template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
       ACE_SYNCH>;
-template class TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
       ACE_SYNCH> >;
-template class ACE_Guard< TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
       ACE_SYNCH> > >;
-template class TAO_EC_Connected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Connected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
       ACE_SYNCH>,TAO_CEC_ProxyPushConsumer >;
-template class TAO_EC_Reconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Reconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
       ACE_SYNCH>,TAO_CEC_ProxyPushConsumer >;
-template class TAO_EC_Disconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Disconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
       ACE_SYNCH>,TAO_CEC_ProxyPushConsumer >;
-template class TAO_EC_Shutdown_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Shutdown_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
       ACE_SYNCH> >;
 
-template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
       ACE_SYNCH_MUTEX>;
-template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
       ACE_SYNCH_MUTEX>;
-  /*
-template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
-      ACE_SYNCH_MUTEX>;
-  */
-template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+      ACE_SYNCH>;
+template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
       ACE_SYNCH>;
-template class TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
       ACE_SYNCH> >;
-template class ACE_Guard< TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
       ACE_SYNCH> > >;
-template class TAO_EC_Connected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Connected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
       ACE_SYNCH>,TAO_CEC_ProxyPushSupplier >;
-template class TAO_EC_Reconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Reconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
       ACE_SYNCH>,TAO_CEC_ProxyPushSupplier >;
-template class TAO_EC_Disconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Disconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
       ACE_SYNCH>,TAO_CEC_ProxyPushSupplier >;
-template class TAO_EC_Shutdown_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Shutdown_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
       ACE_SYNCH> >;
-template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
       ACE_SYNCH_MUTEX>;
-template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
       ACE_SYNCH_MUTEX>;
-  /*
-template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
-      ACE_SYNCH_MUTEX>;
-  */
-template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+      ACE_SYNCH>;
+template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
       ACE_SYNCH>;
-template class TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
       ACE_SYNCH> >;
-template class ACE_Guard< TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
       ACE_SYNCH> > >;
-template class TAO_EC_Connected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Connected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
       ACE_SYNCH>,TAO_CEC_ProxyPushSupplier >;
-template class TAO_EC_Reconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Reconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
       ACE_SYNCH>,TAO_CEC_ProxyPushSupplier >;
-template class TAO_EC_Disconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Disconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
       ACE_SYNCH>,TAO_CEC_ProxyPushSupplier >;
-template class TAO_EC_Shutdown_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Shutdown_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
       ACE_SYNCH> >;
+
+template class TAO_ESF_Copy_On_Write_Read_Guard<
+    TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
+    TAO_CEC_PushConsumer_List_Iterator,
+        ACE_SYNCH_MUTEX>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<
+    TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
+    TAO_CEC_PushSupplier_List_Iterator,
+        ACE_SYNCH_MUTEX>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<
+    TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
+    TAO_CEC_PushConsumer_RB_Tree_Iterator,
+        ACE_SYNCH_MUTEX>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<
+    TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
+    TAO_CEC_PushSupplier_RB_Tree_Iterator,
+        ACE_SYNCH_MUTEX>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<
+    TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
+    TAO_CEC_PushConsumer_List_Iterator,
+        ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<
+    TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
+    TAO_CEC_PushSupplier_List_Iterator,
+        ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<
+    TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
+    TAO_CEC_PushConsumer_RB_Tree_Iterator,
+        ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<
+    TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
+    TAO_CEC_PushSupplier_RB_Tree_Iterator,
+        ACE_SYNCH>;
+
+template class TAO_ESF_Copy_On_Write_Read_Guard<
+    TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
+    TAO_CEC_PullConsumer_List_Iterator,
+        ACE_SYNCH_MUTEX>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<
+    TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
+    TAO_CEC_PullSupplier_List_Iterator,
+        ACE_SYNCH_MUTEX>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<
+    TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
+    TAO_CEC_PullConsumer_RB_Tree_Iterator,
+        ACE_SYNCH_MUTEX>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<
+    TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
+    TAO_CEC_PullSupplier_RB_Tree_Iterator,
+        ACE_SYNCH_MUTEX>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<
+    TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
+    TAO_CEC_PullConsumer_List_Iterator,
+        ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<
+    TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
+    TAO_CEC_PullSupplier_List_Iterator,
+        ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<
+    TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
+    TAO_CEC_PullConsumer_RB_Tree_Iterator,
+        ACE_SYNCH>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<
+    TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
+    TAO_CEC_PullSupplier_RB_Tree_Iterator,
+        ACE_SYNCH>;
+
 #endif /* ACE_HAS_THREADS */
 
-template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_List_Iterator,
       ACE_Null_Mutex>;
-template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_List_Iterator,
       ACE_Null_Mutex>;
-  /*
-template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_List_Iterator,
-      ACE_Null_Mutex>;
-  */
-template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+      ACE_NULL_SYNCH>;
+template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_List_Iterator,
       ACE_NULL_SYNCH>;
-template class TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_List_Iterator,
       ACE_NULL_SYNCH> >;
-template class ACE_Guard< TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_List_Iterator,
       ACE_NULL_SYNCH> > >;
-template class TAO_EC_Connected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Connected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_List_Iterator,
       ACE_NULL_SYNCH>,TAO_CEC_ProxyPushConsumer >;
-template class TAO_EC_Reconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Reconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_List_Iterator,
       ACE_NULL_SYNCH>,TAO_CEC_ProxyPushConsumer >;
-template class TAO_EC_Disconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Disconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_List_Iterator,
       ACE_NULL_SYNCH>,TAO_CEC_ProxyPushConsumer >;
-template class TAO_EC_Shutdown_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Shutdown_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_List_Iterator,
       ACE_NULL_SYNCH> >;
-template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
       ACE_Null_Mutex>;
-template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
       ACE_Null_Mutex>;
-  /*
-template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
-      ACE_Null_Mutex>;
-  */
-template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+      ACE_NULL_SYNCH>;
+template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
       ACE_NULL_SYNCH>;
-template class TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
       ACE_NULL_SYNCH> >;
-template class ACE_Guard< TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
       ACE_NULL_SYNCH> > >;
-template class TAO_EC_Connected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Connected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
       ACE_NULL_SYNCH>,TAO_CEC_ProxyPushConsumer >;
-template class TAO_EC_Reconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Reconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
       ACE_NULL_SYNCH>,TAO_CEC_ProxyPushConsumer >;
-template class TAO_EC_Disconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Disconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
       ACE_NULL_SYNCH>,TAO_CEC_ProxyPushConsumer >;
-template class TAO_EC_Shutdown_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushConsumer>,
+template class TAO_ESF_Shutdown_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
       TAO_CEC_PushConsumer_RB_Tree_Iterator,
       ACE_NULL_SYNCH> >;
 
-template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
       ACE_Null_Mutex>;
-template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
       ACE_Null_Mutex>;
-  /*
-template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
-      ACE_Null_Mutex>;
-  */
-template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+      ACE_NULL_SYNCH>;
+template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
       ACE_NULL_SYNCH>;
-template class TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
       ACE_NULL_SYNCH> >;
-template class ACE_Guard< TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
       ACE_NULL_SYNCH> > >;
-template class TAO_EC_Connected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Connected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
       ACE_NULL_SYNCH>,TAO_CEC_ProxyPushSupplier >;
-template class TAO_EC_Reconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Reconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
       ACE_NULL_SYNCH>,TAO_CEC_ProxyPushSupplier >;
-template class TAO_EC_Disconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Disconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
       ACE_NULL_SYNCH>,TAO_CEC_ProxyPushSupplier >;
-template class TAO_EC_Shutdown_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Shutdown_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_List_Iterator,
       ACE_NULL_SYNCH> >;
-template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
       ACE_Null_Mutex>;
-template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
       ACE_Null_Mutex>;
-  /*
-template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
-      ACE_Null_Mutex>;
-  */
-template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+      ACE_NULL_SYNCH>;
+template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
       ACE_NULL_SYNCH>;
-template class TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
       ACE_NULL_SYNCH> >;
-template class ACE_Guard< TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
       ACE_NULL_SYNCH> > >;
-template class TAO_EC_Connected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Connected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
       ACE_NULL_SYNCH>,TAO_CEC_ProxyPushSupplier >;
-template class TAO_EC_Reconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Reconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
       ACE_NULL_SYNCH>,TAO_CEC_ProxyPushSupplier >;
-template class TAO_EC_Disconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Disconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
       ACE_NULL_SYNCH>,TAO_CEC_ProxyPushSupplier >;
-template class TAO_EC_Shutdown_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPushSupplier>,
+template class TAO_ESF_Shutdown_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
       TAO_CEC_PushSupplier_RB_Tree_Iterator,
       ACE_NULL_SYNCH> >;
 
@@ -1439,395 +1489,446 @@ template class TAO_EC_Shutdown_Command<
 // We *cannot* use explicit ACE_Synch classes because that will not
 // compile in platforms without threads.
 //
-template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_List_Iterator,
       ACE_SYNCH_MUTEX>;
-template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
      TAO_CEC_PullConsumer_List_Iterator,
       ACE_SYNCH_MUTEX>;
-  /*
-template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_List_Iterator,
-      ACE_SYNCH_MUTEX>;
-  */
-template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+      ACE_SYNCH>;
+template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_List_Iterator,
       ACE_SYNCH>;
-template class TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_List_Iterator,
       ACE_SYNCH> >;
-template class ACE_Guard< TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_List_Iterator,
       ACE_SYNCH> > >;
-template class TAO_EC_Connected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Connected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_List_Iterator,
       ACE_SYNCH>,TAO_CEC_ProxyPullConsumer >;
-template class TAO_EC_Reconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Reconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_List_Iterator,
       ACE_SYNCH>,TAO_CEC_ProxyPullConsumer >;
-template class TAO_EC_Disconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Disconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_List_Iterator,
       ACE_SYNCH>,TAO_CEC_ProxyPullConsumer >;
-template class TAO_EC_Shutdown_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Shutdown_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_List_Iterator,
       ACE_SYNCH> >;
-template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
       ACE_SYNCH_MUTEX>;
-template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
       ACE_SYNCH_MUTEX>;
-  /*
-template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
-      ACE_SYNCH_MUTEX>;
-  */
-template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+      ACE_SYNCH>;
+template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
       ACE_SYNCH>;
-template class TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
       ACE_SYNCH> >;
-template class ACE_Guard< TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
       ACE_SYNCH> > >;
-template class TAO_EC_Connected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Connected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
       ACE_SYNCH>,TAO_CEC_ProxyPullConsumer >;
-template class TAO_EC_Reconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Reconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
       ACE_SYNCH>,TAO_CEC_ProxyPullConsumer >;
-template class TAO_EC_Disconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Disconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
       ACE_SYNCH>,TAO_CEC_ProxyPullConsumer >;
-template class TAO_EC_Shutdown_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Shutdown_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
       ACE_SYNCH> >;
 
-template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
       ACE_SYNCH_MUTEX>;
-template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
       ACE_SYNCH_MUTEX>;
-  /*
-template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
-      ACE_SYNCH_MUTEX>;
-  */
-template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+      ACE_SYNCH>;
+template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
       ACE_SYNCH>;
-template class TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
       ACE_SYNCH> >;
-template class ACE_Guard< TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
       ACE_SYNCH> > >;
-template class TAO_EC_Connected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Connected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
       ACE_SYNCH>,TAO_CEC_ProxyPullSupplier >;
-template class TAO_EC_Reconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Reconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
       ACE_SYNCH>,TAO_CEC_ProxyPullSupplier >;
-template class TAO_EC_Disconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Disconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
       ACE_SYNCH>,TAO_CEC_ProxyPullSupplier >;
-template class TAO_EC_Shutdown_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Shutdown_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
       ACE_SYNCH> >;
-template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
       ACE_SYNCH_MUTEX>;
-template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
       ACE_SYNCH_MUTEX>;
-  /*
-template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
-      ACE_SYNCH_MUTEX>;
-  */
-template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+      ACE_SYNCH>;
+template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
       ACE_SYNCH>;
-template class TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
       ACE_SYNCH> >;
-template class ACE_Guard< TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
       ACE_SYNCH> > >;
-template class TAO_EC_Connected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Connected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
       ACE_SYNCH>,TAO_CEC_ProxyPullSupplier >;
-template class TAO_EC_Reconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Reconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
       ACE_SYNCH>,TAO_CEC_ProxyPullSupplier >;
-template class TAO_EC_Disconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Disconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
       ACE_SYNCH>,TAO_CEC_ProxyPullSupplier >;
-template class TAO_EC_Shutdown_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Shutdown_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
       ACE_SYNCH> >;
+
 #endif /* ACE_HAS_THREADS */
 
-template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_List_Iterator,
       ACE_Null_Mutex>;
-template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_List_Iterator,
       ACE_Null_Mutex>;
-  /*
-template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_List_Iterator,
-      ACE_Null_Mutex>;
-  */
-template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+      ACE_NULL_SYNCH>;
+template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_List_Iterator,
       ACE_NULL_SYNCH>;
-template class TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_List_Iterator,
       ACE_NULL_SYNCH> >;
-template class ACE_Guard< TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_List_Iterator,
       ACE_NULL_SYNCH> > >;
-template class TAO_EC_Connected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Connected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_List_Iterator,
       ACE_NULL_SYNCH>,TAO_CEC_ProxyPullConsumer >;
-template class TAO_EC_Reconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Reconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_List_Iterator,
       ACE_NULL_SYNCH>,TAO_CEC_ProxyPullConsumer >;
-template class TAO_EC_Disconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Disconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_List_Iterator,
       ACE_NULL_SYNCH>,TAO_CEC_ProxyPullConsumer >;
-template class TAO_EC_Shutdown_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Shutdown_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_List_Iterator,
       ACE_NULL_SYNCH> >;
-template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
       ACE_Null_Mutex>;
-template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
       ACE_Null_Mutex>;
-  /*
-template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
-      ACE_Null_Mutex>;
-  */
-template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+      ACE_NULL_SYNCH>;
+template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
       ACE_NULL_SYNCH>;
-template class TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
       ACE_NULL_SYNCH> >;
-template class ACE_Guard< TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
       ACE_NULL_SYNCH> > >;
-template class TAO_EC_Connected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Connected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
       ACE_NULL_SYNCH>,TAO_CEC_ProxyPullConsumer >;
-template class TAO_EC_Reconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Reconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
       ACE_NULL_SYNCH>,TAO_CEC_ProxyPullConsumer >;
-template class TAO_EC_Disconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Disconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
       ACE_NULL_SYNCH>,TAO_CEC_ProxyPullConsumer >;
-template class TAO_EC_Shutdown_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullConsumer>,
+template class TAO_ESF_Shutdown_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
       TAO_CEC_PullConsumer_RB_Tree_Iterator,
       ACE_NULL_SYNCH> >;
 
-template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
       ACE_Null_Mutex>;
-template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
       ACE_Null_Mutex>;
-  /*
-template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
-      ACE_Null_Mutex>;
-  */
-template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+      ACE_NULL_SYNCH>;
+template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
       ACE_NULL_SYNCH>;
-template class TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
       ACE_NULL_SYNCH> >;
-template class ACE_Guard< TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
       ACE_NULL_SYNCH> > >;
-template class TAO_EC_Connected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Connected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
       ACE_NULL_SYNCH>,TAO_CEC_ProxyPullSupplier >;
-template class TAO_EC_Reconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Reconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
       ACE_NULL_SYNCH>,TAO_CEC_ProxyPullSupplier >;
-template class TAO_EC_Disconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Disconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
       ACE_NULL_SYNCH>,TAO_CEC_ProxyPullSupplier >;
-template class TAO_EC_Shutdown_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Shutdown_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_List_Iterator,
       ACE_NULL_SYNCH> >;
-template class TAO_EC_Immediate_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
       ACE_Null_Mutex>;
-template class TAO_EC_Copy_On_Read<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
       ACE_Null_Mutex>;
-  /*
-template class TAO_EC_Copy_On_Write<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
-      ACE_Null_Mutex>;
-  */
-template class TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+      ACE_NULL_SYNCH>;
+template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
       ACE_NULL_SYNCH>;
-template class TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
       ACE_NULL_SYNCH> >;
-template class ACE_Guard< TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
       ACE_NULL_SYNCH> > >;
-template class TAO_EC_Connected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Connected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
       ACE_NULL_SYNCH>,TAO_CEC_ProxyPullSupplier >;
-template class TAO_EC_Reconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Reconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
       ACE_NULL_SYNCH>,TAO_CEC_ProxyPullSupplier >;
-template class TAO_EC_Disconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Disconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
       ACE_NULL_SYNCH>,TAO_CEC_ProxyPullSupplier >;
-template class TAO_EC_Shutdown_Command<
-  TAO_EC_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_CEC_ProxyPullSupplier>,
+template class TAO_ESF_Shutdown_Command<
+  TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
       TAO_CEC_PullSupplier_RB_Tree_Iterator,
       ACE_NULL_SYNCH> >;
 
+template class TAO_ESF_Copy_On_Write_Read_Guard<
+    TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
+    TAO_CEC_PushConsumer_List_Iterator,
+        ACE_Null_Mutex>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<
+    TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
+    TAO_CEC_PushSupplier_List_Iterator,
+        ACE_Null_Mutex>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<
+    TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
+    TAO_CEC_PushConsumer_RB_Tree_Iterator,
+        ACE_Null_Mutex>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<
+    TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
+    TAO_CEC_PushSupplier_RB_Tree_Iterator,
+        ACE_Null_Mutex>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<
+    TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>,
+    TAO_CEC_PushConsumer_List_Iterator,
+        ACE_NULL_SYNCH>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<
+    TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>,
+    TAO_CEC_PushSupplier_List_Iterator,
+        ACE_NULL_SYNCH>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<
+    TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>,
+    TAO_CEC_PushConsumer_RB_Tree_Iterator,
+        ACE_NULL_SYNCH>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<
+    TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>,
+    TAO_CEC_PushSupplier_RB_Tree_Iterator,
+        ACE_NULL_SYNCH>;
+
+template class TAO_ESF_Copy_On_Write_Read_Guard<
+    TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
+    TAO_CEC_PullConsumer_List_Iterator,
+        ACE_Null_Mutex>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<
+    TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
+    TAO_CEC_PullSupplier_List_Iterator,
+        ACE_Null_Mutex>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<
+    TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
+    TAO_CEC_PullConsumer_RB_Tree_Iterator,
+        ACE_Null_Mutex>;
+template class TAO_ESF_Copy_On_Write_Read_Guard<
+    TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
+    TAO_CEC_PullSupplier_RB_Tree_Iterator,
+        ACE_Null_Mutex>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<
+    TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>,
+    TAO_CEC_PullConsumer_List_Iterator,
+        ACE_NULL_SYNCH>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<
+    TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>,
+    TAO_CEC_PullSupplier_List_Iterator,
+        ACE_NULL_SYNCH>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<
+    TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>,
+    TAO_CEC_PullConsumer_RB_Tree_Iterator,
+        ACE_NULL_SYNCH>;
+template class TAO_ESF_Copy_On_Write_Write_Guard<
+    TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>,
+    TAO_CEC_PullSupplier_RB_Tree_Iterator,
+        ACE_NULL_SYNCH>;
+
 #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #if !defined(TAO_ORBSVCS_HAS_Event2)
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
index 4779c12f11b..fc7f05dc14d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
@@ -134,37 +134,33 @@ public:
   // Access the supplier control strategy.
 
   // = The factory methods, they delegate on the CEC_Factory.
-  TAO_CEC_ProxyPushSupplier* create_proxy_push_supplier (void);
-  void destroy_proxy_push_supplier (TAO_CEC_ProxyPushSupplier*);
+  void create_proxy (TAO_CEC_ProxyPushSupplier*&);
+  void destroy_proxy (TAO_CEC_ProxyPushSupplier*);
   // Create and destroy a ProxyPushSupplier
 
-  TAO_CEC_ProxyPullSupplier* create_proxy_pull_supplier (void);
-  void destroy_proxy_pull_supplier (TAO_CEC_ProxyPullSupplier*);
+  void create_proxy (TAO_CEC_ProxyPullSupplier*&);
+  void destroy_proxy (TAO_CEC_ProxyPullSupplier*);
   // Create and destroy a ProxyPullSupplier
 
-  TAO_CEC_ProxyPushConsumer* create_proxy_push_consumer (void);
-  void destroy_proxy_push_consumer (TAO_CEC_ProxyPushConsumer*);
+  void create_proxy (TAO_CEC_ProxyPushConsumer*&);
+  void destroy_proxy (TAO_CEC_ProxyPushConsumer*);
   // Create and destroy a ProxyPushConsumer
 
-  TAO_CEC_ProxyPullConsumer* create_proxy_pull_consumer (void);
-  void destroy_proxy_pull_consumer (TAO_CEC_ProxyPullConsumer*);
+  void create_proxy (TAO_CEC_ProxyPullConsumer*&);
+  void destroy_proxy (TAO_CEC_ProxyPullConsumer*);
   // Create and destroy a ProxyPushConsumer
 
-  TAO_CEC_ProxyPushSupplier_Collection*
-      create_proxy_push_supplier_collection (void);
-  void destroy_proxy_push_supplier_collection (TAO_CEC_ProxyPushSupplier_Collection*);
-  TAO_CEC_ProxyPullSupplier_Collection*
-      create_proxy_pull_supplier_collection (void);
-  void destroy_proxy_pull_supplier_collection (TAO_CEC_ProxyPullSupplier_Collection*);
+  void create_proxy_collection (TAO_CEC_ProxyPushSupplier_Collection*&);
+  void destroy_proxy_collection (TAO_CEC_ProxyPushSupplier_Collection*);
+  void create_proxy_collection (TAO_CEC_ProxyPullSupplier_Collection*&);
+  void destroy_proxy_collection (TAO_CEC_ProxyPullSupplier_Collection*);
   // Create and destroy a the collections used to store
   // Proxy*Suppliers
 
-  TAO_CEC_ProxyPushConsumer_Collection*
-      create_proxy_push_consumer_collection (void);
-  void destroy_proxy_push_consumer_collection (TAO_CEC_ProxyPushConsumer_Collection*);
-  TAO_CEC_ProxyPullConsumer_Collection*
-      create_proxy_pull_consumer_collection (void);
-  void destroy_proxy_pull_consumer_collection (TAO_CEC_ProxyPullConsumer_Collection*);
+  void create_proxy_collection (TAO_CEC_ProxyPushConsumer_Collection*&);
+  void destroy_proxy_collection (TAO_CEC_ProxyPushConsumer_Collection*);
+  void create_proxy_collection (TAO_CEC_ProxyPullConsumer_Collection*&);
+  void destroy_proxy_collection (TAO_CEC_ProxyPullConsumer_Collection*);
   // Create and destroy a the collections used to store
   // Proxy*Consumers
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i
index 85a6a65e487..58c70cd9fe8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i
@@ -44,98 +44,98 @@ TAO_CEC_EventChannel::supplier_control (void) const
   return this->supplier_control_;
 }
 
-ACE_INLINE TAO_CEC_ProxyPushSupplier*
-TAO_CEC_EventChannel::create_proxy_push_supplier (void)
+ACE_INLINE void
+TAO_CEC_EventChannel::create_proxy (TAO_CEC_ProxyPushSupplier* &x)
 {
-  return this->factory_->create_proxy_push_supplier (this);
+  x = this->factory_->create_proxy_push_supplier (this);
 }
 
 ACE_INLINE void
-TAO_CEC_EventChannel::destroy_proxy_push_supplier (TAO_CEC_ProxyPushSupplier* supplier)
+TAO_CEC_EventChannel::destroy_proxy (TAO_CEC_ProxyPushSupplier* supplier)
 {
   this->factory_->destroy_proxy_push_supplier (supplier);
 }
 
-ACE_INLINE TAO_CEC_ProxyPullSupplier*
-TAO_CEC_EventChannel::create_proxy_pull_supplier (void)
+ACE_INLINE void
+TAO_CEC_EventChannel::create_proxy (TAO_CEC_ProxyPullSupplier* &x)
 {
-  return this->factory_->create_proxy_pull_supplier (this);
+  x = this->factory_->create_proxy_pull_supplier (this);
 }
 
 ACE_INLINE void
-TAO_CEC_EventChannel::destroy_proxy_pull_supplier (TAO_CEC_ProxyPullSupplier* supplier)
+TAO_CEC_EventChannel::destroy_proxy (TAO_CEC_ProxyPullSupplier* supplier)
 {
   this->factory_->destroy_proxy_pull_supplier (supplier);
 }
 
-ACE_INLINE TAO_CEC_ProxyPushConsumer*
-TAO_CEC_EventChannel::create_proxy_push_consumer (void)
+ACE_INLINE void
+TAO_CEC_EventChannel::create_proxy (TAO_CEC_ProxyPushConsumer* &x)
 {
-  return this->factory_->create_proxy_push_consumer (this);
+  x = this->factory_->create_proxy_push_consumer (this);
 }
 
 ACE_INLINE void
-TAO_CEC_EventChannel::destroy_proxy_push_consumer (TAO_CEC_ProxyPushConsumer* consumer)
+TAO_CEC_EventChannel::destroy_proxy (TAO_CEC_ProxyPushConsumer* consumer)
 {
   this->factory_->destroy_proxy_push_consumer (consumer);
 }
 
-ACE_INLINE TAO_CEC_ProxyPullConsumer*
-TAO_CEC_EventChannel::create_proxy_pull_consumer (void)
+ACE_INLINE void
+TAO_CEC_EventChannel::create_proxy (TAO_CEC_ProxyPullConsumer* &x)
 {
-  return this->factory_->create_proxy_pull_consumer (this);
+  x = this->factory_->create_proxy_pull_consumer (this);
 }
 
 ACE_INLINE void
-TAO_CEC_EventChannel::destroy_proxy_pull_consumer (TAO_CEC_ProxyPullConsumer* consumer)
+TAO_CEC_EventChannel::destroy_proxy (TAO_CEC_ProxyPullConsumer* consumer)
 {
   this->factory_->destroy_proxy_pull_consumer (consumer);
 }
 
-ACE_INLINE TAO_CEC_ProxyPushConsumer_Collection*
-TAO_CEC_EventChannel::create_proxy_push_consumer_collection (void)
+ACE_INLINE void
+TAO_CEC_EventChannel::create_proxy_collection (TAO_CEC_ProxyPushConsumer_Collection* &x)
 {
-  return this->factory_->create_proxy_push_consumer_collection (this);
+  x = this->factory_->create_proxy_push_consumer_collection (this);
 }
 
 ACE_INLINE void
-TAO_CEC_EventChannel::destroy_proxy_push_consumer_collection (TAO_CEC_ProxyPushConsumer_Collection* x)
+TAO_CEC_EventChannel::destroy_proxy_collection (TAO_CEC_ProxyPushConsumer_Collection* x)
 {
   this->factory_->destroy_proxy_push_consumer_collection (x);
 }
 
-ACE_INLINE TAO_CEC_ProxyPullConsumer_Collection*
-TAO_CEC_EventChannel::create_proxy_pull_consumer_collection (void)
+ACE_INLINE void
+TAO_CEC_EventChannel::create_proxy_collection (TAO_CEC_ProxyPullConsumer_Collection* &x)
 {
-  return this->factory_->create_proxy_pull_consumer_collection (this);
+  x = this->factory_->create_proxy_pull_consumer_collection (this);
 }
 
 ACE_INLINE void
-TAO_CEC_EventChannel::destroy_proxy_pull_consumer_collection (TAO_CEC_ProxyPullConsumer_Collection* x)
+TAO_CEC_EventChannel::destroy_proxy_collection (TAO_CEC_ProxyPullConsumer_Collection* x)
 {
   this->factory_->destroy_proxy_pull_consumer_collection (x);
 }
 
-ACE_INLINE TAO_CEC_ProxyPushSupplier_Collection*
-TAO_CEC_EventChannel::create_proxy_push_supplier_collection (void)
+ACE_INLINE void
+TAO_CEC_EventChannel::create_proxy_collection (TAO_CEC_ProxyPushSupplier_Collection* &x)
 {
-  return this->factory_->create_proxy_push_supplier_collection (this);
+  x = this->factory_->create_proxy_push_supplier_collection (this);
 }
 
 ACE_INLINE void
-TAO_CEC_EventChannel::destroy_proxy_push_supplier_collection (TAO_CEC_ProxyPushSupplier_Collection* x)
+TAO_CEC_EventChannel::destroy_proxy_collection (TAO_CEC_ProxyPushSupplier_Collection* x)
 {
   this->factory_->destroy_proxy_push_supplier_collection (x);
 }
 
-ACE_INLINE TAO_CEC_ProxyPullSupplier_Collection*
-TAO_CEC_EventChannel::create_proxy_pull_supplier_collection (void)
+ACE_INLINE void
+TAO_CEC_EventChannel::create_proxy_collection (TAO_CEC_ProxyPullSupplier_Collection* &x)
 {
-  return this->factory_->create_proxy_pull_supplier_collection (this);
+  x = this->factory_->create_proxy_pull_supplier_collection (this);
 }
 
 ACE_INLINE void
-TAO_CEC_EventChannel::destroy_proxy_pull_supplier_collection (TAO_CEC_ProxyPullSupplier_Collection* x)
+TAO_CEC_EventChannel::destroy_proxy_collection (TAO_CEC_ProxyPullSupplier_Collection* x)
 {
   this->factory_->destroy_proxy_pull_supplier_collection (x);
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
index 00d5dfde525..b5a7b7080a8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
@@ -39,14 +39,14 @@ class TAO_CEC_ProxyPushConsumer;
 class TAO_CEC_ProxyPullConsumer;
 class TAO_CEC_ProxyPushSupplier;
 class TAO_CEC_ProxyPullSupplier;
-template<class PROXY> class TAO_EC_Proxy_Collection;
+template<class PROXY> class TAO_ESF_Proxy_Collection;
 class TAO_CEC_ConsumerControl;
 class TAO_CEC_SupplierControl;
 
-typedef TAO_EC_Proxy_Collection<TAO_CEC_ProxyPushConsumer> TAO_CEC_ProxyPushConsumer_Collection;
-typedef TAO_EC_Proxy_Collection<TAO_CEC_ProxyPullConsumer> TAO_CEC_ProxyPullConsumer_Collection;
-typedef TAO_EC_Proxy_Collection<TAO_CEC_ProxyPushSupplier> TAO_CEC_ProxyPushSupplier_Collection;
-typedef TAO_EC_Proxy_Collection<TAO_CEC_ProxyPullSupplier> TAO_CEC_ProxyPullSupplier_Collection;
+typedef TAO_ESF_Proxy_Collection<TAO_CEC_ProxyPushConsumer> TAO_CEC_ProxyPushConsumer_Collection;
+typedef TAO_ESF_Proxy_Collection<TAO_CEC_ProxyPullConsumer> TAO_CEC_ProxyPullConsumer_Collection;
+typedef TAO_ESF_Proxy_Collection<TAO_CEC_ProxyPushSupplier> TAO_CEC_ProxyPushSupplier_Collection;
+typedef TAO_ESF_Proxy_Collection<TAO_CEC_ProxyPullSupplier> TAO_CEC_ProxyPullSupplier_Collection;
 
 class TAO_Event_Export TAO_CEC_Factory : public ACE_Service_Object
 {
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
index 630da52ce99..3ae07eb5abd 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
@@ -31,6 +31,49 @@ TAO_CEC_ProxyPullConsumer::~TAO_CEC_ProxyPullConsumer (void)
   this->event_channel_->destroy_consumer_lock (this->lock_);
 }
 
+CosEventChannelAdmin::ProxyPullConsumer_ptr
+TAO_CEC_ProxyPullConsumer::activate (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC (())
+{
+  CosEventChannelAdmin::ProxyPullConsumer_var result;
+  ACE_TRY
+    {
+      result = this->_this (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      return CosEventChannelAdmin::ProxyPullConsumer::_nil ();
+    }
+  ACE_ENDTRY;
+  return result._retn ();
+}
+
+void
+TAO_CEC_ProxyPullConsumer::deactivate (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC (())
+{
+  ACE_TRY
+    {
+      PortableServer::POA_var poa =
+        this->_default_POA (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      PortableServer::ObjectId_var id =
+        poa->servant_to_id (this, ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      poa->deactivate_object (id.in (), ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      // Exceptions here should not be propagated.  They usually
+      // indicate that an object is beign disconnected twice, or some
+      // race condition, but not a fault that the user needs to know
+      // about.
+    }
+  ACE_ENDTRY;
+}
+
 // NOTE: There is some amount of duplicated code here, but it is
 // intentional. Mainly we want to avoid locking overhead when
 // possible, thus the code flow is optimized for that case more than
@@ -197,26 +240,6 @@ TAO_CEC_ProxyPullConsumer::cleanup_i (void)
     CosEventComm::PullSupplier::_nil ();
 }
 
-void
-TAO_CEC_ProxyPullConsumer::deactivate (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_TRY
-    {
-      PortableServer::POA_var poa =
-        this->_default_POA (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      PortableServer::ObjectId_var id =
-        poa->servant_to_id (this, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      poa->deactivate_object (id.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-}
-
 CORBA::ULong
 TAO_CEC_ProxyPullConsumer::_incr_refcnt (void)
 {
@@ -235,7 +258,7 @@ TAO_CEC_ProxyPullConsumer::_decr_refcnt (void)
   }
 
   // Notify the event channel
-  this->event_channel_->destroy_proxy_pull_consumer (this);
+  this->event_channel_->destroy_proxy (this);
   return 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
index f16f4045ee6..4e7416c3813 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
@@ -24,7 +24,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Event/EC_Worker.h"
+#include "orbsvcs/ESF/ESF_Worker.h"
 #include "event_export.h"
 
 class TAO_CEC_EventChannel;
@@ -47,12 +47,22 @@ class TAO_Event_Export TAO_CEC_ProxyPullConsumer : public POA_CosEventChannelAdm
   //   called.
   //
 public:
+  typedef CosEventChannelAdmin::ProxyPullConsumer_ptr _ptr_type;
+  typedef CosEventChannelAdmin::ProxyPullConsumer_var _var_type;
+
   TAO_CEC_ProxyPullConsumer (TAO_CEC_EventChannel* event_channel);
   // constructor...
 
   virtual ~TAO_CEC_ProxyPullConsumer (void);
   // destructor...
 
+  virtual CosEventChannelAdmin::ProxyPullConsumer_ptr activate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC (());
+  // Activate in the POA
+
+  virtual void deactivate (CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC (());
+  // Deactivate from the POA
+
   CORBA::Boolean is_connected (void) const;
   // Return 0 if no supplier is connected...
 
@@ -106,9 +116,6 @@ protected:
   void cleanup_i (void);
   // Release the supplier
 
-  void deactivate (CORBA::Environment &ACE_TRY_ENV);
-  // Deactivate from the POA
-
 private:
   TAO_CEC_EventChannel* event_channel_;
   // The supplier admin, used for activation and memory managment.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
index a2de547e409..f568a5a818a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
@@ -29,6 +29,49 @@ TAO_CEC_ProxyPullSupplier::~TAO_CEC_ProxyPullSupplier (void)
   this->event_channel_->destroy_supplier_lock (this->lock_);
 }
 
+CosEventChannelAdmin::ProxyPullSupplier_ptr
+TAO_CEC_ProxyPullSupplier::activate (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC (())
+{
+  CosEventChannelAdmin::ProxyPullSupplier_var result;
+  ACE_TRY
+    {
+      result = this->_this (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      return CosEventChannelAdmin::ProxyPullSupplier::_nil ();
+    }
+  ACE_ENDTRY;
+  return result._retn ();
+}
+
+void
+TAO_CEC_ProxyPullSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC (())
+{
+  ACE_TRY
+    {
+      PortableServer::POA_var poa =
+        this->_default_POA (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      PortableServer::ObjectId_var id =
+        poa->servant_to_id (this, ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      poa->deactivate_object (id.in (), ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      // Exceptions here should not be propagated.  They usually
+      // indicate that an object is beign disconnected twice, or some
+      // race condition, but not a fault that the user needs to know
+      // about.
+    }
+  ACE_ENDTRY;
+}
+
 void
 TAO_CEC_ProxyPullSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV)
 {
@@ -160,26 +203,6 @@ TAO_CEC_ProxyPullSupplier::cleanup_i (void)
     CosEventComm::PullConsumer::_nil ();
 }
 
-void
-TAO_CEC_ProxyPullSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_TRY
-    {
-      PortableServer::POA_var poa =
-        this->_default_POA (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      PortableServer::ObjectId_var id =
-        poa->servant_to_id (this, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      poa->deactivate_object (id.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-}
-
 CORBA::ULong
 TAO_CEC_ProxyPullSupplier::_incr_refcnt (void)
 {
@@ -198,7 +221,7 @@ TAO_CEC_ProxyPullSupplier::_decr_refcnt (void)
   }
 
   // Notify the event channel
-  this->event_channel_->destroy_proxy_pull_supplier (this);
+  this->event_channel_->destroy_proxy (this);
   return 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
index eee7039749c..9edd9903c3e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
@@ -51,12 +51,22 @@ class TAO_Event_Export TAO_CEC_ProxyPullSupplier : public POA_CosEventChannelAdm
   //   the locking strategies.
   //
 public:
+  typedef CosEventChannelAdmin::ProxyPullSupplier_ptr _ptr_type;
+  typedef CosEventChannelAdmin::ProxyPullSupplier_var _var_type;
+
   TAO_CEC_ProxyPullSupplier (TAO_CEC_EventChannel* event_channel);
   // constructor...
 
   virtual ~TAO_CEC_ProxyPullSupplier (void);
   // destructor...
 
+  virtual CosEventChannelAdmin::ProxyPullSupplier_ptr activate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC (());
+  // Activate in the POA
+
+  virtual void deactivate (CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC (());
+  // Deactivate from the POA
+
   CORBA::Boolean is_connected (void) const;
   // Return 0 if no consumer is connected...
 
@@ -114,9 +124,6 @@ protected:
   void cleanup_i (void);
   // Release the child and the consumer
 
-  void deactivate (CORBA::Environment &ACE_TRY_ENV);
-  // Deactivate from the POA
-
 private:
   TAO_CEC_EventChannel* event_channel_;
   // The Event Channel that owns this object.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
index bece33352a2..a845882f7d7 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
@@ -30,6 +30,49 @@ TAO_CEC_ProxyPushConsumer::~TAO_CEC_ProxyPushConsumer (void)
   this->event_channel_->destroy_consumer_lock (this->lock_);
 }
 
+CosEventChannelAdmin::ProxyPushConsumer_ptr
+TAO_CEC_ProxyPushConsumer::activate (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC (())
+{
+  CosEventChannelAdmin::ProxyPushConsumer_var result;
+  ACE_TRY
+    {
+      result = this->_this (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      return CosEventChannelAdmin::ProxyPushConsumer::_nil ();
+    }
+  ACE_ENDTRY;
+  return result._retn ();
+}
+
+void
+TAO_CEC_ProxyPushConsumer::deactivate (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC (())
+{
+  ACE_TRY
+    {
+      PortableServer::POA_var poa =
+        this->_default_POA (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      PortableServer::ObjectId_var id =
+        poa->servant_to_id (this, ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      poa->deactivate_object (id.in (), ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      // Exceptions here should not be propagated.  They usually
+      // indicate that an object is beign disconnected twice, or some
+      // race condition, but not a fault that the user needs to know
+      // about.
+    }
+  ACE_ENDTRY;
+}
+
 CORBA::Boolean
 TAO_CEC_ProxyPushConsumer::supplier_non_existent (
       CORBA::Boolean_out disconnected,
@@ -98,26 +141,6 @@ TAO_CEC_ProxyPushConsumer::cleanup_i (void)
     CosEventComm::PushSupplier::_nil ();
 }
 
-void
-TAO_CEC_ProxyPushConsumer::deactivate (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_TRY
-    {
-      PortableServer::POA_var poa =
-        this->_default_POA (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      PortableServer::ObjectId_var id =
-        poa->servant_to_id (this, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      poa->deactivate_object (id.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-}
-
 CORBA::ULong
 TAO_CEC_ProxyPushConsumer::_incr_refcnt (void)
 {
@@ -136,7 +159,7 @@ TAO_CEC_ProxyPushConsumer::_decr_refcnt (void)
   }
 
   // Notify the event channel
-  this->event_channel_->destroy_proxy_push_consumer (this);
+  this->event_channel_->destroy_proxy (this);
   return 0;
 }
 
@@ -227,7 +250,7 @@ TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event,
     if (this->refcount_ != 0)
       return;
   }
-  this->event_channel_->destroy_proxy_push_consumer (this);
+  this->event_channel_->destroy_proxy (this);
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
index 6c00d6621bc..dc856f9f783 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
@@ -25,7 +25,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Event/EC_Worker.h"
+#include "orbsvcs/ESF/ESF_Worker.h"
 
 class TAO_CEC_EventChannel;
 class TAO_CEC_Dispatching;
@@ -47,12 +47,22 @@ class TAO_Event_Export TAO_CEC_ProxyPushConsumer : public POA_CosEventChannelAdm
   //   called.
   //
 public:
+  typedef CosEventChannelAdmin::ProxyPushConsumer_ptr _ptr_type;
+  typedef CosEventChannelAdmin::ProxyPushConsumer_var _var_type;
+
   TAO_CEC_ProxyPushConsumer (TAO_CEC_EventChannel* event_channel);
   // constructor...
 
   virtual ~TAO_CEC_ProxyPushConsumer (void);
   // destructor...
 
+  virtual CosEventChannelAdmin::ProxyPushConsumer_ptr activate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC (());
+  // Activate in the POA
+
+  virtual void deactivate (CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC (());
+  // Deactivate from the POA
+
   CORBA::Boolean is_connected (void) const;
   // Return 0 if no supplier is connected...
 
@@ -104,9 +114,6 @@ protected:
   void cleanup_i (void);
   // Release the supplier
 
-  void deactivate (CORBA::Environment &ACE_TRY_ENV);
-  // Deactivate from the POA
-
 private:
   TAO_CEC_EventChannel* event_channel_;
   // The supplier admin, used for activation and memory managment.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
index a168fbb719c..415c877aa0c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
@@ -29,6 +29,49 @@ TAO_CEC_ProxyPushSupplier::~TAO_CEC_ProxyPushSupplier (void)
   this->event_channel_->destroy_supplier_lock (this->lock_);
 }
 
+CosEventChannelAdmin::ProxyPushSupplier_ptr
+TAO_CEC_ProxyPushSupplier::activate (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC (())
+{
+  CosEventChannelAdmin::ProxyPushSupplier_var result;
+  ACE_TRY
+    {
+      result = this->_this (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      return CosEventChannelAdmin::ProxyPushSupplier::_nil ();
+    }
+  ACE_ENDTRY;
+  return result._retn ();
+}
+
+void
+TAO_CEC_ProxyPushSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC (())
+{
+  ACE_TRY
+    {
+      PortableServer::POA_var poa =
+        this->_default_POA (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      PortableServer::ObjectId_var id =
+        poa->servant_to_id (this, ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      poa->deactivate_object (id.in (), ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      // Exceptions here should not be propagated.  They usually
+      // indicate that an object is beign disconnected twice, or some
+      // race condition, but not a fault that the user needs to know
+      // about.
+    }
+  ACE_ENDTRY;
+}
+
 void
 TAO_CEC_ProxyPushSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV)
 {
@@ -98,26 +141,6 @@ TAO_CEC_ProxyPushSupplier::cleanup_i (void)
     CosEventComm::PushConsumer::_nil ();
 }
 
-void
-TAO_CEC_ProxyPushSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_TRY
-    {
-      PortableServer::POA_var poa =
-        this->_default_POA (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      PortableServer::ObjectId_var id =
-        poa->servant_to_id (this, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      poa->deactivate_object (id.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-}
-
 CORBA::ULong
 TAO_CEC_ProxyPushSupplier::_incr_refcnt (void)
 {
@@ -136,7 +159,7 @@ TAO_CEC_ProxyPushSupplier::_decr_refcnt (void)
   }
 
   // Notify the event channel
-  this->event_channel_->destroy_proxy_push_supplier (this);
+  this->event_channel_->destroy_proxy (this);
   return 0;
 }
 
@@ -256,7 +279,7 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event,
     if (this->refcount_ == 0)
       {
         ace_mon.release ();
-        this->event_channel_->destroy_proxy_push_supplier (this);
+        this->event_channel_->destroy_proxy (this);
         return;
       }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
index 17d9ec60efb..3df40ac9b24 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
@@ -49,12 +49,22 @@ class TAO_Event_Export TAO_CEC_ProxyPushSupplier : public POA_CosEventChannelAdm
   //   the locking strategies.
   //
 public:
+  typedef CosEventChannelAdmin::ProxyPushSupplier_ptr _ptr_type;
+  typedef CosEventChannelAdmin::ProxyPushSupplier_var _var_type;
+
   TAO_CEC_ProxyPushSupplier (TAO_CEC_EventChannel* event_channel);
   // constructor...
 
   virtual ~TAO_CEC_ProxyPushSupplier (void);
   // destructor...
 
+  virtual CosEventChannelAdmin::ProxyPushSupplier_ptr activate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC (());
+  // Activate in the POA
+
+  virtual void deactivate (CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC (());
+  // Deactivate from the POA
+
   CORBA::Boolean is_connected (void) const;
   // Return 0 if no consumer is connected...
 
@@ -116,9 +126,6 @@ protected:
   void cleanup_i (void);
   // Release the child and the consumer
 
-  void deactivate (CORBA::Environment &ACE_TRY_ENV);
-  // Deactivate from the POA
-
 private:
   TAO_CEC_EventChannel* event_channel_;
   // The Event Channel that owns this object.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
index 04c29b1e0a3..1d0742fad4c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
@@ -22,7 +22,7 @@
 #include "ace/pre.h"
 
 #include "CEC_ConsumerControl.h"
-#include "orbsvcs/Event/EC_Worker.h"
+#include "orbsvcs/ESF/ESF_Worker.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -127,7 +127,7 @@ private:
 
 // ****************************************************************
 
-class TAO_CEC_Ping_Push_Consumer : public TAO_EC_Worker<TAO_CEC_ProxyPushSupplier>
+class TAO_CEC_Ping_Push_Consumer : public TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier>
 {
 public:
   TAO_CEC_Ping_Push_Consumer (TAO_CEC_ConsumerControl *control);
@@ -141,7 +141,7 @@ private:
 
 // ****************************************************************
 
-class TAO_CEC_Ping_Pull_Consumer : public TAO_EC_Worker<TAO_CEC_ProxyPullSupplier>
+class TAO_CEC_Ping_Pull_Consumer : public TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier>
 {
 public:
   TAO_CEC_Ping_Pull_Consumer (TAO_CEC_ConsumerControl *control);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
index e3aa7774504..9f8f612be54 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
@@ -26,7 +26,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Event/EC_Worker.h"
+#include "orbsvcs/ESF/ESF_Worker.h"
 #include "tao/corba.h"
 
 class TAO_CEC_ProxyPullConsumer;
@@ -109,7 +109,7 @@ private:
 
 // ****************************************************************
 
-class TAO_CEC_Pull_Event : public TAO_EC_Worker<TAO_CEC_ProxyPullConsumer>
+class TAO_CEC_Pull_Event : public TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer>
 {
 public:
   TAO_CEC_Pull_Event (TAO_CEC_ConsumerAdmin *consumer_admin,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
index 1c7f00eaa9b..6e8d79112fb 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
@@ -22,7 +22,7 @@
 #include "ace/pre.h"
 
 #include "CEC_SupplierControl.h"
-#include "orbsvcs/Event/EC_Worker.h"
+#include "orbsvcs/ESF/ESF_Worker.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -127,7 +127,7 @@ private:
 
 // ****************************************************************
 
-class TAO_CEC_Ping_Push_Supplier : public TAO_EC_Worker<TAO_CEC_ProxyPushConsumer>
+class TAO_CEC_Ping_Push_Supplier : public TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer>
 {
 public:
   TAO_CEC_Ping_Push_Supplier (TAO_CEC_SupplierControl *control);
@@ -141,7 +141,7 @@ private:
 
 // ****************************************************************
 
-class TAO_CEC_Ping_Pull_Supplier : public TAO_EC_Worker<TAO_CEC_ProxyPullConsumer>
+class TAO_CEC_Ping_Pull_Supplier : public TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer>
 {
 public:
   TAO_CEC_Ping_Pull_Supplier (TAO_CEC_SupplierControl *control);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
index aef942bfee7..fbe032bc522 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
@@ -12,14 +12,10 @@
 ACE_RCSID(CosEvent, CEC_SupplierAdmin, "$Id$")
 
 TAO_CEC_SupplierAdmin::TAO_CEC_SupplierAdmin (TAO_CEC_EventChannel *ec)
-  :  event_channel_ (ec)
+  :  event_channel_ (ec),
+     push_admin_ (ec),
+     pull_admin_ (ec)
 {
-  this->push_collection_ =
-    this->event_channel_->create_proxy_push_consumer_collection ();
-
-  this->pull_collection_ =
-    this->event_channel_->create_proxy_pull_consumer_collection ();
-
   // @@
   // @@ this->collection_->busy_hwm (this->event_channel_->busy_hwm ());
   // @@ this->collection_->max_write_delay (
@@ -32,11 +28,6 @@ TAO_CEC_SupplierAdmin::TAO_CEC_SupplierAdmin (TAO_CEC_EventChannel *ec)
 
 TAO_CEC_SupplierAdmin::~TAO_CEC_SupplierAdmin (void)
 {
-  this->event_channel_->destroy_proxy_push_consumer_collection (this->push_collection_);
-  this->push_collection_ = 0;
-
-  this->event_channel_->destroy_proxy_pull_consumer_collection (this->pull_collection_);
-  this->pull_collection_ = 0;
 }
 
 PortableServer::POA_ptr
@@ -46,62 +37,54 @@ TAO_CEC_SupplierAdmin::_default_POA (CORBA::Environment&)
 }
 
 void
-TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPushConsumer * /*consumer*/,
-                                  CORBA::Environment & /*ACE_TRY_ENV*/)
+TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPushConsumer *consumer,
+                                  CORBA::Environment & ACE_TRY_ENV)
 {
-  // this->push_collection_->connected (consumer, ACE_TRY_ENV);
+  this->push_admin_.connected (consumer, ACE_TRY_ENV);
 }
 
 void
 TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPushConsumer *consumer,
                                     CORBA::Environment &ACE_TRY_ENV)
 {
-  this->push_collection_->reconnected (consumer, ACE_TRY_ENV);
+  this->push_admin_.reconnected (consumer, ACE_TRY_ENV);
 }
 
 void
 TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPushConsumer *consumer,
                                      CORBA::Environment &ACE_TRY_ENV)
 {
-  this->push_collection_->disconnected (consumer, ACE_TRY_ENV);
+  this->push_admin_.disconnected (consumer, ACE_TRY_ENV);
 }
 
 void
-TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPullConsumer * /*consumer*/,
-                                  CORBA::Environment & /*ACE_TRY_ENV*/)
+TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPullConsumer *consumer,
+                                  CORBA::Environment &ACE_TRY_ENV)
 {
-  // this->pull_collection_->connected (consumer, ACE_TRY_ENV);
+  this->pull_admin_.connected (consumer, ACE_TRY_ENV);
 }
 
 void
 TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPullConsumer *consumer,
                                     CORBA::Environment &ACE_TRY_ENV)
 {
-  this->pull_collection_->reconnected (consumer, ACE_TRY_ENV);
+  this->pull_admin_.reconnected (consumer, ACE_TRY_ENV);
 }
 
 void
 TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPullConsumer *consumer,
                                      CORBA::Environment &ACE_TRY_ENV)
 {
-  this->pull_collection_->disconnected (consumer, ACE_TRY_ENV);
+  this->pull_admin_.disconnected (consumer, ACE_TRY_ENV);
 }
 
 void
 TAO_CEC_SupplierAdmin::shutdown (CORBA::Environment &ACE_TRY_ENV)
 {
-  TAO_CEC_Shutdown_Push_Consumer push_worker;
-
-  this->push_collection_->for_each (&push_worker, ACE_TRY_ENV);
+  this->push_admin_.shutdown (ACE_TRY_ENV);
   ACE_CHECK;
-  this->push_collection_->shutdown (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  TAO_CEC_Shutdown_Pull_Consumer pull_worker;
 
-  this->pull_collection_->for_each (&pull_worker, ACE_TRY_ENV);
-  ACE_CHECK;
-  this->pull_collection_->shutdown (ACE_TRY_ENV);
+  this->pull_admin_.shutdown (ACE_TRY_ENV);
   ACE_CHECK;
 }
 
@@ -109,86 +92,36 @@ CosEventChannelAdmin::ProxyPushConsumer_ptr
 TAO_CEC_SupplierAdmin::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_CEC_ProxyPushConsumer* consumer =
-    this->event_channel_->create_proxy_push_consumer ();
-
-  PortableServer::ServantBase_var holder = consumer;
-
-  CosEventChannelAdmin::ProxyPushConsumer_var result =
-    consumer->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPushConsumer::_nil ());
-
-  this->push_collection_->connected (consumer, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPushConsumer::_nil ());
-  
-  return result._retn ();
+  return this->push_admin_.obtain (ACE_TRY_ENV);
 }
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
 TAO_CEC_SupplierAdmin::obtain_pull_consumer (CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_CEC_ProxyPullConsumer* consumer =
-    this->event_channel_->create_proxy_pull_consumer ();
-
-  PortableServer::ServantBase_var holder = consumer;
-
-  CosEventChannelAdmin::ProxyPullConsumer_var result =
-    consumer->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPullConsumer::_nil ());
-
-  this->pull_collection_->connected (consumer, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPullConsumer::_nil ());
-  
-  return result._retn ();
-}
-
-// ****************************************************************
-
-void
-TAO_CEC_Shutdown_Push_Consumer::work (TAO_CEC_ProxyPushConsumer *consumer,
-                                      CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_TRY
-    {
-      consumer->shutdown (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // Ignore exceptions
-    }
-  ACE_ENDTRY;
-}
-
-// ****************************************************************
-
-void
-TAO_CEC_Shutdown_Pull_Consumer::work (TAO_CEC_ProxyPullConsumer *consumer,
-                                      CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_TRY
-    {
-      consumer->shutdown (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // Ignore exceptions
-    }
-  ACE_ENDTRY;
+  return this->pull_admin_.obtain (ACE_TRY_ENV);
 }
 
 // ****************************************************************
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_EC_Worker<TAO_CEC_ProxyPushConsumer>;
-template class TAO_EC_Worker<TAO_CEC_ProxyPullConsumer>;
+template class TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel,TAO_CEC_ProxyPushConsumer>;
+template class TAO_ESF_Shutdown_Proxy<TAO_CEC_ProxyPushConsumer>;
+template class TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer>;
+
+template class TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel,TAO_CEC_ProxyPullConsumer>;
+template class TAO_ESF_Shutdown_Proxy<TAO_CEC_ProxyPullConsumer>;
+template class TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer>;
 
 #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_EC_Worker<TAO_CEC_ProxyPushConsumer>
-#pragma instantiate TAO_EC_Worker<TAO_CEC_ProxyPullConsumer>
+#pragma instantiate TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel,TAO_CEC_ProxyPushConsumer>
+#pragma instantiate TAO_ESF_Shutdown_Proxy<TAO_CEC_ProxyPushConsumer>
+#pragma instantiate TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer>
+
+#pragma instantiate TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel,TAO_CEC_ProxyPullConsumer>
+#pragma instantiate TAO_ESF_Shutdown_Proxy<TAO_CEC_ProxyPullConsumer>
+#pragma instantiate TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
index 059510de7a5..e6d03d68f28 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
@@ -32,13 +32,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Event/EC_Proxy_Collection.h"
-#include "orbsvcs/Event/EC_Worker.h"
+#include "orbsvcs/ESF/ESF_Proxy_Admin.h"
+#include "CEC_ProxyPushConsumer.h"
+#include "CEC_ProxyPullConsumer.h"
 #include "event_export.h"
 
 class TAO_CEC_EventChannel;
-class TAO_CEC_ProxyPushConsumer;
-class TAO_CEC_ProxyPullConsumer;
 
 class TAO_Event_Export TAO_CEC_SupplierAdmin : public POA_CosEventChannelAdmin::SupplierAdmin
 {
@@ -67,11 +66,11 @@ public:
   virtual ~TAO_CEC_SupplierAdmin (void);
   // destructor...
 
-  void for_each (TAO_EC_Worker<TAO_CEC_ProxyPushConsumer> *worker,
+  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker,
                  CORBA::Environment &ACE_TRY_ENV);
   // For each elements call <worker->work()>.
 
-  void for_each (TAO_EC_Worker<TAO_CEC_ProxyPullConsumer> *worker,
+  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer> *worker,
                  CORBA::Environment &ACE_TRY_ENV);
   // For each elements call <worker->work()>.
 
@@ -108,42 +107,14 @@ private:
   TAO_CEC_EventChannel *event_channel_;
   // The Event Channel we belong to
 
-  typedef TAO_EC_Proxy_Collection<TAO_CEC_ProxyPushConsumer> PushCollection;
-
-  PushCollection *push_collection_;
-  // The consumer container
-
-  typedef TAO_EC_Proxy_Collection<TAO_CEC_ProxyPullConsumer> PullCollection;
-
-  PullCollection *pull_collection_;
-  // The consumer container
+  TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel,TAO_CEC_ProxyPushConsumer> push_admin_;
+  TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel,TAO_CEC_ProxyPullConsumer> pull_admin_;
+  // The push and pull aspects are implemented using these classes
 
   PortableServer::POA_var default_POA_;
   // Store the default POA.
 };
 
-// ****************************************************************
-
-class TAO_CEC_Shutdown_Push_Consumer : public TAO_EC_Worker<TAO_CEC_ProxyPushConsumer>
-{
-public:
-  TAO_CEC_Shutdown_Push_Consumer (void);
-
-  void work (TAO_CEC_ProxyPushConsumer *consumer,
-             CORBA::Environment &ACE_TRY_ENV);
-};
-
-// ****************************************************************
-
-class TAO_CEC_Shutdown_Pull_Consumer : public TAO_EC_Worker<TAO_CEC_ProxyPullConsumer>
-{
-public:
-  TAO_CEC_Shutdown_Pull_Consumer (void);
-
-  void work (TAO_CEC_ProxyPullConsumer *consumer,
-             CORBA::Environment &ACE_TRY_ENV);
-};
-
 #if defined (__ACE_INLINE__)
 #include "CEC_SupplierAdmin.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i
index 44cbf7860a5..23eb6fc7a67 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i
@@ -2,30 +2,16 @@
 
 ACE_INLINE void
 TAO_CEC_SupplierAdmin::
-    for_each (TAO_EC_Worker<TAO_CEC_ProxyPushConsumer> *worker,
+    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker,
               CORBA::Environment &ACE_TRY_ENV)
 {
-  this->push_collection_->for_each (worker, ACE_TRY_ENV);
+  this->push_admin_.for_each (worker, ACE_TRY_ENV);
 }
 
 ACE_INLINE void
 TAO_CEC_SupplierAdmin::
-    for_each (TAO_EC_Worker<TAO_CEC_ProxyPullConsumer> *worker,
+    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer> *worker,
               CORBA::Environment &ACE_TRY_ENV)
 {
-  this->pull_collection_->for_each (worker, ACE_TRY_ENV);
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_CEC_Shutdown_Push_Consumer::TAO_CEC_Shutdown_Push_Consumer (void)
-{
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_CEC_Shutdown_Pull_Consumer::TAO_CEC_Shutdown_Pull_Consumer (void)
-{
+  this->pull_admin_.for_each (worker, ACE_TRY_ENV);
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
index 5bf008a8c5a..695bfbbcb1d 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
@@ -7,7 +7,7 @@
 //   ORBSVCS Event Service Framework
 //
 // = FILENAME
-//   ESF_Proxy_Collection
+//   ESF_Copy_On_Read
 //
 // = AUTHOR
 //   Carlos O'Ryan (coryan@cs.wustl.edu)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Copy_On_Write.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
index 522be1c27b2..268b10ab444 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Copy_On_Write.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
@@ -1,25 +1,25 @@
 // $Id$
 
-#ifndef TAO_EC_COPY_ON_WRITE_CPP
-#define TAO_EC_COPY_ON_WRITE_CPP
+#ifndef TAO_ESF_COPY_ON_WRITE_CPP
+#define TAO_ESF_COPY_ON_WRITE_CPP
 
-#include "EC_Copy_On_Write.h"
+#include "ESF_Copy_On_Write.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Copy_On_Write.i"
+#include "ESF_Copy_On_Write.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Event, EC_Copy_On_Write, "$Id$")
+ACE_RCSID(ESF, ESF_Copy_On_Write, "$Id$")
 
 template<class COLLECTION, class ITERATOR> CORBA::ULong
-TAO_EC_Copy_On_Write_Collection<COLLECTION,ITERATOR>::_incr_refcnt (void)
+TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR>::_incr_refcnt (void)
 {
   // LOCKING: no locking is required, the caller grabs the mutex.
   return this->refcount_++;
 }
 
 template<class COLLECTION, class ITERATOR> CORBA::ULong
-TAO_EC_Copy_On_Write_Collection<COLLECTION,ITERATOR>::_decr_refcnt (void)
+TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR>::_decr_refcnt (void)
 {
   // LOCKING: no locking is required, the caller grabs the mutex.
   {
@@ -41,8 +41,8 @@ TAO_EC_Copy_On_Write_Collection<COLLECTION,ITERATOR>::_decr_refcnt (void)
 // ****************************************************************
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL>
-TAO_EC_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    TAO_EC_Copy_On_Write (void)
+TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
+    TAO_ESF_Copy_On_Write (void)
       :  writing_ (0),
          cond_ (mutex_)
 {
@@ -50,15 +50,15 @@ TAO_EC_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL>
-TAO_EC_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    ~TAO_EC_Copy_On_Write (void)
+TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
+    ~TAO_ESF_Copy_On_Write (void)
 {
   this->collection_->_decr_refcnt ();
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
-TAO_EC_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    for_each (TAO_EC_Worker<PROXY> *worker,
+TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
+    for_each (TAO_ESF_Worker<PROXY> *worker,
               CORBA::Environment &ACE_TRY_ENV)
 {
   Read_Guard ace_mon (this->mutex_,
@@ -73,7 +73,7 @@ TAO_EC_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 }
 
 template<class PROXY, class C, class I, ACE_SYNCH_DECL> void
-TAO_EC_Copy_On_Write<PROXY,C,I,ACE_SYNCH_USE>::
+TAO_ESF_Copy_On_Write<PROXY,C,I,ACE_SYNCH_USE>::
     connected (PROXY *proxy,
                CORBA::Environment &ACE_TRY_ENV)
 {
@@ -87,7 +87,7 @@ TAO_EC_Copy_On_Write<PROXY,C,I,ACE_SYNCH_USE>::
 }
 
 template<class PROXY, class C, class I, ACE_SYNCH_DECL> void
-TAO_EC_Copy_On_Write<PROXY,C,I,ACE_SYNCH_USE>::
+TAO_ESF_Copy_On_Write<PROXY,C,I,ACE_SYNCH_USE>::
     reconnected (PROXY *proxy,
                  CORBA::Environment &ACE_TRY_ENV)
 {
@@ -101,7 +101,7 @@ TAO_EC_Copy_On_Write<PROXY,C,I,ACE_SYNCH_USE>::
 }
 
 template<class PROXY, class C, class I, ACE_SYNCH_DECL> void
-TAO_EC_Copy_On_Write<PROXY,C,I,ACE_SYNCH_USE>::
+TAO_ESF_Copy_On_Write<PROXY,C,I,ACE_SYNCH_USE>::
     disconnected (PROXY *proxy,
                   CORBA::Environment &ACE_TRY_ENV)
 {
@@ -114,7 +114,7 @@ TAO_EC_Copy_On_Write<PROXY,C,I,ACE_SYNCH_USE>::
 }
 
 template<class PROXY, class C, class I, ACE_SYNCH_DECL> void
-TAO_EC_Copy_On_Write<PROXY,C,I,ACE_SYNCH_USE>::
+TAO_ESF_Copy_On_Write<PROXY,C,I,ACE_SYNCH_USE>::
     shutdown (CORBA::Environment &ACE_TRY_ENV)
 {
   // @@ Do we really need to perform a copy here?
@@ -129,4 +129,4 @@ TAO_EC_Copy_On_Write<PROXY,C,I,ACE_SYNCH_USE>::
 
 // ****************************************************************
 
-#endif /* TAO_EC_COPY_ON_WRITE_CPP */
+#endif /* TAO_ESF_COPY_ON_WRITE_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Copy_On_Write.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
index de0f0f757dd..d90b8596a1a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Copy_On_Write.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
@@ -4,33 +4,33 @@
 // ============================================================================
 //
 // = LIBRARY
-//   ORBSVCS Real-time Event Channel
+//   ORBSVCS Event Service Framework
 //
 // = FILENAME
-//   EC_Copy_On_Write
+//   ESF_Copy_On_Write
 //
 // = AUTHOR
 //   Carlos O'Ryan (coryan@cs.wustl.edu)
 //
 // = CREDITS
-//   http://www.cs.wustl.edu/~coryan/EC/index.html
+//   http://www.cs.wustl.edu/~coryan/ESF/index.html
 //
 // ============================================================================
 
-#ifndef TAO_EC_COPY_ON_WRITE_H
-#define TAO_EC_COPY_ON_WRITE_H
+#ifndef TAO_ESF_COPY_ON_WRITE_H
+#define TAO_ESF_COPY_ON_WRITE_H
 
-#include "EC_Proxy_Collection.h"
+#include "ESF_Proxy_Collection.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 template<class COLLECTION, class ITERATOR>
-class TAO_EC_Copy_On_Write_Collection
+class TAO_ESF_Copy_On_Write_Collection
 {
 public:
-  TAO_EC_Copy_On_Write_Collection (void);
+  TAO_ESF_Copy_On_Write_Collection (void);
 
   CORBA::ULong _incr_refcnt (void);
   CORBA::ULong _decr_refcnt (void);
@@ -47,25 +47,25 @@ private:
 // ****************************************************************
 
 template<class COLLECTION, class ITERATOR, class ACE_LOCK>
-class TAO_EC_Copy_On_Write_Read_Guard
+class TAO_ESF_Copy_On_Write_Read_Guard
 {
   // = TITLE
-  //   TAO_EC_Copy_On_Guard
+  //   TAO_ESF_Copy_On_Guard
   //
   // = DESCRIPTION
   //   This helper class atomically increments the reference count of
-  //   a TAO_EC_Copy_On_Write_Collection and reads the current
+  //   a TAO_ESF_Copy_On_Write_Collection and reads the current
   //   collection in the Copy_On_Write class.
   //
   // = TODO
   //
 public:
-  typedef TAO_EC_Copy_On_Write_Collection<COLLECTION,ITERATOR> Collection;
-  TAO_EC_Copy_On_Write_Read_Guard (ACE_LOCK &mutex,
+  typedef TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR> Collection;
+  TAO_ESF_Copy_On_Write_Read_Guard (ACE_LOCK &mutex,
                                    Collection*& collection);
   // Constructor
 
-  ~TAO_EC_Copy_On_Write_Read_Guard (void);
+  ~TAO_ESF_Copy_On_Write_Read_Guard (void);
   // Destructor
 
   Collection *collection;
@@ -77,27 +77,27 @@ private:
 // ****************************************************************
 
 template<class COLLECTION, class ITERATOR, ACE_SYNCH_DECL>
-class TAO_EC_Copy_On_Write_Write_Guard
+class TAO_ESF_Copy_On_Write_Write_Guard
 {
   // = TITLE
-  //   TAO_EC_Copy_On_Write_Guard
+  //   TAO_ESF_Copy_On_Write_Guard
   //
   // = DESCRIPTION
   //   This helper class atomically increments the reference count of
-  //   a TAO_EC_Copy_On_Write_Collection and reads the current
+  //   a TAO_ESF_Copy_On_Write_Collection and reads the current
   //   collection in the Copy_On_Write class.
   //
   // = TODO
   //
 public:
-  typedef TAO_EC_Copy_On_Write_Collection<COLLECTION,ITERATOR> Collection;
-  TAO_EC_Copy_On_Write_Write_Guard (ACE_SYNCH_MUTEX_T &mutex,
+  typedef TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR> Collection;
+  TAO_ESF_Copy_On_Write_Write_Guard (ACE_SYNCH_MUTEX_T &mutex,
                                     ACE_SYNCH_CONDITION_T &cond,
                                     int &writing_flag,
                                     Collection*& collection);
   // Constructor
 
-  ~TAO_EC_Copy_On_Write_Write_Guard (void);
+  ~TAO_ESF_Copy_On_Write_Write_Guard (void);
   // Destructor
 
   Collection *copy;
@@ -112,10 +112,10 @@ private:
 // ****************************************************************
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL>
-class TAO_EC_Copy_On_Write : public TAO_EC_Proxy_Collection<PROXY>
+class TAO_ESF_Copy_On_Write : public TAO_ESF_Proxy_Collection<PROXY>
 {
   // = TITLE
-  //   TAO_EC_Copy_On_Write
+  //   TAO_ESF_Copy_On_Write
   //
   // = DESCRIPTION
   //   Implement the Copy_On_Write protocol
@@ -125,16 +125,16 @@ class TAO_EC_Copy_On_Write : public TAO_EC_Proxy_Collection<PROXY>
   // = TODO
   //
 public:
-  typedef TAO_EC_Copy_On_Write_Read_Guard<COLLECTION,ITERATOR,ACE_SYNCH_MUTEX_T> Read_Guard;
-  typedef TAO_EC_Copy_On_Write_Write_Guard<COLLECTION,ITERATOR,ACE_SYNCH_USE> Write_Guard;
-  TAO_EC_Copy_On_Write (void);
+  typedef TAO_ESF_Copy_On_Write_Read_Guard<COLLECTION,ITERATOR,ACE_SYNCH_MUTEX_T> Read_Guard;
+  typedef TAO_ESF_Copy_On_Write_Write_Guard<COLLECTION,ITERATOR,ACE_SYNCH_USE> Write_Guard;
+  TAO_ESF_Copy_On_Write (void);
   // Constructor
 
-  ~TAO_EC_Copy_On_Write (void);
+  ~TAO_ESF_Copy_On_Write (void);
   // Destructor
 
-  // = The TAO_EC_Proxy methods
-  virtual void for_each (TAO_EC_Worker<PROXY> *worker,
+  // = The TAO_ESF_Proxy methods
+  virtual void for_each (TAO_ESF_Worker<PROXY> *worker,
                          CORBA::Environment &ACE_TRY_ENV);
   virtual void connected (PROXY *proxy,
                           CORBA::Environment &ACE_TRY_ENV);
@@ -145,7 +145,7 @@ public:
   virtual void shutdown (CORBA::Environment &ACE_TRY_ENV);
 
 private:
-  typedef TAO_EC_Copy_On_Write_Collection<COLLECTION,ITERATOR> Collection;
+  typedef TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR> Collection;
 
   ACE_SYNCH_MUTEX_T mutex_;
   // A mutex to serialize access to the collection pointer.
@@ -165,15 +165,15 @@ private:
 // ****************************************************************
 
 #if defined (__ACE_INLINE__)
-#include "EC_Copy_On_Write.i"
+#include "ESF_Copy_On_Write.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "EC_Copy_On_Write.cpp"
+#include "ESF_Copy_On_Write.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("EC_Copy_On_Write.cpp")
+#pragma implementation ("ESF_Copy_On_Write.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
-#endif /* TAO_EC_COPY_ON_WRITE_H */
+#endif /* TAO_ESF_COPY_ON_WRITE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Copy_On_Write.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i
index bc1779e210e..a4a30b965c1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Copy_On_Write.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i
@@ -1,8 +1,8 @@
 // $Id$
 
 template<class COLLECTION, class ITERATOR> ACE_INLINE
-TAO_EC_Copy_On_Write_Collection<COLLECTION,ITERATOR>::
-    TAO_EC_Copy_On_Write_Collection (void)
+TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR>::
+    TAO_ESF_Copy_On_Write_Collection (void)
       :  refcount_ (1)
 {
 }
@@ -10,8 +10,8 @@ TAO_EC_Copy_On_Write_Collection<COLLECTION,ITERATOR>::
 // ****************************************************************
 
 template<class COLLECTION, class ITERATOR, class ACE_LOCK> ACE_INLINE
-TAO_EC_Copy_On_Write_Read_Guard<COLLECTION,ITERATOR,ACE_LOCK>::
-    TAO_EC_Copy_On_Write_Read_Guard (ACE_LOCK &m,
+TAO_ESF_Copy_On_Write_Read_Guard<COLLECTION,ITERATOR,ACE_LOCK>::
+    TAO_ESF_Copy_On_Write_Read_Guard (ACE_LOCK &m,
                                      Collection*& collection_ref)
       :  collection (0),
          mutex (m)
@@ -22,8 +22,8 @@ TAO_EC_Copy_On_Write_Read_Guard<COLLECTION,ITERATOR,ACE_LOCK>::
 }
 
 template<class COLLECTION, class ITERATOR, class ACE_LOCK> ACE_INLINE
-TAO_EC_Copy_On_Write_Read_Guard<COLLECTION,ITERATOR,ACE_LOCK>::
-    ~TAO_EC_Copy_On_Write_Read_Guard (void)
+TAO_ESF_Copy_On_Write_Read_Guard<COLLECTION,ITERATOR,ACE_LOCK>::
+    ~TAO_ESF_Copy_On_Write_Read_Guard (void)
 {
   if (this->collection != 0)
     {
@@ -35,8 +35,8 @@ TAO_EC_Copy_On_Write_Read_Guard<COLLECTION,ITERATOR,ACE_LOCK>::
 // ****************************************************************
 
 template<class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> ACE_INLINE
-TAO_EC_Copy_On_Write_Write_Guard<COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    TAO_EC_Copy_On_Write_Write_Guard (ACE_SYNCH_MUTEX_T &m,
+TAO_ESF_Copy_On_Write_Write_Guard<COLLECTION,ITERATOR,ACE_SYNCH_USE>::
+    TAO_ESF_Copy_On_Write_Write_Guard (ACE_SYNCH_MUTEX_T &m,
                                       ACE_SYNCH_CONDITION_T &c,
                                       int &w,
                                       Collection*& cr)
@@ -67,8 +67,8 @@ TAO_EC_Copy_On_Write_Write_Guard<COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 }
 
 template<class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> ACE_INLINE
-TAO_EC_Copy_On_Write_Write_Guard<COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    ~TAO_EC_Copy_On_Write_Write_Guard (void)
+TAO_ESF_Copy_On_Write_Write_Guard<COLLECTION,ITERATOR,ACE_SYNCH_USE>::
+    ~TAO_ESF_Copy_On_Write_Write_Guard (void)
 {
   Collection *tmp = 0;
   {
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
index 9dd18a0b5a1..3573060f39a 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
@@ -13,7 +13,7 @@
 #include "ESF_Worker.h"
 #include "ESF_Delayed_Command.h"
 
-ACE_RCSID(ESF, ESF_Immediate_Changes, "$Id$")
+ACE_RCSID(ESF, ESF_Delayed_Changes, "$Id$")
 
 // ****************************************************************
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
index b8df55d9d0b..e30a8020922 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
@@ -13,6 +13,11 @@
 
 ACE_RCSID(ESF, ESF_Peer_Admin, "$Id$")
 
+template<class EC, class P, class PEER>
+TAO_ESF_Peer_Admin<EC,P,PEER>::~TAO_ESF_Peer_Admin (void)
+{
+}
+
 template<class EC, class P, class PEER> void
 TAO_ESF_Peer_Admin<EC,P,PEER>::peer_connected (PEER *peer,
                                                CORBA::Environment &ACE_TRY_ENV)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
index 8076f100978..74b2155ce27 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
@@ -27,7 +27,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 template<class EVENT_CHANNEL, class PROXY, class PEER>
-class TAO_ESF_Peer_Admin : TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY>
+class TAO_ESF_Peer_Admin : public TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY>
 {
   // = TITLE
   //   ESF_Peer_Admin
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
index f0b9b6f9fb1..1395de52e6a 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
@@ -27,7 +27,7 @@ TAO_ESF_Proxy_Admin<EC,P>::~TAO_ESF_Proxy_Admin (void)
 }
 
 template<class EC, class PROXY> ACE_TYPENAME PROXY::_ptr_type
-TAO_ESF_Proxy_Admin<EC,PROXY>::obtain (CORBA::Environment &)
+TAO_ESF_Proxy_Admin<EC,PROXY>::obtain (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC (())
 {
   PROXY* proxy;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
index 7b04adf48fa..0bf8b45392d 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
@@ -107,10 +107,11 @@ public:
   // removes the object from the collection and deactivates the
   // proxy.
 
-private:
+protected:
   EVENT_CHANNEL *event_channel_;
   // The Event Channel we belong to
 
+private:
   typedef TAO_ESF_Proxy_Collection<PROXY> Collection;
 
   Collection *collection_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
index 24b27837727..c043f044daa 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
@@ -10,11 +10,11 @@
 #include "EC_ProxySupplier.h"
 #include "EC_ObserverStrategy.h"
 #include "EC_Null_Scheduling.h"
-#include "EC_Proxy_Collection.h"
-#include "EC_Concrete_Proxy_Set.h"
 #include "EC_Reactive_Timeout_Generator.h"
 #include "EC_Reactive_ConsumerControl.h"
 #include "EC_Reactive_SupplierControl.h"
+#include "orbsvcs/ESF/ESF_Proxy_List.h"
+#include "orbsvcs/ESF/ESF_Delayed_Changes.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "EC_Basic_Factory.i"
@@ -157,10 +157,10 @@ TAO_EC_ProxyPushConsumer_Collection*
 TAO_EC_Basic_Factory::create_proxy_push_consumer_collection (TAO_EC_Event_Channel *)
 {
   // This typedef is a workaround for a SunCC 4.2 bug
-  typedef TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>::Iterator TAO_EC_Consumer_List_Iterator;
-  return new TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>::Iterator,
+  typedef TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>::Iterator TAO_EC_Consumer_List_Iterator;
+  return new TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>::Iterator,
       ACE_SYNCH> ();
 }
 
@@ -174,10 +174,10 @@ TAO_EC_ProxyPushSupplier_Collection*
 TAO_EC_Basic_Factory::create_proxy_push_supplier_collection (TAO_EC_Event_Channel *)
 {
   // This typedef is a workaround for a SunCC 4.2 bug
-  typedef TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>::Iterator TAO_EC_Supplier_List_Iterator;
-  return new TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>::Iterator,
+  typedef TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>::Iterator TAO_EC_Supplier_List_Iterator;
+  return new TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>::Iterator,
       ACE_SYNCH> ();
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Command.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Command.cpp
deleted file mode 100644
index 99a7d944840..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Command.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-// $Id$
-
-#ifndef TAO_EC_COMMAND_CPP
-#define TAO_EC_COMMAND_CPP
-
-#include "EC_Command.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "EC_Command.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Event, EC_Command, "$Id$")
-
-template<class Target, class Object> int
-TAO_EC_Connected_Command<Target,Object>::execute (void* arg)
-{
-  CORBA::Environment *env = &TAO_default_environment ();
-  if (arg != 0)
-    env = ACE_static_cast(CORBA::Environment*, arg);
-
-  this->target_->connected_i (this->object_, *env);
-  return 0;
-}
-
-// ****************************************************************
-
-template<class Target, class Object> int
-TAO_EC_Reconnected_Command<Target,Object>::execute (void* arg)
-{
-  CORBA::Environment *env = &TAO_default_environment ();
-  if (arg != 0)
-    env = ACE_static_cast(CORBA::Environment*, arg);
-
-  this->target_->reconnected_i (this->object_, *env);
-  return 0;
-}
-
-// ****************************************************************
-
-template<class Target, class Object> int
-TAO_EC_Disconnected_Command<Target,Object>::execute (void* arg)
-{
-  CORBA::Environment *env = &TAO_default_environment ();
-  if (arg != 0)
-    env = ACE_static_cast(CORBA::Environment*, arg);
-
-  this->target_->disconnected_i (this->object_, *env);
-  return 0;
-}
-
-// ****************************************************************
-
-template<class Target> int
-TAO_EC_Shutdown_Command<Target>::execute (void* arg)
-{
-  CORBA::Environment *env = &TAO_default_environment ();
-  if (arg != 0)
-    env = ACE_static_cast(CORBA::Environment*, arg);
-
-  this->target_->shutdown_i (*env);
-  return 0;
-}
-
-#endif /* TAO_EC_COMMAND_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Command.h b/TAO/orbsvcs/orbsvcs/Event/EC_Command.h
deleted file mode 100644
index 3ec30798cda..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Command.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel
-//
-// = FILENAME
-//   EC_Command
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// = CREDITS
-//   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
-//   and other members of the DOC group.
-//   More details can be found in:
-//   http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz
-//   http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz
-//
-//
-// ============================================================================
-
-#ifndef TAO_EC_COMMAND_H
-#define TAO_EC_COMMAND_H
-#include "ace/pre.h"
-
-#include "ace/Functor.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-template<class Target, class Object>
-class TAO_EC_Connected_Command : public ACE_Command_Base
-{
-  // = TITLE
-  //   EC_Connected_Command
-  //
-  // = DESCRIPTION
-  //   Implements a Command object that invokes the connected_i() method
-  //   on the target, passing an argument of type Object.
-  //
-  // = MEMORY MANAGMENT
-  //   It does not assume ownership of Object nor the Target
-  //   arguments.
-  //   Usually allocated from the heap or an allocator; but it is not
-  //   self-managed.
-  //
-  // = LOCKING
-  //   No provisions for locking, access must be serialized
-  //   externally.
-  //
-  // = TODO
-  //
-public:
-  TAO_EC_Connected_Command (Target *target,
-                            Object *object);
-  // constructor...
-
-  virtual int execute (void *arg);
-  // The callback method, if the argument is not nil it is interpreted
-  // as a CORBA::Environment.
-
-private:
-  Target *target_;
-  // The target
-
-  Object *object_;
-  // The argument
-};
-
-// ****************************************************************
-
-template<class Target, class Object>
-class TAO_EC_Reconnected_Command : public ACE_Command_Base
-{
-  // = TITLE
-  //   EC_Reconnected_Command
-  //
-  // = DESCRIPTION
-  //   Implements a Command object that invokes the reconnected_i() method
-  //   on the target, passing an argument of type Object.
-  //
-  // = MEMORY MANAGMENT
-  //   It does not assume ownership of Object nor the Target
-  //   arguments.
-  //   Usually allocated from the heap or an allocator; but it is not
-  //   self-managed.
-  //
-  // = LOCKING
-  //   No provisions for locking, access must be serialized
-  //   externally.
-  //
-  // = TODO
-  //
-public:
-  TAO_EC_Reconnected_Command (Target *target,
-                            Object *object);
-  // constructor...
-
-  virtual int execute (void *arg);
-  // The callback method, if the argument is not nil it is interpreted
-  // as a CORBA::Environment.
-
-private:
-  Target *target_;
-  // The target
-
-  Object *object_;
-  // The argument
-};
-
-// ****************************************************************
-
-template<class Target, class Object>
-class TAO_EC_Disconnected_Command : public ACE_Command_Base
-{
-  // = TITLE
-  //   EC_Disconnected_Command
-  //
-  // = DESCRIPTION
-  //   Implements a Command object that invokes the disconnected_i()
-  //   method on the target, passing an argument of type Object.
-  //
-  // = MEMORY MANAGMENT
-  //   It does not assume ownership of Object nor the Target
-  //   arguments.
-  //   Usually allocated from the heap or an allocator; but it is not
-  //   self-managed.
-  //
-  // = LOCKING
-  //   No provisions for locking, access must be serialized
-  //   externally.
-  //
-  // = TODO
-  //
-public:
-  TAO_EC_Disconnected_Command (Target *target,
-                               Object *object);
-  // constructor...
-
-  virtual int execute (void *arg);
-  // The callback method, if the argument is not nil it is interpreted
-  // as a CORBA::Environment.
-
-private:
-  Target *target_;
-  // The target
-
-  Object *object_;
-  // The argument
-};
-
-// ****************************************************************
-
-template<class Target>
-class TAO_EC_Shutdown_Command : public ACE_Command_Base
-{
-  // = TITLE
-  //   EC_Shutdown_Command
-  //
-  // = DESCRIPTION
-  //   Implements a Command object that invokes the shutdown_i()
-  //   method on the target, passing an argument of type Object.
-  //
-  // = MEMORY MANAGMENT
-  //   It does not assume ownership of Object nor the Target
-  //   arguments.
-  //   Usually allocated from the heap or an allocator; but it is not
-  //   self-managed.
-  //
-  // = LOCKING
-  //   No provisions for locking, access must be serialized
-  //   externally.
-  //
-  // = TODO
-  //
-public:
-  TAO_EC_Shutdown_Command (Target *target);
-  // constructor...
-
-  virtual int execute (void *arg);
-  // The callback method, if the argument is not nil it is interpreted
-  // as a CORBA::Environment.
-
-private:
-  Target *target_;
-  // The target
-};
-
-// ****************************************************************
-
-#if defined (__ACE_INLINE__)
-#include "EC_Command.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "EC_Command.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("EC_Command.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include "ace/post.h"
-#endif /* TAO_EC_COMMAND_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Command.i b/TAO/orbsvcs/orbsvcs/Event/EC_Command.i
deleted file mode 100644
index 46f76b31f9b..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Command.i
+++ /dev/null
@@ -1,41 +0,0 @@
-// $Id$
-
-template<class Target, class Object>
-TAO_EC_Connected_Command<Target,Object>::
-      TAO_EC_Connected_Command (Target *target,
-                                Object *object)
-  : target_ (target),
-    object_ (object)
-{
-}
-
-// ****************************************************************
-
-template<class Target, class Object>
-TAO_EC_Reconnected_Command<Target,Object>::
-      TAO_EC_Reconnected_Command (Target *target,
-                                  Object *object)
-  : target_ (target),
-    object_ (object)
-{
-}
-
-// ****************************************************************
-
-template<class Target, class Object>
-TAO_EC_Disconnected_Command<Target,Object>::
-      TAO_EC_Disconnected_Command (Target *target,
-                                   Object *object)
-  : target_ (target),
-    object_ (object)
-{
-}
-
-// ****************************************************************
-
-template<class Target>
-TAO_EC_Shutdown_Command<Target>::
-      TAO_EC_Shutdown_Command (Target *target)
-  : target_ (target)
-{
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Concrete_Proxy_Set.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Concrete_Proxy_Set.cpp
deleted file mode 100644
index 54c2eaef18b..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Concrete_Proxy_Set.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-// $Id$
-
-#ifndef TAO_EC_CONCRETE_PROXY_SET_CPP
-#define TAO_EC_CONCRETE_PROXY_SET_CPP
-
-#include "EC_Concrete_Proxy_Set.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "EC_Concrete_Proxy_Set.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Event, EC_Concrete_Proxy_Set, "$Id$")
-
-template<class PROXY>
-TAO_EC_List_Based_Proxy_Set<PROXY>::
-      TAO_EC_List_Based_Proxy_Set (void)
-{
-}
-
-template<class PROXY> void
-TAO_EC_List_Based_Proxy_Set<PROXY>::connected (PROXY *proxy,
-                                               CORBA::Environment &)
-{
-  int r = this->impl_.insert (proxy);
-  if (r == 0)
-    return;
-
-  if (r == 1)
-    {
-      // @@ Already there, throw some user exception..
-      proxy->_decr_refcnt ();
-    }
-  if (r == -1)
-    {
-      // @@ Cannot insert, running out of memory? throw some other
-      // user exception
-      proxy->_decr_refcnt ();
-    }
-}
-
-template<class PROXY> void
-TAO_EC_List_Based_Proxy_Set<PROXY>::reconnected (PROXY *proxy,
-                                                 CORBA::Environment &)
-{
-  int r = this->impl_.insert (proxy);
-  if (r == 0 || r == 1)
-    {
-      // Reference count is incremented by the callers to [re]connected.
-      // @@ Find out if the protocol could be simplified, and decoupling
-      //    increased.
-      proxy->_decr_refcnt ();
-      return;
-    }
-
-  if (r == -1)
-    {
-      // @@ Cannot insert, running out of memory? throw some other
-      // user exception
-      proxy->_decr_refcnt ();
-    }
-}
-
-template<class PROXY> void
-TAO_EC_List_Based_Proxy_Set<PROXY>::disconnected (PROXY *proxy,
-                                                  CORBA::Environment &)
-{
-  int r = this->impl_.remove (proxy);
-  if (r != 0)
-    {
-      // @@ Cannot remove, throw some other
-      // user exception
-      return;
-    }
-  proxy->_decr_refcnt ();
-}
-
-template<class PROXY> void
-TAO_EC_List_Based_Proxy_Set<PROXY>::shutdown (CORBA::Environment &)
-{
-  Iterator end = this->impl_.end ();
-  for (Iterator i = this->impl_.begin (); i != end; ++i)
-    {
-      // Decrement reference count
-      (*i)->_decr_refcnt ();
-    }
-  this->impl_.reset ();
-}
-
-// ****************************************************************
-
-template<class PROXY>
-TAO_EC_RB_Tree_Based_Proxy_Set<PROXY>::
-      TAO_EC_RB_Tree_Based_Proxy_Set (void)
-{
-}
-
-template<class PROXY> void
-TAO_EC_RB_Tree_Based_Proxy_Set<PROXY>::connected (PROXY *proxy,
-                                                  CORBA::Environment &)
-{
-  int r = this->impl_.bind (proxy, 1);
-  if (r == 0)
-    return;
-
-  if (r == 1)
-    {
-      // @@ Already there, throw some user exception..
-      proxy->_decr_refcnt ();
-    }
-  if (r == -1)
-    {
-      // @@ Cannot insert, running out of memory? throw some other
-      // user exception
-      proxy->_decr_refcnt ();
-    }
-}
-
-template<class PROXY> void
-TAO_EC_RB_Tree_Based_Proxy_Set<PROXY>::reconnected (PROXY *proxy,
-                                                 CORBA::Environment &)
-{
-  int r = this->impl_.rebind (proxy, 1);
-  if (r != 0)
-    {
-      // Reference count is incremented by the callers to [re]connected.
-      // @@ Find out if the protocol could be simplified, and decoupling
-      //    increased.
-      proxy->_decr_refcnt ();
-      return;
-    }
-}
-
-template<class PROXY> void
-TAO_EC_RB_Tree_Based_Proxy_Set<PROXY>::disconnected (PROXY *proxy,
-                                                  CORBA::Environment &)
-{
-  int r = this->impl_.unbind (proxy);
-  if (r != 0)
-    {
-      // @@ Cannot remove, throw some other
-      // user exception
-      return;
-    }
-  proxy->_decr_refcnt ();
-}
-
-template<class PROXY> void
-TAO_EC_RB_Tree_Based_Proxy_Set<PROXY>::shutdown (CORBA::Environment &)
-{
-  Iterator end = this->impl_.end ();
-  for (Iterator i = this->impl_.begin (); i != end; ++i)
-    {
-      // Decrement reference count
-      (*i)->_decr_refcnt ();
-    }
-  this->impl_.clear ();
-}
-
-#endif /* TAO_EC_CONCRETE_PROXY_SET_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Concrete_Proxy_Set.h b/TAO/orbsvcs/orbsvcs/Event/EC_Concrete_Proxy_Set.h
deleted file mode 100644
index be93414a967..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Concrete_Proxy_Set.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel
-//
-// = FILENAME
-//   EC_Concrete_Proxy_Set
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// = CREDITS
-//   http://www.cs.wustl.edu/~coryan/EC/index.html
-//
-// ============================================================================
-
-#ifndef TAO_EC_CONCRETE_PROXY_SET_H
-#define TAO_EC_CONCRETE_PROXY_SET_H
-#include "ace/pre.h"
-
-#include "tao/corba.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Containers.h"
-#include "ace/RB_Tree.h"
-
-template<class PROXY>
-class TAO_EC_List_Based_Proxy_Set
-{
-public:
-  typedef ACE_Unbounded_Set<PROXY*> Implementation;
-  typedef ACE_Unbounded_Set_Iterator<PROXY*> Iterator;
-
-  TAO_EC_List_Based_Proxy_Set (void);
-
-  ACE_Unbounded_Set_Iterator<PROXY*> begin (void);
-  ACE_Unbounded_Set_Iterator<PROXY*> end (void);
-  size_t size (void) const;
-  void connected (PROXY *,
-                CORBA::Environment &);
-  void reconnected (PROXY *,
-                    CORBA::Environment &);
-  void disconnected (PROXY *,
-                     CORBA::Environment &);
-  void shutdown (CORBA::Environment &);
-
-private:
-  ACE_Unbounded_Set<PROXY*> impl_;
-};
-
-// ****************************************************************
-
-template<class PROXY>
-class TAO_EC_RB_Tree_Based_Proxy_Set_Iterator
-{
-public:
-  typedef ACE_RB_Tree_Iterator<PROXY*,int,ACE_Less_Than<PROXY*>,ACE_Null_Mutex> Implementation;
-
-  TAO_EC_RB_Tree_Based_Proxy_Set_Iterator (const Implementation &i);
-
-  int operator == (const TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<PROXY> &rhs) const;
-  int operator != (const TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<PROXY> &rhs) const;
-  TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<PROXY>& operator++ (void);
-  TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<PROXY> operator++ (int);
-  PROXY *operator *(void);
-
-private:
-  Implementation impl_;
-};
-
-// ****************************************************************
-
-template<class PROXY>
-class TAO_EC_RB_Tree_Based_Proxy_Set
-{
-public:
-  typedef ACE_RB_Tree<PROXY*,int,ACE_Less_Than<PROXY*>,ACE_Null_Mutex> Implementation;
-  typedef TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<PROXY> Iterator;
-
-  TAO_EC_RB_Tree_Based_Proxy_Set (void);
-
-  TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<PROXY> begin (void);
-  TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<PROXY> end (void);
-  size_t size (void) const;
-  void connected (PROXY *,
-                CORBA::Environment &);
-  void reconnected (PROXY *,
-                    CORBA::Environment &);
-  void disconnected (PROXY *,
-                     CORBA::Environment &);
-  void shutdown (CORBA::Environment &);
-
-private:
-  Implementation impl_;
-};
-
-// ****************************************************************
-
-#if defined (__ACE_INLINE__)
-#include "EC_Concrete_Proxy_Set.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "EC_Concrete_Proxy_Set.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("EC_Concrete_Proxy_Set.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include "ace/post.h"
-#endif /* TAO_EC_CONCRETE_PROXY_SET_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Concrete_Proxy_Set.i b/TAO/orbsvcs/orbsvcs/Event/EC_Concrete_Proxy_Set.i
deleted file mode 100644
index 7c3046c97fe..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Concrete_Proxy_Set.i
+++ /dev/null
@@ -1,83 +0,0 @@
-// $Id$
-
-template<class PROXY> ACE_INLINE ACE_Unbounded_Set_Iterator<PROXY*>
-TAO_EC_List_Based_Proxy_Set<PROXY>::begin (void)
-{
-  return this->impl_.begin ();
-}
-
-template<class PROXY> ACE_INLINE ACE_Unbounded_Set_Iterator<PROXY*>
-TAO_EC_List_Based_Proxy_Set<PROXY>::end (void)
-{
-  return this->impl_.end ();
-}
-
-template<class PROXY> ACE_INLINE size_t
-TAO_EC_List_Based_Proxy_Set<PROXY>::size (void) const
-{
-  return this->impl_.size ();
-}
-
-// ****************************************************************
-
-template<class PROXY> ACE_INLINE
-TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<PROXY>::
-    TAO_EC_RB_Tree_Based_Proxy_Set_Iterator (const Implementation &i)
-      :  impl_ (i)
-{
-}
-
-template<class PROXY> ACE_INLINE int
-TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<PROXY>::
-    operator == (const TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<PROXY> &rhs) const
-{
-  return this->impl_ == rhs.impl_;
-}
-
-template<class PROXY> ACE_INLINE int
-TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<PROXY>::
-    operator != (const TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<PROXY> &rhs) const
-{
-  return this->impl_ != rhs.impl_;
-}
-
-template<class PROXY> ACE_INLINE TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<PROXY>&
-TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<PROXY>::operator++ (void)
-{
-  ++this->impl_;
-  return *this;
-}
-
-template<class PROXY> ACE_INLINE TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<PROXY>
-TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<PROXY>::operator++ (int)
-{
-  TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<PROXY> tmp = *this;
-  ++this->impl_;
-  return tmp;
-}
-
-template<class PROXY> ACE_INLINE PROXY*
-TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<PROXY>::operator *(void)
-{
-  return (*this->impl_).key ();
-}
-
-// ****************************************************************
-
-template<class PROXY> ACE_INLINE TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<PROXY>
-TAO_EC_RB_Tree_Based_Proxy_Set<PROXY>::begin (void)
-{
-  return Iterator (this->impl_.begin ());
-}
-
-template<class PROXY> ACE_INLINE TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<PROXY>
-TAO_EC_RB_Tree_Based_Proxy_Set<PROXY>::end (void)
-{
-  return Iterator (this->impl_.end ());
-}
-
-template<class PROXY> ACE_INLINE size_t
-TAO_EC_RB_Tree_Based_Proxy_Set<PROXY>::size (void) const
-{
-  return this->impl_.current_size ();
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
index 38570cf7167..59b2b6c3ab5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
@@ -12,101 +12,21 @@
 ACE_RCSID(Event, EC_ConsumerAdmin, "$Id$")
 
 TAO_EC_ConsumerAdmin::TAO_EC_ConsumerAdmin (TAO_EC_Event_Channel *ec)
-  :  event_channel_ (ec)
+  :  TAO_ESF_Peer_Admin<TAO_EC_Event_Channel,TAO_EC_ProxyPushSupplier,TAO_EC_ProxyPushConsumer> (ec)
 {
-  this->collection_ =
-    this->event_channel_->create_proxy_push_supplier_collection ();
-
-  // @@
-  // @@ this->collection_->busy_hwm (this->event_channel_->busy_hwm ());
-  // @@ this->collection_->max_write_delay (
-  // @@           this->event_channel_->max_write_delay ()
-  // @@ );
-
   this->default_POA_ =
     this->event_channel_->consumer_poa ();
 }
 
 TAO_EC_ConsumerAdmin::~TAO_EC_ConsumerAdmin (void)
 {
-  this->event_channel_->destroy_proxy_push_supplier_collection (this->collection_);
-  this->collection_ = 0;
-}
-
-void
-TAO_EC_ConsumerAdmin::connected (TAO_EC_ProxyPushConsumer *consumer,
-                                 CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_EC_Connect_Consumer worker (consumer);
-
-  this->collection_->for_each (&worker, ACE_TRY_ENV);
-}
-
-void
-TAO_EC_ConsumerAdmin::reconnected (TAO_EC_ProxyPushConsumer *consumer,
-                                   CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_EC_Reconnect_Consumer worker (consumer);
-
-  this->collection_->for_each (&worker, ACE_TRY_ENV);
-}
-
-void
-TAO_EC_ConsumerAdmin::disconnected (TAO_EC_ProxyPushConsumer *consumer,
-                                    CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_EC_Disconnect_Consumer worker (consumer);
-
-  this->collection_->for_each (&worker, ACE_TRY_ENV);
-}
-
-void
-TAO_EC_ConsumerAdmin::connected (TAO_EC_ProxyPushSupplier * /*supplier*/,
-                                 CORBA::Environment & /*ACE_TRY_ENV*/)
-{
-  // this->collection_->connected (supplier, ACE_TRY_ENV);
-}
-
-void
-TAO_EC_ConsumerAdmin::reconnected (TAO_EC_ProxyPushSupplier *supplier,
-                                   CORBA::Environment &ACE_TRY_ENV)
-{
-  this->collection_->reconnected (supplier, ACE_TRY_ENV);
-}
-
-void
-TAO_EC_ConsumerAdmin::disconnected (TAO_EC_ProxyPushSupplier *supplier,
-                                    CORBA::Environment &ACE_TRY_ENV)
-{
-  this->collection_->disconnected (supplier, ACE_TRY_ENV);
-}
-
-void
-TAO_EC_ConsumerAdmin::shutdown (CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_EC_Shutdown_Supplier worker;
-
-  this->collection_->for_each (&worker, ACE_TRY_ENV);
-  this->collection_->shutdown (ACE_TRY_ENV);
 }
 
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_EC_ConsumerAdmin::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_EC_ProxyPushSupplier* supplier =
-    this->event_channel_->create_proxy_push_supplier ();
-
-  PortableServer::ServantBase_var holder = supplier;
-
-  RtecEventChannelAdmin::ProxyPushSupplier_var result =
-    supplier->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (RtecEventChannelAdmin::ProxyPushSupplier::_nil ());
-
-  this->collection_->connected (supplier, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (RtecEventChannelAdmin::ProxyPushSupplier::_nil ());
-
-  return result._retn ();
+  return this->obtain (ACE_TRY_ENV);
 }
 
 PortableServer::POA_ptr
@@ -115,67 +35,24 @@ TAO_EC_ConsumerAdmin::_default_POA (CORBA::Environment&)
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
-// ****************************************************************
-
-void
-TAO_EC_Connect_Consumer::work (TAO_EC_ProxyPushSupplier *supplier,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  supplier->connected (this->consumer_, ACE_TRY_ENV);
-  ACE_CHECK;
-  this->consumer_->connected (supplier, ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-// ****************************************************************
-
-void
-TAO_EC_Reconnect_Consumer::work (TAO_EC_ProxyPushSupplier *supplier,
-                                 CORBA::Environment &ACE_TRY_ENV)
-{
-  supplier->reconnected (this->consumer_, ACE_TRY_ENV);
-  ACE_CHECK;
-  this->consumer_->reconnected (supplier, ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-// ****************************************************************
-
-void
-TAO_EC_Disconnect_Consumer::work (TAO_EC_ProxyPushSupplier *supplier,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  supplier->disconnected (this->consumer_, ACE_TRY_ENV);
-  ACE_CHECK;
-  this->consumer_->disconnected (supplier, ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-// ****************************************************************
-
-void
-TAO_EC_Shutdown_Supplier::work (TAO_EC_ProxyPushSupplier *supplier,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_TRY
-    {
-      supplier->shutdown (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // Ignore exceptions
-    }
-  ACE_ENDTRY;
-}
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_EC_Worker<TAO_EC_ProxyPushSupplier>;
+template class TAO_ESF_Peer_Admin<TAO_EC_Event_Channel,TAO_EC_ProxyPushSupplier,TAO_EC_ProxyPushConsumer>;
+template class TAO_ESF_Proxy_Admin<TAO_EC_Event_Channel,TAO_EC_ProxyPushSupplier>;
+template class TAO_ESF_Worker<TAO_EC_ProxyPushSupplier>;
+template class TAO_ESF_Shutdown_Proxy<TAO_EC_ProxyPushSupplier>;
+template class TAO_ESF_Peer_Connected<TAO_EC_ProxyPushSupplier,TAO_EC_ProxyPushConsumer>;
+template class TAO_ESF_Peer_Reconnected<TAO_EC_ProxyPushSupplier,TAO_EC_ProxyPushConsumer>;
+template class TAO_ESF_Peer_Disconnected<TAO_EC_ProxyPushSupplier,TAO_EC_ProxyPushConsumer>;
 
 #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_EC_Worker<TAO_EC_ProxyPushSupplier>
+#pragma instantiate TAO_ESF_Peer_Admin<TAO_EC_Event_Channel,TAO_EC_ProxyPushSupplier,TAO_EC_ProxyPushConsumer>
+#pragma instantiate TAO_ESF_Proxy_Admin<TAO_EC_Event_Channel,TAO_EC_ProxyPushSupplier>
+#pragma instantiate TAO_ESF_Worker<TAO_EC_ProxyPushSupplier>
+#pragma instantiate TAO_ESF_Shutdown_Proxy<TAO_EC_ProxyPushSupplier>
+#pragma instantiate TAO_ESF_Peer_Connected<TAO_EC_ProxyPushSupplier,TAO_EC_ProxyPushConsumer>
+#pragma instantiate TAO_ESF_Peer_Reconnected<TAO_EC_ProxyPushSupplier,TAO_EC_ProxyPushConsumer>
+#pragma instantiate TAO_ESF_Peer_Disconnected<TAO_EC_ProxyPushSupplier,TAO_EC_ProxyPushConsumer>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
index 74dd1fa746d..746d14e2777 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
@@ -25,21 +25,21 @@
 #define TAO_EC_CONSUMERADMIN_H
 #include "ace/pre.h"
 
-#include "orbsvcs/RtecEventChannelAdminS.h"
-#include "event_export.h"
+#include "EC_ProxySupplier.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "EC_Proxy_Collection.h"
-#include "EC_Worker.h"
+#include "orbsvcs/ESF/ESF_Peer_Admin.h"
+#include "event_export.h"
 
 class TAO_EC_Event_Channel;
-class TAO_EC_ProxyPushSupplier;
 class TAO_EC_ProxyPushConsumer;
 
-class TAO_RTEvent_Export TAO_EC_ConsumerAdmin : public POA_RtecEventChannelAdmin::ConsumerAdmin
+class TAO_RTEvent_Export TAO_EC_ConsumerAdmin
+  : public POA_RtecEventChannelAdmin::ConsumerAdmin
+  , public TAO_ESF_Peer_Admin<TAO_EC_Event_Channel,TAO_EC_ProxyPushSupplier,TAO_EC_ProxyPushConsumer> 
 {
   // = TITLE
   //   ConsumerAdmin
@@ -68,32 +68,6 @@ public:
   virtual ~TAO_EC_ConsumerAdmin (void);
   // destructor...
 
-  void for_each (TAO_EC_Worker<TAO_EC_ProxyPushSupplier> *worker,
-                 CORBA::Environment &ACE_TRY_ENV);
-  // For each elements call <worker->work()>.
-
-  virtual void connected (TAO_EC_ProxyPushConsumer*,
-                          CORBA::Environment&);
-  virtual void reconnected (TAO_EC_ProxyPushConsumer*,
-                            CORBA::Environment&);
-  virtual void disconnected (TAO_EC_ProxyPushConsumer*,
-                             CORBA::Environment&);
-  // Used to inform the EC that a Consumer has connected or
-  // disconnected from it.
-
-  virtual void connected (TAO_EC_ProxyPushSupplier*,
-                          CORBA::Environment&);
-  virtual void reconnected (TAO_EC_ProxyPushSupplier*,
-                            CORBA::Environment&);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier*,
-                             CORBA::Environment&);
-  // Used to inform the EC that a Supplier has connected or
-  // disconnected from it.
-
-  virtual void shutdown (CORBA::Environment&);
-  // The event channel is shutting down, inform all the consumers of
-  // this
-
   // = The RtecEventChannelAdmin::ConsumerAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr
       obtain_push_supplier (CORBA::Environment &)
@@ -103,95 +77,10 @@ public:
   virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env);
 
 private:
-  TAO_EC_Event_Channel *event_channel_;
-  // The Event Channel we belong to
-
-  typedef TAO_EC_Proxy_Collection<TAO_EC_ProxyPushSupplier> Collection;
-
-  Collection *collection_;
-  // The supplier container.
-
   PortableServer::POA_var default_POA_;
   // Store the default POA.
 };
 
-// ****************************************************************
-
-class TAO_EC_Connect_Consumer : public TAO_EC_Worker<TAO_EC_ProxyPushSupplier>
-{
-  // = TITLE
-  //   TAO_EC_Connect_Consumer
-  //
-  // = DESCRIPTION
-  //   Worker class to connect the ProxyPushConsumer objects with all
-  //   the ProxyPushSupplier objects in the collection.
-  //
-public:
-  TAO_EC_Connect_Consumer (TAO_EC_ProxyPushConsumer *consumer);
-  // Constructor
-
-  void work (TAO_EC_ProxyPushSupplier *supplier,
-             CORBA::Environment &ACE_TRY_ENV);
-
-private:
-  TAO_EC_ProxyPushConsumer *consumer_;
-};
-
-// ****************************************************************
-
-class TAO_EC_Reconnect_Consumer : public TAO_EC_Worker<TAO_EC_ProxyPushSupplier>
-{
-  // = TITLE
-  //   TAO_EC_Reconnect_Consumer
-  //
-  // = DESCRIPTION
-  //   Worker class to reconnect the ProxyPushConsumer objects with all
-  //   the ProxyPushSupplier objects in the collection.
-  //
-public:
-  TAO_EC_Reconnect_Consumer (TAO_EC_ProxyPushConsumer *consumer);
-  // Constructor
-
-  void work (TAO_EC_ProxyPushSupplier *supplier,
-             CORBA::Environment &ACE_TRY_ENV);
-
-private:
-  TAO_EC_ProxyPushConsumer *consumer_;
-};
-
-// ****************************************************************
-
-class TAO_EC_Disconnect_Consumer : public TAO_EC_Worker<TAO_EC_ProxyPushSupplier>
-{
-  // = TITLE
-  //   TAO_EC_Disconnect_Consumer
-  //
-  // = DESCRIPTION
-  //   Worker class to disconnect the ProxyPushConsumer objects with all
-  //   the ProxyPushSupplier objects in the collection.
-  //
-public:
-  TAO_EC_Disconnect_Consumer (TAO_EC_ProxyPushConsumer *consumer);
-  // Constructor
-
-  void work (TAO_EC_ProxyPushSupplier *supplier,
-             CORBA::Environment &ACE_TRY_ENV);
-
-private:
-  TAO_EC_ProxyPushConsumer *consumer_;
-};
-
-// ****************************************************************
-
-class TAO_EC_Shutdown_Supplier : public TAO_EC_Worker<TAO_EC_ProxyPushSupplier>
-{
-public:
-  TAO_EC_Shutdown_Supplier (void);
-
-  void work (TAO_EC_ProxyPushSupplier *supplier,
-             CORBA::Environment &ACE_TRY_ENV);
-};
-
 #if defined (__ACE_INLINE__)
 #include "EC_ConsumerAdmin.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i
index 33c51235be2..cfa1da318d3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i
@@ -1,43 +1 @@
 // $Id$
-
-ACE_INLINE void
-TAO_EC_ConsumerAdmin::
-    for_each (TAO_EC_Worker<TAO_EC_ProxyPushSupplier> *worker,
-              CORBA::Environment &ACE_TRY_ENV)
-{
-  this->collection_->for_each (worker, ACE_TRY_ENV);
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_EC_Connect_Consumer::
-    TAO_EC_Connect_Consumer (TAO_EC_ProxyPushConsumer *consumer)
-      :  consumer_ (consumer)
-{
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_EC_Reconnect_Consumer::
-    TAO_EC_Reconnect_Consumer (TAO_EC_ProxyPushConsumer *consumer)
-      :  consumer_ (consumer)
-{
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_EC_Disconnect_Consumer::
-    TAO_EC_Disconnect_Consumer (TAO_EC_ProxyPushConsumer *consumer)
-      :  consumer_ (consumer)
-{
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_EC_Shutdown_Supplier::TAO_EC_Shutdown_Supplier (void)
-{
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
index f2c091de83b..ee427a42c0f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
@@ -15,14 +15,19 @@
 #include "EC_ObserverStrategy.h"
 #include "EC_Null_Scheduling.h"
 #include "EC_Priority_Scheduling.h"
-#include "EC_Proxy_Collection.h"
-#include "EC_Copy_On_Write.h"
-#include "EC_Concrete_Proxy_Set.h"
-#include "EC_Command.h" // Work around bug in GHS compiler
 #include "EC_Reactive_Timeout_Generator.h"
 #include "EC_Event_Channel.h"
 #include "EC_Reactive_ConsumerControl.h"
 #include "EC_Reactive_SupplierControl.h"
+
+#include "orbsvcs/ESF/ESF_Proxy_List.h"
+#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.h"
+#include "orbsvcs/ESF/ESF_Immediate_Changes.h"
+#include "orbsvcs/ESF/ESF_Copy_On_Read.h"
+#include "orbsvcs/ESF/ESF_Copy_On_Write.h"
+#include "orbsvcs/ESF/ESF_Delayed_Changes.h"
+#include "orbsvcs/ESF/ESF_Delayed_Command.h"
+
 #include "ace/Arg_Shifter.h"
 #include "ace/Sched_Params.h"
 
@@ -696,16 +701,16 @@ TAO_EC_Default_Factory::destroy_scheduling_strategy (TAO_EC_Scheduling_Strategy*
 
 // These typedefs workaround a SunCC 4.2 bug
 typedef
-    TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>::Iterator
+    TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>::Iterator
     TAO_EC_Consumer_List_Iterator;
 typedef
-    TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>::Iterator
+    TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>::Iterator
     TAO_EC_Consumer_RB_Tree_Iterator;
 typedef
-    TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>::Iterator
+    TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>::Iterator
     TAO_EC_Supplier_List_Iterator;
 typedef
-    TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>::Iterator
+    TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>::Iterator
     TAO_EC_Supplier_RB_Tree_Iterator;
 
 
@@ -713,83 +718,83 @@ TAO_EC_ProxyPushConsumer_Collection*
 TAO_EC_Default_Factory::create_proxy_push_consumer_collection (TAO_EC_Event_Channel *)
 {
   if (this->consumer_collection_ == 0x000)
-    return new TAO_EC_Immediate_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+    return new TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_SYNCH_MUTEX> ();
   else if (this->consumer_collection_ == 0x001)
-    return new TAO_EC_Copy_On_Read<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+    return new TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_SYNCH_MUTEX> ();
   else if (this->consumer_collection_ == 0x002)
-    return new TAO_EC_Copy_On_Write<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+    return new TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_SYNCH> ();
   else if (this->consumer_collection_ == 0x003)
-    return new TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+    return new TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_SYNCH> ();
   else if (this->consumer_collection_ == 0x010)
-    return new TAO_EC_Immediate_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+    return new TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_SYNCH_MUTEX> ();
   else if (this->consumer_collection_ == 0x011)
-    return new TAO_EC_Copy_On_Read<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+    return new TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_SYNCH_MUTEX> ();
   else if (this->consumer_collection_ == 0x012)
-    return new TAO_EC_Copy_On_Write<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+    return new TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_SYNCH> ();
   else if (this->consumer_collection_ == 0x013)
-    return new TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+    return new TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_SYNCH> ();
   else if (this->consumer_collection_ == 0x100)
-    return new TAO_EC_Immediate_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+    return new TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_Null_Mutex> ();
   else if (this->consumer_collection_ == 0x101)
-    return new TAO_EC_Copy_On_Read<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+    return new TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_Null_Mutex> ();
   else if (this->consumer_collection_ == 0x102)
-    return new TAO_EC_Copy_On_Write<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+    return new TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_NULL_SYNCH> ();
   else if (this->consumer_collection_ == 0x103)
-    return new TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+    return new TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_NULL_SYNCH> ();
   else if (this->consumer_collection_ == 0x110)
-    return new TAO_EC_Immediate_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+    return new TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_Null_Mutex> ();
   else if (this->consumer_collection_ == 0x111)
-    return new TAO_EC_Copy_On_Read<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+    return new TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_Null_Mutex> ();
   else if (this->consumer_collection_ == 0x112)
-    return new TAO_EC_Copy_On_Write<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+    return new TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_NULL_SYNCH> ();
   else if (this->consumer_collection_ == 0x113)
-    return new TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+    return new TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_NULL_SYNCH> ();
 
@@ -806,83 +811,83 @@ TAO_EC_ProxyPushSupplier_Collection*
 TAO_EC_Default_Factory::create_proxy_push_supplier_collection (TAO_EC_Event_Channel *)
 {
   if (this->supplier_collection_ == 0x000)
-    return new TAO_EC_Immediate_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+    return new TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_SYNCH_MUTEX> ();
   else if (this->supplier_collection_ == 0x001)
-    return new TAO_EC_Copy_On_Read<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+    return new TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_SYNCH_MUTEX> ();
   else if (this->supplier_collection_ == 0x002)
-    return new TAO_EC_Copy_On_Write<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+    return new TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_SYNCH> ();
   else if (this->supplier_collection_ == 0x003)
-    return new TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+    return new TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_SYNCH> ();
   else if (this->supplier_collection_ == 0x010)
-    return new TAO_EC_Immediate_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+    return new TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_SYNCH_MUTEX> ();
   else if (this->supplier_collection_ == 0x011)
-    return new TAO_EC_Copy_On_Read<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+    return new TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_SYNCH_MUTEX> ();
   else if (this->supplier_collection_ == 0x012)
-    return new TAO_EC_Copy_On_Write<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+    return new TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_SYNCH> ();
   else if (this->supplier_collection_ == 0x013)
-    return new TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+    return new TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_SYNCH> ();
   else if (this->supplier_collection_ == 0x100)
-    return new TAO_EC_Immediate_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+    return new TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_Null_Mutex> ();
   else if (this->supplier_collection_ == 0x101)
-    return new TAO_EC_Copy_On_Read<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+    return new TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_Null_Mutex> ();
   else if (this->supplier_collection_ == 0x102)
-    return new TAO_EC_Copy_On_Write<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+    return new TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_NULL_SYNCH> ();
   else if (this->supplier_collection_ == 0x103)
-    return new TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+    return new TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_NULL_SYNCH> ();
   else if (this->supplier_collection_ == 0x110)
-    return new TAO_EC_Immediate_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+    return new TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_Null_Mutex> ();
   else if (this->supplier_collection_ == 0x111)
-    return new TAO_EC_Copy_On_Read<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+    return new TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_Null_Mutex> ();
   else if (this->supplier_collection_ == 0x112)
-    return new TAO_EC_Copy_On_Write<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+    return new TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_NULL_SYNCH> ();
   else if (this->supplier_collection_ == 0x113)
-    return new TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+    return new TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_NULL_SYNCH> ();
 
@@ -997,9 +1002,9 @@ template class ACE_Node<ACE_Command_Base*>;
 template class ACE_Unbounded_Queue<ACE_Command_Base*>;
 template class ACE_Unbounded_Queue_Iterator<ACE_Command_Base*>;
 
-template class TAO_EC_Proxy_Collection<TAO_EC_ProxyPushConsumer>;
-template class TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>;
-template class TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>;
+template class TAO_ESF_Proxy_Collection<TAO_EC_ProxyPushConsumer>;
+template class TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>;
+template class TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>;
 template class ACE_Unbounded_Set<TAO_EC_ProxyPushConsumer *>;
 template class ACE_Node<TAO_EC_ProxyPushConsumer *>;
 template class ACE_Unbounded_Set_Iterator<TAO_EC_ProxyPushConsumer *>;
@@ -1009,24 +1014,24 @@ template class ACE_RB_Tree_Reverse_Iterator<TAO_EC_ProxyPushConsumer *, int, ACE
 template class ACE_RB_Tree_Iterator_Base<TAO_EC_ProxyPushConsumer *, int, ACE_Less_Than<TAO_EC_ProxyPushConsumer *>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Node<TAO_EC_ProxyPushConsumer *, int>;
 template class ACE_Less_Than<TAO_EC_ProxyPushConsumer *>;
-template class TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<TAO_EC_ProxyPushConsumer>;
+template class TAO_ESF_Proxy_RB_Tree_Iterator<TAO_EC_ProxyPushConsumer>;
 
-template class TAO_EC_Copy_On_Write_Collection<
-    TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Copy_On_Write_Collection<
+    TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
     TAO_EC_Consumer_List_Iterator >;
-template class TAO_EC_Copy_On_Write_Collection<
-    TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Copy_On_Write_Collection<
+    TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
     TAO_EC_Supplier_List_Iterator >;
-template class TAO_EC_Copy_On_Write_Collection<
-    TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Copy_On_Write_Collection<
+    TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
     TAO_EC_Consumer_RB_Tree_Iterator >;
-template class TAO_EC_Copy_On_Write_Collection<
-    TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Copy_On_Write_Collection<
+    TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
     TAO_EC_Supplier_RB_Tree_Iterator >;
 
-template class TAO_EC_Proxy_Collection<TAO_EC_ProxyPushSupplier>;
-template class TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>;
-template class TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>;
+template class TAO_ESF_Proxy_Collection<TAO_EC_ProxyPushSupplier>;
+template class TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>;
+template class TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>;
 template class ACE_Unbounded_Set<TAO_EC_ProxyPushSupplier *>;
 template class ACE_Node<TAO_EC_ProxyPushSupplier *>;
 template class ACE_Unbounded_Set_Iterator<TAO_EC_ProxyPushSupplier *>;
@@ -1036,7 +1041,7 @@ template class ACE_RB_Tree_Iterator_Base<TAO_EC_ProxyPushSupplier *, int, ACE_Le
 template class ACE_RB_Tree_Reverse_Iterator<TAO_EC_ProxyPushSupplier *, int, ACE_Less_Than<TAO_EC_ProxyPushSupplier *>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Node<TAO_EC_ProxyPushSupplier *, int>;
 template class ACE_Less_Than<TAO_EC_ProxyPushSupplier *>;
-template class TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<TAO_EC_ProxyPushSupplier>;
+template class TAO_ESF_Proxy_RB_Tree_Iterator<TAO_EC_ProxyPushSupplier>;
 
 #if defined (ACE_HAS_THREADS)
 //
@@ -1046,455 +1051,449 @@ template class TAO_EC_RB_Tree_Based_Proxy_Set_Iterator<TAO_EC_ProxyPushSupplier>
 // We *cannot* use explicit ACE_Synch classes because that will not
 // compile in platforms without threads.
 //
-template class TAO_EC_Immediate_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_SYNCH_MUTEX>;
-template class TAO_EC_Copy_On_Read<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
      TAO_EC_Consumer_List_Iterator,
       ACE_SYNCH_MUTEX>;
-template class TAO_EC_Copy_On_Write<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_SYNCH>;
-template class TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_SYNCH>;
-template class TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_SYNCH> >;
-template class ACE_Guard< TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_SYNCH> > >;
-template class TAO_EC_Connected_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Connected_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_SYNCH>,TAO_EC_ProxyPushConsumer >;
-template class TAO_EC_Reconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Reconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_SYNCH>,TAO_EC_ProxyPushConsumer >;
-template class TAO_EC_Disconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Disconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_SYNCH>,TAO_EC_ProxyPushConsumer >;
-template class TAO_EC_Shutdown_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Shutdown_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_SYNCH> >;
-template class TAO_EC_Immediate_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_SYNCH_MUTEX>;
-template class TAO_EC_Copy_On_Read<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_SYNCH_MUTEX>;
-template class TAO_EC_Copy_On_Write<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_SYNCH>;
-template class TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_SYNCH>;
-template class TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_SYNCH> >;
-template class ACE_Guard< TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_SYNCH> > >;
-template class TAO_EC_Connected_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Connected_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_SYNCH>,TAO_EC_ProxyPushConsumer >;
-template class TAO_EC_Reconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Reconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_SYNCH>,TAO_EC_ProxyPushConsumer >;
-template class TAO_EC_Disconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Disconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_SYNCH>,TAO_EC_ProxyPushConsumer >;
-template class TAO_EC_Shutdown_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Shutdown_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_SYNCH> >;
 
-template class TAO_EC_Immediate_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_SYNCH_MUTEX>;
-template class TAO_EC_Copy_On_Read<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_SYNCH_MUTEX>;
-template class TAO_EC_Copy_On_Write<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_SYNCH>;
-template class TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_SYNCH>;
-template class TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_SYNCH> >;
-template class ACE_Guard< TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_SYNCH> > >;
-template class TAO_EC_Connected_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Connected_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_SYNCH>,TAO_EC_ProxyPushSupplier >;
-template class TAO_EC_Reconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Reconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_SYNCH>,TAO_EC_ProxyPushSupplier >;
-template class TAO_EC_Disconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Disconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_SYNCH>,TAO_EC_ProxyPushSupplier >;
-template class TAO_EC_Shutdown_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Shutdown_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_SYNCH> >;
-template class TAO_EC_Immediate_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_SYNCH_MUTEX>;
-template class TAO_EC_Copy_On_Read<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_SYNCH_MUTEX>;
-template class TAO_EC_Copy_On_Write<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_SYNCH>;
-template class TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_SYNCH>;
-template class TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_SYNCH> >;
-template class ACE_Guard< TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_SYNCH> > >;
-template class TAO_EC_Connected_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Connected_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_SYNCH>,TAO_EC_ProxyPushSupplier >;
-template class TAO_EC_Reconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Reconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_SYNCH>,TAO_EC_ProxyPushSupplier >;
-template class TAO_EC_Disconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Disconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_SYNCH>,TAO_EC_ProxyPushSupplier >;
-template class TAO_EC_Shutdown_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Shutdown_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_SYNCH> >;
 
-template class TAO_EC_Copy_On_Write_Read_Guard<
-    TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Copy_On_Write_Read_Guard<
+    TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
     TAO_EC_Consumer_List_Iterator,
         ACE_SYNCH_MUTEX>;
-template class TAO_EC_Copy_On_Write_Read_Guard<
-    TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Copy_On_Write_Read_Guard<
+    TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
     TAO_EC_Supplier_List_Iterator,
         ACE_SYNCH_MUTEX>;
-template class TAO_EC_Copy_On_Write_Read_Guard<
-    TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Copy_On_Write_Read_Guard<
+    TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
     TAO_EC_Consumer_RB_Tree_Iterator,
         ACE_SYNCH_MUTEX>;
-template class TAO_EC_Copy_On_Write_Read_Guard<
-    TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Copy_On_Write_Read_Guard<
+    TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
     TAO_EC_Supplier_RB_Tree_Iterator,
         ACE_SYNCH_MUTEX>;
-template class TAO_EC_Copy_On_Write_Write_Guard<
-    TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Copy_On_Write_Write_Guard<
+    TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
     TAO_EC_Consumer_List_Iterator,
         ACE_SYNCH>;
-template class TAO_EC_Copy_On_Write_Write_Guard<
-    TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Copy_On_Write_Write_Guard<
+    TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
     TAO_EC_Supplier_List_Iterator,
         ACE_SYNCH>;
-template class TAO_EC_Copy_On_Write_Write_Guard<
-    TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Copy_On_Write_Write_Guard<
+    TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
     TAO_EC_Consumer_RB_Tree_Iterator,
         ACE_SYNCH>;
-template class TAO_EC_Copy_On_Write_Write_Guard<
-    TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Copy_On_Write_Write_Guard<
+    TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
     TAO_EC_Supplier_RB_Tree_Iterator,
         ACE_SYNCH>;
 
 #endif /* ACE_HAS_THREADS */
 
-template class TAO_EC_Immediate_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_Null_Mutex>;
-template class TAO_EC_Copy_On_Read<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_Null_Mutex>;
-template class TAO_EC_Copy_On_Write<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_NULL_SYNCH>;
-template class TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_NULL_SYNCH>;
-template class TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_NULL_SYNCH> >;
-template class ACE_Guard< TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_NULL_SYNCH> > >;
-template class TAO_EC_Connected_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Connected_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_NULL_SYNCH>,TAO_EC_ProxyPushConsumer >;
-template class TAO_EC_Reconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Reconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_NULL_SYNCH>,TAO_EC_ProxyPushConsumer >;
-template class TAO_EC_Disconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Disconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_NULL_SYNCH>,TAO_EC_ProxyPushConsumer >;
-template class TAO_EC_Shutdown_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Shutdown_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_NULL_SYNCH> >;
-template class TAO_EC_Immediate_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_Null_Mutex>;
-template class TAO_EC_Copy_On_Read<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_Null_Mutex>;
-template class TAO_EC_Copy_On_Write<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_NULL_SYNCH>;
-template class TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_NULL_SYNCH>;
-template class TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_NULL_SYNCH> >;
-template class ACE_Guard< TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_NULL_SYNCH> > >;
-template class TAO_EC_Connected_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Connected_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_NULL_SYNCH>,TAO_EC_ProxyPushConsumer >;
-template class TAO_EC_Reconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Reconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_NULL_SYNCH>,TAO_EC_ProxyPushConsumer >;
-template class TAO_EC_Disconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Disconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_NULL_SYNCH>,TAO_EC_ProxyPushConsumer >;
-template class TAO_EC_Shutdown_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Shutdown_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_RB_Tree_Iterator,
       ACE_NULL_SYNCH> >;
 
-template class TAO_EC_Immediate_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_Null_Mutex>;
-template class TAO_EC_Copy_On_Read<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_Null_Mutex>;
-template class TAO_EC_Copy_On_Write<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_NULL_SYNCH>;
-template class TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_NULL_SYNCH>;
-template class TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_NULL_SYNCH> >;
-template class ACE_Guard< TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_NULL_SYNCH> > >;
-template class TAO_EC_Connected_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Connected_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_NULL_SYNCH>,TAO_EC_ProxyPushSupplier >;
-template class TAO_EC_Reconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Reconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_NULL_SYNCH>,TAO_EC_ProxyPushSupplier >;
-template class TAO_EC_Disconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Disconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_NULL_SYNCH>,TAO_EC_ProxyPushSupplier >;
-template class TAO_EC_Shutdown_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Shutdown_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_NULL_SYNCH> >;
-template class TAO_EC_Immediate_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_Null_Mutex>;
-template class TAO_EC_Copy_On_Read<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_Null_Mutex>;
-template class TAO_EC_Copy_On_Write<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_NULL_SYNCH>;
-template class TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_NULL_SYNCH>;
-template class TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_NULL_SYNCH> >;
-template class ACE_Guard< TAO_EC_Busy_Lock_Adapter<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_NULL_SYNCH> > >;
-template class TAO_EC_Connected_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Connected_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_NULL_SYNCH>,TAO_EC_ProxyPushSupplier >;
-template class TAO_EC_Reconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Reconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_NULL_SYNCH>,TAO_EC_ProxyPushSupplier >;
-template class TAO_EC_Disconnected_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Disconnected_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_NULL_SYNCH>,TAO_EC_ProxyPushSupplier >;
-template class TAO_EC_Shutdown_Command<
-  TAO_EC_Delayed_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Shutdown_Command<
+  TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_RB_Tree_Iterator,
       ACE_NULL_SYNCH> >;
 
-template class TAO_EC_Copy_On_Write_Read_Guard<
-    TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Copy_On_Write_Read_Guard<
+    TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
     TAO_EC_Consumer_List_Iterator,
         ACE_Null_Mutex>;
-template class TAO_EC_Copy_On_Write_Read_Guard<
-    TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Copy_On_Write_Read_Guard<
+    TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
     TAO_EC_Supplier_List_Iterator,
         ACE_Null_Mutex>;
-template class TAO_EC_Copy_On_Write_Read_Guard<
-    TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Copy_On_Write_Read_Guard<
+    TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
     TAO_EC_Consumer_RB_Tree_Iterator,
         ACE_Null_Mutex>;
-template class TAO_EC_Copy_On_Write_Read_Guard<
-    TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Copy_On_Write_Read_Guard<
+    TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
     TAO_EC_Supplier_RB_Tree_Iterator,
         ACE_Null_Mutex>;
-template class TAO_EC_Copy_On_Write_Write_Guard<
-    TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Copy_On_Write_Write_Guard<
+    TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
     TAO_EC_Consumer_List_Iterator,
         ACE_NULL_SYNCH>;
-template class TAO_EC_Copy_On_Write_Write_Guard<
-    TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Copy_On_Write_Write_Guard<
+    TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
     TAO_EC_Supplier_List_Iterator,
         ACE_NULL_SYNCH>;
-template class TAO_EC_Copy_On_Write_Write_Guard<
-    TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+template class TAO_ESF_Copy_On_Write_Write_Guard<
+    TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>,
     TAO_EC_Consumer_RB_Tree_Iterator,
         ACE_NULL_SYNCH>;
-template class TAO_EC_Copy_On_Write_Write_Guard<
-    TAO_EC_RB_Tree_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+template class TAO_ESF_Copy_On_Write_Write_Guard<
+    TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>,
     TAO_EC_Supplier_RB_Tree_Iterator,
         ACE_NULL_SYNCH>;
 
 #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate ACE_Node<ACE_Command_Base*>
-#pragma instantiate ACE_Unbounded_Queue<ACE_Command_Base*>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_Command_Base*>
-#pragma instantiate TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>
-#pragma instantiate TAO_EC_RB_Tree_Proxy_Set<TAO_EC_ProxyPushConsumer>
-#pragma instantiate TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>
-#pragma instantiate TAO_EC_RB_Tree_Proxy_Set<TAO_EC_ProxyPushSupplier>
+// @@ TODO!!!
 
 #if defined (ACE_HAS_THREADS)
 #endif /* ACE_HAS_THREADS */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
index 30625c1b2f8..623b6a6100b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
@@ -147,7 +147,7 @@ void
 TAO_EC_Event_Channel::connected (TAO_EC_ProxyPushConsumer* consumer,
                                  CORBA::Environment &ACE_TRY_ENV)
 {
-  this->consumer_admin_->connected (consumer, ACE_TRY_ENV);
+  this->consumer_admin_->peer_connected (consumer, ACE_TRY_ENV);
   ACE_CHECK;
   this->supplier_admin_->connected (consumer, ACE_TRY_ENV);
   ACE_CHECK;
@@ -159,7 +159,7 @@ void
 TAO_EC_Event_Channel::reconnected (TAO_EC_ProxyPushConsumer* consumer,
                                    CORBA::Environment &ACE_TRY_ENV)
 {
-  this->consumer_admin_->reconnected (consumer, ACE_TRY_ENV);
+  this->consumer_admin_->peer_reconnected (consumer, ACE_TRY_ENV);
   ACE_CHECK;
   this->supplier_admin_->reconnected (consumer, ACE_TRY_ENV);
   ACE_CHECK;
@@ -171,7 +171,7 @@ void
 TAO_EC_Event_Channel::disconnected (TAO_EC_ProxyPushConsumer* consumer,
                                     CORBA::Environment &ACE_TRY_ENV)
 {
-  this->consumer_admin_->disconnected (consumer, ACE_TRY_ENV);
+  this->consumer_admin_->peer_disconnected (consumer, ACE_TRY_ENV);
   ACE_CHECK;
   this->supplier_admin_->disconnected (consumer, ACE_TRY_ENV);
   ACE_CHECK;
@@ -183,7 +183,7 @@ void
 TAO_EC_Event_Channel::connected (TAO_EC_ProxyPushSupplier* supplier,
                                  CORBA::Environment &ACE_TRY_ENV)
 {
-  this->supplier_admin_->connected (supplier, ACE_TRY_ENV);
+  this->supplier_admin_->peer_connected (supplier, ACE_TRY_ENV);
   ACE_CHECK;
   this->consumer_admin_->connected (supplier, ACE_TRY_ENV);
   ACE_CHECK;
@@ -195,7 +195,7 @@ void
 TAO_EC_Event_Channel::reconnected (TAO_EC_ProxyPushSupplier* supplier,
                                    CORBA::Environment &ACE_TRY_ENV)
 {
-  this->supplier_admin_->reconnected (supplier, ACE_TRY_ENV);
+  this->supplier_admin_->peer_reconnected (supplier, ACE_TRY_ENV);
   ACE_CHECK;
   this->consumer_admin_->reconnected (supplier, ACE_TRY_ENV);
   ACE_CHECK;
@@ -207,7 +207,7 @@ void
 TAO_EC_Event_Channel::disconnected (TAO_EC_ProxyPushSupplier* supplier,
                                     CORBA::Environment &ACE_TRY_ENV)
 {
-  this->supplier_admin_->disconnected (supplier, ACE_TRY_ENV);
+  this->supplier_admin_->peer_disconnected (supplier, ACE_TRY_ENV);
   ACE_CHECK;
   this->consumer_admin_->disconnected (supplier, ACE_TRY_ENV);
   ACE_CHECK;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
index 910c6d650db..7622b115245 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
@@ -155,23 +155,23 @@ public:
   // Access the client control strategies.
 
   // = The factory methods, they delegate on the EC_Factory.
-  TAO_EC_ProxyPushSupplier* create_proxy_push_supplier (void);
-  void destroy_proxy_push_supplier (TAO_EC_ProxyPushSupplier*);
+  void create_proxy (TAO_EC_ProxyPushSupplier*&);
+  void destroy_proxy (TAO_EC_ProxyPushSupplier*);
   // Create and destroy a ProxyPushSupplier
 
-  TAO_EC_ProxyPushConsumer* create_proxy_push_consumer (void);
-  void destroy_proxy_push_consumer (TAO_EC_ProxyPushConsumer*);
+  void create_proxy (TAO_EC_ProxyPushConsumer*&);
+  void destroy_proxy (TAO_EC_ProxyPushConsumer*);
   // Create and destroy a ProxyPushConsumer
 
-  TAO_EC_ProxyPushSupplier_Collection*
-      create_proxy_push_supplier_collection (void);
-  void destroy_proxy_push_supplier_collection (TAO_EC_ProxyPushSupplier_Collection*);
+
+  void create_proxy_collection (TAO_EC_ProxyPushSupplier_Collection*&);
+  void destroy_proxy_collection (TAO_EC_ProxyPushSupplier_Collection*);
   // Create and destroy a the collections used to store
   // ProxyPushSuppliers
 
-  TAO_EC_ProxyPushConsumer_Collection*
-      create_proxy_push_consumer_collection (void);
-  void destroy_proxy_push_consumer_collection (TAO_EC_ProxyPushConsumer_Collection*);
+
+  void create_proxy_collection (TAO_EC_ProxyPushConsumer_Collection*&);
+  void destroy_proxy_collection (TAO_EC_ProxyPushConsumer_Collection*);
   // Create and destroy a the collections used to store
   // ProxyPushConsumers
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.i b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.i
index 93c1b7585e4..f76477765c5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.i
@@ -69,52 +69,52 @@ TAO_EC_Event_Channel::supplier_control (void) const
   return this->supplier_control_;
 }
 
-ACE_INLINE TAO_EC_ProxyPushSupplier*
-TAO_EC_Event_Channel::create_proxy_push_supplier (void)
+ACE_INLINE void
+TAO_EC_Event_Channel::create_proxy (TAO_EC_ProxyPushSupplier*& x)
 {
-  return this->factory_->create_proxy_push_supplier (this);
+  x = this->factory_->create_proxy_push_supplier (this);
 }
 
 ACE_INLINE void
-TAO_EC_Event_Channel::destroy_proxy_push_supplier (TAO_EC_ProxyPushSupplier* supplier)
+TAO_EC_Event_Channel::destroy_proxy (TAO_EC_ProxyPushSupplier* supplier)
 {
   this->factory_->destroy_proxy_push_supplier (supplier);
 }
 
-ACE_INLINE TAO_EC_ProxyPushConsumer*
-TAO_EC_Event_Channel::create_proxy_push_consumer (void)
+ACE_INLINE void
+TAO_EC_Event_Channel::create_proxy (TAO_EC_ProxyPushConsumer*& x)
 {
-  return this->factory_->create_proxy_push_consumer (this);
+  x = this->factory_->create_proxy_push_consumer (this);
 }
 
-ACE_INLINE TAO_EC_ProxyPushConsumer_Collection*
-TAO_EC_Event_Channel::create_proxy_push_consumer_collection (void)
+ACE_INLINE void
+TAO_EC_Event_Channel::destroy_proxy (TAO_EC_ProxyPushConsumer* consumer)
 {
-  return this->factory_->create_proxy_push_consumer_collection (this);
+  this->factory_->destroy_proxy_push_consumer (consumer);
 }
 
 ACE_INLINE void
-TAO_EC_Event_Channel::destroy_proxy_push_consumer_collection (TAO_EC_ProxyPushConsumer_Collection* x)
+TAO_EC_Event_Channel::create_proxy_collection (TAO_EC_ProxyPushConsumer_Collection*& x)
 {
-  this->factory_->destroy_proxy_push_consumer_collection (x);
+  x = this->factory_->create_proxy_push_consumer_collection (this);
 }
 
-ACE_INLINE TAO_EC_ProxyPushSupplier_Collection*
-TAO_EC_Event_Channel::create_proxy_push_supplier_collection (void)
+ACE_INLINE void
+TAO_EC_Event_Channel::destroy_proxy_collection (TAO_EC_ProxyPushConsumer_Collection* x)
 {
-  return this->factory_->create_proxy_push_supplier_collection (this);
+  this->factory_->destroy_proxy_push_consumer_collection (x);
 }
 
 ACE_INLINE void
-TAO_EC_Event_Channel::destroy_proxy_push_supplier_collection (TAO_EC_ProxyPushSupplier_Collection* x)
+TAO_EC_Event_Channel::create_proxy_collection (TAO_EC_ProxyPushSupplier_Collection*& x)
 {
-  this->factory_->destroy_proxy_push_supplier_collection (x);
+  x = this->factory_->create_proxy_push_supplier_collection (this);
 }
 
 ACE_INLINE void
-TAO_EC_Event_Channel::destroy_proxy_push_consumer (TAO_EC_ProxyPushConsumer* consumer)
+TAO_EC_Event_Channel::destroy_proxy_collection (TAO_EC_ProxyPushSupplier_Collection* x)
 {
-  this->factory_->destroy_proxy_push_consumer (consumer);
+  this->factory_->destroy_proxy_push_supplier_collection (x);
 }
 
 ACE_INLINE PortableServer::POA_ptr
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
index 4a2e7076fe8..e39e421cd06 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
@@ -47,14 +47,14 @@ class TAO_EC_SupplierAdmin;
 class TAO_EC_ProxyPushConsumer;
 class TAO_EC_ProxyPushSupplier;
 class TAO_EC_ObserverStrategy;
-template<class PROXY> class TAO_EC_Proxy_Collection;
+template<class PROXY> class TAO_ESF_Proxy_Collection;
 class TAO_EC_Timeout_Generator;
 class TAO_EC_Scheduling_Strategy;
 class TAO_EC_ConsumerControl;
 class TAO_EC_SupplierControl;
 
-typedef TAO_EC_Proxy_Collection<TAO_EC_ProxyPushConsumer> TAO_EC_ProxyPushConsumer_Collection;
-typedef TAO_EC_Proxy_Collection<TAO_EC_ProxyPushSupplier> TAO_EC_ProxyPushSupplier_Collection;
+typedef TAO_ESF_Proxy_Collection<TAO_EC_ProxyPushConsumer> TAO_EC_ProxyPushConsumer_Collection;
+typedef TAO_ESF_Proxy_Collection<TAO_EC_ProxyPushSupplier> TAO_EC_ProxyPushSupplier_Collection;
 
 class TAO_RTEvent_Export TAO_EC_Factory : public ACE_Service_Object
 {
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
index e4744af803f..945fe718be8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
@@ -10,11 +10,11 @@
 #include "EC_ProxySupplier.h"
 #include "EC_ObserverStrategy.h"
 #include "EC_Null_Scheduling.h"
-#include "EC_Concrete_Proxy_Set.h"
-#include "EC_Proxy_Collection.h"
 #include "EC_Reactive_Timeout_Generator.h"
 #include "EC_ConsumerControl.h"
 #include "EC_SupplierControl.h"
+#include "orbsvcs/ESF/ESF_Proxy_List.h"
+#include "orbsvcs/ESF/ESF_Immediate_Changes.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "EC_Null_Factory.i"
@@ -155,9 +155,9 @@ TAO_EC_ProxyPushConsumer_Collection*
 TAO_EC_Null_Factory::create_proxy_push_consumer_collection (TAO_EC_Event_Channel *)
 {
   // This typedef is a workaround for a SunCC 4.2 bug
-  typedef TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>::Iterator TAO_EC_Consumer_List_Iterator;
-  return new TAO_EC_Immediate_Changes<TAO_EC_ProxyPushConsumer,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushConsumer>,
+  typedef TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>::Iterator TAO_EC_Consumer_List_Iterator;
+  return new TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushConsumer,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_EC_Consumer_List_Iterator,
       ACE_Null_Mutex> ();
 }
@@ -172,9 +172,9 @@ TAO_EC_ProxyPushSupplier_Collection*
 TAO_EC_Null_Factory::create_proxy_push_supplier_collection (TAO_EC_Event_Channel *)
 {
   // This typedef is a workaround for a SunCC 4.2 bug
-  typedef TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>::Iterator TAO_EC_Supplier_List_Iterator;
-  return new TAO_EC_Immediate_Changes<TAO_EC_ProxyPushSupplier,
-      TAO_EC_List_Based_Proxy_Set<TAO_EC_ProxyPushSupplier>,
+  typedef TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>::Iterator TAO_EC_Supplier_List_Iterator;
+  return new TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushSupplier,
+      TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_EC_Supplier_List_Iterator,
       ACE_Null_Mutex> ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
index 254fdbeaf9c..682c4f724d6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
@@ -26,7 +26,7 @@
 #define TAO_EC_OBSERVERSTRATEGY_H
 #include "ace/pre.h"
 
-#include "EC_Worker.h"
+#include "orbsvcs/ESF/ESF_Worker.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -252,7 +252,7 @@ protected:
 
 // ****************************************************************
 
-class TAO_EC_Accumulate_Supplier_Headers : public TAO_EC_Worker<TAO_EC_ProxyPushSupplier>
+class TAO_EC_Accumulate_Supplier_Headers : public TAO_ESF_Worker<TAO_EC_ProxyPushSupplier>
 {
 public:
   TAO_EC_Accumulate_Supplier_Headers (TAO_EC_Basic_ObserverStrategy::Headers &headers);
@@ -267,7 +267,7 @@ private:
 
 // ****************************************************************
 
-class TAO_EC_Accumulate_Consumer_Headers : public TAO_EC_Worker<TAO_EC_ProxyPushConsumer>
+class TAO_EC_Accumulate_Consumer_Headers : public TAO_ESF_Worker<TAO_EC_ProxyPushConsumer>
 {
 public:
   TAO_EC_Accumulate_Consumer_Headers (TAO_EC_Basic_ObserverStrategy::Headers &headers);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
index 94f456de3ab..78141e2bc4e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
@@ -5,8 +5,10 @@
 #include "EC_ProxySupplier.h"
 #include "EC_ProxyConsumer.h"
 #include "EC_Scheduling_Strategy.h"
-#include "EC_Proxy_Collection.h"
 #include "EC_QOS_Info.h"
+
+#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
+
 #include "orbsvcs/Event_Service_Constants.h"
 
 #if ! defined (__ACE_INLINE__)
@@ -21,8 +23,7 @@ TAO_EC_Per_Supplier_Filter::
      consumer_ (0),
      refcnt_ (1)
 {
-  this->collection_ =
-    this->event_channel_->create_proxy_push_supplier_collection ();
+  this->event_channel_->create_proxy_collection (this->collection_);
   // @@
   // @@ this->collection_->busy_hwm (this->event_channel_->busy_hwm ());
   // @@ this->collection_->max_write_delay (
@@ -32,7 +33,7 @@ TAO_EC_Per_Supplier_Filter::
 
 TAO_EC_Per_Supplier_Filter::~TAO_EC_Per_Supplier_Filter (void)
 {
-  this->event_channel_->destroy_proxy_push_supplier_collection (this->collection_);
+  this->event_channel_->destroy_proxy_collection (this->collection_);
   this->collection_ = 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
index 73a21552344..1928251d427 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
@@ -34,7 +34,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-template<class PROXY> class TAO_EC_Proxy_Collection;
+template<class PROXY> class TAO_ESF_Proxy_Collection;
 
 class TAO_RTEvent_Export TAO_EC_Per_Supplier_Filter : public TAO_EC_Supplier_Filter
 {
@@ -78,7 +78,7 @@ private:
   TAO_EC_ProxyPushConsumer* consumer_;
   // The proxy for the supplier we are bound to.
 
-  TAO_EC_Proxy_Collection<TAO_EC_ProxyPushSupplier>* collection_;
+  TAO_ESF_Proxy_Collection<TAO_EC_ProxyPushSupplier>* collection_;
   // Keep the collection of proxies for the consumers that may be
   // interested in our events.
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
index f95c0167cf0..2652eaec36d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
@@ -214,6 +214,24 @@ TAO_EC_ProxyPushConsumer::cleanup_i (void)
   this->filter_ = 0;
 }
 
+RtecEventChannelAdmin::ProxyPushConsumer_ptr
+TAO_EC_ProxyPushConsumer::activate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC (())
+{
+  RtecEventChannelAdmin::ProxyPushConsumer_var result;
+  ACE_TRY
+    {
+      result =
+        this->_this (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      // Ignore exceptions...
+    }
+  ACE_ENDTRY;
+  return result._retn ();
+}
+
 void
 TAO_EC_ProxyPushConsumer::deactivate (CORBA::Environment &ACE_TRY_ENV)
 {
@@ -256,7 +274,7 @@ TAO_EC_ProxyPushConsumer::_decr_refcnt (void)
   }
 
   // Notify the event channel
-  this->event_channel_->destroy_proxy_push_consumer (this);
+  this->event_channel_->destroy_proxy (this);
   return 0;
 }
 
@@ -295,14 +313,17 @@ TAO_EC_ProxyPushConsumer::connect_push_supplier (
           // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
           ACE_CHECK;
 
-          this->event_channel_->disconnected (this, ACE_TRY_ENV);
+          this->event_channel_->reconnected (this, ACE_TRY_ENV);
           ACE_CHECK;
         }
 
-        // What if a second thread connected us after this?
+        // A separate thread could have connected siomultaneously,
+        // this is probably an application error, handle it as
+        // gracefully as possible
         if (this->is_connected_i ())
-          return;
+          return; // @@ Should we throw
       }
+
     this->supplier_ =
       RtecEventComm::PushSupplier::_duplicate (push_supplier);
     this->qos_ = qos;
@@ -362,7 +383,7 @@ TAO_EC_ProxyPushConsumer::push (const RtecEventComm::EventSet& event,
     if (this->refcount_ != 0)
       return;
   }
-  this->event_channel_->destroy_proxy_push_consumer (this);
+  this->event_channel_->destroy_proxy (this);
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
index 0798ab3cc15..18cf62a9c53 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
@@ -61,12 +61,21 @@ class TAO_RTEvent_Export TAO_EC_ProxyPushConsumer : public POA_RtecEventChannelA
   //   externally.
   //
 public:
+  typedef RtecEventChannelAdmin::ProxyPushConsumer_ptr _ptr_type;
+  typedef RtecEventChannelAdmin::ProxyPushConsumer_var _var_type;
+
   TAO_EC_ProxyPushConsumer (TAO_EC_Event_Channel* event_channel);
   // constructor...
 
   virtual ~TAO_EC_ProxyPushConsumer (void);
   // destructor...
 
+  virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr activate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC (());
+  // Activate in the POA
+
+  void deactivate (CORBA::Environment &ACE_TRY_ENV);
+  // Deactivate from the POA
+
   CORBA::Boolean is_connected (void) const;
   // Return 0 if no supplier is connected...
 
@@ -144,9 +153,6 @@ protected:
   void cleanup_i (void);
   // Release the filter and the supplier
 
-  void deactivate (CORBA::Environment &ACE_TRY_ENV);
-  // Deactivate from the POA
-
 private:
   TAO_EC_Event_Channel* event_channel_;
   // The supplier admin, used for activation and memory managment.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index ce60a8797aa..7cc09c11a6a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -131,8 +131,26 @@ TAO_EC_ProxyPushSupplier::cleanup_i (void)
   this->child_ = 0;
 }
 
+RtecEventChannelAdmin::ProxyPushSupplier_ptr
+TAO_EC_ProxyPushSupplier::activate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC (())
+{
+  RtecEventChannelAdmin::ProxyPushSupplier_var result;
+  ACE_TRY
+    {
+      result =
+        this->_this (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      // Ignore exceptions...
+    }
+  ACE_ENDTRY;
+  return result._retn ();
+}
+
 void
-TAO_EC_ProxyPushSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_ProxyPushSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC (())
 {
   ACE_TRY
     {
@@ -173,7 +191,7 @@ TAO_EC_ProxyPushSupplier::_decr_refcnt (void)
   }
 
   // Notify the event channel
-  this->event_channel_->destroy_proxy_push_supplier (this);
+  this->event_channel_->destroy_proxy (this);
   return 0;
 }
 
@@ -224,7 +242,12 @@ TAO_EC_ProxyPushSupplier::connect_push_consumer (
           this->event_channel_->reconnected (this, ACE_TRY_ENV);
           ACE_CHECK;
         }
-        return;
+
+        // A separate thread could have connected siomultaneously,
+        // this is probably an application error, handle it as
+        // gracefully as possible
+        if (this->is_connected_i ())
+          return; // @@ Should we throw
       }
 
     this->consumer_ =
@@ -348,7 +371,7 @@ TAO_EC_ProxyPushSupplier::filter (const RtecEventComm::EventSet& event,
       return result;
   }
 
-  this->event_channel_->destroy_proxy_push_supplier (this);
+  this->event_channel_->destroy_proxy (this);
   return result;
 }
 
@@ -374,7 +397,7 @@ TAO_EC_ProxyPushSupplier::filter_nocopy (RtecEventComm::EventSet& event,
       return result;
   }
 
-  this->event_channel_->destroy_proxy_push_supplier (this);
+  this->event_channel_->destroy_proxy (this);
   return result;
 }
 
@@ -419,7 +442,7 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event,
   if (this->refcount_ == 0)
     {
       this->lock_->release ();
-      this->event_channel_->destroy_proxy_push_supplier (this);
+      this->event_channel_->destroy_proxy (this);
     }
 }
 
@@ -464,7 +487,7 @@ TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event,
   if (this->refcount_ == 0)
     {
       this->lock_->release ();
-      this->event_channel_->destroy_proxy_push_supplier (this);
+      this->event_channel_->destroy_proxy (this);
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
index d42e958b040..6b5ebf7f248 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
@@ -62,12 +62,21 @@ class TAO_RTEvent_Export TAO_EC_ProxyPushSupplier : public POA_RtecEventChannelA
   //   is properly configured, we need to explore this...
   //
 public:
+  typedef RtecEventChannelAdmin::ProxyPushSupplier_ptr _ptr_type;
+  typedef RtecEventChannelAdmin::ProxyPushSupplier_var _var_type;
+
   TAO_EC_ProxyPushSupplier (TAO_EC_Event_Channel* event_channel);
   // constructor...
 
   virtual ~TAO_EC_ProxyPushSupplier (void);
   // destructor...
 
+  virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr activate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC (());
+  // Activate in the POA
+
+  virtual void deactivate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC (());
+  // Deactivate from the POA
+
   CORBA::Boolean is_connected (void) const;
   // Return 0 if no consumer is connected...
 
@@ -175,9 +184,6 @@ protected:
   void cleanup_i (void);
   // Release the child and the consumer
 
-  void deactivate (CORBA::Environment &ACE_TRY_ENV);
-  // Deactivate from the POA
-
 private:
   TAO_EC_Event_Channel* event_channel_;
   // The Event Channel that owns this object.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Collection.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Collection.cpp
deleted file mode 100644
index 070f57a527b..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Collection.cpp
+++ /dev/null
@@ -1,394 +0,0 @@
-// $Id$
-
-#ifndef TAO_EC_PROXY_COLLECTION_CPP
-#define TAO_EC_PROXY_COLLECTION_CPP
-
-#include "EC_Proxy_Collection.h"
-#include "EC_Command.h"
-#include "EC_Worker.h"
-#include "EC_Defaults.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "EC_Proxy_Collection.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Event, EC_Proxy_Collection, "$Id$")
-
-// ****************************************************************
-
-template<class PROXY>
-TAO_EC_Proxy_Collection<PROXY>::~TAO_EC_Proxy_Collection (void)
-{
-}
-
-// ****************************************************************
-
-template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK>
-TAO_EC_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    TAO_EC_Immediate_Changes (void)
-{
-}
-
-template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK>
-TAO_EC_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    TAO_EC_Immediate_Changes (const COLLECTION &collection)
-      :  collection_ (collection)
-{
-}
-
-template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
-TAO_EC_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    for_each (TAO_EC_Worker<PROXY> *worker,
-              CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
-
-  ITERATOR end = this->collection_.end ();
-  for (ITERATOR i = this->collection_.begin (); i != end; ++i)
-    {
-      worker->work ((*i), ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-}
-
-template<class PROXY, class C, class I, class L> void
-TAO_EC_Immediate_Changes<PROXY,C,I,L>::
-    connected (PROXY *proxy,
-               CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD (L, ace_mon, this->lock_);
-
-  proxy->_incr_refcnt ();
-  this->collection_.connected (proxy, ACE_TRY_ENV);
-}
-
-template<class PROXY, class C, class I, class L> void
-TAO_EC_Immediate_Changes<PROXY,C,I,L>::
-    reconnected (PROXY *proxy,
-                 CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD (L, ace_mon, this->lock_);
-
-  proxy->_incr_refcnt ();
-  this->collection_.reconnected (proxy, ACE_TRY_ENV);
-}
-
-template<class PROXY, class C, class I, class L> void
-TAO_EC_Immediate_Changes<PROXY,C,I,L>::
-    disconnected (PROXY *proxy,
-                  CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD (L, ace_mon, this->lock_);
-
-  this->collection_.disconnected (proxy, ACE_TRY_ENV);
-}
-
-template<class PROXY, class C, class I, class L> void
-TAO_EC_Immediate_Changes<PROXY,C,I,L>::
-    shutdown (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD (L, ace_mon, this->lock_);
-
-  this->collection_.shutdown (ACE_TRY_ENV);
-}
-
-// ****************************************************************
-
-template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL>
-TAO_EC_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    TAO_EC_Delayed_Changes (void)
-      :  lock_ (this),
-         busy_cond_ (busy_lock_),
-         busy_count_ (0),
-         write_delay_count_ (0),
-         busy_hwm_ (TAO_EC_DEFAULT_BUSY_HWM),
-         max_write_delay_ (TAO_EC_DEFAULT_MAX_WRITE_DELAY)
-{
-}
-
-template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL>
-TAO_EC_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    TAO_EC_Delayed_Changes (const COLLECTION &collection)
-      :  collection_ (collection),
-         lock_ (this),
-         busy_cond_ (busy_lock_),
-         busy_count_ (0),
-         write_delay_count_ (0),
-         busy_hwm_ (TAO_EC_DEFAULT_BUSY_HWM),
-         max_write_delay_ (TAO_EC_DEFAULT_MAX_WRITE_DELAY)
-{
-}
-
-template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
-TAO_EC_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    for_each (TAO_EC_Worker<PROXY> *worker,
-              CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD (Busy_Lock, ace_mon, this->lock_);
-
-  ITERATOR end = this->collection_.end ();
-  for (ITERATOR i = this->collection_.begin (); i != end; ++i)
-    {
-      worker->work (*i, ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-}
-
-template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> int
-TAO_EC_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    busy (void)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_, -1);
-
-  while (this->busy_count_ >= this->busy_hwm_
-         || this->write_delay_count_ >= this->max_write_delay_)
-    this->busy_cond_.wait ();
-  this->busy_count_++;
-
-  return 0;
-}
-
-template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> int
-TAO_EC_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    idle (void)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_, -1);
-
-  this->busy_count_--;
-  if (this->busy_count_ == 0)
-    {
-      this->write_delay_count_ = 0;
-      this->execute_delayed_operations ();
-      this->busy_cond_.broadcast ();
-    }
-  return 0;
-}
-
-template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> int
-TAO_EC_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    execute_delayed_operations (void)
-{
-  while (!this->command_queue_.is_empty ())
-    {
-      ACE_Command_Base* command;
-      this->command_queue_.dequeue_head (command);
-
-      command->execute ();
-
-      delete command;
-    }
-  return 0;
-}
-
-template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
-TAO_EC_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    connected (PROXY *proxy,
-               CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
-      RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-  ACE_CHECK;
-
-  proxy->_incr_refcnt ();
-  if (this->busy_count_ == 0)
-    {
-      // We can add the object immediately
-      this->connected_i (proxy, ACE_TRY_ENV);
-    }
-  else
-    {
-      ACE_Command_Base* command;
-      ACE_NEW (command,
-               Connected_Command (this,
-                                  proxy));
-      this->command_queue_.enqueue_tail (command);
-      this->write_delay_count_++;
-    }
-}
-
-template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
-TAO_EC_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    reconnected (PROXY *proxy,
-                 CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
-      RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-  ACE_CHECK;
-
-  proxy->_incr_refcnt ();
-  if (this->busy_count_ == 0)
-    {
-      // We can reconnect the object immediately
-      this->reconnected_i (proxy, ACE_TRY_ENV);
-    }
-  else
-    {
-      ACE_Command_Base* command;
-      ACE_NEW (command,
-               Reconnected_Command (this,
-                                    proxy));
-      this->command_queue_.enqueue_tail (command);
-      this->write_delay_count_++;
-    }
-}
-
-template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
-TAO_EC_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    disconnected (PROXY *proxy,
-                  CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
-      RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-  ACE_CHECK;
-
-  if (this->busy_count_ == 0)
-    {
-      // We can remove the object immediately
-      this->disconnected_i (proxy, ACE_TRY_ENV);
-    }
-  else
-    {
-      ACE_Command_Base* command;
-      ACE_NEW (command,
-               Disconnected_Command (this,
-                                     proxy));
-      this->command_queue_.enqueue_tail (command);
-      this->write_delay_count_++;
-    }
-}
-
-template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
-TAO_EC_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    shutdown (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
-      RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-  ACE_CHECK;
-
-  if (this->busy_count_ == 0)
-    {
-      // We can shutdown the object immediately
-      this->shutdown_i (ACE_TRY_ENV);
-    }
-  else
-    {
-      ACE_Command_Base* command;
-      ACE_NEW (command,
-               Shutdown_Command (this));
-      this->command_queue_.enqueue_tail (command);
-      this->write_delay_count_++;
-    }
-}
-
-// ****************************************************************
-
-template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK>
-TAO_EC_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    TAO_EC_Copy_On_Read (void)
-{
-}
-
-template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK>
-TAO_EC_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    TAO_EC_Copy_On_Read (const COLLECTION &collection)
-      :  collection_ (collection)
-{
-}
-
-template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
-TAO_EC_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    for_each (TAO_EC_Worker<PROXY> *worker,
-              CORBA::Environment &ACE_TRY_ENV)
-{
-  // @@ Use an allocator for this memory...
-  PROXY **proxies = 0;
-  size_t size = 0;
-  ACE_TRY
-    {
-      {
-        ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
-
-        size = this->collection_.size ();
-        ACE_NEW (proxies, PROXY*[size]);
-        PROXY **j = proxies;
-
-        for (; j != proxies + size; ++j)
-          *j = 0;
-
-        j = proxies;
-        ITERATOR end = this->collection_.end ();
-        for (ITERATOR i = this->collection_.begin (); i != end; ++i)
-          {
-            *j = *i;
-            (*j)->_incr_refcnt ();
-            ++j;
-          }
-      }
-
-      for (PROXY **j = proxies; j != proxies + size; ++j)
-        {
-          worker->work (*j, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          (*j)->_decr_refcnt ();
-        }
-      delete[] proxies;
-    }
-  ACE_CATCHANY
-    {
-      for (PROXY **j = proxies; j != proxies + size; ++j)
-        {
-          if (*j != 0)
-            (*j)->_decr_refcnt ();
-        }
-      delete[] proxies;
-
-      ACE_RETHROW;
-    }
-  ACE_ENDTRY;
-}
-
-template<class PROXY, class C, class I, class L> void
-TAO_EC_Copy_On_Read<PROXY,C,I,L>::
-    connected (PROXY *proxy,
-               CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD (L, ace_mon, this->lock_);
-
-  proxy->_incr_refcnt ();
-  this->collection_.connected (proxy, ACE_TRY_ENV);
-}
-
-template<class PROXY, class C, class I, class L> void
-TAO_EC_Copy_On_Read<PROXY,C,I,L>::
-    reconnected (PROXY *proxy,
-                 CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD (L, ace_mon, this->lock_);
-
-  proxy->_incr_refcnt ();
-  this->collection_.reconnected (proxy, ACE_TRY_ENV);
-}
-
-template<class PROXY, class C, class I, class L> void
-TAO_EC_Copy_On_Read<PROXY,C,I,L>::
-    disconnected (PROXY *proxy,
-                  CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD (L, ace_mon, this->lock_);
-
-  this->collection_.disconnected (proxy, ACE_TRY_ENV);
-}
-
-template<class PROXY, class C, class I, class L> void
-TAO_EC_Copy_On_Read<PROXY,C,I,L>::
-    shutdown (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD (L, ace_mon, this->lock_);
-
-  this->collection_.shutdown (ACE_TRY_ENV);
-}
-
-// ****************************************************************
-
-#endif /* TAO_EC_PROXY_COLLECTION_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Collection.h b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Collection.h
deleted file mode 100644
index 3ca9c10df9c..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Collection.h
+++ /dev/null
@@ -1,362 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel
-//
-// = FILENAME
-//   EC_Proxy_Collection
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// = CREDITS
-//   http://www.cs.wustl.edu/~coryan/EC/index.html
-//
-// ============================================================================
-
-#ifndef TAO_EC_PROXY_COLLECTION_H
-#define TAO_EC_PROXY_COLLECTION_H
-#include "ace/pre.h"
-
-#include "EC_Busy_Lock.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/corba.h"
-#include "ace/Containers.h"
-
-template<class Target> class TAO_EC_Worker;
-
-template<class PROXY>
-class TAO_EC_Proxy_Collection
-{
-  // = TITLE
-  //   EC_Proxy_Collection
-  //
-  // = DESCRIPTION
-  //   Many components in the Event Channel need to keep a collection
-  //   of proxies; these collections must be able to cope with several
-  //   concurrency issues:
-  //   + Some threads may need to iterate over the collection and
-  //     invoke a method on each element.  Locking the collection
-  //     while this is done is not feasible in all cases: under some
-  //     configurations the same thread that is iterating over the
-  //     collection may need to make changes to the set.
-  //   + A recursive lock does not solve the concurrency problems
-  //     because recursive changes to the collection still invalidate
-  //     the iterators.
-  //
-  //   There are several solutions to this problem (see the VARIANTS)
-  //   section, and there is no single one that works bests in all
-  //   cases.  As usual, we wish the strategize the protocol used to
-  //   serialize iterations and changes to the collection.  This class
-  //   encapsulates that protocol.
-  //
-  //   The reasons are too long to enumerate here, but the Iterator
-  //   pattern is not appropriate in this case.  We use Function
-  //   Objects (aka Worker) to perform a client-defined task on each
-  //   member.
-  //
-  //   Regular member functions are used to insert, remove and update
-  //   members of the collection and to shutdown (i.e. perform final
-  //   cleanup operations).
-  //
-  //   The class must also collaborate with other components of the
-  //   EC to efficiently and safely perform memory managment of the
-  //   members in the collection.
-  //
-  // = VARIANTS
-  //
-  //   We identify several sources of variation:
-  //
-  //   + Immediate_Changes: in this variant the iteration in performed
-  //   while holding some kind of synchronization primitive, such as a
-  //   thread mutex, a recursive mutex, a RW lock, etc.
-  //   This is only useful in configurations where a separate thread
-  //   dispatches the events, and thus, can only be used with real
-  //   locks.
-  //
-  //   + Copy_On_Read: before performing the iteration the collection
-  //   is duplicated into a temporary array.  Thus no locks are held
-  //   during the iteration.  This is a very expensive approach, but
-  //   useful in many cases.
-  //   The kind of lock is also strategized in this case.
-  //
-  //   + Copy_On_Write: this is very similar to the previous approach,
-  //   but the collection is only duplicated when a change is required
-  //   while some thread is performing an iteration.  The iteration
-  //   continues over the original copy, while the changes are
-  //   performed in the duplicate.  The new copy of the collection is
-  //   used for any subsequent operations, the original is discarded
-  //   when the last thread using it completes its work.
-  //   This approach optimizes for the case where no changes are
-  //   is duplicated into a temporary array.  Thus no locks are held
-  //   during the iteration.  This is a very expensive approach, but
-  //   useful in many cases.
-  //   The kind of lock is also strategized in this case.
-  //
-  //   + Delayed_Changes: before starting the iteration a counter is
-  //   incremented, this counter is used to keep track of the number
-  //   of threads concurrently using the collection.
-  //   If a thread wants to perform a change to the collection it must
-  //   first verify that there are no threads iterating over it.  If
-  //   there are any threads then the thread queues the modification
-  //   for later execution, using the Command pattern.
-  //   The kind of lock is strategized, as this approach is used in
-  //   single threaded configurations.
-  //   There are two main variations:
-  //     - An upcall can result in new dispatches: in this case we
-  //       have to keep track of a the list of current threads using
-  //       a Set, to avoid dead-locks.
-  //       IMPLEMENTATION: the design is not complete, probably
-  //       similar to the next one.
-  //     - Otherwise we just need to control the concurrency using the
-  //       algorithm described below.
-  //
-  //
-  // = MEMORY MANAGMENT
-  //   It assumes ownership of the proxies added to the collection,
-  //   it increases the reference count.
-  //
-  // = LOCKING
-  //   Locking is provided by derived classes.
-  //
-  // = TODO
-  //
-public:
-  virtual ~TAO_EC_Proxy_Collection (void);
-  // destructor
-
-  virtual void for_each (TAO_EC_Worker<PROXY> *worker,
-                         CORBA::Environment &ACE_TRY_ENV) = 0;
-  // Iterate over the collection and invoke worker->work() for each
-  // member of the collection.
-  // This encapsulates
-
-  virtual void connected (PROXY *proxy,
-                          CORBA::Environment &ACE_TRY_ENV) = 0;
-  // Insert a new element into the collection.  The collection assumes
-  // ownership of the element.
-
-  virtual void reconnected (PROXY *proxy,
-                            CORBA::Environment &ACE_TRY_ENV) = 0;
-  // Insert an element into the collection.  No errors can be raised
-  // if the element is already present.
-  // The collection assumes ownership, i.e. must invoke
-  // <proxy->_decr_refcnt()> if the element is already present in the
-  // collection.
-
-  virtual void disconnected (PROXY *proxy,
-                             CORBA::Environment &ACE_TRY_ENV) = 0;
-  // Remove an element from the collection.
-
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV) = 0;
-  // The EC is shutting down, must release all the elements.
-};
-
-// ****************************************************************
-
-template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK>
-class TAO_EC_Immediate_Changes : public TAO_EC_Proxy_Collection<PROXY>
-{
-  // = TITLE
-  //   TAO_EC_Immediate_Changes
-  //
-  // = DESCRIPTION
-  //   Implement the Immediate_
-public:
-  TAO_EC_Immediate_Changes (void);
-  TAO_EC_Immediate_Changes (const COLLECTION &collection);
-
-  // = The TAO_EC_Proxy methods
-  virtual void for_each (TAO_EC_Worker<PROXY> *worker,
-                         CORBA::Environment &ACE_TRY_ENV);
-  virtual void connected (PROXY *proxy,
-                          CORBA::Environment &ACE_TRY_ENV);
-  virtual void reconnected (PROXY *proxy,
-                            CORBA::Environment &ACE_TRY_ENV);
-  virtual void disconnected (PROXY *proxy,
-                             CORBA::Environment &ACE_TRY_ENV);
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV);
-
-private:
-  COLLECTION collection_;
-
-  ACE_LOCK lock_;
-};
-
-// ****************************************************************
-
-template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK>
-class TAO_EC_Copy_On_Read : public TAO_EC_Proxy_Collection<PROXY>
-{
-  // = TITLE
-  //   TAO_EC_Copy_On_Read
-  //
-  // = DESCRIPTION
-  //   Implement the Copy_On_Read protocol
-  //   The class is parametric on the kind of collection and locking
-  //   mechanism used.
-  //
-  // = TODO
-  //
-public:
-  TAO_EC_Copy_On_Read (void);
-  TAO_EC_Copy_On_Read (const COLLECTION &collection);
-  // Constructors
-
-  // = The TAO_EC_Proxy methods
-  virtual void for_each (TAO_EC_Worker<PROXY> *worker,
-                         CORBA::Environment &ACE_TRY_ENV);
-  virtual void connected (PROXY *proxy,
-                          CORBA::Environment &ACE_TRY_ENV);
-  virtual void reconnected (PROXY *proxy,
-                            CORBA::Environment &ACE_TRY_ENV);
-  virtual void disconnected (PROXY *proxy,
-                             CORBA::Environment &ACE_TRY_ENV);
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV);
-
-private:
-  COLLECTION collection_;
-
-  ACE_LOCK lock_;
-};
-
-// ****************************************************************
-
-template<class Target,class Object> class TAO_EC_Connected_Command;
-template<class Target,class Object> class TAO_EC_Disconnected_Command;
-template<class Target,class Object> class TAO_EC_Reconnected_Command;
-template<class Target> class TAO_EC_Shutdown_Command;
-
-template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL>
-class TAO_EC_Delayed_Changes : public TAO_EC_Proxy_Collection<PROXY>
-{
-  // = TITLE
-  //   TAO_EC_Delayed_Operations
-  //
-  // = DESCRIPTION
-  //   This class implements the Delayed Operations protocol to solve
-  //   the concurrency challenges outlined in the documentation of
-  //   TAO_EC_Proxy_Collection.
-  //   In short the class delays changes by putting them on an
-  //   "operation queue", the operations are stored as command objects
-  //   in this queue and executed once the system is quiescent
-  //   (i.e. no threads are iterating over the collection).
-  //
-  //   The algorithm implemented so far is:
-  //   - If a thread is using the set then it increases the busy
-  //     count, this is done by calling the busy() method. Once the
-  //     thread has stopped using the collection the idle() method is
-  //     invoked and the busy count is decreased.
-  //     A helper class (Busy_Lock) is used to hide this protocol
-  //     behind the familiar GUARD idiom.
-  //   - If the busy count reaches the busy_hwm then the thread must
-  //     wait until the count reaches 0 again.
-  //     This can be used to control the maximum concurrency in the
-  //     EC, matching it (for example) with the number of
-  //     processors. Setting the concurrency to a high value (say one
-  //     million) allows for an arbitrary number of threads to execute
-  //     concurrently.
-  //  - If a modification is posted to the collection we need to
-  //    execute it at some point.
-  //    Just using the busy_hwm would not work, the HWM may not be
-  //    reached ever, so another form of control is needed.
-  //    Instead we use another counter, that keeps track of how many
-  //    threads have used the set since the modification was
-  //    posted. If this number of threads reaches max_write_delay then
-  //    we don't allow any more threads to go in, eventually the
-  //    thread count reaches 0 and we can proceed with the operations.
-  //
-  //  - There is one aspect of concurrency that can be problematic: if
-  //    thread pushes events as part of an upcall then the same thread
-  //    could be counted twice, we need to keep track of the threads
-  //    that are dispatching events and not increase (or decrease) the
-  //    reference count when a thread iterates twice over the same
-  //    set.
-  //
-  //   This solves the major problems, but there are other issues to
-  //   be addressed:
-  //   + How do we ensure that the operations are eventually executed?
-  //   + How do we simplify the execution of the locking protocol for
-  //   clients of this class?
-  //   + How do we minimize overhead for single threaded execution?
-  //   + How do we minimize the overhead for the cases where the
-  //     threads dispatching events don't post changes to the
-  //     collection?
-  //
-public:
-  TAO_EC_Delayed_Changes (void);
-  TAO_EC_Delayed_Changes (const COLLECTION &collection);
-
-  int busy (void);
-  int idle (void);
-  int execute_delayed_operations (void);
-
-  void connected_i (PROXY *proxy,
-                    CORBA::Environment &ACE_TRY_ENV);
-  void reconnected_i (PROXY *proxy,
-                    CORBA::Environment &ACE_TRY_ENV);
-  void disconnected_i (PROXY *proxy,
-                     CORBA::Environment &ACE_TRY_ENV);
-  void shutdown_i (CORBA::Environment &ACE_TRY_ENV);
-
-  typedef TAO_EC_Connected_Command<TAO_EC_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>,PROXY> Connected_Command;
-  typedef TAO_EC_Reconnected_Command<TAO_EC_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>,PROXY> Reconnected_Command;
-  typedef TAO_EC_Disconnected_Command<TAO_EC_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>,PROXY> Disconnected_Command;
-  typedef TAO_EC_Shutdown_Command<TAO_EC_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE> > Shutdown_Command;
-
-  // = The TAO_EC_Proxy methods
-  virtual void for_each (TAO_EC_Worker<PROXY> *worker,
-                         CORBA::Environment &ACE_TRY_ENV);
-  virtual void connected (PROXY *proxy,
-                          CORBA::Environment &ACE_TRY_ENV);
-  virtual void reconnected (PROXY *proxy,
-                            CORBA::Environment &ACE_TRY_ENV);
-  virtual void disconnected (PROXY *proxy,
-                             CORBA::Environment &ACE_TRY_ENV);
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV);
-
-private:
-  COLLECTION collection_;
-
-  typedef TAO_EC_Busy_Lock_Adapter<TAO_EC_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE> > Busy_Lock;
-
-  Busy_Lock lock_;
-
-  ACE_SYNCH_MUTEX_T busy_lock_;
-
-  ACE_SYNCH_CONDITION_T busy_cond_;
-
-  CORBA::ULong busy_count_;
-
-  CORBA::ULong write_delay_count_;
-
-  CORBA::ULong busy_hwm_;
-  CORBA::ULong max_write_delay_;
-  // Control variables for the concurrency policies.
-
-  ACE_Unbounded_Queue<ACE_Command_Base*> command_queue_;
-};
-
-// ****************************************************************
-
-#if defined (__ACE_INLINE__)
-#include "EC_Proxy_Collection.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "EC_Proxy_Collection.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("EC_Proxy_Collection.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include "ace/post.h"
-#endif /* TAO_EC_PROXY_COLLECTION_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Collection.i b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Collection.i
deleted file mode 100644
index 4dff88f5d4c..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Collection.i
+++ /dev/null
@@ -1,32 +0,0 @@
-// $Id$
-
-template<class PROXY, class C, class I,ACE_SYNCH_DECL> ACE_INLINE void
-TAO_EC_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    connected_i (PROXY *proxy,
-               CORBA::Environment &ACE_TRY_ENV)
-{
-  this->collection_.connected (proxy, ACE_TRY_ENV);
-}
-
-template<class PROXY, class C, class I,ACE_SYNCH_DECL> ACE_INLINE void
-TAO_EC_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    reconnected_i (PROXY *proxy,
-                 CORBA::Environment &ACE_TRY_ENV)
-{
-  this->collection_.reconnected (proxy, ACE_TRY_ENV);
-}
-
-template<class PROXY, class C, class I,ACE_SYNCH_DECL> ACE_INLINE void
-TAO_EC_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    disconnected_i (PROXY *proxy,
-                  CORBA::Environment &ACE_TRY_ENV)
-{
-  this->collection_.disconnected (proxy, ACE_TRY_ENV);
-}
-
-template<class PROXY, class C, class I,ACE_SYNCH_DECL> ACE_INLINE void
-TAO_EC_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    shutdown_i (CORBA::Environment &ACE_TRY_ENV)
-{
-  this->collection_.shutdown (ACE_TRY_ENV);
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
index 391a64175e0..484879e36df 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
@@ -22,7 +22,7 @@
 #include "ace/pre.h"
 
 #include "EC_ConsumerControl.h"
-#include "EC_Worker.h"
+#include "orbsvcs/ESF/ESF_Worker.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -125,7 +125,7 @@ private:
 
 // ****************************************************************
 
-class TAO_EC_Ping_Consumer : public TAO_EC_Worker<TAO_EC_ProxyPushSupplier>
+class TAO_EC_Ping_Consumer : public TAO_ESF_Worker<TAO_EC_ProxyPushSupplier>
 {
 public:
   TAO_EC_Ping_Consumer (TAO_EC_ConsumerControl *control);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
index 9e3d7850a24..42b29564e77 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
@@ -22,7 +22,7 @@
 #include "ace/pre.h"
 
 #include "EC_SupplierControl.h"
-#include "EC_Worker.h"
+#include "orbsvcs/ESF/ESF_Worker.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -125,7 +125,7 @@ private:
 
 // ****************************************************************
 
-class TAO_EC_Ping_Supplier : public TAO_EC_Worker<TAO_EC_ProxyPushConsumer>
+class TAO_EC_Ping_Supplier : public TAO_ESF_Worker<TAO_EC_ProxyPushConsumer>
 {
 public:
   TAO_EC_Ping_Supplier (TAO_EC_SupplierControl *control);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
index 4b22fafae14..f1010d5478c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
@@ -12,166 +12,47 @@
 ACE_RCSID(Event, EC_SupplierAdmin, "$Id$")
 
 TAO_EC_SupplierAdmin::TAO_EC_SupplierAdmin (TAO_EC_Event_Channel *ec)
-  :  event_channel_ (ec)
+  : TAO_ESF_Peer_Admin<TAO_EC_Event_Channel,TAO_EC_ProxyPushConsumer,TAO_EC_ProxyPushSupplier> (ec)
 {
-  this->collection_ =
-    this->event_channel_->create_proxy_push_consumer_collection ();
-
-  // @@
-  // @@ this->collection_->busy_hwm (this->event_channel_->busy_hwm ());
-  // @@ this->collection_->max_write_delay (
-  // @@           this->event_channel_->max_write_delay ()
-  // @@ );
-
   this->default_POA_ =
     this->event_channel_->supplier_poa ();
 }
 
 TAO_EC_SupplierAdmin::~TAO_EC_SupplierAdmin (void)
 {
-  this->event_channel_->destroy_proxy_push_consumer_collection (this->collection_);
-  this->collection_ = 0;
-}
-
-PortableServer::POA_ptr
-TAO_EC_SupplierAdmin::_default_POA (CORBA::Environment&)
-{
-  return PortableServer::POA::_duplicate (this->default_POA_.in ());
-}
-
-void
-TAO_EC_SupplierAdmin::connected (TAO_EC_ProxyPushSupplier *supplier,
-                                 CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_EC_Connect_Supplier worker (supplier);
-  this->collection_->for_each (&worker, ACE_TRY_ENV);
-}
-
-void
-TAO_EC_SupplierAdmin::reconnected (TAO_EC_ProxyPushSupplier *supplier,
-                                   CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_EC_Reconnect_Supplier worker (supplier);
-  this->collection_->for_each (&worker, ACE_TRY_ENV);
-}
-
-void
-TAO_EC_SupplierAdmin::disconnected (TAO_EC_ProxyPushSupplier *supplier,
-                                    CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_EC_Disconnect_Supplier worker (supplier);
-  this->collection_->for_each (&worker, ACE_TRY_ENV);
-}
-
-void
-TAO_EC_SupplierAdmin::connected (TAO_EC_ProxyPushConsumer * /*consumer*/,
-                                 CORBA::Environment &/*ACE_TRY_ENV*/)
-{
-  // this->collection_->connected (consumer, ACE_TRY_ENV);
-}
-
-void
-TAO_EC_SupplierAdmin::reconnected (TAO_EC_ProxyPushConsumer *consumer,
-                                   CORBA::Environment &ACE_TRY_ENV)
-{
-  this->collection_->reconnected (consumer, ACE_TRY_ENV);
-}
-
-void
-TAO_EC_SupplierAdmin::disconnected (TAO_EC_ProxyPushConsumer *consumer,
-                                    CORBA::Environment &ACE_TRY_ENV)
-{
-  this->collection_->disconnected (consumer, ACE_TRY_ENV);
-}
-
-void
-TAO_EC_SupplierAdmin::shutdown (CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_EC_Shutdown_Consumer worker;
-
-  this->collection_->for_each (&worker, ACE_TRY_ENV);
-  this->collection_->shutdown (ACE_TRY_ENV);
 }
 
 RtecEventChannelAdmin::ProxyPushConsumer_ptr
 TAO_EC_SupplierAdmin::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_EC_ProxyPushConsumer* consumer =
-    this->event_channel_->create_proxy_push_consumer ();
-
-  PortableServer::ServantBase_var holder = consumer;
-
-  RtecEventChannelAdmin::ProxyPushConsumer_var result =
-    consumer->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (RtecEventChannelAdmin::ProxyPushConsumer::_nil ());
-
-  this->collection_->connected (consumer, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (RtecEventChannelAdmin::ProxyPushConsumer::_nil ());
-  
-  return result._retn ();
-}
-
-// ****************************************************************
-
-void
-TAO_EC_Connect_Supplier::work (TAO_EC_ProxyPushConsumer *consumer,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  consumer->connected (this->supplier_, ACE_TRY_ENV);
-  ACE_CHECK;
-  this->supplier_->connected (consumer, ACE_TRY_ENV);
-  ACE_CHECK;
+  return this->obtain (ACE_TRY_ENV);
 }
 
-// ****************************************************************
-
-void
-TAO_EC_Reconnect_Supplier::work (TAO_EC_ProxyPushConsumer *consumer,
-                                 CORBA::Environment &ACE_TRY_ENV)
-{
-  consumer->reconnected (this->supplier_, ACE_TRY_ENV);
-  ACE_CHECK;
-  this->supplier_->reconnected (consumer, ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-// ****************************************************************
-
-void
-TAO_EC_Disconnect_Supplier::work (TAO_EC_ProxyPushConsumer *consumer,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  consumer->disconnected (this->supplier_, ACE_TRY_ENV);
-  ACE_CHECK;
-  this->supplier_->disconnected (consumer, ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-// ****************************************************************
-
-void
-TAO_EC_Shutdown_Consumer::work (TAO_EC_ProxyPushConsumer *consumer,
-                                CORBA::Environment &ACE_TRY_ENV)
+PortableServer::POA_ptr
+TAO_EC_SupplierAdmin::_default_POA (CORBA::Environment&)
 {
-  ACE_TRY
-    {
-      consumer->shutdown (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // Ignore exceptions
-    }
-  ACE_ENDTRY;
+  return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class TAO_EC_Worker<TAO_EC_ProxyPushConsumer>;
+template class TAO_ESF_Peer_Admin<TAO_EC_Event_Channel,TAO_EC_ProxyPushConsumer,TAO_EC_ProxyPushSupplier>;
+template class TAO_ESF_Proxy_Admin<TAO_EC_Event_Channel,TAO_EC_ProxyPushConsumer>;
+template class TAO_ESF_Worker<TAO_EC_ProxyPushConsumer>;
+template class TAO_ESF_Shutdown_Proxy<TAO_EC_ProxyPushConsumer>;
+template class TAO_ESF_Peer_Connected<TAO_EC_ProxyPushConsumer,TAO_EC_ProxyPushSupplier>;
+template class TAO_ESF_Peer_Reconnected<TAO_EC_ProxyPushConsumer,TAO_EC_ProxyPushSupplier>;
+template class TAO_ESF_Peer_Disconnected<TAO_EC_ProxyPushConsumer,TAO_EC_ProxyPushSupplier>;
 
 #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_EC_Worker<TAO_EC_ProxyPushConsumer>
+#pragma instantiate TAO_ESF_Peer_Admin<TAO_EC_Event_Channel,TAO_EC_ProxyPushConsumer,TAO_EC_ProxyPushSupplier>
+#pragma instantiate TAO_ESF_Proxy_Admin<TAO_EC_Event_Channel,TAO_EC_ProxyPushConsumer>
+#pragma instantiate TAO_ESF_Worker<TAO_EC_ProxyPushConsumer>
+#pragma instantiate TAO_ESF_Shutdown_Proxy<TAO_EC_ProxyPushConsumer>
+#pragma instantiate TAO_ESF_Peer_Connected<TAO_EC_ProxyPushConsumer,TAO_EC_ProxyPushSupplier>
+#pragma instantiate TAO_ESF_Peer_Reconnected<TAO_EC_ProxyPushConsumer,TAO_EC_ProxyPushSupplier>
+#pragma instantiate TAO_ESF_Peer_Disconnected<TAO_EC_ProxyPushConsumer,TAO_EC_ProxyPushSupplier>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
index b0b6652789b..040a00719b4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
@@ -26,21 +26,21 @@
 #define TAO_EC_SUPPLIERADMIN_H
 #include "ace/pre.h"
 
-#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "EC_ProxyConsumer.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "EC_Proxy_Collection.h"
-#include "EC_Worker.h"
+#include "orbsvcs/ESF/ESF_Peer_Admin.h"
 #include "event_export.h"
 
 class TAO_EC_Event_Channel;
 class TAO_EC_ProxyPushSupplier;
-class TAO_EC_ProxyPushConsumer;
 
-class TAO_RTEvent_Export TAO_EC_SupplierAdmin : public POA_RtecEventChannelAdmin::SupplierAdmin
+class TAO_RTEvent_Export TAO_EC_SupplierAdmin
+  : public POA_RtecEventChannelAdmin::SupplierAdmin
+  , public TAO_ESF_Peer_Admin<TAO_EC_Event_Channel,TAO_EC_ProxyPushConsumer,TAO_EC_ProxyPushSupplier>
 {
   // = TITLE
   //   ProxyPushSupplier
@@ -60,32 +60,6 @@ public:
   virtual ~TAO_EC_SupplierAdmin (void);
   // destructor...
 
-  void for_each (TAO_EC_Worker<TAO_EC_ProxyPushConsumer> *worker,
-                 CORBA::Environment &ACE_TRY_ENV);
-  // For each elements call <worker->work()>.
-
-  virtual void connected (TAO_EC_ProxyPushConsumer*,
-                          CORBA::Environment&);
-  virtual void reconnected (TAO_EC_ProxyPushConsumer*,
-                            CORBA::Environment&);
-  virtual void disconnected (TAO_EC_ProxyPushConsumer*,
-                             CORBA::Environment&);
-  // Used to inform the EC that a Consumer has connected or
-  // disconnected from it.
-
-  virtual void connected (TAO_EC_ProxyPushSupplier*,
-                          CORBA::Environment&);
-  virtual void reconnected (TAO_EC_ProxyPushSupplier*,
-                            CORBA::Environment&);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier*,
-                             CORBA::Environment&);
-  // Used to inform the EC that a Supplier has connected or
-  // disconnected from it.
-
-  virtual void shutdown (CORBA::Environment&);
-  // The event channel is shutting down, inform all the consumers of
-  // this
-
   // = The RtecEventChannelAdmin::SupplierAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr
       obtain_push_consumer (CORBA::Environment &)
@@ -95,95 +69,10 @@ public:
   virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env);
 
 private:
-  TAO_EC_Event_Channel *event_channel_;
-  // The Event Channel we belong to
-
-  typedef TAO_EC_Proxy_Collection<TAO_EC_ProxyPushConsumer> Collection;
-
-  Collection *collection_;
-  // The consumer container
-
   PortableServer::POA_var default_POA_;
   // Store the default POA.
 };
 
-// ****************************************************************
-
-class TAO_EC_Connect_Supplier : public TAO_EC_Worker<TAO_EC_ProxyPushConsumer>
-{
-  // = TITLE
-  //   TAO_EC_Connect_Supplier
-  //
-  // = DESCRIPTION
-  //   Worker class to connect the ProxyPushConsumer objects with all
-  //   the ProxyPushConsumer objects in the collection.
-  //
-public:
-  TAO_EC_Connect_Supplier (TAO_EC_ProxyPushSupplier *supplier);
-  // Constructor
-
-  void work (TAO_EC_ProxyPushConsumer *consumer,
-             CORBA::Environment &ACE_TRY_ENV);
-
-private:
-  TAO_EC_ProxyPushSupplier *supplier_;
-};
-
-// ****************************************************************
-
-class TAO_EC_Reconnect_Supplier : public TAO_EC_Worker<TAO_EC_ProxyPushConsumer>
-{
-  // = TITLE
-  //   TAO_EC_Reconnect_Supplier
-  //
-  // = DESCRIPTION
-  //   Worker class to reconnect the ProxyPushConsumer objects with all
-  //   the ProxyPushConsumer objects in the collection.
-  //
-public:
-  TAO_EC_Reconnect_Supplier (TAO_EC_ProxyPushSupplier *supplier);
-  // Constructor
-
-  void work (TAO_EC_ProxyPushConsumer *consumer,
-             CORBA::Environment &ACE_TRY_ENV);
-
-private:
-  TAO_EC_ProxyPushSupplier *supplier_;
-};
-
-// ****************************************************************
-
-class TAO_EC_Disconnect_Supplier : public TAO_EC_Worker<TAO_EC_ProxyPushConsumer>
-{
-  // = TITLE
-  //   TAO_EC_Disconnect_Supplier
-  //
-  // = DESCRIPTION
-  //   Worker class to disconnect the ProxyPushConsumer objects with all
-  //   the ProxyPushConsumer objects in the collection.
-  //
-public:
-  TAO_EC_Disconnect_Supplier (TAO_EC_ProxyPushSupplier *supplier);
-  // Constructor
-
-  void work (TAO_EC_ProxyPushConsumer *consumer,
-             CORBA::Environment &ACE_TRY_ENV);
-
-private:
-  TAO_EC_ProxyPushSupplier *supplier_;
-};
-
-// ****************************************************************
-
-class TAO_EC_Shutdown_Consumer : public TAO_EC_Worker<TAO_EC_ProxyPushConsumer>
-{
-public:
-  TAO_EC_Shutdown_Consumer (void);
-
-  void work (TAO_EC_ProxyPushConsumer *consumer,
-             CORBA::Environment &ACE_TRY_ENV);
-};
-
 #if defined (__ACE_INLINE__)
 #include "EC_SupplierAdmin.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.i b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.i
index 5377f943532..cfa1da318d3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.i
@@ -1,43 +1 @@
 // $Id$
-
-ACE_INLINE void
-TAO_EC_SupplierAdmin::
-    for_each (TAO_EC_Worker<TAO_EC_ProxyPushConsumer> *worker,
-              CORBA::Environment &ACE_TRY_ENV)
-{
-  this->collection_->for_each (worker, ACE_TRY_ENV);
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_EC_Connect_Supplier::
-    TAO_EC_Connect_Supplier (TAO_EC_ProxyPushSupplier *supplier)
-      :  supplier_ (supplier)
-{
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_EC_Reconnect_Supplier::
-    TAO_EC_Reconnect_Supplier (TAO_EC_ProxyPushSupplier *supplier)
-      :  supplier_ (supplier)
-{
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_EC_Disconnect_Supplier::
-    TAO_EC_Disconnect_Supplier (TAO_EC_ProxyPushSupplier *supplier)
-      :  supplier_ (supplier)
-{
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_EC_Shutdown_Consumer::TAO_EC_Shutdown_Consumer (void)
-{
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
index c57640cb409..711f48363f0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
@@ -31,7 +31,7 @@
 #include "ace/pre.h"
 
 #include "orbsvcs/RtecEventCommC.h"
-#include "EC_Worker.h"
+#include "orbsvcs/ESF/ESF_Worker.h"
 #include "event_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -124,7 +124,7 @@ public:
 
 // ****************************************************************
 
-class TAO_EC_Filter_Worker : public TAO_EC_Worker<TAO_EC_ProxyPushSupplier>
+class TAO_EC_Filter_Worker : public TAO_ESF_Worker<TAO_EC_ProxyPushSupplier>
 {
 public:
   TAO_EC_Filter_Worker (RtecEventComm::EventSet &event,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Worker.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Worker.cpp
deleted file mode 100644
index d1b532155e4..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Worker.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Id$
-
-#ifndef TAO_EC_WORKER_CPP
-#define TAO_EC_WORKER_CPP
-
-#include "EC_Worker.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "EC_Worker.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Event, EC_Worker, "$Id$")
-
-template<class Object>
-TAO_EC_Worker<Object>::~TAO_EC_Worker (void)
-{
-}
-
-#endif /* TAO_EC_WORKER_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Worker.h b/TAO/orbsvcs/orbsvcs/Event/EC_Worker.h
deleted file mode 100644
index 3735fc6f652..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Worker.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel
-//
-// = FILENAME
-//   EC_Worker
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// = CREDITS
-//   http://www.cs.wustl.edu/~coryan/EC/index.html
-//
-// ============================================================================
-
-#ifndef TAO_EC_WORKER_H
-#define TAO_EC_WORKER_H
-#include "ace/pre.h"
-
-#include "tao/corba.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-template<class Object>
-class TAO_EC_Worker
-{
-public:
-  virtual ~TAO_EC_Worker (void);
-
-  virtual void work (Object *object,
-                     CORBA::Environment &ACE_TRY_ENV) = 0;
-};
-
-#if defined (__ACE_INLINE__)
-#include "EC_Worker.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "EC_Worker.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("EC_Worker.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include "ace/post.h"
-#endif /* TAO_EC_WORKER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Worker.i b/TAO/orbsvcs/orbsvcs/Event/EC_Worker.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Worker.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosEvent b/TAO/orbsvcs/orbsvcs/Makefile.CosEvent
index 35df752c882..1c55db3cbb0 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.CosEvent
+++ b/TAO/orbsvcs/orbsvcs/Makefile.CosEvent
@@ -99,7 +99,8 @@ realclean: clean
 
 
 .obj/CosEventCommS.o .obj/CosEventCommS.so .shobj/CosEventCommS.o .shobj/CosEventCommS.so: CosEventCommS.cpp CosEventCommS.h \
- $(ACE_ROOT)/ace/pre.h CosEventCommC.h \
+ $(ACE_ROOT)/ace/pre.h \
+ CosEventCommC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -257,14 +258,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -313,6 +309,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -378,6 +376,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -389,8 +391,8 @@ realclean: clean
 
 .obj/CosEventChannelAdminS.o .obj/CosEventChannelAdminS.so .shobj/CosEventChannelAdminS.o .shobj/CosEventChannelAdminS.so: CosEventChannelAdminS.cpp \
  CosEventChannelAdminS.h \
- $(ACE_ROOT)/ace/pre.h CosEventCommS.h \
- CosEventCommC.h \
+ $(ACE_ROOT)/ace/pre.h \
+ CosEventCommS.h CosEventCommC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -548,14 +550,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -604,6 +601,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -669,6 +668,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -840,14 +843,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -896,6 +894,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -961,6 +961,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -1129,14 +1133,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -1185,6 +1184,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -1250,6 +1251,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -1259,10 +1264,12 @@ realclean: clean
  CosEvent/event_export.h CosEventCommC.h CosEventCommC.i \
  CosEventChannelAdminC.i
 
-.obj/ConsumerAdmin_i.o .obj/ConsumerAdmin_i.so .shobj/ConsumerAdmin_i.o .shobj/ConsumerAdmin_i.so: CosEvent/ConsumerAdmin_i.cpp \
- CosEvent/ConsumerAdmin_i.h \
+.obj/CEC_ConsumerAdmin.o .obj/CEC_ConsumerAdmin.so .shobj/CEC_ConsumerAdmin.o .shobj/CEC_ConsumerAdmin.so: CosEvent/CEC_ConsumerAdmin.cpp \
+ CosEvent/CEC_ConsumerAdmin.h \
  $(ACE_ROOT)/ace/pre.h \
- RtecEventChannelAdminC.h \
+ CosEventChannelAdminS.h \
+ CosEventCommS.h \
+ CosEventCommC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -1420,14 +1427,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -1476,6 +1478,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -1541,6 +1545,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -1548,20 +1556,6 @@ realclean: clean
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
  CosEvent/event_export.h \
- RtecEventCommC.h \
- TimeBaseC.h \
- svc_utils_export.h \
- TimeBaseC.i \
- RtecDefaultEventDataC.h \
- RtecDefaultEventDataC.i \
- RtecEventCommC.i \
- RtecSchedulerC.h \
- Sched/sched_export.h \
- RtecSchedulerC.i \
- RtecEventChannelAdminC.i \
- CosEventChannelAdminS.h \
- CosEventCommS.h \
- CosEventCommC.h \
  CosEventCommC.i \
  CosEventCommS_T.h \
  CosEventCommS_T.i \
@@ -1573,16 +1567,30 @@ realclean: clean
  CosEventChannelAdminS_T.i \
  CosEventChannelAdminS_T.cpp \
  CosEventChannelAdminS.i \
- CosEvent/ProxyPushSupplier_i.h \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
+ ESF/ESF_Proxy_Admin.h \
+ ESF/ESF_Proxy_Collection.h \
+ ESF/ESF_Proxy_Collection.i \
+ ESF/ESF_Proxy_Collection.cpp \
+ ESF/ESF_Worker.h \
+ ESF/ESF_Worker.i \
+ ESF/ESF_Worker.cpp \
+ ESF/ESF_Proxy_Admin.i \
+ ESF/ESF_Proxy_Admin.cpp \
+ ESF/ESF_Shutdown_Proxy.h \
+ ESF/ESF_Shutdown_Proxy.i \
+ ESF/ESF_Shutdown_Proxy.cpp \
+ CosEvent/event_export.h CosEvent/CEC_ConsumerAdmin.i \
+ CosEvent/CEC_ProxyPushSupplier.h CosEvent/CEC_ProxyPushSupplier.i \
+ CosEvent/CEC_ProxyPullSupplier.h CosEvent/CEC_ProxyPullSupplier.i \
+ CosEvent/CEC_ProxyPushConsumer.h CosEvent/CEC_ProxyPushConsumer.i \
+ CosEvent/CEC_EventChannel.h CosEvent/CEC_Factory.h \
+ CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \
+ CosEvent/CEC_EventChannel.i
 
-.obj/SupplierAdmin_i.o .obj/SupplierAdmin_i.so .shobj/SupplierAdmin_i.o .shobj/SupplierAdmin_i.so: CosEvent/SupplierAdmin_i.cpp \
- CosEvent/SupplierAdmin_i.h \
+.obj/CEC_ConsumerControl.o .obj/CEC_ConsumerControl.so .shobj/CEC_ConsumerControl.o .shobj/CEC_ConsumerControl.so: CosEvent/CEC_ConsumerControl.cpp \
+ CosEvent/CEC_ConsumerControl.h \
  $(ACE_ROOT)/ace/pre.h \
- RtecEventChannelAdminC.h \
- $(TAO_ROOT)/tao/corba.h \
+ CosEvent/event_export.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/post.h \
@@ -1596,6 +1604,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -1739,14 +1748,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -1795,6 +1799,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -1860,77 +1866,22 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h \
- RtecEventCommC.h \
- TimeBaseC.h \
- svc_utils_export.h \
- TimeBaseC.i \
- RtecDefaultEventDataC.h \
- RtecDefaultEventDataC.i \
- RtecEventCommC.i \
- RtecSchedulerC.h \
- Sched/sched_export.h \
- RtecSchedulerC.i \
- RtecEventChannelAdminC.i \
- CosEventChannelAdminC.h \
- CosEventCommC.h \
- CosEventCommC.i \
- CosEventChannelAdminC.i \
- CosEvent/ProxyPushConsumer_i.h \
- RtecEventChannelAdminS.h \
- RtecEventCommS.h \
- TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- TimeBaseS_T.h \
- TimeBaseS_T.i \
- TimeBaseS_T.cpp \
- TimeBaseS.i \
- RtecDefaultEventDataS.h \
- RtecDefaultEventDataS_T.h \
- RtecDefaultEventDataS_T.i \
- RtecDefaultEventDataS_T.cpp \
- RtecDefaultEventDataS.i \
- RtecEventCommS_T.h \
- RtecEventCommS_T.i \
- RtecEventCommS_T.cpp \
- RtecEventCommS.i \
- RtecSchedulerS.h \
- RtecSchedulerS_T.h \
- RtecSchedulerS_T.i \
- RtecSchedulerS_T.cpp \
- RtecSchedulerS.i \
- RtecEventChannelAdminS_T.h \
- RtecEventChannelAdminS_T.i \
- RtecEventChannelAdminS_T.cpp \
- RtecEventChannelAdminS.i \
- CosEventChannelAdminS.h \
- CosEventCommS.h \
- CosEventCommS_T.h \
- CosEventCommS_T.i \
- CosEventCommS_T.cpp \
- CosEventCommS.i \
- CosEventChannelAdminS_T.h \
- CosEventChannelAdminS_T.i \
- CosEventChannelAdminS_T.cpp \
- CosEventChannelAdminS.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
+ CosEvent/CEC_ConsumerControl.i
 
-.obj/EventChannel_i.o .obj/EventChannel_i.so .shobj/EventChannel_i.o .shobj/EventChannel_i.so: CosEvent/EventChannel_i.cpp \
- CosEvent/EventChannel_i.h \
+.obj/CEC_Dispatching.o .obj/CEC_Dispatching.so .shobj/CEC_Dispatching.o .shobj/CEC_Dispatching.so: CosEvent/CEC_Dispatching.cpp \
+ CosEvent/CEC_Dispatching.h \
  $(ACE_ROOT)/ace/pre.h \
- RtecEventChannelAdminC.h \
+ CosEventCommC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -2088,14 +2039,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -2144,6 +2090,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -2209,6 +2157,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -2216,74 +2168,27 @@ realclean: clean
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
  CosEvent/event_export.h \
- RtecEventCommC.h \
- TimeBaseC.h \
- svc_utils_export.h \
- TimeBaseC.i \
- RtecDefaultEventDataC.h \
- RtecDefaultEventDataC.i \
- RtecEventCommC.i \
- RtecSchedulerC.h \
- Sched/sched_export.h \
- RtecSchedulerC.i \
- RtecEventChannelAdminC.i \
- CosEventChannelAdminC.h \
- CosEventCommC.h \
  CosEventCommC.i \
- CosEventChannelAdminC.i \
- CosEvent/ConsumerAdmin_i.h \
+ CosEvent/event_export.h CosEvent/CEC_Dispatching.i \
+ CosEvent/CEC_ProxyPushSupplier.h \
  CosEventChannelAdminS.h \
  CosEventCommS.h \
  CosEventCommS_T.h \
  CosEventCommS_T.i \
  CosEventCommS_T.cpp \
  CosEventCommS.i \
+ CosEventChannelAdminC.h \
+ CosEventChannelAdminC.i \
  CosEventChannelAdminS_T.h \
  CosEventChannelAdminS_T.i \
  CosEventChannelAdminS_T.cpp \
  CosEventChannelAdminS.i \
- CosEvent/ProxyPushSupplier_i.h \
- CosEvent/SupplierAdmin_i.h \
- CosEvent/ProxyPushConsumer_i.h \
- RtecEventChannelAdminS.h \
- RtecEventCommS.h \
- TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- TimeBaseS_T.h \
- TimeBaseS_T.i \
- TimeBaseS_T.cpp \
- TimeBaseS.i \
- RtecDefaultEventDataS.h \
- RtecDefaultEventDataS_T.h \
- RtecDefaultEventDataS_T.i \
- RtecDefaultEventDataS_T.cpp \
- RtecDefaultEventDataS.i \
- RtecEventCommS_T.h \
- RtecEventCommS_T.i \
- RtecEventCommS_T.cpp \
- RtecEventCommS.i \
- RtecSchedulerS.h \
- RtecSchedulerS_T.h \
- RtecSchedulerS_T.i \
- RtecSchedulerS_T.cpp \
- RtecSchedulerS.i \
- RtecEventChannelAdminS_T.h \
- RtecEventChannelAdminS_T.i \
- RtecEventChannelAdminS_T.cpp \
- RtecEventChannelAdminS.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
+ CosEvent/CEC_ProxyPushSupplier.i
 
-.obj/ProxyPushConsumer_i.o .obj/ProxyPushConsumer_i.so .shobj/ProxyPushConsumer_i.o .shobj/ProxyPushConsumer_i.so: CosEvent/ProxyPushConsumer_i.cpp \
- Event_Utilities.h \
+.obj/CEC_EventChannel.o .obj/CEC_EventChannel.so .shobj/CEC_EventChannel.o .shobj/CEC_EventChannel.so: CosEvent/CEC_EventChannel.cpp \
+ CosEvent/CEC_EventChannel.h \
  $(ACE_ROOT)/ace/pre.h \
- RtecEventChannelAdminC.h \
- $(TAO_ROOT)/tao/corba.h \
+ CosEvent/CEC_Factory.h CosEvent/event_export.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/post.h \
@@ -2297,6 +2202,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -2440,14 +2346,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -2496,6 +2397,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -2561,83 +2464,56 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h \
- RtecEventCommC.h \
- TimeBaseC.h \
- svc_utils_export.h \
- TimeBaseC.i \
- RtecDefaultEventDataC.h \
- RtecDefaultEventDataC.i \
- RtecEventCommC.i \
- RtecSchedulerC.h \
- Sched/sched_export.h \
- RtecSchedulerC.i \
- RtecEventChannelAdminC.i \
- Event_Service_Constants.h \
- Time_Utilities.h \
- Time_Utilities.i \
- Event/event_export.h \
- Event_Utilities.i \
- CosEventChannelAdminC.h \
- CosEventCommC.h \
- CosEventCommC.i \
- CosEventChannelAdminC.i \
+ CosEvent/CEC_Factory.i \
  CosEventChannelAdminS.h \
  CosEventCommS.h \
+ CosEventCommC.h \
+ CosEvent/event_export.h \
+ CosEventCommC.i \
  CosEventCommS_T.h \
  CosEventCommS_T.i \
  CosEventCommS_T.cpp \
  CosEventCommS.i \
+ CosEventChannelAdminC.h \
+ CosEventChannelAdminC.i \
  CosEventChannelAdminS_T.h \
  CosEventChannelAdminS_T.i \
  CosEventChannelAdminS_T.cpp \
  CosEventChannelAdminS.i \
- RtecEventCommS.h \
- TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- TimeBaseS_T.h \
- TimeBaseS_T.i \
- TimeBaseS_T.cpp \
- TimeBaseS.i \
- RtecDefaultEventDataS.h \
- RtecDefaultEventDataS_T.h \
- RtecDefaultEventDataS_T.i \
- RtecDefaultEventDataS_T.cpp \
- RtecDefaultEventDataS.i \
- RtecEventCommS_T.h \
- RtecEventCommS_T.i \
- RtecEventCommS_T.cpp \
- RtecEventCommS.i \
- CosEvent/ProxyPushConsumer_i.h \
- RtecEventChannelAdminS.h \
- RtecSchedulerS.h \
- RtecSchedulerS_T.h \
- RtecSchedulerS_T.i \
- RtecSchedulerS_T.cpp \
- RtecSchedulerS.i \
- RtecEventChannelAdminS_T.h \
- RtecEventChannelAdminS_T.i \
- RtecEventChannelAdminS_T.cpp \
- RtecEventChannelAdminS.i \
- CosEvent/event_export.h \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
+ CosEvent/CEC_Defaults.h CosEvent/CEC_EventChannel.i \
+ CosEvent/CEC_Dispatching.h CosEvent/CEC_Dispatching.i \
+ CosEvent/CEC_Pulling_Strategy.h CosEvent/CEC_Pulling_Strategy.i \
+ CosEvent/CEC_ConsumerAdmin.h \
+ ESF/ESF_Proxy_Admin.h \
+ ESF/ESF_Proxy_Collection.h \
+ ESF/ESF_Proxy_Collection.i \
+ ESF/ESF_Proxy_Collection.cpp \
+ ESF/ESF_Worker.h \
+ ESF/ESF_Worker.i \
+ ESF/ESF_Worker.cpp \
+ ESF/ESF_Proxy_Admin.i \
+ ESF/ESF_Proxy_Admin.cpp \
+ ESF/ESF_Shutdown_Proxy.h \
+ ESF/ESF_Shutdown_Proxy.i \
+ ESF/ESF_Shutdown_Proxy.cpp \
+ CosEvent/CEC_ConsumerAdmin.i CosEvent/CEC_SupplierAdmin.h \
+ CosEvent/CEC_SupplierAdmin.i CosEvent/CEC_ConsumerControl.h \
+ CosEvent/CEC_ConsumerControl.i CosEvent/CEC_SupplierControl.h \
+ CosEvent/CEC_SupplierControl.i
 
-.obj/ProxyPushSupplier_i.o .obj/ProxyPushSupplier_i.so .shobj/ProxyPushSupplier_i.o .shobj/ProxyPushSupplier_i.so: CosEvent/ProxyPushSupplier_i.cpp \
- RtecEventChannelAdminC.h \
+.obj/CEC_Factory.o .obj/CEC_Factory.so .shobj/CEC_Factory.o .shobj/CEC_Factory.so: CosEvent/CEC_Factory.cpp CosEvent/CEC_Factory.h \
  $(ACE_ROOT)/ace/pre.h \
- $(TAO_ROOT)/tao/corba.h \
+ CosEvent/event_export.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/post.h \
@@ -2651,6 +2527,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -2794,14 +2671,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -2850,6 +2722,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -2915,66 +2789,24 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h \
- RtecEventCommC.h \
- TimeBaseC.h \
- svc_utils_export.h \
- TimeBaseC.i \
- RtecDefaultEventDataC.h \
- RtecDefaultEventDataC.i \
- RtecEventCommC.i \
- RtecSchedulerC.h \
- Sched/sched_export.h \
- RtecSchedulerC.i \
- RtecEventChannelAdminC.i \
- CosEventChannelAdminC.h \
- CosEventCommC.h \
- CosEventCommC.i \
- CosEventChannelAdminC.i \
- CosEventChannelAdminS.h \
- CosEventCommS.h \
- CosEventCommS_T.h \
- CosEventCommS_T.i \
- CosEventCommS_T.cpp \
- CosEventCommS.i \
- CosEventChannelAdminS_T.h \
- CosEventChannelAdminS_T.i \
- CosEventChannelAdminS_T.cpp \
- CosEventChannelAdminS.i \
- RtecEventCommS.h \
- TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- TimeBaseS_T.h \
- TimeBaseS_T.i \
- TimeBaseS_T.cpp \
- TimeBaseS.i \
- RtecDefaultEventDataS.h \
- RtecDefaultEventDataS_T.h \
- RtecDefaultEventDataS_T.i \
- RtecDefaultEventDataS_T.cpp \
- RtecDefaultEventDataS.i \
- RtecEventCommS_T.h \
- RtecEventCommS_T.i \
- RtecEventCommS_T.cpp \
- RtecEventCommS.i \
- CosEvent/ProxyPushSupplier_i.h CosEvent/event_export.h \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
+ CosEvent/CEC_Factory.i
 
-.obj/CosEvent_Utilities.o .obj/CosEvent_Utilities.so .shobj/CosEvent_Utilities.o .shobj/CosEvent_Utilities.so: CosEvent_Utilities.cpp CosEvent_Utilities.h \
+.obj/CEC_ProxyPushConsumer.o .obj/CEC_ProxyPushConsumer.so .shobj/CEC_ProxyPushConsumer.o .shobj/CEC_ProxyPushConsumer.so: CosEvent/CEC_ProxyPushConsumer.cpp \
+ CosEvent/CEC_ProxyPushConsumer.h \
  $(ACE_ROOT)/ace/pre.h \
- RtecSchedulerC.h \
+ CosEventChannelAdminS.h \
+ CosEventCommS.h \
+ CosEventCommC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -3132,14 +2964,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -3188,6 +3015,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -3253,57 +3082,17 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- Sched/sched_export.h \
- TimeBaseC.h \
- svc_utils_export.h \
- TimeBaseC.i \
- RtecSchedulerC.i \
- RtecEventChannelAdminS.h \
- RtecEventCommS.h \
- TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- TimeBaseS_T.h \
- TimeBaseS_T.i \
- TimeBaseS_T.cpp \
- TimeBaseS.i \
- RtecDefaultEventDataS.h \
- RtecDefaultEventDataC.h \
  CosEvent/event_export.h \
- RtecDefaultEventDataC.i \
- RtecDefaultEventDataS_T.h \
- RtecDefaultEventDataS_T.i \
- RtecDefaultEventDataS_T.cpp \
- RtecDefaultEventDataS.i \
- RtecEventCommC.h \
- RtecEventCommC.i \
- RtecEventCommS_T.h \
- RtecEventCommS_T.i \
- RtecEventCommS_T.cpp \
- RtecEventCommS.i \
- RtecSchedulerS.h \
- RtecSchedulerS_T.h \
- RtecSchedulerS_T.i \
- RtecSchedulerS_T.cpp \
- RtecSchedulerS.i \
- RtecEventChannelAdminC.h \
- RtecEventChannelAdminC.i \
- RtecEventChannelAdminS_T.h \
- RtecEventChannelAdminS_T.i \
- RtecEventChannelAdminS_T.cpp \
- RtecEventChannelAdminS.i \
- CosEventChannelAdminS.h \
- CosEventCommS.h \
- CosEventCommC.h \
  CosEventCommC.i \
  CosEventCommS_T.h \
  CosEventCommS_T.i \
@@ -3315,29 +3104,27 @@ realclean: clean
  CosEventChannelAdminS_T.i \
  CosEventChannelAdminS_T.cpp \
  CosEventChannelAdminS.i \
- Event_Utilities.h \
- Event_Service_Constants.h \
- Time_Utilities.h \
- Time_Utilities.i \
- Event/event_export.h \
- Event_Utilities.i \
  CosEvent/event_export.h \
- Event/EC_Event_Channel.h \
- Event/EC_Factory.h \
- Event/EC_Factory.i \
- Event/EC_Defaults.h \
- Event/EC_Event_Channel.i \
- CosEvent/EventChannel_i.h \
- CosEvent/ConsumerAdmin_i.h \
- CosEvent/ProxyPushSupplier_i.h \
- CosEvent/SupplierAdmin_i.h \
- CosEvent/ProxyPushConsumer_i.h \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
+ ESF/ESF_Worker.h \
+ ESF/ESF_Worker.i \
+ ESF/ESF_Worker.cpp \
+ CosEvent/CEC_ProxyPushConsumer.i CosEvent/CEC_EventChannel.h \
+ CosEvent/CEC_Factory.h CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \
+ CosEvent/CEC_EventChannel.i CosEvent/CEC_ConsumerAdmin.h \
+ ESF/ESF_Proxy_Admin.h \
+ ESF/ESF_Proxy_Collection.h \
+ ESF/ESF_Proxy_Collection.i \
+ ESF/ESF_Proxy_Collection.cpp \
+ ESF/ESF_Proxy_Admin.i \
+ ESF/ESF_Proxy_Admin.cpp \
+ ESF/ESF_Shutdown_Proxy.h \
+ ESF/ESF_Shutdown_Proxy.i \
+ ESF/ESF_Shutdown_Proxy.cpp \
+ CosEvent/CEC_ConsumerAdmin.i CosEvent/CEC_ProxyPushSupplier.h \
+ CosEvent/CEC_ProxyPushSupplier.i
 
-.obj/CEC_ConsumerAdmin.o .obj/CEC_ConsumerAdmin.so .shobj/CEC_ConsumerAdmin.o .shobj/CEC_ConsumerAdmin.so: CosEvent/CEC_ConsumerAdmin.cpp \
- CosEvent/CEC_ConsumerAdmin.h \
+.obj/CEC_ProxyPullConsumer.o .obj/CEC_ProxyPullConsumer.so .shobj/CEC_ProxyPullConsumer.o .shobj/CEC_ProxyPullConsumer.so: CosEvent/CEC_ProxyPullConsumer.cpp \
+ CosEvent/CEC_ProxyPullConsumer.h \
  $(ACE_ROOT)/ace/pre.h \
  CosEventChannelAdminS.h \
  CosEventCommS.h \
@@ -3499,14 +3286,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -3555,6 +3337,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -3620,6 +3404,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -3638,43 +3426,33 @@ realclean: clean
  CosEventChannelAdminS_T.i \
  CosEventChannelAdminS_T.cpp \
  CosEventChannelAdminS.i \
- Event/EC_Proxy_Collection.h \
- Event/EC_Busy_Lock.h \
- Event/EC_Busy_Lock.i \
- Event/EC_Busy_Lock.cpp \
- Event/EC_Proxy_Collection.i \
- Event/EC_Proxy_Collection.cpp \
- Event/EC_Command.h \
- Event/EC_Command.i \
- Event/EC_Command.cpp \
- Event/EC_Worker.h \
- Event/EC_Worker.i \
- Event/EC_Worker.cpp \
- Event/EC_Defaults.h \
- RtecEventChannelAdminC.h \
- RtecEventCommC.h \
- TimeBaseC.h \
- svc_utils_export.h \
- TimeBaseC.i \
- RtecDefaultEventDataC.h \
- RtecDefaultEventDataC.i \
- RtecEventCommC.i \
- RtecSchedulerC.h \
- Sched/sched_export.h \
- RtecSchedulerC.i \
- RtecEventChannelAdminC.i \
- CosEvent/event_export.h CosEvent/CEC_ConsumerAdmin.i \
- CosEvent/CEC_ProxyPushSupplier.h CosEvent/CEC_ProxyPushSupplier.i \
- CosEvent/CEC_ProxyPullSupplier.h CosEvent/CEC_ProxyPullSupplier.i \
- CosEvent/CEC_ProxyPushConsumer.h CosEvent/CEC_ProxyPushConsumer.i \
+ ESF/ESF_Worker.h \
+ ESF/ESF_Worker.i \
+ ESF/ESF_Worker.cpp \
+ CosEvent/event_export.h CosEvent/CEC_ProxyPullConsumer.i \
  CosEvent/CEC_EventChannel.h CosEvent/CEC_Factory.h \
  CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \
- CosEvent/CEC_EventChannel.i
+ CosEvent/CEC_EventChannel.i CosEvent/CEC_ConsumerAdmin.h \
+ ESF/ESF_Proxy_Admin.h \
+ ESF/ESF_Proxy_Collection.h \
+ ESF/ESF_Proxy_Collection.i \
+ ESF/ESF_Proxy_Collection.cpp \
+ ESF/ESF_Proxy_Admin.i \
+ ESF/ESF_Proxy_Admin.cpp \
+ ESF/ESF_Shutdown_Proxy.h \
+ ESF/ESF_Shutdown_Proxy.i \
+ ESF/ESF_Shutdown_Proxy.cpp \
+ CosEvent/CEC_ConsumerAdmin.i CosEvent/CEC_SupplierControl.h \
+ CosEvent/CEC_SupplierControl.i CosEvent/CEC_ProxyPullSupplier.h \
+ CosEvent/CEC_ProxyPullSupplier.i
 
-.obj/CEC_ConsumerControl.o .obj/CEC_ConsumerControl.so .shobj/CEC_ConsumerControl.o .shobj/CEC_ConsumerControl.so: CosEvent/CEC_ConsumerControl.cpp \
- CosEvent/CEC_ConsumerControl.h \
+.obj/CEC_ProxyPushSupplier.o .obj/CEC_ProxyPushSupplier.so .shobj/CEC_ProxyPushSupplier.o .shobj/CEC_ProxyPushSupplier.so: CosEvent/CEC_ProxyPushSupplier.cpp \
+ CosEvent/CEC_ProxyPushSupplier.h \
  $(ACE_ROOT)/ace/pre.h \
- CosEvent/event_export.h \
+ CosEventChannelAdminS.h \
+ CosEventCommS.h \
+ CosEventCommC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/post.h \
@@ -3688,7 +3466,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -3832,14 +3609,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -3888,6 +3660,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -3953,17 +3727,40 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
+ CosEvent/event_export.h \
+ CosEventCommC.i \
+ CosEventCommS_T.h \
+ CosEventCommS_T.i \
+ CosEventCommS_T.cpp \
+ CosEventCommS.i \
+ CosEventChannelAdminC.h \
+ CosEventChannelAdminC.i \
+ CosEventChannelAdminS_T.h \
+ CosEventChannelAdminS_T.i \
+ CosEventChannelAdminS_T.cpp \
+ CosEventChannelAdminS.i \
+ CosEvent/event_export.h CosEvent/CEC_ProxyPushSupplier.i \
+ CosEvent/CEC_Dispatching.h CosEvent/CEC_Dispatching.i \
+ CosEvent/CEC_EventChannel.h CosEvent/CEC_Factory.h \
+ CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \
+ CosEvent/CEC_EventChannel.i CosEvent/CEC_ConsumerControl.h \
  CosEvent/CEC_ConsumerControl.i
 
-.obj/CEC_Dispatching.o .obj/CEC_Dispatching.so .shobj/CEC_Dispatching.o .shobj/CEC_Dispatching.so: CosEvent/CEC_Dispatching.cpp \
- CosEvent/CEC_Dispatching.h \
+.obj/CEC_ProxyPullSupplier.o .obj/CEC_ProxyPullSupplier.so .shobj/CEC_ProxyPullSupplier.o .shobj/CEC_ProxyPullSupplier.so: CosEvent/CEC_ProxyPullSupplier.cpp \
+ CosEvent/CEC_ProxyPullSupplier.h \
  $(ACE_ROOT)/ace/pre.h \
+ CosEventChannelAdminS.h \
+ CosEventCommS.h \
  CosEventCommC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -4122,14 +3919,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -4178,6 +3970,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -4243,6 +4037,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -4251,10 +4049,6 @@ realclean: clean
  $(TAO_ROOT)/tao/BoundsC.i \
  CosEvent/event_export.h \
  CosEventCommC.i \
- CosEvent/event_export.h CosEvent/CEC_Dispatching.i \
- CosEvent/CEC_ProxyPushSupplier.h \
- CosEventChannelAdminS.h \
- CosEventCommS.h \
  CosEventCommS_T.h \
  CosEventCommS_T.i \
  CosEventCommS_T.cpp \
@@ -4265,12 +4059,19 @@ realclean: clean
  CosEventChannelAdminS_T.i \
  CosEventChannelAdminS_T.cpp \
  CosEventChannelAdminS.i \
- CosEvent/CEC_ProxyPushSupplier.i
+ CosEvent/event_export.h CosEvent/CEC_ProxyPullSupplier.i \
+ CosEvent/CEC_Dispatching.h CosEvent/CEC_Dispatching.i \
+ CosEvent/CEC_EventChannel.h CosEvent/CEC_Factory.h \
+ CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \
+ CosEvent/CEC_EventChannel.i
 
-.obj/CEC_EventChannel.o .obj/CEC_EventChannel.so .shobj/CEC_EventChannel.o .shobj/CEC_EventChannel.so: CosEvent/CEC_EventChannel.cpp \
- CosEvent/CEC_EventChannel.h \
+.obj/CEC_SupplierAdmin.o .obj/CEC_SupplierAdmin.so .shobj/CEC_SupplierAdmin.o .shobj/CEC_SupplierAdmin.so: CosEvent/CEC_SupplierAdmin.cpp \
+ CosEvent/CEC_SupplierAdmin.h \
  $(ACE_ROOT)/ace/pre.h \
- CosEvent/CEC_Factory.h CosEvent/event_export.h \
+ CosEventChannelAdminS.h \
+ CosEventCommS.h \
+ CosEventCommC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/post.h \
@@ -4284,7 +4085,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -4428,14 +4228,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -4484,6 +4279,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -4549,16 +4346,16 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/CEC_Factory.i \
- CosEventChannelAdminS.h \
- CosEventCommS.h \
- CosEventCommC.h \
  CosEvent/event_export.h \
  CosEventCommC.i \
  CosEventCommS_T.h \
@@ -4571,41 +4368,27 @@ realclean: clean
  CosEventChannelAdminS_T.i \
  CosEventChannelAdminS_T.cpp \
  CosEventChannelAdminS.i \
- CosEvent/CEC_Defaults.h CosEvent/CEC_EventChannel.i \
- CosEvent/CEC_Dispatching.h CosEvent/CEC_Dispatching.i \
- CosEvent/CEC_Pulling_Strategy.h CosEvent/CEC_Pulling_Strategy.i \
- CosEvent/CEC_ConsumerAdmin.h \
- Event/EC_Proxy_Collection.h \
- Event/EC_Busy_Lock.h \
- Event/EC_Busy_Lock.i \
- Event/EC_Busy_Lock.cpp \
- Event/EC_Proxy_Collection.i \
- Event/EC_Proxy_Collection.cpp \
- Event/EC_Command.h \
- Event/EC_Command.i \
- Event/EC_Command.cpp \
- Event/EC_Worker.h \
- Event/EC_Worker.i \
- Event/EC_Worker.cpp \
- Event/EC_Defaults.h \
- RtecEventChannelAdminC.h \
- RtecEventCommC.h \
- TimeBaseC.h \
- svc_utils_export.h \
- TimeBaseC.i \
- RtecDefaultEventDataC.h \
- RtecDefaultEventDataC.i \
- RtecEventCommC.i \
- RtecSchedulerC.h \
- Sched/sched_export.h \
- RtecSchedulerC.i \
- RtecEventChannelAdminC.i \
- CosEvent/CEC_ConsumerAdmin.i CosEvent/CEC_SupplierAdmin.h \
- CosEvent/CEC_SupplierAdmin.i CosEvent/CEC_ConsumerControl.h \
- CosEvent/CEC_ConsumerControl.i CosEvent/CEC_SupplierControl.h \
- CosEvent/CEC_SupplierControl.i
+ ESF/ESF_Proxy_Admin.h \
+ ESF/ESF_Proxy_Collection.h \
+ ESF/ESF_Proxy_Collection.i \
+ ESF/ESF_Proxy_Collection.cpp \
+ ESF/ESF_Worker.h \
+ ESF/ESF_Worker.i \
+ ESF/ESF_Worker.cpp \
+ ESF/ESF_Proxy_Admin.i \
+ ESF/ESF_Proxy_Admin.cpp \
+ ESF/ESF_Shutdown_Proxy.h \
+ ESF/ESF_Shutdown_Proxy.i \
+ ESF/ESF_Shutdown_Proxy.cpp \
+ CosEvent/event_export.h CosEvent/CEC_SupplierAdmin.i \
+ CosEvent/CEC_ProxyPushConsumer.h CosEvent/CEC_ProxyPushConsumer.i \
+ CosEvent/CEC_ProxyPullConsumer.h CosEvent/CEC_ProxyPullConsumer.i \
+ CosEvent/CEC_EventChannel.h CosEvent/CEC_Factory.h \
+ CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \
+ CosEvent/CEC_EventChannel.i
 
-.obj/CEC_Factory.o .obj/CEC_Factory.so .shobj/CEC_Factory.o .shobj/CEC_Factory.so: CosEvent/CEC_Factory.cpp CosEvent/CEC_Factory.h \
+.obj/CEC_SupplierControl.o .obj/CEC_SupplierControl.so .shobj/CEC_SupplierControl.o .shobj/CEC_SupplierControl.so: CosEvent/CEC_SupplierControl.cpp \
+ CosEvent/CEC_SupplierControl.h \
  $(ACE_ROOT)/ace/pre.h \
  CosEvent/event_export.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -4765,14 +4548,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -4821,6 +4599,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -4886,21 +4666,25 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/CEC_Factory.i
+ CosEvent/CEC_SupplierControl.i
 
-.obj/CEC_ProxyPushConsumer.o .obj/CEC_ProxyPushConsumer.so .shobj/CEC_ProxyPushConsumer.o .shobj/CEC_ProxyPushConsumer.so: CosEvent/CEC_ProxyPushConsumer.cpp \
- CosEvent/CEC_ProxyPushConsumer.h \
+.obj/CEC_Dispatching_Task.o .obj/CEC_Dispatching_Task.so .shobj/CEC_Dispatching_Task.o .shobj/CEC_Dispatching_Task.so: CosEvent/CEC_Dispatching_Task.cpp \
+ CosEvent/CEC_Dispatching_Task.h \
  $(ACE_ROOT)/ace/pre.h \
- CosEventChannelAdminS.h \
- CosEventCommS.h \
- CosEventCommC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/post.h \
@@ -4914,18 +4698,14 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -4933,13 +4713,21 @@ realclean: clean
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
  $(ACE_ROOT)/ace/Synch.i \
  $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -4956,47 +4744,28 @@ realclean: clean
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -5008,6 +4777,51 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ CosEvent/event_export.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -5057,14 +4871,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -5113,29 +4922,10 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/Profile.h \
@@ -5178,13 +4968,20 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h \
+ CosEvent/CEC_Dispatching_Task.i CosEvent/CEC_ProxyPushSupplier.h \
+ CosEventChannelAdminS.h \
+ CosEventCommS.h \
+ CosEventCommC.h \
  CosEventCommC.i \
  CosEventCommS_T.h \
  CosEventCommS_T.i \
@@ -5196,43 +4993,12 @@ realclean: clean
  CosEventChannelAdminS_T.i \
  CosEventChannelAdminS_T.cpp \
  CosEventChannelAdminS.i \
- CosEvent/event_export.h \
- Event/EC_Worker.h \
- Event/EC_Worker.i \
- Event/EC_Worker.cpp \
- CosEvent/CEC_ProxyPushConsumer.i CosEvent/CEC_EventChannel.h \
- CosEvent/CEC_Factory.h CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \
- CosEvent/CEC_EventChannel.i CosEvent/CEC_ConsumerAdmin.h \
- Event/EC_Proxy_Collection.h \
- Event/EC_Busy_Lock.h \
- Event/EC_Busy_Lock.i \
- Event/EC_Busy_Lock.cpp \
- Event/EC_Proxy_Collection.i \
- Event/EC_Proxy_Collection.cpp \
- Event/EC_Command.h \
- Event/EC_Command.i \
- Event/EC_Command.cpp \
- Event/EC_Defaults.h \
- RtecEventChannelAdminC.h \
- RtecEventCommC.h \
- TimeBaseC.h \
- svc_utils_export.h \
- TimeBaseC.i \
- RtecDefaultEventDataC.h \
- RtecDefaultEventDataC.i \
- RtecEventCommC.i \
- RtecSchedulerC.h \
- Sched/sched_export.h \
- RtecSchedulerC.i \
- RtecEventChannelAdminC.i \
- CosEvent/CEC_ConsumerAdmin.i CosEvent/CEC_ProxyPushSupplier.h \
- CosEvent/CEC_ProxyPushSupplier.i
+ CosEvent/event_export.h CosEvent/CEC_ProxyPushSupplier.i
 
-.obj/CEC_ProxyPullConsumer.o .obj/CEC_ProxyPullConsumer.so .shobj/CEC_ProxyPullConsumer.o .shobj/CEC_ProxyPullConsumer.so: CosEvent/CEC_ProxyPullConsumer.cpp \
- CosEvent/CEC_ProxyPullConsumer.h \
+.obj/CEC_MT_Dispatching.o .obj/CEC_MT_Dispatching.so .shobj/CEC_MT_Dispatching.o .shobj/CEC_MT_Dispatching.so: CosEvent/CEC_MT_Dispatching.cpp \
+ CosEvent/CEC_MT_Dispatching.h \
  $(ACE_ROOT)/ace/pre.h \
- CosEventChannelAdminS.h \
- CosEventCommS.h \
+ CosEvent/CEC_Dispatching.h \
  CosEventCommC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -5391,14 +5157,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -5447,6 +5208,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -5512,6 +5275,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -5520,56 +5287,27 @@ realclean: clean
  $(TAO_ROOT)/tao/BoundsC.i \
  CosEvent/event_export.h \
  CosEventCommC.i \
- CosEventCommS_T.h \
- CosEventCommS_T.i \
- CosEventCommS_T.cpp \
- CosEventCommS.i \
- CosEventChannelAdminC.h \
- CosEventChannelAdminC.i \
- CosEventChannelAdminS_T.h \
- CosEventChannelAdminS_T.i \
- CosEventChannelAdminS_T.cpp \
- CosEventChannelAdminS.i \
- Event/EC_Worker.h \
- Event/EC_Worker.i \
- Event/EC_Worker.cpp \
- CosEvent/event_export.h CosEvent/CEC_ProxyPullConsumer.i \
- CosEvent/CEC_EventChannel.h CosEvent/CEC_Factory.h \
- CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \
- CosEvent/CEC_EventChannel.i CosEvent/CEC_ConsumerAdmin.h \
- Event/EC_Proxy_Collection.h \
- Event/EC_Busy_Lock.h \
- Event/EC_Busy_Lock.i \
- Event/EC_Busy_Lock.cpp \
- Event/EC_Proxy_Collection.i \
- Event/EC_Proxy_Collection.cpp \
- Event/EC_Command.h \
- Event/EC_Command.i \
- Event/EC_Command.cpp \
- Event/EC_Defaults.h \
- RtecEventChannelAdminC.h \
- RtecEventCommC.h \
- TimeBaseC.h \
- svc_utils_export.h \
- TimeBaseC.i \
- RtecDefaultEventDataC.h \
- RtecDefaultEventDataC.i \
- RtecEventCommC.i \
- RtecSchedulerC.h \
- Sched/sched_export.h \
- RtecSchedulerC.i \
- RtecEventChannelAdminC.i \
- CosEvent/CEC_ConsumerAdmin.i CosEvent/CEC_SupplierControl.h \
- CosEvent/CEC_SupplierControl.i CosEvent/CEC_ProxyPullSupplier.h \
- CosEvent/CEC_ProxyPullSupplier.i
+ CosEvent/event_export.h CosEvent/CEC_Dispatching.i \
+ CosEvent/CEC_Dispatching_Task.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ CosEvent/CEC_Dispatching_Task.i CosEvent/CEC_MT_Dispatching.i
 
-.obj/CEC_ProxyPushSupplier.o .obj/CEC_ProxyPushSupplier.so .shobj/CEC_ProxyPushSupplier.o .shobj/CEC_ProxyPushSupplier.so: CosEvent/CEC_ProxyPushSupplier.cpp \
- CosEvent/CEC_ProxyPushSupplier.h \
+.obj/CEC_Reactive_ConsumerControl.o .obj/CEC_Reactive_ConsumerControl.so .shobj/CEC_Reactive_ConsumerControl.o .shobj/CEC_Reactive_ConsumerControl.so: \
+ CosEvent/CEC_Reactive_ConsumerControl.cpp \
+ CosEvent/CEC_Reactive_ConsumerControl.h \
  $(ACE_ROOT)/ace/pre.h \
- CosEventChannelAdminS.h \
- CosEventCommS.h \
- CosEventCommC.h \
- $(TAO_ROOT)/tao/corba.h \
+ CosEvent/CEC_ConsumerControl.h \
+ CosEvent/event_export.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/post.h \
@@ -5583,6 +5321,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -5726,14 +5465,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -5782,6 +5516,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -5847,13 +5583,25 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h \
+ CosEvent/CEC_ConsumerControl.i \
+ ESF/ESF_Worker.h \
+ ESF/ESF_Worker.i \
+ ESF/ESF_Worker.cpp \
+ CosEvent/CEC_Reactive_ConsumerControl.i CosEvent/CEC_EventChannel.h \
+ CosEvent/CEC_Factory.h CosEvent/event_export.h CosEvent/CEC_Factory.i \
+ CosEventChannelAdminS.h \
+ CosEventCommS.h \
+ CosEventCommC.h \
  CosEventCommC.i \
  CosEventCommS_T.h \
  CosEventCommS_T.i \
@@ -5865,20 +5613,27 @@ realclean: clean
  CosEventChannelAdminS_T.i \
  CosEventChannelAdminS_T.cpp \
  CosEventChannelAdminS.i \
- CosEvent/event_export.h CosEvent/CEC_ProxyPushSupplier.i \
- CosEvent/CEC_Dispatching.h CosEvent/CEC_Dispatching.i \
- CosEvent/CEC_EventChannel.h CosEvent/CEC_Factory.h \
- CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \
- CosEvent/CEC_EventChannel.i CosEvent/CEC_ConsumerControl.h \
- CosEvent/CEC_ConsumerControl.i
+ CosEvent/CEC_Defaults.h CosEvent/CEC_EventChannel.i \
+ CosEvent/CEC_ConsumerAdmin.h \
+ ESF/ESF_Proxy_Admin.h \
+ ESF/ESF_Proxy_Collection.h \
+ ESF/ESF_Proxy_Collection.i \
+ ESF/ESF_Proxy_Collection.cpp \
+ ESF/ESF_Proxy_Admin.i \
+ ESF/ESF_Proxy_Admin.cpp \
+ ESF/ESF_Shutdown_Proxy.h \
+ ESF/ESF_Shutdown_Proxy.i \
+ ESF/ESF_Shutdown_Proxy.cpp \
+ CosEvent/CEC_ConsumerAdmin.i CosEvent/CEC_ProxyPushSupplier.h \
+ CosEvent/CEC_ProxyPushSupplier.i CosEvent/CEC_ProxyPullSupplier.h \
+ CosEvent/CEC_ProxyPullSupplier.i
 
-.obj/CEC_ProxyPullSupplier.o .obj/CEC_ProxyPullSupplier.so .shobj/CEC_ProxyPullSupplier.o .shobj/CEC_ProxyPullSupplier.so: CosEvent/CEC_ProxyPullSupplier.cpp \
- CosEvent/CEC_ProxyPullSupplier.h \
+.obj/CEC_Reactive_SupplierControl.o .obj/CEC_Reactive_SupplierControl.so .shobj/CEC_Reactive_SupplierControl.o .shobj/CEC_Reactive_SupplierControl.so: \
+ CosEvent/CEC_Reactive_SupplierControl.cpp \
+ CosEvent/CEC_Reactive_SupplierControl.h \
  $(ACE_ROOT)/ace/pre.h \
- CosEventChannelAdminS.h \
- CosEventCommS.h \
- CosEventCommC.h \
- $(TAO_ROOT)/tao/corba.h \
+ CosEvent/CEC_SupplierControl.h \
+ CosEvent/event_export.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/post.h \
@@ -5892,6 +5647,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -6035,14 +5791,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -6091,6 +5842,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -6156,13 +5909,25 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h \
+ CosEvent/CEC_SupplierControl.i \
+ ESF/ESF_Worker.h \
+ ESF/ESF_Worker.i \
+ ESF/ESF_Worker.cpp \
+ CosEvent/CEC_Reactive_SupplierControl.i CosEvent/CEC_EventChannel.h \
+ CosEvent/CEC_Factory.h CosEvent/event_export.h CosEvent/CEC_Factory.i \
+ CosEventChannelAdminS.h \
+ CosEventCommS.h \
+ CosEventCommC.h \
  CosEventCommC.i \
  CosEventCommS_T.h \
  CosEventCommS_T.i \
@@ -6174,19 +5939,25 @@ realclean: clean
  CosEventChannelAdminS_T.i \
  CosEventChannelAdminS_T.cpp \
  CosEventChannelAdminS.i \
- CosEvent/event_export.h CosEvent/CEC_ProxyPullSupplier.i \
- CosEvent/CEC_Dispatching.h CosEvent/CEC_Dispatching.i \
- CosEvent/CEC_EventChannel.h CosEvent/CEC_Factory.h \
- CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \
- CosEvent/CEC_EventChannel.i
-
-.obj/CEC_SupplierAdmin.o .obj/CEC_SupplierAdmin.so .shobj/CEC_SupplierAdmin.o .shobj/CEC_SupplierAdmin.so: CosEvent/CEC_SupplierAdmin.cpp \
+ CosEvent/CEC_Defaults.h CosEvent/CEC_EventChannel.i \
  CosEvent/CEC_SupplierAdmin.h \
+ ESF/ESF_Proxy_Admin.h \
+ ESF/ESF_Proxy_Collection.h \
+ ESF/ESF_Proxy_Collection.i \
+ ESF/ESF_Proxy_Collection.cpp \
+ ESF/ESF_Proxy_Admin.i \
+ ESF/ESF_Proxy_Admin.cpp \
+ ESF/ESF_Shutdown_Proxy.h \
+ ESF/ESF_Shutdown_Proxy.i \
+ ESF/ESF_Shutdown_Proxy.cpp \
+ CosEvent/CEC_SupplierAdmin.i CosEvent/CEC_ProxyPushConsumer.h \
+ CosEvent/CEC_ProxyPushConsumer.i CosEvent/CEC_ProxyPullConsumer.h \
+ CosEvent/CEC_ProxyPullConsumer.i
+
+.obj/CEC_Pulling_Strategy.o .obj/CEC_Pulling_Strategy.so .shobj/CEC_Pulling_Strategy.o .shobj/CEC_Pulling_Strategy.so: CosEvent/CEC_Pulling_Strategy.cpp \
+ CosEvent/CEC_Pulling_Strategy.h \
  $(ACE_ROOT)/ace/pre.h \
- CosEventChannelAdminS.h \
- CosEventCommS.h \
- CosEventCommC.h \
- $(TAO_ROOT)/tao/corba.h \
+ CosEvent/event_export.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/post.h \
@@ -6200,6 +5971,30 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
+ CosEvent/CEC_Pulling_Strategy.i
+
+.obj/CEC_Reactive_Pulling_Strategy.o .obj/CEC_Reactive_Pulling_Strategy.so .shobj/CEC_Reactive_Pulling_Strategy.o .shobj/CEC_Reactive_Pulling_Strategy.so: \
+ CosEvent/CEC_Reactive_Pulling_Strategy.cpp \
+ CosEvent/CEC_Reactive_Pulling_Strategy.h \
+ $(ACE_ROOT)/ace/pre.h \
+ CosEvent/CEC_Pulling_Strategy.h \
+ CosEvent/event_export.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ CosEvent/CEC_Pulling_Strategy.i \
+ ESF/ESF_Worker.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -6343,14 +6138,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -6399,6 +6189,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -6464,13 +6256,23 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h \
+ ESF/ESF_Worker.i \
+ ESF/ESF_Worker.cpp \
+ CosEvent/CEC_Reactive_Pulling_Strategy.i \
+ CosEvent/CEC_ProxyPullConsumer.h \
+ CosEventChannelAdminS.h \
+ CosEventCommS.h \
+ CosEventCommC.h \
  CosEventCommC.i \
  CosEventCommS_T.h \
  CosEventCommS_T.i \
@@ -6482,42 +6284,26 @@ realclean: clean
  CosEventChannelAdminS_T.i \
  CosEventChannelAdminS_T.cpp \
  CosEventChannelAdminS.i \
- Event/EC_Proxy_Collection.h \
- Event/EC_Busy_Lock.h \
- Event/EC_Busy_Lock.i \
- Event/EC_Busy_Lock.cpp \
- Event/EC_Proxy_Collection.i \
- Event/EC_Proxy_Collection.cpp \
- Event/EC_Command.h \
- Event/EC_Command.i \
- Event/EC_Command.cpp \
- Event/EC_Worker.h \
- Event/EC_Worker.i \
- Event/EC_Worker.cpp \
- Event/EC_Defaults.h \
- RtecEventChannelAdminC.h \
- RtecEventCommC.h \
- TimeBaseC.h \
- svc_utils_export.h \
- TimeBaseC.i \
- RtecDefaultEventDataC.h \
- RtecDefaultEventDataC.i \
- RtecEventCommC.i \
- RtecSchedulerC.h \
- Sched/sched_export.h \
- RtecSchedulerC.i \
- RtecEventChannelAdminC.i \
- CosEvent/event_export.h CosEvent/CEC_SupplierAdmin.i \
- CosEvent/CEC_ProxyPushConsumer.h CosEvent/CEC_ProxyPushConsumer.i \
- CosEvent/CEC_ProxyPullConsumer.h CosEvent/CEC_ProxyPullConsumer.i \
+ CosEvent/event_export.h CosEvent/CEC_ProxyPullConsumer.i \
  CosEvent/CEC_EventChannel.h CosEvent/CEC_Factory.h \
  CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \
- CosEvent/CEC_EventChannel.i
+ CosEvent/CEC_EventChannel.i CosEvent/CEC_SupplierAdmin.h \
+ ESF/ESF_Proxy_Admin.h \
+ ESF/ESF_Proxy_Collection.h \
+ ESF/ESF_Proxy_Collection.i \
+ ESF/ESF_Proxy_Collection.cpp \
+ ESF/ESF_Proxy_Admin.i \
+ ESF/ESF_Proxy_Admin.cpp \
+ ESF/ESF_Shutdown_Proxy.h \
+ ESF/ESF_Shutdown_Proxy.i \
+ ESF/ESF_Shutdown_Proxy.cpp \
+ CosEvent/CEC_SupplierAdmin.i CosEvent/CEC_ConsumerAdmin.h \
+ CosEvent/CEC_ConsumerAdmin.i
 
-.obj/CEC_SupplierControl.o .obj/CEC_SupplierControl.so .shobj/CEC_SupplierControl.o .shobj/CEC_SupplierControl.so: CosEvent/CEC_SupplierControl.cpp \
- CosEvent/CEC_SupplierControl.h \
+.obj/CEC_Default_Factory.o .obj/CEC_Default_Factory.so .shobj/CEC_Default_Factory.o .shobj/CEC_Default_Factory.so: CosEvent/CEC_Default_Factory.cpp \
+ CosEvent/CEC_Default_Factory.h \
  $(ACE_ROOT)/ace/pre.h \
- CosEvent/event_export.h \
+ CosEvent/CEC_Factory.h CosEvent/event_export.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/post.h \
@@ -6675,14 +6461,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -6731,6 +6512,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -6796,21 +6579,111 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/CEC_SupplierControl.i
+ CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \
+ CosEvent/CEC_Default_Factory.i CosEvent/CEC_MT_Dispatching.h \
+ CosEvent/CEC_Dispatching.h \
+ CosEventCommC.h \
+ CosEvent/event_export.h \
+ CosEventCommC.i \
+ CosEvent/CEC_Dispatching.i CosEvent/CEC_Dispatching_Task.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ CosEvent/CEC_Dispatching_Task.i CosEvent/CEC_MT_Dispatching.i \
+ CosEvent/CEC_Reactive_Pulling_Strategy.h \
+ CosEvent/CEC_Pulling_Strategy.h CosEvent/CEC_Pulling_Strategy.i \
+ ESF/ESF_Worker.h \
+ ESF/ESF_Worker.i \
+ ESF/ESF_Worker.cpp \
+ CosEvent/CEC_Reactive_Pulling_Strategy.i CosEvent/CEC_ConsumerAdmin.h \
+ CosEventChannelAdminS.h \
+ CosEventCommS.h \
+ CosEventCommS_T.h \
+ CosEventCommS_T.i \
+ CosEventCommS_T.cpp \
+ CosEventCommS.i \
+ CosEventChannelAdminC.h \
+ CosEventChannelAdminC.i \
+ CosEventChannelAdminS_T.h \
+ CosEventChannelAdminS_T.i \
+ CosEventChannelAdminS_T.cpp \
+ CosEventChannelAdminS.i \
+ ESF/ESF_Proxy_Admin.h \
+ ESF/ESF_Proxy_Collection.h \
+ ESF/ESF_Proxy_Collection.i \
+ ESF/ESF_Proxy_Collection.cpp \
+ ESF/ESF_Proxy_Admin.i \
+ ESF/ESF_Proxy_Admin.cpp \
+ ESF/ESF_Shutdown_Proxy.h \
+ ESF/ESF_Shutdown_Proxy.i \
+ ESF/ESF_Shutdown_Proxy.cpp \
+ CosEvent/CEC_ConsumerAdmin.i CosEvent/CEC_SupplierAdmin.h \
+ CosEvent/CEC_SupplierAdmin.i CosEvent/CEC_ProxyPushConsumer.h \
+ CosEvent/CEC_ProxyPushConsumer.i CosEvent/CEC_ProxyPullConsumer.h \
+ CosEvent/CEC_ProxyPullConsumer.i CosEvent/CEC_ProxyPushSupplier.h \
+ CosEvent/CEC_ProxyPushSupplier.i CosEvent/CEC_ProxyPullSupplier.h \
+ CosEvent/CEC_ProxyPullSupplier.i CosEvent/CEC_EventChannel.h \
+ CosEvent/CEC_EventChannel.i CosEvent/CEC_Reactive_ConsumerControl.h \
+ CosEvent/CEC_ConsumerControl.h CosEvent/CEC_ConsumerControl.i \
+ CosEvent/CEC_Reactive_ConsumerControl.i \
+ CosEvent/CEC_Reactive_SupplierControl.h \
+ CosEvent/CEC_SupplierControl.h CosEvent/CEC_SupplierControl.i \
+ CosEvent/CEC_Reactive_SupplierControl.i \
+ ESF/ESF_Immediate_Changes.h \
+ ESF/ESF_Immediate_Changes.i \
+ ESF/ESF_Immediate_Changes.cpp \
+ ESF/ESF_Delayed_Changes.h \
+ ESF/ESF_Busy_Lock.h \
+ ESF/ESF_Busy_Lock.i \
+ ESF/ESF_Busy_Lock.cpp \
+ ESF/ESF_Delayed_Changes.i \
+ ESF/ESF_Delayed_Changes.cpp \
+ ESF/ESF_Defaults.h \
+ ESF/ESF_Delayed_Command.h \
+ ESF/ESF_Delayed_Command.i \
+ ESF/ESF_Delayed_Command.cpp \
+ ESF/ESF_Copy_On_Write.h \
+ ESF/ESF_Copy_On_Write.i \
+ ESF/ESF_Copy_On_Write.cpp \
+ ESF/ESF_Copy_On_Read.h \
+ ESF/ESF_Copy_On_Read.i \
+ ESF/ESF_Copy_On_Read.cpp \
+ ESF/ESF_Proxy_List.h \
+ ESF/ESF_Proxy_List.i \
+ ESF/ESF_Proxy_List.cpp \
+ ESF/ESF_Proxy_RB_Tree.h \
+ $(ACE_ROOT)/ace/RB_Tree.h \
+ $(ACE_ROOT)/ace/RB_Tree.i \
+ $(ACE_ROOT)/ace/RB_Tree.cpp \
+ ESF/ESF_Proxy_RB_Tree.i \
+ ESF/ESF_Proxy_RB_Tree.cpp \
+ $(ACE_ROOT)/ace/Arg_Shifter.h \
+ $(ACE_ROOT)/ace/Sched_Params.h \
+ $(ACE_ROOT)/ace/Sched_Params.i
 
-.obj/CEC_Dispatching_Task.o .obj/CEC_Dispatching_Task.so .shobj/CEC_Dispatching_Task.o .shobj/CEC_Dispatching_Task.so: CosEvent/CEC_Dispatching_Task.cpp \
- CosEvent/CEC_Dispatching_Task.h \
+.obj/ConsumerAdmin_i.o .obj/ConsumerAdmin_i.so .shobj/ConsumerAdmin_i.o .shobj/ConsumerAdmin_i.so: CosEvent/ConsumerAdmin_i.cpp \
+ CosEvent/ConsumerAdmin_i.h \
  $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
+ RtecEventChannelAdminC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/post.h \
@@ -6824,14 +6697,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -6839,21 +6716,13 @@ realclean: clean
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
  $(ACE_ROOT)/ace/Synch.i \
  $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -6870,73 +6739,21 @@ realclean: clean
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- CosEvent/event_export.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
@@ -6948,6 +6765,32 @@ realclean: clean
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -6997,14 +6840,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -7053,8 +6891,31 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/Profile.h \
@@ -7097,16 +6958,32 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/CEC_Dispatching_Task.i CosEvent/CEC_ProxyPushSupplier.h \
+ Event/event_export.h \
+ RtecEventCommC.h \
+ TimeBaseC.h \
+ svc_utils_export.h \
+ TimeBaseC.i \
+ RtecDefaultEventDataC.h \
+ RtecDefaultEventDataC.i \
+ RtecEventCommC.i \
+ RtecSchedulerC.h \
+ Sched/sched_export.h \
+ RtecSchedulerC.i \
+ RtecEventChannelAdminC.i \
  CosEventChannelAdminS.h \
  CosEventCommS.h \
  CosEventCommC.h \
+ CosEvent/event_export.h \
  CosEventCommC.i \
  CosEventCommS_T.h \
  CosEventCommS_T.i \
@@ -7118,13 +6995,15 @@ realclean: clean
  CosEventChannelAdminS_T.i \
  CosEventChannelAdminS_T.cpp \
  CosEventChannelAdminS.i \
- CosEvent/event_export.h CosEvent/CEC_ProxyPushSupplier.i
+ CosEvent/ProxyPushSupplier_i.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp
 
-.obj/CEC_MT_Dispatching.o .obj/CEC_MT_Dispatching.so .shobj/CEC_MT_Dispatching.o .shobj/CEC_MT_Dispatching.so: CosEvent/CEC_MT_Dispatching.cpp \
- CosEvent/CEC_MT_Dispatching.h \
+.obj/SupplierAdmin_i.o .obj/SupplierAdmin_i.so .shobj/SupplierAdmin_i.o .shobj/SupplierAdmin_i.so: CosEvent/SupplierAdmin_i.cpp \
+ CosEvent/SupplierAdmin_i.h \
  $(ACE_ROOT)/ace/pre.h \
- CosEvent/CEC_Dispatching.h \
- CosEventCommC.h \
+ RtecEventChannelAdminC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -7282,14 +7161,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -7338,6 +7212,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -7403,35 +7279,83 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
+ Event/event_export.h \
+ RtecEventCommC.h \
+ TimeBaseC.h \
+ svc_utils_export.h \
+ TimeBaseC.i \
+ RtecDefaultEventDataC.h \
+ RtecDefaultEventDataC.i \
+ RtecEventCommC.i \
+ RtecSchedulerC.h \
+ Sched/sched_export.h \
+ RtecSchedulerC.i \
+ RtecEventChannelAdminC.i \
+ CosEventChannelAdminC.h \
  CosEvent/event_export.h \
+ CosEventCommC.h \
  CosEventCommC.i \
- CosEvent/event_export.h CosEvent/CEC_Dispatching.i \
- CosEvent/CEC_Dispatching_Task.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- CosEvent/CEC_Dispatching_Task.i CosEvent/CEC_MT_Dispatching.i
+ CosEventChannelAdminC.i \
+ CosEvent/ProxyPushConsumer_i.h \
+ RtecEventChannelAdminS.h \
+ RtecEventCommS.h \
+ TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
+ RtecDefaultEventDataS.h \
+ RtecDefaultEventDataS_T.h \
+ RtecDefaultEventDataS_T.i \
+ RtecDefaultEventDataS_T.cpp \
+ RtecDefaultEventDataS.i \
+ RtecEventCommS_T.h \
+ RtecEventCommS_T.i \
+ RtecEventCommS_T.cpp \
+ RtecEventCommS.i \
+ RtecSchedulerS.h \
+ RtecSchedulerS_T.h \
+ RtecSchedulerS_T.i \
+ RtecSchedulerS_T.cpp \
+ RtecSchedulerS.i \
+ RtecEventChannelAdminS_T.h \
+ RtecEventChannelAdminS_T.i \
+ RtecEventChannelAdminS_T.cpp \
+ RtecEventChannelAdminS.i \
+ CosEventChannelAdminS.h \
+ CosEventCommS.h \
+ CosEventCommS_T.h \
+ CosEventCommS_T.i \
+ CosEventCommS_T.cpp \
+ CosEventCommS.i \
+ CosEventChannelAdminS_T.h \
+ CosEventChannelAdminS_T.i \
+ CosEventChannelAdminS_T.cpp \
+ CosEventChannelAdminS.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp
 
-.obj/CEC_Reactive_ConsumerControl.o .obj/CEC_Reactive_ConsumerControl.so .shobj/CEC_Reactive_ConsumerControl.o .shobj/CEC_Reactive_ConsumerControl.so: \
- CosEvent/CEC_Reactive_ConsumerControl.cpp \
- CosEvent/CEC_Reactive_ConsumerControl.h \
+.obj/EventChannel_i.o .obj/EventChannel_i.so .shobj/EventChannel_i.o .shobj/EventChannel_i.so: CosEvent/EventChannel_i.cpp \
+ CosEvent/EventChannel_i.h \
  $(ACE_ROOT)/ace/pre.h \
- CosEvent/CEC_ConsumerControl.h \
- CosEvent/event_export.h \
+ RtecEventChannelAdminC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/post.h \
@@ -7445,7 +7369,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -7589,14 +7512,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -7645,6 +7563,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -7710,45 +7630,17 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/CEC_ConsumerControl.i \
- Event/EC_Worker.h \
- Event/EC_Worker.i \
- Event/EC_Worker.cpp \
- CosEvent/CEC_Reactive_ConsumerControl.i CosEvent/CEC_EventChannel.h \
- CosEvent/CEC_Factory.h CosEvent/event_export.h CosEvent/CEC_Factory.i \
- CosEventChannelAdminS.h \
- CosEventCommS.h \
- CosEventCommC.h \
- CosEventCommC.i \
- CosEventCommS_T.h \
- CosEventCommS_T.i \
- CosEventCommS_T.cpp \
- CosEventCommS.i \
- CosEventChannelAdminC.h \
- CosEventChannelAdminC.i \
- CosEventChannelAdminS_T.h \
- CosEventChannelAdminS_T.i \
- CosEventChannelAdminS_T.cpp \
- CosEventChannelAdminS.i \
- CosEvent/CEC_Defaults.h CosEvent/CEC_EventChannel.i \
- CosEvent/CEC_ConsumerAdmin.h \
- Event/EC_Proxy_Collection.h \
- Event/EC_Busy_Lock.h \
- Event/EC_Busy_Lock.i \
- Event/EC_Busy_Lock.cpp \
- Event/EC_Proxy_Collection.i \
- Event/EC_Proxy_Collection.cpp \
- Event/EC_Command.h \
- Event/EC_Command.i \
- Event/EC_Command.cpp \
- Event/EC_Defaults.h \
- RtecEventChannelAdminC.h \
+ Event/event_export.h \
  RtecEventCommC.h \
  TimeBaseC.h \
  svc_utils_export.h \
@@ -7760,16 +7652,64 @@ realclean: clean
  Sched/sched_export.h \
  RtecSchedulerC.i \
  RtecEventChannelAdminC.i \
- CosEvent/CEC_ConsumerAdmin.i CosEvent/CEC_ProxyPushSupplier.h \
- CosEvent/CEC_ProxyPushSupplier.i CosEvent/CEC_ProxyPullSupplier.h \
- CosEvent/CEC_ProxyPullSupplier.i
+ CosEventChannelAdminC.h \
+ CosEvent/event_export.h \
+ CosEventCommC.h \
+ CosEventCommC.i \
+ CosEventChannelAdminC.i \
+ CosEvent/ConsumerAdmin_i.h \
+ CosEventChannelAdminS.h \
+ CosEventCommS.h \
+ CosEventCommS_T.h \
+ CosEventCommS_T.i \
+ CosEventCommS_T.cpp \
+ CosEventCommS.i \
+ CosEventChannelAdminS_T.h \
+ CosEventChannelAdminS_T.i \
+ CosEventChannelAdminS_T.cpp \
+ CosEventChannelAdminS.i \
+ CosEvent/ProxyPushSupplier_i.h \
+ CosEvent/SupplierAdmin_i.h \
+ CosEvent/ProxyPushConsumer_i.h \
+ RtecEventChannelAdminS.h \
+ RtecEventCommS.h \
+ TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
+ RtecDefaultEventDataS.h \
+ RtecDefaultEventDataS_T.h \
+ RtecDefaultEventDataS_T.i \
+ RtecDefaultEventDataS_T.cpp \
+ RtecDefaultEventDataS.i \
+ RtecEventCommS_T.h \
+ RtecEventCommS_T.i \
+ RtecEventCommS_T.cpp \
+ RtecEventCommS.i \
+ RtecSchedulerS.h \
+ RtecSchedulerS_T.h \
+ RtecSchedulerS_T.i \
+ RtecSchedulerS_T.cpp \
+ RtecSchedulerS.i \
+ RtecEventChannelAdminS_T.h \
+ RtecEventChannelAdminS_T.i \
+ RtecEventChannelAdminS_T.cpp \
+ RtecEventChannelAdminS.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp
 
-.obj/CEC_Reactive_SupplierControl.o .obj/CEC_Reactive_SupplierControl.so .shobj/CEC_Reactive_SupplierControl.o .shobj/CEC_Reactive_SupplierControl.so: \
- CosEvent/CEC_Reactive_SupplierControl.cpp \
- CosEvent/CEC_Reactive_SupplierControl.h \
+.obj/ProxyPushConsumer_i.o .obj/ProxyPushConsumer_i.so .shobj/ProxyPushConsumer_i.o .shobj/ProxyPushConsumer_i.so: CosEvent/ProxyPushConsumer_i.cpp \
+ Event_Utilities.h \
  $(ACE_ROOT)/ace/pre.h \
- CosEvent/CEC_SupplierControl.h \
- CosEvent/event_export.h \
+ RtecEventChannelAdminC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/post.h \
@@ -7783,7 +7723,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -7927,14 +7866,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -7983,6 +7917,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -8048,45 +7984,17 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/CEC_SupplierControl.i \
- Event/EC_Worker.h \
- Event/EC_Worker.i \
- Event/EC_Worker.cpp \
- CosEvent/CEC_Reactive_SupplierControl.i CosEvent/CEC_EventChannel.h \
- CosEvent/CEC_Factory.h CosEvent/event_export.h CosEvent/CEC_Factory.i \
- CosEventChannelAdminS.h \
- CosEventCommS.h \
- CosEventCommC.h \
- CosEventCommC.i \
- CosEventCommS_T.h \
- CosEventCommS_T.i \
- CosEventCommS_T.cpp \
- CosEventCommS.i \
- CosEventChannelAdminC.h \
- CosEventChannelAdminC.i \
- CosEventChannelAdminS_T.h \
- CosEventChannelAdminS_T.i \
- CosEventChannelAdminS_T.cpp \
- CosEventChannelAdminS.i \
- CosEvent/CEC_Defaults.h CosEvent/CEC_EventChannel.i \
- CosEvent/CEC_SupplierAdmin.h \
- Event/EC_Proxy_Collection.h \
- Event/EC_Busy_Lock.h \
- Event/EC_Busy_Lock.i \
- Event/EC_Busy_Lock.cpp \
- Event/EC_Proxy_Collection.i \
- Event/EC_Proxy_Collection.cpp \
- Event/EC_Command.h \
- Event/EC_Command.i \
- Event/EC_Command.cpp \
- Event/EC_Defaults.h \
- RtecEventChannelAdminC.h \
+ Event/event_export.h \
  RtecEventCommC.h \
  TimeBaseC.h \
  svc_utils_export.h \
@@ -8098,35 +8006,65 @@ realclean: clean
  Sched/sched_export.h \
  RtecSchedulerC.i \
  RtecEventChannelAdminC.i \
- CosEvent/CEC_SupplierAdmin.i CosEvent/CEC_ProxyPushConsumer.h \
- CosEvent/CEC_ProxyPushConsumer.i CosEvent/CEC_ProxyPullConsumer.h \
- CosEvent/CEC_ProxyPullConsumer.i
-
-.obj/CEC_Pulling_Strategy.o .obj/CEC_Pulling_Strategy.so .shobj/CEC_Pulling_Strategy.o .shobj/CEC_Pulling_Strategy.so: CosEvent/CEC_Pulling_Strategy.cpp \
- CosEvent/CEC_Pulling_Strategy.h \
- $(ACE_ROOT)/ace/pre.h \
+ Event_Service_Constants.h \
+ Time_Utilities.h \
+ Time_Utilities.i \
+ Event_Utilities.i \
+ CosEventChannelAdminC.h \
  CosEvent/event_export.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- CosEvent/CEC_Pulling_Strategy.i
+ CosEventCommC.h \
+ CosEventCommC.i \
+ CosEventChannelAdminC.i \
+ CosEventChannelAdminS.h \
+ CosEventCommS.h \
+ CosEventCommS_T.h \
+ CosEventCommS_T.i \
+ CosEventCommS_T.cpp \
+ CosEventCommS.i \
+ CosEventChannelAdminS_T.h \
+ CosEventChannelAdminS_T.i \
+ CosEventChannelAdminS_T.cpp \
+ CosEventChannelAdminS.i \
+ RtecEventCommS.h \
+ TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
+ RtecDefaultEventDataS.h \
+ RtecDefaultEventDataS_T.h \
+ RtecDefaultEventDataS_T.i \
+ RtecDefaultEventDataS_T.cpp \
+ RtecDefaultEventDataS.i \
+ RtecEventCommS_T.h \
+ RtecEventCommS_T.i \
+ RtecEventCommS_T.cpp \
+ RtecEventCommS.i \
+ CosEvent/ProxyPushConsumer_i.h \
+ RtecEventChannelAdminS.h \
+ RtecSchedulerS.h \
+ RtecSchedulerS_T.h \
+ RtecSchedulerS_T.i \
+ RtecSchedulerS_T.cpp \
+ RtecSchedulerS.i \
+ RtecEventChannelAdminS_T.h \
+ RtecEventChannelAdminS_T.i \
+ RtecEventChannelAdminS_T.cpp \
+ RtecEventChannelAdminS.i \
+ CosEvent/event_export.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp
 
-.obj/CEC_Reactive_Pulling_Strategy.o .obj/CEC_Reactive_Pulling_Strategy.so .shobj/CEC_Reactive_Pulling_Strategy.o .shobj/CEC_Reactive_Pulling_Strategy.so: \
- CosEvent/CEC_Reactive_Pulling_Strategy.cpp \
- CosEvent/CEC_Reactive_Pulling_Strategy.h \
+.obj/ProxyPushSupplier_i.o .obj/ProxyPushSupplier_i.so .shobj/ProxyPushSupplier_i.o .shobj/ProxyPushSupplier_i.so: CosEvent/ProxyPushSupplier_i.cpp \
+ RtecEventChannelAdminC.h \
  $(ACE_ROOT)/ace/pre.h \
- CosEvent/CEC_Pulling_Strategy.h \
- CosEvent/event_export.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/post.h \
@@ -8140,9 +8078,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- CosEvent/CEC_Pulling_Strategy.i \
- Event/EC_Worker.h \
- $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -8286,14 +8221,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -8342,6 +8272,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -8407,45 +8339,17 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- Event/EC_Worker.i \
- Event/EC_Worker.cpp \
- CosEvent/CEC_Reactive_Pulling_Strategy.i \
- CosEvent/CEC_ProxyPullConsumer.h \
- CosEventChannelAdminS.h \
- CosEventCommS.h \
- CosEventCommC.h \
- CosEventCommC.i \
- CosEventCommS_T.h \
- CosEventCommS_T.i \
- CosEventCommS_T.cpp \
- CosEventCommS.i \
- CosEventChannelAdminC.h \
- CosEventChannelAdminC.i \
- CosEventChannelAdminS_T.h \
- CosEventChannelAdminS_T.i \
- CosEventChannelAdminS_T.cpp \
- CosEventChannelAdminS.i \
- CosEvent/event_export.h CosEvent/CEC_ProxyPullConsumer.i \
- CosEvent/CEC_EventChannel.h CosEvent/CEC_Factory.h \
- CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \
- CosEvent/CEC_EventChannel.i CosEvent/CEC_SupplierAdmin.h \
- Event/EC_Proxy_Collection.h \
- Event/EC_Busy_Lock.h \
- Event/EC_Busy_Lock.i \
- Event/EC_Busy_Lock.cpp \
- Event/EC_Proxy_Collection.i \
- Event/EC_Proxy_Collection.cpp \
- Event/EC_Command.h \
- Event/EC_Command.i \
- Event/EC_Command.cpp \
- Event/EC_Defaults.h \
- RtecEventChannelAdminC.h \
+ Event/event_export.h \
  RtecEventCommC.h \
  TimeBaseC.h \
  svc_utils_export.h \
@@ -8457,13 +8361,50 @@ realclean: clean
  Sched/sched_export.h \
  RtecSchedulerC.i \
  RtecEventChannelAdminC.i \
- CosEvent/CEC_SupplierAdmin.i CosEvent/CEC_ConsumerAdmin.h \
- CosEvent/CEC_ConsumerAdmin.i
+ CosEventChannelAdminC.h \
+ CosEvent/event_export.h \
+ CosEventCommC.h \
+ CosEventCommC.i \
+ CosEventChannelAdminC.i \
+ CosEventChannelAdminS.h \
+ CosEventCommS.h \
+ CosEventCommS_T.h \
+ CosEventCommS_T.i \
+ CosEventCommS_T.cpp \
+ CosEventCommS.i \
+ CosEventChannelAdminS_T.h \
+ CosEventChannelAdminS_T.i \
+ CosEventChannelAdminS_T.cpp \
+ CosEventChannelAdminS.i \
+ RtecEventCommS.h \
+ TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
+ RtecDefaultEventDataS.h \
+ RtecDefaultEventDataS_T.h \
+ RtecDefaultEventDataS_T.i \
+ RtecDefaultEventDataS_T.cpp \
+ RtecDefaultEventDataS.i \
+ RtecEventCommS_T.h \
+ RtecEventCommS_T.i \
+ RtecEventCommS_T.cpp \
+ RtecEventCommS.i \
+ CosEvent/ProxyPushSupplier_i.h CosEvent/event_export.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp
 
-.obj/CEC_Default_Factory.o .obj/CEC_Default_Factory.so .shobj/CEC_Default_Factory.o .shobj/CEC_Default_Factory.so: CosEvent/CEC_Default_Factory.cpp \
- CosEvent/CEC_Default_Factory.h \
+.obj/CosEvent_Utilities.o .obj/CosEvent_Utilities.so .shobj/CosEvent_Utilities.o .shobj/CosEvent_Utilities.so: CosEvent_Utilities.cpp CosEvent_Utilities.h \
  $(ACE_ROOT)/ace/pre.h \
- CosEvent/CEC_Factory.h CosEvent/event_export.h \
+ RtecSchedulerC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/post.h \
@@ -8477,7 +8418,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -8621,14 +8561,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -8677,6 +8612,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -8742,39 +8679,63 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \
- CosEvent/CEC_Default_Factory.i CosEvent/CEC_MT_Dispatching.h \
- CosEvent/CEC_Dispatching.h \
+ Sched/sched_export.h \
+ TimeBaseC.h \
+ svc_utils_export.h \
+ TimeBaseC.i \
+ RtecSchedulerC.i \
+ RtecEventChannelAdminS.h \
+ RtecEventCommS.h \
+ TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
+ RtecDefaultEventDataS.h \
+ RtecDefaultEventDataC.h \
+ Event/event_export.h \
+ RtecDefaultEventDataC.i \
+ RtecDefaultEventDataS_T.h \
+ RtecDefaultEventDataS_T.i \
+ RtecDefaultEventDataS_T.cpp \
+ RtecDefaultEventDataS.i \
+ RtecEventCommC.h \
+ RtecEventCommC.i \
+ RtecEventCommS_T.h \
+ RtecEventCommS_T.i \
+ RtecEventCommS_T.cpp \
+ RtecEventCommS.i \
+ RtecSchedulerS.h \
+ RtecSchedulerS_T.h \
+ RtecSchedulerS_T.i \
+ RtecSchedulerS_T.cpp \
+ RtecSchedulerS.i \
+ RtecEventChannelAdminC.h \
+ RtecEventChannelAdminC.i \
+ RtecEventChannelAdminS_T.h \
+ RtecEventChannelAdminS_T.i \
+ RtecEventChannelAdminS_T.cpp \
+ RtecEventChannelAdminS.i \
+ CosEventChannelAdminS.h \
+ CosEventCommS.h \
  CosEventCommC.h \
  CosEvent/event_export.h \
  CosEventCommC.i \
- CosEvent/CEC_Dispatching.i CosEvent/CEC_Dispatching_Task.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- CosEvent/CEC_Dispatching_Task.i CosEvent/CEC_MT_Dispatching.i \
- CosEvent/CEC_Reactive_Pulling_Strategy.h \
- CosEvent/CEC_Pulling_Strategy.h CosEvent/CEC_Pulling_Strategy.i \
- Event/EC_Worker.h \
- Event/EC_Worker.i \
- Event/EC_Worker.cpp \
- CosEvent/CEC_Reactive_Pulling_Strategy.i CosEvent/CEC_ConsumerAdmin.h \
- CosEventChannelAdminS.h \
- CosEventCommS.h \
  CosEventCommS_T.h \
  CosEventCommS_T.i \
  CosEventCommS_T.cpp \
@@ -8785,48 +8746,24 @@ realclean: clean
  CosEventChannelAdminS_T.i \
  CosEventChannelAdminS_T.cpp \
  CosEventChannelAdminS.i \
- Event/EC_Proxy_Collection.h \
- Event/EC_Busy_Lock.h \
- Event/EC_Busy_Lock.i \
- Event/EC_Busy_Lock.cpp \
- Event/EC_Proxy_Collection.i \
- Event/EC_Proxy_Collection.cpp \
- Event/EC_Command.h \
- Event/EC_Command.i \
- Event/EC_Command.cpp \
+ Event_Utilities.h \
+ Event_Service_Constants.h \
+ Time_Utilities.h \
+ Time_Utilities.i \
+ Event_Utilities.i \
+ CosEvent/event_export.h \
+ Event/EC_Event_Channel.h \
+ Event/EC_Factory.h \
+ Event/EC_Factory.i \
  Event/EC_Defaults.h \
- RtecEventChannelAdminC.h \
- RtecEventCommC.h \
- TimeBaseC.h \
- svc_utils_export.h \
- TimeBaseC.i \
- RtecDefaultEventDataC.h \
- RtecDefaultEventDataC.i \
- RtecEventCommC.i \
- RtecSchedulerC.h \
- Sched/sched_export.h \
- RtecSchedulerC.i \
- RtecEventChannelAdminC.i \
- CosEvent/CEC_ConsumerAdmin.i CosEvent/CEC_SupplierAdmin.h \
- CosEvent/CEC_SupplierAdmin.i CosEvent/CEC_ProxyPushConsumer.h \
- CosEvent/CEC_ProxyPushConsumer.i CosEvent/CEC_ProxyPullConsumer.h \
- CosEvent/CEC_ProxyPullConsumer.i CosEvent/CEC_ProxyPushSupplier.h \
- CosEvent/CEC_ProxyPushSupplier.i CosEvent/CEC_ProxyPullSupplier.h \
- CosEvent/CEC_ProxyPullSupplier.i CosEvent/CEC_EventChannel.h \
- CosEvent/CEC_EventChannel.i CosEvent/CEC_Reactive_ConsumerControl.h \
- CosEvent/CEC_ConsumerControl.h CosEvent/CEC_ConsumerControl.i \
- CosEvent/CEC_Reactive_ConsumerControl.i \
- CosEvent/CEC_Reactive_SupplierControl.h \
- CosEvent/CEC_SupplierControl.h CosEvent/CEC_SupplierControl.i \
- CosEvent/CEC_Reactive_SupplierControl.i \
- Event/EC_Concrete_Proxy_Set.h \
- $(ACE_ROOT)/ace/RB_Tree.h \
- $(ACE_ROOT)/ace/RB_Tree.i \
- $(ACE_ROOT)/ace/RB_Tree.cpp \
- Event/EC_Concrete_Proxy_Set.i \
- Event/EC_Concrete_Proxy_Set.cpp \
- $(ACE_ROOT)/ace/Arg_Shifter.h \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i
+ Event/EC_Event_Channel.i \
+ CosEvent/EventChannel_i.h \
+ CosEvent/ConsumerAdmin_i.h \
+ CosEvent/ProxyPushSupplier_i.h \
+ CosEvent/SupplierAdmin_i.h \
+ CosEvent/ProxyPushConsumer_i.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.RTEvent b/TAO/orbsvcs/orbsvcs/Makefile.RTEvent
index 9347164e5e4..a8a630613ae 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.RTEvent
+++ b/TAO/orbsvcs/orbsvcs/Makefile.RTEvent
@@ -310,14 +310,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -366,6 +361,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -431,13 +428,17 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h RtecDefaultEventDataC.i \
+ Event/event_export.h RtecDefaultEventDataC.i \
  RtecDefaultEventDataS_T.h RtecDefaultEventDataS_T.i \
  RtecDefaultEventDataS_T.cpp RtecDefaultEventDataS.i
 
@@ -537,8 +538,7 @@ realclean: clean
  $(TAO_ROOT)/tao/TimeBaseS_T.i \
  $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
  $(TAO_ROOT)/tao/TimeBaseS.i \
- TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
+ TimeBaseC.h $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -608,12 +608,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -662,6 +657,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -727,6 +724,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -735,12 +736,11 @@ realclean: clean
  $(TAO_ROOT)/tao/BoundsC.i \
  svc_utils_export.h TimeBaseC.i TimeBaseS_T.h TimeBaseS_T.i \
  TimeBaseS_T.cpp TimeBaseS.i RtecDefaultEventDataS.h \
- RtecDefaultEventDataC.h CosEvent/event_export.h \
- RtecDefaultEventDataC.i RtecDefaultEventDataS_T.h \
- RtecDefaultEventDataS_T.i RtecDefaultEventDataS_T.cpp \
- RtecDefaultEventDataS.i RtecEventCommC.h RtecEventCommC.i \
- RtecEventCommS_T.h RtecEventCommS_T.i RtecEventCommS_T.cpp \
- RtecEventCommS.i
+ RtecDefaultEventDataC.h Event/event_export.h RtecDefaultEventDataC.i \
+ RtecDefaultEventDataS_T.h RtecDefaultEventDataS_T.i \
+ RtecDefaultEventDataS_T.cpp RtecDefaultEventDataS.i RtecEventCommC.h \
+ RtecEventCommC.i RtecEventCommS_T.h RtecEventCommS_T.i \
+ RtecEventCommS_T.cpp RtecEventCommS.i
 
 .obj/RtecEventChannelAdminS.o .obj/RtecEventChannelAdminS.so .shobj/RtecEventChannelAdminS.o .shobj/RtecEventChannelAdminS.so: RtecEventChannelAdminS.cpp \
  RtecEventChannelAdminS.h \
@@ -840,8 +840,7 @@ realclean: clean
  $(TAO_ROOT)/tao/TimeBaseS_T.i \
  $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
  $(TAO_ROOT)/tao/TimeBaseS.i \
- TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
+ TimeBaseC.h $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -911,12 +910,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -965,6 +959,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -1030,6 +1026,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -1038,15 +1038,14 @@ realclean: clean
  $(TAO_ROOT)/tao/BoundsC.i \
  svc_utils_export.h TimeBaseC.i TimeBaseS_T.h TimeBaseS_T.i \
  TimeBaseS_T.cpp TimeBaseS.i RtecDefaultEventDataS.h \
- RtecDefaultEventDataC.h CosEvent/event_export.h \
- RtecDefaultEventDataC.i RtecDefaultEventDataS_T.h \
- RtecDefaultEventDataS_T.i RtecDefaultEventDataS_T.cpp \
- RtecDefaultEventDataS.i RtecEventCommC.h RtecEventCommC.i \
- RtecEventCommS_T.h RtecEventCommS_T.i RtecEventCommS_T.cpp \
- RtecEventCommS.i RtecSchedulerS.h RtecSchedulerC.h \
- Sched/sched_export.h RtecSchedulerC.i RtecSchedulerS_T.h \
- RtecSchedulerS_T.i RtecSchedulerS_T.cpp RtecSchedulerS.i \
- RtecEventChannelAdminC.h RtecEventChannelAdminC.i \
+ RtecDefaultEventDataC.h Event/event_export.h RtecDefaultEventDataC.i \
+ RtecDefaultEventDataS_T.h RtecDefaultEventDataS_T.i \
+ RtecDefaultEventDataS_T.cpp RtecDefaultEventDataS.i RtecEventCommC.h \
+ RtecEventCommC.i RtecEventCommS_T.h RtecEventCommS_T.i \
+ RtecEventCommS_T.cpp RtecEventCommS.i RtecSchedulerS.h \
+ RtecSchedulerC.h Sched/sched_export.h RtecSchedulerC.i \
+ RtecSchedulerS_T.h RtecSchedulerS_T.i RtecSchedulerS_T.cpp \
+ RtecSchedulerS.i RtecEventChannelAdminC.h RtecEventChannelAdminC.i \
  RtecEventChannelAdminS_T.h RtecEventChannelAdminS_T.i \
  RtecEventChannelAdminS_T.cpp RtecEventChannelAdminS.i
 
@@ -1147,8 +1146,7 @@ realclean: clean
  $(TAO_ROOT)/tao/TimeBaseS_T.i \
  $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
  $(TAO_ROOT)/tao/TimeBaseS.i \
- TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
+ TimeBaseC.h $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -1218,12 +1216,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -1272,6 +1265,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -1337,6 +1332,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -1345,12 +1344,11 @@ realclean: clean
  $(TAO_ROOT)/tao/BoundsC.i \
  svc_utils_export.h TimeBaseC.i TimeBaseS_T.h TimeBaseS_T.i \
  TimeBaseS_T.cpp TimeBaseS.i RtecDefaultEventDataS.h \
- RtecDefaultEventDataC.h CosEvent/event_export.h \
- RtecDefaultEventDataC.i RtecDefaultEventDataS_T.h \
- RtecDefaultEventDataS_T.i RtecDefaultEventDataS_T.cpp \
- RtecDefaultEventDataS.i RtecEventCommC.h RtecEventCommC.i \
- RtecEventCommS_T.h RtecEventCommS_T.i RtecEventCommS_T.cpp \
- RtecEventCommS.i RtecUDPAdminC.h Event/event_export.h RtecUDPAdminC.i \
+ RtecDefaultEventDataC.h Event/event_export.h RtecDefaultEventDataC.i \
+ RtecDefaultEventDataS_T.h RtecDefaultEventDataS_T.i \
+ RtecDefaultEventDataS_T.cpp RtecDefaultEventDataS.i RtecEventCommC.h \
+ RtecEventCommC.i RtecEventCommS_T.h RtecEventCommS_T.i \
+ RtecEventCommS_T.cpp RtecEventCommS.i RtecUDPAdminC.h RtecUDPAdminC.i \
  RtecUDPAdminS_T.h RtecUDPAdminS_T.i RtecUDPAdminS_T.cpp \
  RtecUDPAdminS.i
 
@@ -1514,14 +1512,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -1570,6 +1563,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -1635,13 +1630,17 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h RtecDefaultEventDataC.i
+ Event/event_export.h RtecDefaultEventDataC.i
 
 .obj/RtecEventCommC.o .obj/RtecEventCommC.so .shobj/RtecEventCommC.o .shobj/RtecEventCommC.so: RtecEventCommC.cpp RtecEventCommC.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -1802,14 +1801,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -1858,6 +1852,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -1923,13 +1919,17 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h TimeBaseC.h svc_utils_export.h TimeBaseC.i \
+ Event/event_export.h TimeBaseC.h svc_utils_export.h TimeBaseC.i \
  RtecDefaultEventDataC.h RtecDefaultEventDataC.i RtecEventCommC.i
 
 .obj/RtecEventChannelAdminC.o .obj/RtecEventChannelAdminC.so .shobj/RtecEventChannelAdminC.o .shobj/RtecEventChannelAdminC.so: RtecEventChannelAdminC.cpp \
@@ -2092,14 +2092,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -2148,6 +2143,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -2213,16 +2210,20 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h RtecEventCommC.h TimeBaseC.h \
- svc_utils_export.h TimeBaseC.i RtecDefaultEventDataC.h \
- RtecDefaultEventDataC.i RtecEventCommC.i RtecSchedulerC.h \
- Sched/sched_export.h RtecSchedulerC.i RtecEventChannelAdminC.i
+ Event/event_export.h RtecEventCommC.h TimeBaseC.h svc_utils_export.h \
+ TimeBaseC.i RtecDefaultEventDataC.h RtecDefaultEventDataC.i \
+ RtecEventCommC.i RtecSchedulerC.h Sched/sched_export.h \
+ RtecSchedulerC.i RtecEventChannelAdminC.i
 
 .obj/RtecUDPAdminC.o .obj/RtecUDPAdminC.so .shobj/RtecUDPAdminC.o .shobj/RtecUDPAdminC.so: RtecUDPAdminC.cpp RtecUDPAdminC.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -2383,14 +2384,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -2439,6 +2435,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -2504,15 +2502,19 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- Event/event_export.h RtecEventCommC.h CosEvent/event_export.h \
- TimeBaseC.h svc_utils_export.h TimeBaseC.i RtecDefaultEventDataC.h \
- RtecDefaultEventDataC.i RtecEventCommC.i RtecUDPAdminC.i
+ Event/event_export.h RtecEventCommC.h TimeBaseC.h svc_utils_export.h \
+ TimeBaseC.i RtecDefaultEventDataC.h RtecDefaultEventDataC.i \
+ RtecEventCommC.i RtecUDPAdminC.i
 
 .obj/EC_Event_Channel.o .obj/EC_Event_Channel.so .shobj/EC_Event_Channel.o .shobj/EC_Event_Channel.so: Event/EC_Event_Channel.cpp \
  Event/EC_Event_Channel.h \
@@ -2676,14 +2678,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -2732,6 +2729,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -2797,6 +2796,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -2821,7 +2824,6 @@ realclean: clean
  TimeBaseS.i \
  RtecDefaultEventDataS.h \
  RtecDefaultEventDataC.h \
- CosEvent/event_export.h \
  RtecDefaultEventDataC.i \
  RtecDefaultEventDataS_T.h \
  RtecDefaultEventDataS_T.i \
@@ -2850,14 +2852,33 @@ realclean: clean
  Event/EC_Event_Channel.i Event/EC_Default_Factory.h \
  Event/EC_Default_Factory.i Event/EC_Dispatching.h \
  Event/event_export.h Event/EC_Dispatching.i Event/EC_ConsumerAdmin.h \
- Event/EC_Proxy_Collection.h Event/EC_Busy_Lock.h Event/EC_Busy_Lock.i \
- Event/EC_Busy_Lock.cpp Event/EC_Proxy_Collection.i \
- Event/EC_Proxy_Collection.cpp Event/EC_Command.h Event/EC_Command.i \
- Event/EC_Command.cpp Event/EC_Worker.h Event/EC_Worker.i \
- Event/EC_Worker.cpp Event/EC_ConsumerAdmin.i Event/EC_SupplierAdmin.h \
+ Event/EC_ProxySupplier.h \
+ Event/EC_Filter.h \
+ Event/EC_Filter.i \
+ Event/EC_ProxySupplier.i \
+ ESF/ESF_Peer_Admin.h \
+ ESF/ESF_Proxy_Admin.h \
+ ESF/ESF_Proxy_Collection.h \
+ ESF/ESF_Proxy_Collection.i \
+ ESF/ESF_Proxy_Collection.cpp \
+ ESF/ESF_Worker.h \
+ ESF/ESF_Worker.i \
+ ESF/ESF_Worker.cpp \
+ ESF/ESF_Proxy_Admin.i \
+ ESF/ESF_Proxy_Admin.cpp \
+ ESF/ESF_Shutdown_Proxy.h \
+ ESF/ESF_Shutdown_Proxy.i \
+ ESF/ESF_Shutdown_Proxy.cpp \
+ ESF/ESF_Peer_Admin.i \
+ ESF/ESF_Peer_Admin.cpp \
+ ESF/ESF_Peer_Workers.h \
+ ESF/ESF_Peer_Workers.i \
+ ESF/ESF_Peer_Workers.cpp \
+ Event/EC_ConsumerAdmin.i Event/EC_SupplierAdmin.h \
+ Event/EC_ProxyConsumer.h Event/EC_ProxyConsumer.i \
  Event/EC_SupplierAdmin.i Event/EC_Timeout_Generator.h \
- Event/EC_Timeout_Filter.h Event/EC_Filter.h Event/EC_Filter.i \
- Event/EC_QOS_Info.h Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i \
+ Event/EC_Timeout_Filter.h Event/EC_Filter.h Event/EC_QOS_Info.h \
+ Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i \
  Event/EC_Timeout_Generator.i Event/EC_ObserverStrategy.h \
  $(ACE_ROOT)/ace/RB_Tree.h \
  $(ACE_ROOT)/ace/RB_Tree.i \
@@ -2869,6 +2890,7 @@ realclean: clean
 .obj/EC_ConsumerAdmin.o .obj/EC_ConsumerAdmin.so .shobj/EC_ConsumerAdmin.o .shobj/EC_ConsumerAdmin.so: Event/EC_ConsumerAdmin.cpp \
  Event/EC_ConsumerAdmin.h \
  $(ACE_ROOT)/ace/pre.h \
+ Event/EC_ProxySupplier.h \
  RtecEventChannelAdminS.h \
  RtecEventCommS.h \
  TimeBaseS.h \
@@ -3037,12 +3059,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -3091,6 +3108,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -3156,6 +3175,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -3170,7 +3193,7 @@ realclean: clean
  TimeBaseS.i \
  RtecDefaultEventDataS.h \
  RtecDefaultEventDataC.h \
- CosEvent/event_export.h \
+ Event/event_export.h \
  RtecDefaultEventDataC.i \
  RtecDefaultEventDataS_T.h \
  RtecDefaultEventDataS_T.i \
@@ -3196,22 +3219,36 @@ realclean: clean
  RtecEventChannelAdminS_T.i \
  RtecEventChannelAdminS_T.cpp \
  RtecEventChannelAdminS.i \
- Event/event_export.h Event/EC_Proxy_Collection.h Event/EC_Busy_Lock.h \
- Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
- Event/EC_Proxy_Collection.i Event/EC_Proxy_Collection.cpp \
- Event/EC_Command.h Event/EC_Command.i Event/EC_Command.cpp \
- Event/EC_Worker.h Event/EC_Worker.i Event/EC_Worker.cpp \
- Event/EC_Defaults.h Event/EC_ConsumerAdmin.i Event/EC_ProxySupplier.h \
  Event/EC_Filter.h \
- Event/event_export.h \
  Event/EC_Filter.i \
- Event/EC_ProxySupplier.i Event/EC_ProxyConsumer.h \
- Event/EC_ProxyConsumer.i Event/EC_Event_Channel.h Event/EC_Factory.h \
- Event/EC_Factory.i Event/EC_Event_Channel.i
+ Event/EC_ProxySupplier.i \
+ ESF/ESF_Peer_Admin.h \
+ ESF/ESF_Proxy_Admin.h \
+ ESF/ESF_Proxy_Collection.h \
+ ESF/ESF_Proxy_Collection.i \
+ ESF/ESF_Proxy_Collection.cpp \
+ ESF/ESF_Worker.h \
+ ESF/ESF_Worker.i \
+ ESF/ESF_Worker.cpp \
+ ESF/ESF_Proxy_Admin.i \
+ ESF/ESF_Proxy_Admin.cpp \
+ ESF/ESF_Shutdown_Proxy.h \
+ ESF/ESF_Shutdown_Proxy.i \
+ ESF/ESF_Shutdown_Proxy.cpp \
+ ESF/ESF_Peer_Admin.i \
+ ESF/ESF_Peer_Admin.cpp \
+ ESF/ESF_Peer_Workers.h \
+ ESF/ESF_Peer_Workers.i \
+ ESF/ESF_Peer_Workers.cpp \
+ Event/event_export.h Event/EC_ConsumerAdmin.i \
+ Event/EC_ProxyConsumer.h Event/EC_ProxyConsumer.i \
+ Event/EC_Event_Channel.h Event/EC_Factory.h Event/EC_Factory.i \
+ Event/EC_Defaults.h Event/EC_Event_Channel.i
 
 .obj/EC_SupplierAdmin.o .obj/EC_SupplierAdmin.so .shobj/EC_SupplierAdmin.o .shobj/EC_SupplierAdmin.so: Event/EC_SupplierAdmin.cpp \
  Event/EC_SupplierAdmin.h \
  $(ACE_ROOT)/ace/pre.h \
+ Event/EC_ProxyConsumer.h \
  RtecEventChannelAdminS.h \
  RtecEventCommS.h \
  TimeBaseS.h \
@@ -3380,12 +3417,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -3434,6 +3466,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -3499,6 +3533,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -3513,7 +3551,7 @@ realclean: clean
  TimeBaseS.i \
  RtecDefaultEventDataS.h \
  RtecDefaultEventDataC.h \
- CosEvent/event_export.h \
+ Event/event_export.h \
  RtecDefaultEventDataC.i \
  RtecDefaultEventDataS_T.h \
  RtecDefaultEventDataS_T.i \
@@ -3539,18 +3577,31 @@ realclean: clean
  RtecEventChannelAdminS_T.i \
  RtecEventChannelAdminS_T.cpp \
  RtecEventChannelAdminS.i \
- Event/EC_Proxy_Collection.h Event/EC_Busy_Lock.h Event/EC_Busy_Lock.i \
- Event/EC_Busy_Lock.cpp Event/EC_Proxy_Collection.i \
- Event/EC_Proxy_Collection.cpp Event/EC_Command.h Event/EC_Command.i \
- Event/EC_Command.cpp Event/EC_Worker.h Event/EC_Worker.i \
- Event/EC_Worker.cpp Event/EC_Defaults.h Event/event_export.h \
- Event/EC_SupplierAdmin.i Event/EC_ProxyConsumer.h \
  Event/EC_Filter.h \
- Event/event_export.h \
  Event/EC_Filter.i \
- Event/EC_ProxyConsumer.i Event/EC_ProxySupplier.h \
- Event/EC_ProxySupplier.i Event/EC_Event_Channel.h Event/EC_Factory.h \
- Event/EC_Factory.i Event/EC_Event_Channel.i
+ Event/EC_ProxyConsumer.i \
+ ESF/ESF_Peer_Admin.h \
+ ESF/ESF_Proxy_Admin.h \
+ ESF/ESF_Proxy_Collection.h \
+ ESF/ESF_Proxy_Collection.i \
+ ESF/ESF_Proxy_Collection.cpp \
+ ESF/ESF_Worker.h \
+ ESF/ESF_Worker.i \
+ ESF/ESF_Worker.cpp \
+ ESF/ESF_Proxy_Admin.i \
+ ESF/ESF_Proxy_Admin.cpp \
+ ESF/ESF_Shutdown_Proxy.h \
+ ESF/ESF_Shutdown_Proxy.i \
+ ESF/ESF_Shutdown_Proxy.cpp \
+ ESF/ESF_Peer_Admin.i \
+ ESF/ESF_Peer_Admin.cpp \
+ ESF/ESF_Peer_Workers.h \
+ ESF/ESF_Peer_Workers.i \
+ ESF/ESF_Peer_Workers.cpp \
+ Event/event_export.h Event/EC_SupplierAdmin.i \
+ Event/EC_ProxySupplier.h Event/EC_ProxySupplier.i \
+ Event/EC_Event_Channel.h Event/EC_Factory.h Event/EC_Factory.i \
+ Event/EC_Defaults.h Event/EC_Event_Channel.i
 
 .obj/EC_ProxyConsumer.o .obj/EC_ProxyConsumer.so .shobj/EC_ProxyConsumer.o .shobj/EC_ProxyConsumer.so: Event/EC_ProxyConsumer.cpp \
  Event/EC_ProxyConsumer.h \
@@ -3723,12 +3774,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -3777,6 +3823,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -3842,6 +3890,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -3856,7 +3908,7 @@ realclean: clean
  TimeBaseS.i \
  RtecDefaultEventDataS.h \
  RtecDefaultEventDataC.h \
- CosEvent/event_export.h \
+ Event/event_export.h \
  RtecDefaultEventDataC.i \
  RtecDefaultEventDataS_T.h \
  RtecDefaultEventDataS_T.i \
@@ -3883,12 +3935,14 @@ realclean: clean
  RtecEventChannelAdminS_T.cpp \
  RtecEventChannelAdminS.i \
  Event/EC_Filter.h \
- Event/event_export.h \
  Event/EC_Filter.i \
  Event/EC_ProxyConsumer.i Event/EC_Event_Channel.h Event/EC_Factory.h \
  Event/EC_Factory.i Event/EC_Defaults.h Event/EC_Event_Channel.i \
- Event/EC_Supplier_Filter.h Event/EC_Worker.h Event/EC_Worker.i \
- Event/EC_Worker.cpp Event/event_export.h Event/EC_Supplier_Filter.i \
+ Event/EC_Supplier_Filter.h \
+ ESF/ESF_Worker.h \
+ ESF/ESF_Worker.i \
+ ESF/ESF_Worker.cpp \
+ Event/event_export.h Event/EC_Supplier_Filter.i \
  Event/EC_Supplier_Filter_Builder.h Event/EC_Supplier_Filter_Builder.i
 
 .obj/EC_ProxySupplier.o .obj/EC_ProxySupplier.so .shobj/EC_ProxySupplier.o .shobj/EC_ProxySupplier.so: Event/EC_ProxySupplier.cpp \
@@ -4062,12 +4116,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -4116,6 +4165,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -4181,6 +4232,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -4195,7 +4250,7 @@ realclean: clean
  TimeBaseS.i \
  RtecDefaultEventDataS.h \
  RtecDefaultEventDataC.h \
- CosEvent/event_export.h \
+ Event/event_export.h \
  RtecDefaultEventDataC.i \
  RtecDefaultEventDataS_T.h \
  RtecDefaultEventDataS_T.i \
@@ -4222,7 +4277,6 @@ realclean: clean
  RtecEventChannelAdminS_T.cpp \
  RtecEventChannelAdminS.i \
  Event/EC_Filter.h \
- Event/event_export.h \
  Event/EC_Filter.i \
  Event/EC_ProxySupplier.i Event/EC_Dispatching.h Event/event_export.h \
  Event/EC_Dispatching.i Event/EC_Filter_Builder.h \
@@ -4393,14 +4447,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -4449,6 +4498,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -4514,20 +4565,26 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h \
+ Event/event_export.h \
  TimeBaseC.h \
  svc_utils_export.h \
  TimeBaseC.i \
  RtecDefaultEventDataC.h \
  RtecDefaultEventDataC.i \
  RtecEventCommC.i \
- Event/EC_Worker.h Event/EC_Worker.i Event/EC_Worker.cpp \
+ ESF/ESF_Worker.h \
+ ESF/ESF_Worker.i \
+ ESF/ESF_Worker.cpp \
  Event/event_export.h Event/EC_Supplier_Filter.i \
  Event/EC_ProxySupplier.h \
  RtecEventChannelAdminS.h \
@@ -4566,7 +4623,6 @@ realclean: clean
  RtecEventChannelAdminS_T.cpp \
  RtecEventChannelAdminS.i \
  Event/EC_Filter.h \
- Event/event_export.h \
  Event/EC_Filter.i \
  Event/EC_ProxySupplier.i Event/EC_QOS_Info.h Event/EC_QOS_Info.i
 
@@ -4731,14 +4787,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -4787,6 +4838,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -4852,13 +4905,17 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h \
+ Event/event_export.h \
  RtecEventCommC.h \
  TimeBaseC.h \
  svc_utils_export.h \
@@ -5034,14 +5091,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -5090,6 +5142,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -5155,20 +5209,26 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h \
+ Event/event_export.h \
  TimeBaseC.h \
  svc_utils_export.h \
  TimeBaseC.i \
  RtecDefaultEventDataC.h \
  RtecDefaultEventDataC.i \
  RtecEventCommC.i \
- Event/EC_Worker.h Event/EC_Worker.i Event/EC_Worker.cpp \
+ ESF/ESF_Worker.h \
+ ESF/ESF_Worker.i \
+ ESF/ESF_Worker.cpp \
  Event/event_export.h Event/EC_Supplier_Filter.i \
  Event/EC_Supplier_Filter_Builder.h \
  RtecEventChannelAdminC.h \
@@ -5177,9 +5237,8 @@ realclean: clean
  RtecSchedulerC.i \
  RtecEventChannelAdminC.i \
  Event/EC_Supplier_Filter_Builder.i Event/EC_Trivial_Supplier_Filter.i \
- Event/EC_Event_Channel.h Event/EC_Factory.h \
- Event/event_export.h \
- Event/EC_Factory.i Event/EC_Defaults.h \
+ Event/EC_Event_Channel.h Event/EC_Factory.h Event/EC_Factory.i \
+ Event/EC_Defaults.h \
  RtecEventChannelAdminS.h \
  RtecEventCommS.h \
  TimeBaseS.h \
@@ -5211,14 +5270,26 @@ realclean: clean
  RtecEventChannelAdminS_T.cpp \
  RtecEventChannelAdminS.i \
  Event/EC_Event_Channel.i Event/EC_ConsumerAdmin.h \
- Event/EC_Proxy_Collection.h Event/EC_Busy_Lock.h Event/EC_Busy_Lock.i \
- Event/EC_Busy_Lock.cpp Event/EC_Proxy_Collection.i \
- Event/EC_Proxy_Collection.cpp Event/EC_Command.h Event/EC_Command.i \
- Event/EC_Command.cpp Event/EC_ConsumerAdmin.i \
  Event/EC_ProxySupplier.h \
  Event/EC_Filter.h \
  Event/EC_Filter.i \
- Event/EC_ProxySupplier.i Event/EC_QOS_Info.h Event/EC_QOS_Info.i
+ Event/EC_ProxySupplier.i \
+ ESF/ESF_Peer_Admin.h \
+ ESF/ESF_Proxy_Admin.h \
+ ESF/ESF_Proxy_Collection.h \
+ ESF/ESF_Proxy_Collection.i \
+ ESF/ESF_Proxy_Collection.cpp \
+ ESF/ESF_Proxy_Admin.i \
+ ESF/ESF_Proxy_Admin.cpp \
+ ESF/ESF_Shutdown_Proxy.h \
+ ESF/ESF_Shutdown_Proxy.i \
+ ESF/ESF_Shutdown_Proxy.cpp \
+ ESF/ESF_Peer_Admin.i \
+ ESF/ESF_Peer_Admin.cpp \
+ ESF/ESF_Peer_Workers.h \
+ ESF/ESF_Peer_Workers.i \
+ ESF/ESF_Peer_Workers.cpp \
+ Event/EC_ConsumerAdmin.i Event/EC_QOS_Info.h Event/EC_QOS_Info.i
 
 .obj/EC_Filter.o .obj/EC_Filter.so .shobj/EC_Filter.o .shobj/EC_Filter.so: Event/EC_Filter.cpp Event/EC_Filter.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -5380,14 +5451,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -5436,6 +5502,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -5501,13 +5569,17 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h \
+ Event/event_export.h \
  TimeBaseC.h \
  svc_utils_export.h \
  TimeBaseC.i \
@@ -5677,14 +5749,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -5733,6 +5800,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -5798,13 +5867,17 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h \
+ Event/event_export.h \
  RtecEventCommC.h \
  TimeBaseC.h \
  svc_utils_export.h \
@@ -5979,14 +6052,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -6035,6 +6103,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -6100,13 +6170,17 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h \
+ Event/event_export.h \
  TimeBaseC.h \
  svc_utils_export.h \
  TimeBaseC.i \
@@ -6150,7 +6224,6 @@ realclean: clean
  RtecEventChannelAdminS_T.cpp \
  RtecEventChannelAdminS.i \
  Event/EC_Filter.h \
- Event/event_export.h \
  Event/EC_Filter.i \
  Event/EC_ProxySupplier.i
 
@@ -6314,14 +6387,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -6370,6 +6438,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -6435,6 +6505,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -6603,14 +6677,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -6659,6 +6728,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -6724,6 +6795,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -6898,14 +6973,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -6954,6 +7024,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -7019,6 +7091,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -7027,7 +7103,6 @@ realclean: clean
  $(TAO_ROOT)/tao/BoundsC.i \
  Event/EC_Factory.i Event/EC_Null_Factory.i Event/EC_Dispatching.h \
  RtecEventCommC.h \
- CosEvent/event_export.h \
  TimeBaseC.h \
  svc_utils_export.h \
  TimeBaseC.i \
@@ -7041,10 +7116,13 @@ realclean: clean
  RtecSchedulerC.i \
  RtecEventChannelAdminC.i \
  Event/EC_Filter_Builder.i Event/EC_Trivial_Supplier_Filter.h \
- Event/EC_Supplier_Filter.h Event/EC_Worker.h Event/EC_Worker.i \
- Event/EC_Worker.cpp Event/EC_Supplier_Filter.i \
- Event/EC_Supplier_Filter_Builder.h Event/EC_Supplier_Filter_Builder.i \
- Event/EC_Trivial_Supplier_Filter.i Event/EC_ConsumerAdmin.h \
+ Event/EC_Supplier_Filter.h \
+ ESF/ESF_Worker.h \
+ ESF/ESF_Worker.i \
+ ESF/ESF_Worker.cpp \
+ Event/EC_Supplier_Filter.i Event/EC_Supplier_Filter_Builder.h \
+ Event/EC_Supplier_Filter_Builder.i Event/EC_Trivial_Supplier_Filter.i \
+ Event/EC_ConsumerAdmin.h Event/EC_ProxySupplier.h \
  RtecEventChannelAdminS.h \
  RtecEventCommS.h \
  TimeBaseS.h \
@@ -7075,34 +7153,49 @@ realclean: clean
  RtecEventChannelAdminS_T.i \
  RtecEventChannelAdminS_T.cpp \
  RtecEventChannelAdminS.i \
- Event/EC_Proxy_Collection.h Event/EC_Busy_Lock.h Event/EC_Busy_Lock.i \
- Event/EC_Busy_Lock.cpp Event/EC_Proxy_Collection.i \
- Event/EC_Proxy_Collection.cpp Event/EC_Command.h Event/EC_Command.i \
- Event/EC_Command.cpp Event/EC_Defaults.h Event/EC_ConsumerAdmin.i \
- Event/EC_SupplierAdmin.h Event/EC_SupplierAdmin.i \
- Event/EC_ProxyConsumer.h \
  Event/EC_Filter.h \
  Event/EC_Filter.i \
- Event/EC_ProxyConsumer.i Event/EC_ProxySupplier.h \
- Event/EC_ProxySupplier.i Event/EC_ObserverStrategy.h \
+ Event/EC_ProxySupplier.i \
+ ESF/ESF_Peer_Admin.h \
+ ESF/ESF_Proxy_Admin.h \
+ ESF/ESF_Proxy_Collection.h \
+ ESF/ESF_Proxy_Collection.i \
+ ESF/ESF_Proxy_Collection.cpp \
+ ESF/ESF_Proxy_Admin.i \
+ ESF/ESF_Proxy_Admin.cpp \
+ ESF/ESF_Shutdown_Proxy.h \
+ ESF/ESF_Shutdown_Proxy.i \
+ ESF/ESF_Shutdown_Proxy.cpp \
+ ESF/ESF_Peer_Admin.i \
+ ESF/ESF_Peer_Admin.cpp \
+ ESF/ESF_Peer_Workers.h \
+ ESF/ESF_Peer_Workers.i \
+ ESF/ESF_Peer_Workers.cpp \
+ Event/EC_ConsumerAdmin.i Event/EC_SupplierAdmin.h \
+ Event/EC_ProxyConsumer.h Event/EC_ProxyConsumer.i \
+ Event/EC_SupplierAdmin.i Event/EC_ObserverStrategy.h \
  $(ACE_ROOT)/ace/RB_Tree.h \
  $(ACE_ROOT)/ace/RB_Tree.i \
  $(ACE_ROOT)/ace/RB_Tree.cpp \
  Event/EC_ObserverStrategy.i Event/EC_Null_Scheduling.h \
  Event/EC_Scheduling_Strategy.h Event/EC_Scheduling_Strategy.i \
- Event/EC_Null_Scheduling.i Event/EC_Concrete_Proxy_Set.h \
- Event/EC_Concrete_Proxy_Set.i Event/EC_Concrete_Proxy_Set.cpp \
- Event/EC_Reactive_Timeout_Generator.h Event/EC_Timeout_Generator.h \
- Event/EC_Timeout_Filter.h Event/EC_Filter.h Event/EC_QOS_Info.h \
- Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i \
- Event/EC_Timeout_Generator.i Event/EC_Reactive_Timeout_Generator.i \
- Event/EC_ConsumerControl.h Event/EC_ConsumerControl.i \
- Event/EC_SupplierControl.h Event/EC_SupplierControl.i
+ Event/EC_Null_Scheduling.i Event/EC_Reactive_Timeout_Generator.h \
+ Event/EC_Timeout_Generator.h Event/EC_Timeout_Filter.h \
+ Event/EC_Filter.h Event/EC_QOS_Info.h Event/EC_QOS_Info.i \
+ Event/EC_Timeout_Filter.i Event/EC_Timeout_Generator.i \
+ Event/EC_Reactive_Timeout_Generator.i Event/EC_ConsumerControl.h \
+ Event/EC_ConsumerControl.i Event/EC_SupplierControl.h \
+ Event/EC_SupplierControl.i \
+ ESF/ESF_Proxy_List.h \
+ ESF/ESF_Proxy_List.i \
+ ESF/ESF_Proxy_List.cpp \
+ ESF/ESF_Immediate_Changes.h \
+ ESF/ESF_Immediate_Changes.i \
+ ESF/ESF_Immediate_Changes.cpp
 
 .obj/EC_Disjunction_Filter.o .obj/EC_Disjunction_Filter.so .shobj/EC_Disjunction_Filter.o .shobj/EC_Disjunction_Filter.so: Event/EC_Disjunction_Filter.cpp \
  Event/EC_Disjunction_Filter.h \
- $(ACE_ROOT)/ace/pre.h \
- Event/EC_Filter.h \
+ $(ACE_ROOT)/ace/pre.h Event/EC_Filter.h \
  RtecEventCommC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -7261,14 +7354,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -7317,6 +7405,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -7382,13 +7472,17 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h \
+ Event/event_export.h \
  TimeBaseC.h \
  svc_utils_export.h \
  TimeBaseC.i \
@@ -7399,8 +7493,7 @@ realclean: clean
 
 .obj/EC_Conjunction_Filter.o .obj/EC_Conjunction_Filter.so .shobj/EC_Conjunction_Filter.o .shobj/EC_Conjunction_Filter.so: Event/EC_Conjunction_Filter.cpp \
  Event/EC_Conjunction_Filter.h \
- $(ACE_ROOT)/ace/pre.h \
- Event/EC_Filter.h \
+ $(ACE_ROOT)/ace/pre.h Event/EC_Filter.h \
  RtecEventCommC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -7559,14 +7652,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -7615,6 +7703,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -7680,13 +7770,17 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h \
+ Event/event_export.h \
  TimeBaseC.h \
  svc_utils_export.h \
  TimeBaseC.i \
@@ -7697,8 +7791,7 @@ realclean: clean
 
 .obj/EC_Negation_Filter.o .obj/EC_Negation_Filter.so .shobj/EC_Negation_Filter.o .shobj/EC_Negation_Filter.so: Event/EC_Negation_Filter.cpp \
  Event/EC_Negation_Filter.h \
- $(ACE_ROOT)/ace/pre.h \
- Event/EC_Filter.h \
+ $(ACE_ROOT)/ace/pre.h Event/EC_Filter.h \
  RtecEventCommC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -7857,14 +7950,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -7913,6 +8001,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -7978,13 +8068,17 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h \
+ Event/event_export.h \
  TimeBaseC.h \
  svc_utils_export.h \
  TimeBaseC.i \
@@ -7994,8 +8088,7 @@ realclean: clean
  Event/event_export.h Event/EC_Filter.i Event/EC_Negation_Filter.i
 
 .obj/EC_Type_Filter.o .obj/EC_Type_Filter.so .shobj/EC_Type_Filter.o .shobj/EC_Type_Filter.so: Event/EC_Type_Filter.cpp Event/EC_Type_Filter.h \
- $(ACE_ROOT)/ace/pre.h \
- Event/EC_Filter.h \
+ $(ACE_ROOT)/ace/pre.h Event/EC_Filter.h \
  RtecEventCommC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -8154,14 +8247,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -8210,6 +8298,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -8275,13 +8365,17 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h \
+ Event/event_export.h \
  TimeBaseC.h \
  svc_utils_export.h \
  TimeBaseC.i \
@@ -8452,14 +8546,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -8508,6 +8597,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -8573,6 +8664,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -8584,7 +8679,7 @@ realclean: clean
  Time_Utilities.i \
  Event/EC_Basic_Filter_Builder.h Event/EC_Filter_Builder.h \
  RtecEventChannelAdminC.h \
- CosEvent/event_export.h \
+ Event/event_export.h \
  RtecEventCommC.h \
  RtecDefaultEventDataC.h \
  RtecDefaultEventDataC.i \
@@ -8766,14 +8861,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -8822,6 +8912,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -8887,6 +8979,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -8895,7 +8991,6 @@ realclean: clean
  $(TAO_ROOT)/tao/BoundsC.i \
  Event/EC_Factory.i Event/EC_Basic_Factory.i Event/EC_Dispatching.h \
  RtecEventCommC.h \
- CosEvent/event_export.h \
  TimeBaseC.h \
  svc_utils_export.h \
  TimeBaseC.i \
@@ -8911,10 +9006,12 @@ realclean: clean
  RtecEventChannelAdminC.i \
  Event/EC_Filter_Builder.i Event/EC_Basic_Filter_Builder.i \
  Event/EC_Trivial_Supplier_Filter.h Event/EC_Supplier_Filter.h \
- Event/EC_Worker.h Event/EC_Worker.i Event/EC_Worker.cpp \
+ ESF/ESF_Worker.h \
+ ESF/ESF_Worker.i \
+ ESF/ESF_Worker.cpp \
  Event/EC_Supplier_Filter.i Event/EC_Supplier_Filter_Builder.h \
  Event/EC_Supplier_Filter_Builder.i Event/EC_Trivial_Supplier_Filter.i \
- Event/EC_ConsumerAdmin.h \
+ Event/EC_ConsumerAdmin.h Event/EC_ProxySupplier.h \
  RtecEventChannelAdminS.h \
  RtecEventCommS.h \
  TimeBaseS.h \
@@ -8945,31 +9042,54 @@ realclean: clean
  RtecEventChannelAdminS_T.i \
  RtecEventChannelAdminS_T.cpp \
  RtecEventChannelAdminS.i \
- Event/EC_Proxy_Collection.h Event/EC_Busy_Lock.h Event/EC_Busy_Lock.i \
- Event/EC_Busy_Lock.cpp Event/EC_Proxy_Collection.i \
- Event/EC_Proxy_Collection.cpp Event/EC_Command.h Event/EC_Command.i \
- Event/EC_Command.cpp Event/EC_Defaults.h Event/EC_ConsumerAdmin.i \
- Event/EC_SupplierAdmin.h Event/EC_SupplierAdmin.i \
- Event/EC_ProxyConsumer.h \
  Event/EC_Filter.h \
  Event/EC_Filter.i \
- Event/EC_ProxyConsumer.i Event/EC_ProxySupplier.h \
- Event/EC_ProxySupplier.i Event/EC_ObserverStrategy.h \
+ Event/EC_ProxySupplier.i \
+ ESF/ESF_Peer_Admin.h \
+ ESF/ESF_Proxy_Admin.h \
+ ESF/ESF_Proxy_Collection.h \
+ ESF/ESF_Proxy_Collection.i \
+ ESF/ESF_Proxy_Collection.cpp \
+ ESF/ESF_Proxy_Admin.i \
+ ESF/ESF_Proxy_Admin.cpp \
+ ESF/ESF_Shutdown_Proxy.h \
+ ESF/ESF_Shutdown_Proxy.i \
+ ESF/ESF_Shutdown_Proxy.cpp \
+ ESF/ESF_Peer_Admin.i \
+ ESF/ESF_Peer_Admin.cpp \
+ ESF/ESF_Peer_Workers.h \
+ ESF/ESF_Peer_Workers.i \
+ ESF/ESF_Peer_Workers.cpp \
+ Event/EC_ConsumerAdmin.i Event/EC_SupplierAdmin.h \
+ Event/EC_ProxyConsumer.h Event/EC_ProxyConsumer.i \
+ Event/EC_SupplierAdmin.i Event/EC_ObserverStrategy.h \
  $(ACE_ROOT)/ace/RB_Tree.h \
  $(ACE_ROOT)/ace/RB_Tree.i \
  $(ACE_ROOT)/ace/RB_Tree.cpp \
  Event/EC_ObserverStrategy.i Event/EC_Null_Scheduling.h \
  Event/EC_Scheduling_Strategy.h Event/EC_Scheduling_Strategy.i \
- Event/EC_Null_Scheduling.i Event/EC_Concrete_Proxy_Set.h \
- Event/EC_Concrete_Proxy_Set.i Event/EC_Concrete_Proxy_Set.cpp \
- Event/EC_Reactive_Timeout_Generator.h Event/EC_Timeout_Generator.h \
- Event/EC_Timeout_Filter.h Event/EC_Filter.h Event/EC_QOS_Info.h \
- Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i \
- Event/EC_Timeout_Generator.i Event/EC_Reactive_Timeout_Generator.i \
+ Event/EC_Null_Scheduling.i Event/EC_Reactive_Timeout_Generator.h \
+ Event/EC_Timeout_Generator.h Event/EC_Timeout_Filter.h \
+ Event/EC_Filter.h Event/EC_QOS_Info.h Event/EC_QOS_Info.i \
+ Event/EC_Timeout_Filter.i Event/EC_Timeout_Generator.i \
+ Event/EC_Reactive_Timeout_Generator.i \
  Event/EC_Reactive_ConsumerControl.h Event/EC_ConsumerControl.h \
  Event/EC_ConsumerControl.i Event/EC_Reactive_ConsumerControl.i \
  Event/EC_Reactive_SupplierControl.h Event/EC_SupplierControl.h \
- Event/EC_SupplierControl.i Event/EC_Reactive_SupplierControl.i
+ Event/EC_SupplierControl.i Event/EC_Reactive_SupplierControl.i \
+ ESF/ESF_Proxy_List.h \
+ ESF/ESF_Proxy_List.i \
+ ESF/ESF_Proxy_List.cpp \
+ ESF/ESF_Delayed_Changes.h \
+ ESF/ESF_Busy_Lock.h \
+ ESF/ESF_Busy_Lock.i \
+ ESF/ESF_Busy_Lock.cpp \
+ ESF/ESF_Delayed_Changes.i \
+ ESF/ESF_Delayed_Changes.cpp \
+ ESF/ESF_Defaults.h \
+ ESF/ESF_Delayed_Command.h \
+ ESF/ESF_Delayed_Command.i \
+ ESF/ESF_Delayed_Command.cpp
 
 .obj/EC_Default_Factory.o .obj/EC_Default_Factory.so .shobj/EC_Default_Factory.o .shobj/EC_Default_Factory.so: Event/EC_Default_Factory.cpp \
  Event/EC_Default_Factory.h \
@@ -9133,14 +9253,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -9189,6 +9304,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -9254,6 +9371,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -9270,7 +9391,6 @@ realclean: clean
  RtecSchedulerC.i \
  Event/event_export.h Event/EC_Dispatching.h \
  RtecEventCommC.h \
- CosEvent/event_export.h \
  RtecDefaultEventDataC.h \
  RtecDefaultEventDataC.i \
  RtecEventCommC.i \
@@ -9328,14 +9448,28 @@ realclean: clean
  Event/EC_Filter_Builder.i Event/EC_Basic_Filter_Builder.i \
  Event/EC_Prefix_Filter_Builder.h Event/EC_Prefix_Filter_Builder.i \
  Event/EC_Sched_Filter_Builder.h Event/EC_Sched_Filter_Builder.i \
- Event/EC_ConsumerAdmin.h Event/EC_Proxy_Collection.h \
- Event/EC_Busy_Lock.h Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
- Event/EC_Proxy_Collection.i Event/EC_Proxy_Collection.cpp \
- Event/EC_Command.h Event/EC_Command.i Event/EC_Command.cpp \
- Event/EC_Worker.h Event/EC_Worker.i Event/EC_Worker.cpp \
+ Event/EC_ConsumerAdmin.h \
+ ESF/ESF_Peer_Admin.h \
+ ESF/ESF_Proxy_Admin.h \
+ ESF/ESF_Proxy_Collection.h \
+ ESF/ESF_Proxy_Collection.i \
+ ESF/ESF_Proxy_Collection.cpp \
+ ESF/ESF_Worker.h \
+ ESF/ESF_Worker.i \
+ ESF/ESF_Worker.cpp \
+ ESF/ESF_Proxy_Admin.i \
+ ESF/ESF_Proxy_Admin.cpp \
+ ESF/ESF_Shutdown_Proxy.h \
+ ESF/ESF_Shutdown_Proxy.i \
+ ESF/ESF_Shutdown_Proxy.cpp \
+ ESF/ESF_Peer_Admin.i \
+ ESF/ESF_Peer_Admin.cpp \
+ ESF/ESF_Peer_Workers.h \
+ ESF/ESF_Peer_Workers.i \
+ ESF/ESF_Peer_Workers.cpp \
  Event/EC_ConsumerAdmin.i Event/EC_SupplierAdmin.h \
- Event/EC_SupplierAdmin.i Event/EC_ProxyConsumer.h \
- Event/EC_ProxyConsumer.i Event/EC_Trivial_Supplier_Filter.h \
+ Event/EC_ProxyConsumer.h Event/EC_ProxyConsumer.i \
+ Event/EC_SupplierAdmin.i Event/EC_Trivial_Supplier_Filter.h \
  Event/EC_Supplier_Filter.h Event/EC_Supplier_Filter.i \
  Event/EC_Supplier_Filter_Builder.h Event/EC_Supplier_Filter_Builder.i \
  Event/EC_Trivial_Supplier_Filter.i Event/EC_Per_Supplier_Filter.h \
@@ -9346,10 +9480,7 @@ realclean: clean
  Event/EC_ObserverStrategy.i Event/EC_Null_Scheduling.h \
  Event/EC_Scheduling_Strategy.h Event/EC_Scheduling_Strategy.i \
  Event/EC_Null_Scheduling.i Event/EC_Priority_Scheduling.h \
- Event/EC_Priority_Scheduling.i Event/EC_Copy_On_Write.h \
- Event/EC_Copy_On_Write.i Event/EC_Copy_On_Write.cpp \
- Event/EC_Concrete_Proxy_Set.h Event/EC_Concrete_Proxy_Set.i \
- Event/EC_Concrete_Proxy_Set.cpp Event/EC_Reactive_Timeout_Generator.h \
+ Event/EC_Priority_Scheduling.i Event/EC_Reactive_Timeout_Generator.h \
  Event/EC_Timeout_Generator.h Event/EC_Timeout_Filter.h \
  Event/EC_Filter.h Event/EC_QOS_Info.h Event/EC_QOS_Info.i \
  Event/EC_Timeout_Filter.i Event/EC_Timeout_Generator.i \
@@ -9359,6 +9490,31 @@ realclean: clean
  Event/EC_Reactive_ConsumerControl.i \
  Event/EC_Reactive_SupplierControl.h Event/EC_SupplierControl.h \
  Event/EC_SupplierControl.i Event/EC_Reactive_SupplierControl.i \
+ ESF/ESF_Proxy_List.h \
+ ESF/ESF_Proxy_List.i \
+ ESF/ESF_Proxy_List.cpp \
+ ESF/ESF_Proxy_RB_Tree.h \
+ ESF/ESF_Proxy_RB_Tree.i \
+ ESF/ESF_Proxy_RB_Tree.cpp \
+ ESF/ESF_Immediate_Changes.h \
+ ESF/ESF_Immediate_Changes.i \
+ ESF/ESF_Immediate_Changes.cpp \
+ ESF/ESF_Delayed_Changes.h \
+ ESF/ESF_Busy_Lock.h \
+ ESF/ESF_Busy_Lock.i \
+ ESF/ESF_Busy_Lock.cpp \
+ ESF/ESF_Delayed_Changes.i \
+ ESF/ESF_Delayed_Changes.cpp \
+ ESF/ESF_Defaults.h \
+ ESF/ESF_Delayed_Command.h \
+ ESF/ESF_Delayed_Command.i \
+ ESF/ESF_Delayed_Command.cpp \
+ ESF/ESF_Copy_On_Read.h \
+ ESF/ESF_Copy_On_Read.i \
+ ESF/ESF_Copy_On_Read.cpp \
+ ESF/ESF_Copy_On_Write.h \
+ ESF/ESF_Copy_On_Write.i \
+ ESF/ESF_Copy_On_Write.cpp \
  $(ACE_ROOT)/ace/Arg_Shifter.h \
  $(ACE_ROOT)/ace/Sched_Params.h \
  $(ACE_ROOT)/ace/Sched_Params.i
@@ -9366,7 +9522,7 @@ realclean: clean
 .obj/EC_ObserverStrategy.o .obj/EC_ObserverStrategy.so .shobj/EC_ObserverStrategy.o .shobj/EC_ObserverStrategy.so: Event/EC_ObserverStrategy.cpp \
  Event/EC_ObserverStrategy.h \
  $(ACE_ROOT)/ace/pre.h \
- Event/EC_Worker.h \
+ ESF/ESF_Worker.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -9524,14 +9680,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -9580,6 +9731,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -9645,18 +9798,23 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- Event/EC_Worker.i Event/EC_Worker.cpp \
+ ESF/ESF_Worker.i \
+ ESF/ESF_Worker.cpp \
  $(ACE_ROOT)/ace/RB_Tree.h \
  $(ACE_ROOT)/ace/RB_Tree.i \
  $(ACE_ROOT)/ace/RB_Tree.cpp \
  RtecEventChannelAdminC.h \
- CosEvent/event_export.h \
+ Event/event_export.h \
  RtecEventCommC.h \
  TimeBaseC.h \
  svc_utils_export.h \
@@ -9669,9 +9827,8 @@ realclean: clean
  RtecSchedulerC.i \
  RtecEventChannelAdminC.i \
  Event/event_export.h Event/EC_ObserverStrategy.i \
- Event/EC_Event_Channel.h Event/EC_Factory.h \
- Event/event_export.h \
- Event/EC_Factory.i Event/EC_Defaults.h \
+ Event/EC_Event_Channel.h Event/EC_Factory.h Event/EC_Factory.i \
+ Event/EC_Defaults.h \
  RtecEventChannelAdminS.h \
  RtecEventCommS.h \
  TimeBaseS.h \
@@ -9707,11 +9864,23 @@ realclean: clean
  Event/EC_Filter.i \
  Event/EC_ProxySupplier.i Event/EC_ProxyConsumer.h \
  Event/EC_ProxyConsumer.i Event/EC_ConsumerAdmin.h \
- Event/EC_Proxy_Collection.h Event/EC_Busy_Lock.h Event/EC_Busy_Lock.i \
- Event/EC_Busy_Lock.cpp Event/EC_Proxy_Collection.i \
- Event/EC_Proxy_Collection.cpp Event/EC_Command.h Event/EC_Command.i \
- Event/EC_Command.cpp Event/EC_ConsumerAdmin.i \
- Event/EC_SupplierAdmin.h Event/EC_SupplierAdmin.i \
+ ESF/ESF_Peer_Admin.h \
+ ESF/ESF_Proxy_Admin.h \
+ ESF/ESF_Proxy_Collection.h \
+ ESF/ESF_Proxy_Collection.i \
+ ESF/ESF_Proxy_Collection.cpp \
+ ESF/ESF_Proxy_Admin.i \
+ ESF/ESF_Proxy_Admin.cpp \
+ ESF/ESF_Shutdown_Proxy.h \
+ ESF/ESF_Shutdown_Proxy.i \
+ ESF/ESF_Shutdown_Proxy.cpp \
+ ESF/ESF_Peer_Admin.i \
+ ESF/ESF_Peer_Admin.cpp \
+ ESF/ESF_Peer_Workers.h \
+ ESF/ESF_Peer_Workers.i \
+ ESF/ESF_Peer_Workers.cpp \
+ Event/EC_ConsumerAdmin.i Event/EC_SupplierAdmin.h \
+ Event/EC_SupplierAdmin.i \
  Event_Service_Constants.h \
  Time_Utilities.h \
  Time_Utilities.i \
@@ -9881,14 +10050,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -9937,6 +10101,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -10002,20 +10168,26 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h \
+ Event/event_export.h \
  TimeBaseC.h \
  svc_utils_export.h \
  TimeBaseC.i \
  RtecDefaultEventDataC.h \
  RtecDefaultEventDataC.i \
  RtecEventCommC.i \
- Event/EC_Worker.h Event/EC_Worker.i Event/EC_Worker.cpp \
+ ESF/ESF_Worker.h \
+ ESF/ESF_Worker.i \
+ ESF/ESF_Worker.cpp \
  Event/event_export.h Event/EC_Supplier_Filter.i \
  Event/EC_Supplier_Filter_Builder.h \
  RtecEventChannelAdminC.h \
@@ -10024,9 +10196,8 @@ realclean: clean
  RtecSchedulerC.i \
  RtecEventChannelAdminC.i \
  Event/EC_Supplier_Filter_Builder.i Event/EC_Per_Supplier_Filter.i \
- Event/EC_Event_Channel.h Event/EC_Factory.h \
- Event/event_export.h \
- Event/EC_Factory.i Event/EC_Defaults.h \
+ Event/EC_Event_Channel.h Event/EC_Factory.h Event/EC_Factory.i \
+ Event/EC_Defaults.h \
  RtecEventChannelAdminS.h \
  RtecEventCommS.h \
  TimeBaseS.h \
@@ -10062,19 +10233,18 @@ realclean: clean
  Event/EC_Filter.i \
  Event/EC_ProxySupplier.i Event/EC_ProxyConsumer.h \
  Event/EC_ProxyConsumer.i Event/EC_Scheduling_Strategy.h \
- Event/EC_Scheduling_Strategy.i Event/EC_Proxy_Collection.h \
- Event/EC_Busy_Lock.h Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
- Event/EC_Proxy_Collection.i Event/EC_Proxy_Collection.cpp \
- Event/EC_Command.h Event/EC_Command.i Event/EC_Command.cpp \
- Event/EC_QOS_Info.h Event/EC_QOS_Info.i \
+ Event/EC_Scheduling_Strategy.i Event/EC_QOS_Info.h \
+ Event/EC_QOS_Info.i \
+ ESF/ESF_Proxy_Collection.h \
+ ESF/ESF_Proxy_Collection.i \
+ ESF/ESF_Proxy_Collection.cpp \
  Event_Service_Constants.h \
  Time_Utilities.h \
  Time_Utilities.i
 
 .obj/EC_Timeout_Filter.o .obj/EC_Timeout_Filter.so .shobj/EC_Timeout_Filter.o .shobj/EC_Timeout_Filter.so: Event/EC_Timeout_Filter.cpp \
  Event/EC_Timeout_Filter.h \
- $(ACE_ROOT)/ace/pre.h \
- Event/EC_Filter.h \
+ $(ACE_ROOT)/ace/pre.h Event/EC_Filter.h \
  RtecEventCommC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -10233,14 +10403,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -10289,6 +10454,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -10354,13 +10521,17 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h \
+ Event/event_export.h \
  TimeBaseC.h \
  svc_utils_export.h \
  TimeBaseC.i \
@@ -10372,10 +10543,9 @@ realclean: clean
  Sched/sched_export.h \
  RtecSchedulerC.i \
  Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i \
- Event/EC_Timeout_Generator.h \
- Event/event_export.h \
- Event/EC_Timeout_Generator.i Event/EC_Event_Channel.h \
- Event/EC_Factory.h Event/EC_Factory.i Event/EC_Defaults.h \
+ Event/EC_Timeout_Generator.h Event/EC_Timeout_Generator.i \
+ Event/EC_Event_Channel.h Event/EC_Factory.h Event/EC_Factory.i \
+ Event/EC_Defaults.h \
  RtecEventChannelAdminS.h \
  RtecEventCommS.h \
  TimeBaseS.h \
@@ -10578,14 +10748,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -10634,6 +10799,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -10699,13 +10866,16 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h \
  TimeBaseC.h \
  svc_utils_export.h \
  TimeBaseC.i \
@@ -10887,14 +11057,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -10943,6 +11108,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -11008,13 +11175,16 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h \
  TimeBaseC.h \
  svc_utils_export.h \
  TimeBaseC.i \
@@ -11189,14 +11359,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -11245,6 +11410,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -11310,6 +11477,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -11323,7 +11494,7 @@ realclean: clean
  RtecSchedulerC.i \
  Event/event_export.h Event/EC_Dispatching.h \
  RtecEventCommC.h \
- CosEvent/event_export.h \
+ Event/event_export.h \
  RtecDefaultEventDataC.h \
  RtecDefaultEventDataC.i \
  RtecEventCommC.i \
@@ -11362,7 +11533,6 @@ realclean: clean
  RtecEventChannelAdminS_T.cpp \
  RtecEventChannelAdminS.i \
  Event/EC_Filter.h \
- Event/event_export.h \
  Event/EC_Filter.i \
  Event/EC_ProxySupplier.i \
  $(ACE_ROOT)/ace/Task.h \
@@ -11547,14 +11717,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -11603,6 +11768,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -11668,13 +11835,17 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h \
+ Event/event_export.h \
  TimeBaseC.h \
  svc_utils_export.h \
  TimeBaseC.i \
@@ -11719,7 +11890,6 @@ realclean: clean
  RtecEventChannelAdminS_T.cpp \
  RtecEventChannelAdminS.i \
  Event/EC_Filter.h \
- Event/event_export.h \
  Event/EC_Filter.i \
  Event/EC_ProxySupplier.i \
  $(ACE_ROOT)/ace/Task.h \
@@ -11907,12 +12077,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -11961,6 +12126,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -12026,6 +12193,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -12040,7 +12211,7 @@ realclean: clean
  TimeBaseS.i \
  RtecDefaultEventDataS.h \
  RtecDefaultEventDataC.h \
- CosEvent/event_export.h \
+ Event/event_export.h \
  RtecDefaultEventDataC.i \
  RtecDefaultEventDataS_T.h \
  RtecDefaultEventDataS_T.i \
@@ -12067,7 +12238,6 @@ realclean: clean
  RtecEventChannelAdminS_T.cpp \
  RtecEventChannelAdminS.i \
  Event/EC_Filter.h \
- Event/event_export.h \
  Event/EC_Filter.i \
  Event/EC_ProxySupplier.i Event/event_export.h \
  $(ACE_ROOT)/ace/Task.h \
@@ -12243,14 +12413,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -12299,6 +12464,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -12364,6 +12531,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -12377,7 +12548,7 @@ realclean: clean
  RtecSchedulerC.i \
  Event/EC_Filter.h \
  RtecEventCommC.h \
- CosEvent/event_export.h \
+ Event/event_export.h \
  RtecDefaultEventDataC.h \
  RtecDefaultEventDataC.i \
  RtecEventCommC.i \
@@ -12545,14 +12716,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -12601,6 +12767,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -12666,6 +12834,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -12679,7 +12851,7 @@ realclean: clean
  RtecSchedulerC.i \
  Event/EC_Filter.h \
  RtecEventCommC.h \
- CosEvent/event_export.h \
+ Event/event_export.h \
  RtecDefaultEventDataC.h \
  RtecDefaultEventDataC.i \
  RtecEventCommC.i \
@@ -12696,7 +12868,6 @@ realclean: clean
  Event/EC_Disjunction_Filter.h Event/EC_Disjunction_Filter.i \
  Event/EC_Timeout_Filter.h Event/EC_QOS_Info.h Event/EC_QOS_Info.i \
  Event/EC_Timeout_Filter.i Event/EC_Event_Channel.h Event/EC_Factory.h \
- Event/event_export.h \
  Event/EC_Factory.i Event/EC_Defaults.h \
  RtecEventChannelAdminS.h \
  RtecEventCommS.h \
@@ -12891,14 +13062,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -12947,6 +13113,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -13012,6 +13180,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -13024,7 +13196,7 @@ realclean: clean
  TimeBaseC.i \
  RtecSchedulerC.i \
  RtecEventCommC.h \
- CosEvent/event_export.h \
+ Event/event_export.h \
  RtecDefaultEventDataC.h \
  RtecDefaultEventDataC.i \
  RtecEventCommC.i \
@@ -13193,14 +13365,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -13249,6 +13416,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -13314,6 +13483,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -13326,7 +13499,7 @@ realclean: clean
  TimeBaseC.i \
  RtecSchedulerC.i \
  RtecEventCommC.h \
- CosEvent/event_export.h \
+ Event/event_export.h \
  RtecDefaultEventDataC.h \
  RtecDefaultEventDataC.i \
  RtecEventCommC.i \
@@ -13495,14 +13668,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -13551,6 +13719,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -13616,6 +13786,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -13628,7 +13802,7 @@ realclean: clean
  TimeBaseC.i \
  RtecSchedulerC.i \
  RtecEventCommC.h \
- CosEvent/event_export.h \
+ Event/event_export.h \
  RtecDefaultEventDataC.h \
  RtecDefaultEventDataC.i \
  RtecEventCommC.i \
@@ -13668,7 +13842,6 @@ realclean: clean
  RtecEventChannelAdminS_T.cpp \
  RtecEventChannelAdminS.i \
  Event/EC_Filter.h \
- Event/event_export.h \
  Event/EC_Filter.i \
  Event/EC_ProxyConsumer.i Event/EC_ProxySupplier.h \
  Event/EC_ProxySupplier.i
@@ -13834,14 +14007,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -13890,6 +14058,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -13955,6 +14125,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -14124,14 +14298,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -14180,6 +14349,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -14245,6 +14416,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -14415,14 +14590,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -14471,6 +14641,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -14536,16 +14708,22 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- Event/EC_ConsumerControl.i Event/EC_Worker.h Event/EC_Worker.i \
- Event/EC_Worker.cpp Event/EC_Reactive_ConsumerControl.i \
- Event/EC_Event_Channel.h Event/EC_Factory.h Event/EC_Factory.i \
- Event/EC_Defaults.h \
+ Event/EC_ConsumerControl.i \
+ ESF/ESF_Worker.h \
+ ESF/ESF_Worker.i \
+ ESF/ESF_Worker.cpp \
+ Event/EC_Reactive_ConsumerControl.i Event/EC_Event_Channel.h \
+ Event/EC_Factory.h Event/EC_Factory.i Event/EC_Defaults.h \
  RtecEventChannelAdminS.h \
  RtecEventCommS.h \
  TimeBaseS.h \
@@ -14563,7 +14741,6 @@ realclean: clean
  TimeBaseS.i \
  RtecDefaultEventDataS.h \
  RtecDefaultEventDataC.h \
- CosEvent/event_export.h \
  RtecDefaultEventDataC.i \
  RtecDefaultEventDataS_T.h \
  RtecDefaultEventDataS_T.i \
@@ -14590,14 +14767,26 @@ realclean: clean
  RtecEventChannelAdminS_T.cpp \
  RtecEventChannelAdminS.i \
  Event/EC_Event_Channel.i Event/EC_ConsumerAdmin.h \
- Event/event_export.h Event/EC_Proxy_Collection.h Event/EC_Busy_Lock.h \
- Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
- Event/EC_Proxy_Collection.i Event/EC_Proxy_Collection.cpp \
- Event/EC_Command.h Event/EC_Command.i Event/EC_Command.cpp \
- Event/EC_ConsumerAdmin.i Event/EC_ProxySupplier.h \
+ Event/EC_ProxySupplier.h \
  Event/EC_Filter.h \
  Event/EC_Filter.i \
- Event/EC_ProxySupplier.i
+ Event/EC_ProxySupplier.i \
+ ESF/ESF_Peer_Admin.h \
+ ESF/ESF_Proxy_Admin.h \
+ ESF/ESF_Proxy_Collection.h \
+ ESF/ESF_Proxy_Collection.i \
+ ESF/ESF_Proxy_Collection.cpp \
+ ESF/ESF_Proxy_Admin.i \
+ ESF/ESF_Proxy_Admin.cpp \
+ ESF/ESF_Shutdown_Proxy.h \
+ ESF/ESF_Shutdown_Proxy.i \
+ ESF/ESF_Shutdown_Proxy.cpp \
+ ESF/ESF_Peer_Admin.i \
+ ESF/ESF_Peer_Admin.cpp \
+ ESF/ESF_Peer_Workers.h \
+ ESF/ESF_Peer_Workers.i \
+ ESF/ESF_Peer_Workers.cpp \
+ Event/event_export.h Event/EC_ConsumerAdmin.i
 
 .obj/EC_Reactive_SupplierControl.o .obj/EC_Reactive_SupplierControl.so .shobj/EC_Reactive_SupplierControl.o .shobj/EC_Reactive_SupplierControl.so: Event/EC_Reactive_SupplierControl.cpp \
  Event/EC_Reactive_SupplierControl.h \
@@ -14761,14 +14950,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -14817,6 +15001,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -14882,16 +15068,22 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- Event/EC_SupplierControl.i Event/EC_Worker.h Event/EC_Worker.i \
- Event/EC_Worker.cpp Event/EC_Reactive_SupplierControl.i \
- Event/EC_Event_Channel.h Event/EC_Factory.h Event/EC_Factory.i \
- Event/EC_Defaults.h \
+ Event/EC_SupplierControl.i \
+ ESF/ESF_Worker.h \
+ ESF/ESF_Worker.i \
+ ESF/ESF_Worker.cpp \
+ Event/EC_Reactive_SupplierControl.i Event/EC_Event_Channel.h \
+ Event/EC_Factory.h Event/EC_Factory.i Event/EC_Defaults.h \
  RtecEventChannelAdminS.h \
  RtecEventCommS.h \
  TimeBaseS.h \
@@ -14909,7 +15101,6 @@ realclean: clean
  TimeBaseS.i \
  RtecDefaultEventDataS.h \
  RtecDefaultEventDataC.h \
- CosEvent/event_export.h \
  RtecDefaultEventDataC.i \
  RtecDefaultEventDataS_T.h \
  RtecDefaultEventDataS_T.i \
@@ -14936,19 +15127,30 @@ realclean: clean
  RtecEventChannelAdminS_T.cpp \
  RtecEventChannelAdminS.i \
  Event/EC_Event_Channel.i Event/EC_SupplierAdmin.h \
- Event/EC_Proxy_Collection.h Event/EC_Busy_Lock.h Event/EC_Busy_Lock.i \
- Event/EC_Busy_Lock.cpp Event/EC_Proxy_Collection.i \
- Event/EC_Proxy_Collection.cpp Event/EC_Command.h Event/EC_Command.i \
- Event/EC_Command.cpp Event/event_export.h Event/EC_SupplierAdmin.i \
  Event/EC_ProxyConsumer.h \
  Event/EC_Filter.h \
  Event/EC_Filter.i \
- Event/EC_ProxyConsumer.i
+ Event/EC_ProxyConsumer.i \
+ ESF/ESF_Peer_Admin.h \
+ ESF/ESF_Proxy_Admin.h \
+ ESF/ESF_Proxy_Collection.h \
+ ESF/ESF_Proxy_Collection.i \
+ ESF/ESF_Proxy_Collection.cpp \
+ ESF/ESF_Proxy_Admin.i \
+ ESF/ESF_Proxy_Admin.cpp \
+ ESF/ESF_Shutdown_Proxy.h \
+ ESF/ESF_Shutdown_Proxy.i \
+ ESF/ESF_Shutdown_Proxy.cpp \
+ ESF/ESF_Peer_Admin.i \
+ ESF/ESF_Peer_Admin.cpp \
+ ESF/ESF_Peer_Workers.h \
+ ESF/ESF_Peer_Workers.i \
+ ESF/ESF_Peer_Workers.cpp \
+ Event/event_export.h Event/EC_SupplierAdmin.i
 
 .obj/EC_Bitmask_Filter.o .obj/EC_Bitmask_Filter.so .shobj/EC_Bitmask_Filter.o .shobj/EC_Bitmask_Filter.so: Event/EC_Bitmask_Filter.cpp \
  Event/EC_Bitmask_Filter.h \
- $(ACE_ROOT)/ace/pre.h \
- Event/EC_Filter.h \
+ $(ACE_ROOT)/ace/pre.h Event/EC_Filter.h \
  RtecEventCommC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -15107,14 +15309,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -15163,6 +15360,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -15228,13 +15427,17 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h \
+ Event/event_export.h \
  TimeBaseC.h \
  svc_utils_export.h \
  TimeBaseC.i \
@@ -15245,8 +15448,7 @@ realclean: clean
 
 .obj/EC_Masked_Type_Filter.o .obj/EC_Masked_Type_Filter.so .shobj/EC_Masked_Type_Filter.o .shobj/EC_Masked_Type_Filter.so: Event/EC_Masked_Type_Filter.cpp \
  Event/EC_Masked_Type_Filter.h \
- $(ACE_ROOT)/ace/pre.h \
- Event/EC_Filter.h \
+ $(ACE_ROOT)/ace/pre.h Event/EC_Filter.h \
  RtecEventCommC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -15405,14 +15607,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -15461,6 +15658,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -15526,13 +15725,17 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h \
+ Event/event_export.h \
  TimeBaseC.h \
  svc_utils_export.h \
  TimeBaseC.i \
@@ -15703,14 +15906,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -15759,6 +15957,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -15824,6 +16024,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -15835,7 +16039,7 @@ realclean: clean
  Time_Utilities.i \
  Event/EC_Prefix_Filter_Builder.h Event/EC_Filter_Builder.h \
  RtecEventChannelAdminC.h \
- CosEvent/event_export.h \
+ Event/event_export.h \
  RtecEventCommC.h \
  RtecDefaultEventDataC.h \
  RtecDefaultEventDataC.i \
@@ -15857,8 +16061,7 @@ realclean: clean
  Event/EC_Timeout_Filter.i
 
 .obj/EC_And_Filter.o .obj/EC_And_Filter.so .shobj/EC_And_Filter.o .shobj/EC_And_Filter.so: Event/EC_And_Filter.cpp Event/EC_And_Filter.h \
- $(ACE_ROOT)/ace/pre.h \
- Event/EC_Filter.h \
+ $(ACE_ROOT)/ace/pre.h Event/EC_Filter.h \
  RtecEventCommC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -16017,14 +16220,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -16073,6 +16271,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -16138,13 +16338,17 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h \
+ Event/event_export.h \
  TimeBaseC.h \
  svc_utils_export.h \
  TimeBaseC.i \
@@ -16314,14 +16518,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -16370,6 +16569,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -16435,13 +16636,17 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h \
+ Event/event_export.h \
  RtecEventCommC.h \
  TimeBaseC.h \
  svc_utils_export.h \
@@ -16456,31 +16661,22 @@ realclean: clean
  Event_Service_Constants.h \
  Time_Utilities.h \
  Time_Utilities.i \
- Event/event_export.h \
  Event_Utilities.i
 
-.obj/BCU.o .obj/BCU.so .shobj/BCU.o .shobj/BCU.so: Event/BCU.cpp \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/ACE.i Event/BCU.h \
- Event/event_export.h
-
-.obj/Dispatching_Modules.o .obj/Dispatching_Modules.so .shobj/Dispatching_Modules.o .shobj/Dispatching_Modules.so: Event/Dispatching_Modules.cpp \
- $(ACE_ROOT)/ace/Sched_Params.h \
+.obj/EC_Gateway.o .obj/EC_Gateway.so .shobj/EC_Gateway.o .shobj/EC_Gateway.so: Event/EC_Gateway.cpp \
+ Event/EC_Gateway.h \
  $(ACE_ROOT)/ace/pre.h \
+ RtecEventChannelAdminS.h \
+ RtecEventCommS.h \
+ TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/post.h \
@@ -16494,14 +16690,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Sched_Params.i \
- Scheduler_Factory.h \
- CosNamingC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -16560,11 +16748,24 @@ realclean: clean
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ TimeBaseC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -16601,18 +16802,12 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/IORManipulation.h \
  $(TAO_ROOT)/tao/IORS.h \
  $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/IORC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
  $(TAO_ROOT)/tao/POAC.h \
@@ -16628,8 +16823,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InterceptorC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/InterceptorC.i \
  $(TAO_ROOT)/tao/Interceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
@@ -16641,14 +16834,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -16697,6 +16883,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -16762,112 +16950,65 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- Naming/naming_export.h \
- CosNamingC.i \
- RtecSchedulerC.h \
- Sched/sched_export.h \
- TimeBaseC.h \
  svc_utils_export.h \
  TimeBaseC.i \
- RtecSchedulerC.i \
- Scheduler_Factory.i \
- Time_Utilities.h \
- Time_Utilities.i \
- Event/Memory_Pools.h Event/Event_Channel.h \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- Event/Local_ESTypes.h \
- Event_Service_Constants.h \
- RtecSchedulerS.h \
- TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
  TimeBaseS_T.h \
  TimeBaseS_T.i \
  TimeBaseS_T.cpp \
  TimeBaseS.i \
- RtecSchedulerS_T.h \
- RtecSchedulerS_T.i \
- RtecSchedulerS_T.cpp \
- RtecSchedulerS.i \
- RtecEventCommC.h \
- CosEvent/event_export.h \
+ RtecDefaultEventDataS.h \
  RtecDefaultEventDataC.h \
+ Event/event_export.h \
  RtecDefaultEventDataC.i \
- RtecEventCommC.i \
- RtecEventCommS.h \
- RtecDefaultEventDataS.h \
  RtecDefaultEventDataS_T.h \
  RtecDefaultEventDataS_T.i \
  RtecDefaultEventDataS_T.cpp \
  RtecDefaultEventDataS.i \
+ RtecEventCommC.h \
+ RtecEventCommC.i \
  RtecEventCommS_T.h \
  RtecEventCommS_T.i \
  RtecEventCommS_T.cpp \
  RtecEventCommS.i \
+ RtecSchedulerS.h \
+ RtecSchedulerC.h \
+ Sched/sched_export.h \
+ RtecSchedulerC.i \
+ RtecSchedulerS_T.h \
+ RtecSchedulerS_T.i \
+ RtecSchedulerS_T.cpp \
+ RtecSchedulerS.i \
  RtecEventChannelAdminC.h \
  RtecEventChannelAdminC.i \
- RtecEventChannelAdminS.h \
  RtecEventChannelAdminS_T.h \
  RtecEventChannelAdminS_T.i \
  RtecEventChannelAdminS_T.cpp \
  RtecEventChannelAdminS.i \
- Event/Local_ESTypes.i \
- Event/Timer_Module.h \
- Event/RT_Task.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- Event/event_export.h \
- Event/RT_Task.i \
- Event/Timer_Module.i \
- Event/ReactorTask.h \
- Event/Fast_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor_T.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.h \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Select_Reactor_Base.i \
- $(ACE_ROOT)/ace/Select_Reactor_T.cpp \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
- $(ACE_ROOT)/ace/Select_Reactor_T.i \
- $(ACE_ROOT)/ace/Select_Reactor.i \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_List_T.cpp \
- Event/Event_Manip.h \
- Event/Event_Manip.i \
- Event/Event_Channel.i Event/Dispatching_Modules.h \
- Event/Event_Channel.h \
- Event/Dispatching_Modules.i Event/Memory_Pools.i
+ Channel_Clients_T.h \
+ Channel_Clients_T.i \
+ Channel_Clients_T.cpp \
+ Event_Utilities.h \
+ Event_Service_Constants.h \
+ Time_Utilities.h \
+ Time_Utilities.i \
+ Event_Utilities.i
 
-.obj/Event_Channel.o .obj/Event_Channel.so .shobj/Event_Channel.o .shobj/Event_Channel.so: Event/Event_Channel.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
+.obj/EC_Gateway_UDP.o .obj/EC_Gateway_UDP.so .shobj/EC_Gateway_UDP.o .shobj/EC_Gateway_UDP.so: Event/EC_Gateway_UDP.cpp \
+ Event/EC_Gateway_UDP.h \
  $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -16883,11 +17024,25 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -16895,23 +17050,13 @@ realclean: clean
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
  $(ACE_ROOT)/ace/Synch.i \
  $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
  $(ACE_ROOT)/ace/Thread.h \
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -16927,29 +17072,25 @@ realclean: clean
  $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- Scheduler_Factory.h \
- CosNamingC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ RtecEventChannelAdminS.h \
+ RtecEventCommS.h \
+ TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -16957,16 +17098,31 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ TimeBaseC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -16978,6 +17134,22 @@ realclean: clean
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -16987,18 +17159,12 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/IORManipulation.h \
  $(TAO_ROOT)/tao/IORS.h \
  $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/IORC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
  $(TAO_ROOT)/tao/POAC.h \
@@ -17014,8 +17180,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InterceptorC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/InterceptorC.i \
  $(TAO_ROOT)/tao/Interceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
@@ -17027,14 +17191,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -17083,6 +17240,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -17148,121 +17307,78 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- Naming/naming_export.h \
- CosNamingC.i \
- RtecSchedulerC.h \
- Sched/sched_export.h \
- TimeBaseC.h \
  svc_utils_export.h \
  TimeBaseC.i \
- RtecSchedulerC.i \
- Scheduler_Factory.i \
- Event_Utilities.h \
- RtecEventChannelAdminC.h \
- CosEvent/event_export.h \
- RtecEventCommC.h \
- RtecDefaultEventDataC.h \
- RtecDefaultEventDataC.i \
- RtecEventCommC.i \
- RtecEventChannelAdminC.i \
- Event_Service_Constants.h \
- Time_Utilities.h \
- Time_Utilities.i \
- Event/event_export.h \
- Event_Utilities.i \
- Event/Dispatching_Modules.h \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- Event/ReactorTask.h \
- Event/Fast_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor_T.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.h \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Select_Reactor_Base.i \
- $(ACE_ROOT)/ace/Select_Reactor_T.cpp \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
- $(ACE_ROOT)/ace/Select_Reactor_T.i \
- $(ACE_ROOT)/ace/Select_Reactor.i \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_List_T.cpp \
- Event/Local_ESTypes.h \
- RtecSchedulerS.h \
- TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
  TimeBaseS_T.h \
  TimeBaseS_T.i \
  TimeBaseS_T.cpp \
  TimeBaseS.i \
- RtecSchedulerS_T.h \
- RtecSchedulerS_T.i \
- RtecSchedulerS_T.cpp \
- RtecSchedulerS.i \
- RtecEventCommS.h \
  RtecDefaultEventDataS.h \
+ RtecDefaultEventDataC.h \
+ Event/event_export.h \
+ RtecDefaultEventDataC.i \
  RtecDefaultEventDataS_T.h \
  RtecDefaultEventDataS_T.i \
  RtecDefaultEventDataS_T.cpp \
  RtecDefaultEventDataS.i \
+ RtecEventCommC.h \
+ RtecEventCommC.i \
  RtecEventCommS_T.h \
  RtecEventCommS_T.i \
  RtecEventCommS_T.cpp \
  RtecEventCommS.i \
- RtecEventChannelAdminS.h \
+ RtecSchedulerS.h \
+ RtecSchedulerC.h \
+ Sched/sched_export.h \
+ RtecSchedulerC.i \
+ RtecSchedulerS_T.h \
+ RtecSchedulerS_T.i \
+ RtecSchedulerS_T.cpp \
+ RtecSchedulerS.i \
+ RtecEventChannelAdminC.h \
+ RtecEventChannelAdminC.i \
  RtecEventChannelAdminS_T.h \
  RtecEventChannelAdminS_T.i \
  RtecEventChannelAdminS_T.cpp \
  RtecEventChannelAdminS.i \
- Event/Local_ESTypes.i \
- Event/RT_Task.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- Event/RT_Task.i \
- Event/Event_Manip.h \
- Event/Event_Manip.i \
- Event/Event_Channel.h \
- Event/Timer_Module.h \
- Event/Timer_Module.i \
- Event/Event_Channel.i \
- Event/Dispatching_Modules.i \
- Event/Memory_Pools.h \
- Event/Memory_Pools.i \
- Event/EC_Gateway.h \
- Channel_Clients_T.h \
- Channel_Clients_T.i \
- Channel_Clients_T.cpp \
- Event/Module_Factory.h
+ RtecUDPAdminS.h \
+ RtecUDPAdminC.h \
+ RtecUDPAdminC.i \
+ RtecUDPAdminS_T.h \
+ RtecUDPAdminS_T.i \
+ RtecUDPAdminS_T.cpp \
+ RtecUDPAdminS.i \
+ Event/EC_Gateway_UDP.i \
+ Event_Utilities.h \
+ Event_Service_Constants.h \
+ Time_Utilities.h \
+ Time_Utilities.i \
+ Event_Utilities.i
 
-.obj/Event_Manip.o .obj/Event_Manip.so .shobj/Event_Manip.o .shobj/Event_Manip.so: Event/Event_Manip.cpp \
- Event/Event_Manip.h \
+.obj/EC_UDP_Admin.o .obj/EC_UDP_Admin.so .shobj/EC_UDP_Admin.o .shobj/EC_UDP_Admin.so: Event/EC_UDP_Admin.cpp \
+ Event/EC_UDP_Admin.h \
  $(ACE_ROOT)/ace/pre.h \
- RtecEventCommC.h \
- $(TAO_ROOT)/tao/corba.h \
+ RtecUDPAdminS.h \
+ RtecEventCommS.h \
+ TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/post.h \
@@ -17276,10 +17392,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -17338,11 +17450,24 @@ realclean: clean
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ TimeBaseC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -17379,18 +17504,12 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/IORManipulation.h \
  $(TAO_ROOT)/tao/IORS.h \
  $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/IORC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
  $(TAO_ROOT)/tao/POAC.h \
@@ -17406,8 +17525,6 @@ realclean: clean
  $(TAO_ROOT)/tao/InterceptorC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/InterceptorC.i \
  $(TAO_ROOT)/tao/Interceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
@@ -17419,14 +17536,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -17475,6 +17585,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -17540,25 +17652,46 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- CosEvent/event_export.h \
- TimeBaseC.h \
  svc_utils_export.h \
  TimeBaseC.i \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
+ RtecDefaultEventDataS.h \
  RtecDefaultEventDataC.h \
+ Event/event_export.h \
  RtecDefaultEventDataC.i \
+ RtecDefaultEventDataS_T.h \
+ RtecDefaultEventDataS_T.i \
+ RtecDefaultEventDataS_T.cpp \
+ RtecDefaultEventDataS.i \
+ RtecEventCommC.h \
  RtecEventCommC.i \
- Event/event_export.h \
- Event/Event_Manip.i
+ RtecEventCommS_T.h \
+ RtecEventCommS_T.i \
+ RtecEventCommS_T.cpp \
+ RtecEventCommS.i \
+ RtecUDPAdminC.h \
+ RtecUDPAdminC.i \
+ RtecUDPAdminS_T.h \
+ RtecUDPAdminS_T.i \
+ RtecUDPAdminS_T.cpp \
+ RtecUDPAdminS.i
 
-.obj/Local_ESTypes.o .obj/Local_ESTypes.so .shobj/Local_ESTypes.o .shobj/Local_ESTypes.so: Event/Local_ESTypes.cpp Event/Local_ESTypes.h \
+.obj/BCU.o .obj/BCU.so .shobj/BCU.o .shobj/BCU.so: Event/BCU.cpp \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/pre.h \
- $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/post.h \
@@ -17572,6 +17705,29 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/ACE.i Event/BCU.h \
+ Event/event_export.h
+
+.obj/Dispatching_Modules.o .obj/Dispatching_Modules.so .shobj/Dispatching_Modules.o .shobj/Dispatching_Modules.so: Event/Dispatching_Modules.cpp \
+ $(ACE_ROOT)/ace/Sched_Params.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Sched_Params.i \
+ Scheduler_Factory.h \
+ CosNamingC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -17715,14 +17871,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -17771,6 +17922,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -17836,24 +17989,32 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- Event_Service_Constants.h \
- Time_Utilities.h \
- TimeBaseC.h \
- svc_utils_export.h \
- TimeBaseC.i \
- Time_Utilities.i \
- CosNamingC.h \
  Naming/naming_export.h \
  CosNamingC.i \
  RtecSchedulerC.h \
  Sched/sched_export.h \
+ TimeBaseC.h \
+ svc_utils_export.h \
+ TimeBaseC.i \
  RtecSchedulerC.i \
+ Scheduler_Factory.i \
+ Time_Utilities.h \
+ Time_Utilities.i \
+ Event/Memory_Pools.h Event/Event_Channel.h \
+ $(TAO_ROOT)/tao/Timeprobe.h \
+ $(ACE_ROOT)/ace/Timeprobe.h \
+ Event/Local_ESTypes.h \
+ Event_Service_Constants.h \
  RtecSchedulerS.h \
  TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
@@ -17870,7 +18031,7 @@ realclean: clean
  RtecSchedulerS_T.cpp \
  RtecSchedulerS.i \
  RtecEventCommC.h \
- CosEvent/event_export.h \
+ Event/event_export.h \
  RtecDefaultEventDataC.h \
  RtecDefaultEventDataC.i \
  RtecEventCommC.i \
@@ -17891,11 +18052,52 @@ realclean: clean
  RtecEventChannelAdminS_T.i \
  RtecEventChannelAdminS_T.cpp \
  RtecEventChannelAdminS.i \
- Event/Local_ESTypes.i
+ Event/Local_ESTypes.i \
+ Event/Timer_Module.h \
+ Event/RT_Task.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ Event/RT_Task.i \
+ Event/Timer_Module.i \
+ Event/ReactorTask.h \
+ Event/Fast_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor_T.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.h \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.i \
+ $(ACE_ROOT)/ace/Select_Reactor_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Heap.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
+ $(ACE_ROOT)/ace/Select_Reactor_T.i \
+ $(ACE_ROOT)/ace/Select_Reactor.i \
+ $(ACE_ROOT)/ace/Timer_List.h \
+ $(ACE_ROOT)/ace/Timer_List_T.h \
+ $(ACE_ROOT)/ace/Timer_List_T.cpp \
+ Event/Event_Manip.h \
+ Event/Event_Manip.i \
+ Event/Event_Channel.i Event/Dispatching_Modules.h \
+ Event/Event_Channel.h \
+ Event/Dispatching_Modules.i Event/Memory_Pools.i
 
-.obj/Memory_Pools.o .obj/Memory_Pools.so .shobj/Memory_Pools.o .shobj/Memory_Pools.so: Event/Memory_Pools.cpp Event/Memory_Pools.h \
+.obj/Event_Channel.o .obj/Event_Channel.so .shobj/Event_Channel.o .shobj/Event_Channel.so: Event/Event_Channel.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -17911,20 +18113,23 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
  $(ACE_ROOT)/ace/Synch.i \
  $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch_T.i \
  $(ACE_ROOT)/ace/Thread.h \
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- Event/Event_Channel.h \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
@@ -17952,19 +18157,10 @@ realclean: clean
  $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
@@ -17978,13 +18174,9 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  Scheduler_Factory.h \
  CosNamingC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -18007,6 +18199,11 @@ realclean: clean
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
  $(ACE_ROOT)/ace/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
@@ -18060,14 +18257,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -18088,6 +18280,9 @@ realclean: clean
  $(ACE_ROOT)/ace/Pair_T.h \
  $(ACE_ROOT)/ace/Pair_T.i \
  $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Active_Map_Manager.h \
  $(ACE_ROOT)/ace/Active_Map_Manager.i \
  $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -18113,6 +18308,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -18178,6 +18375,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -18193,10 +18394,41 @@ realclean: clean
  TimeBaseC.i \
  RtecSchedulerC.i \
  Scheduler_Factory.i \
- Event/Local_ESTypes.h \
+ Event_Utilities.h \
+ RtecEventChannelAdminC.h \
+ Event/event_export.h \
+ RtecEventCommC.h \
+ RtecDefaultEventDataC.h \
+ RtecDefaultEventDataC.i \
+ RtecEventCommC.i \
+ RtecEventChannelAdminC.i \
  Event_Service_Constants.h \
  Time_Utilities.h \
  Time_Utilities.i \
+ Event_Utilities.i \
+ Event/Dispatching_Modules.h \
+ $(TAO_ROOT)/tao/Timeprobe.h \
+ $(ACE_ROOT)/ace/Timeprobe.h \
+ Event/ReactorTask.h \
+ Event/Fast_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor_T.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.h \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.i \
+ $(ACE_ROOT)/ace/Select_Reactor_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Heap.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
+ $(ACE_ROOT)/ace/Select_Reactor_T.i \
+ $(ACE_ROOT)/ace/Select_Reactor.i \
+ $(ACE_ROOT)/ace/Timer_List.h \
+ $(ACE_ROOT)/ace/Timer_List_T.h \
+ $(ACE_ROOT)/ace/Timer_List_T.cpp \
+ Event/Local_ESTypes.h \
  RtecSchedulerS.h \
  TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
@@ -18212,11 +18444,6 @@ realclean: clean
  RtecSchedulerS_T.i \
  RtecSchedulerS_T.cpp \
  RtecSchedulerS.i \
- RtecEventCommC.h \
- CosEvent/event_export.h \
- RtecDefaultEventDataC.h \
- RtecDefaultEventDataC.i \
- RtecEventCommC.i \
  RtecEventCommS.h \
  RtecDefaultEventDataS.h \
  RtecDefaultEventDataS_T.h \
@@ -18227,15 +18454,12 @@ realclean: clean
  RtecEventCommS_T.i \
  RtecEventCommS_T.cpp \
  RtecEventCommS.i \
- RtecEventChannelAdminC.h \
- RtecEventChannelAdminC.i \
  RtecEventChannelAdminS.h \
  RtecEventChannelAdminS_T.h \
  RtecEventChannelAdminS_T.i \
  RtecEventChannelAdminS_T.cpp \
  RtecEventChannelAdminS.i \
  Event/Local_ESTypes.i \
- Event/Timer_Module.h \
  Event/RT_Task.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -18248,37 +18472,27 @@ realclean: clean
  $(ACE_ROOT)/ace/Stream_Modules.h \
  $(ACE_ROOT)/ace/Stream_Modules.i \
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
- Event/event_export.h \
  Event/RT_Task.i \
- Event/Timer_Module.i \
- Event/ReactorTask.h \
- Event/Fast_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor_T.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.h \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Select_Reactor_Base.i \
- $(ACE_ROOT)/ace/Select_Reactor_T.cpp \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
- $(ACE_ROOT)/ace/Select_Reactor_T.i \
- $(ACE_ROOT)/ace/Select_Reactor.i \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_List_T.cpp \
  Event/Event_Manip.h \
  Event/Event_Manip.i \
- Event/Event_Channel.i Event/Dispatching_Modules.h \
  Event/Event_Channel.h \
- Event/Dispatching_Modules.i Event/Memory_Pools.i
+ Event/Timer_Module.h \
+ Event/Timer_Module.i \
+ Event/Event_Channel.i \
+ Event/Dispatching_Modules.i \
+ Event/Memory_Pools.h \
+ Event/Memory_Pools.i \
+ Event/EC_Gateway.h \
+ Channel_Clients_T.h \
+ Channel_Clients_T.i \
+ Channel_Clients_T.cpp \
+ Event/Module_Factory.h
 
-.obj/RT_Task.o .obj/RT_Task.so .shobj/RT_Task.o .shobj/RT_Task.so: Event/RT_Task.cpp \
- $(ACE_ROOT)/ace/Sched_Params.h \
+.obj/Event_Manip.o .obj/Event_Manip.so .shobj/Event_Manip.o .shobj/Event_Manip.so: Event/Event_Manip.cpp \
+ Event/Event_Manip.h \
  $(ACE_ROOT)/ace/pre.h \
+ RtecEventCommC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/post.h \
@@ -18292,10 +18506,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Sched_Params.i \
- Scheduler_Factory.h \
- CosNamingC.h \
- $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -18439,14 +18649,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -18495,6 +18700,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -18560,112 +18767,28 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- Naming/naming_export.h \
- CosNamingC.i \
- RtecSchedulerC.h \
- Sched/sched_export.h \
+ Event/event_export.h \
  TimeBaseC.h \
  svc_utils_export.h \
  TimeBaseC.i \
- RtecSchedulerC.i \
- Scheduler_Factory.i \
- Event/RT_Task.h $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- Event/event_export.h Event/RT_Task.i Event/Debug_Macros.h \
- Event/Event_Channel.h \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- Event/Local_ESTypes.h \
- Event_Service_Constants.h \
- Time_Utilities.h \
- Time_Utilities.i \
- RtecSchedulerS.h \
- TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- TimeBaseS_T.h \
- TimeBaseS_T.i \
- TimeBaseS_T.cpp \
- TimeBaseS.i \
- RtecSchedulerS_T.h \
- RtecSchedulerS_T.i \
- RtecSchedulerS_T.cpp \
- RtecSchedulerS.i \
- RtecEventCommC.h \
- CosEvent/event_export.h \
  RtecDefaultEventDataC.h \
  RtecDefaultEventDataC.i \
  RtecEventCommC.i \
- RtecEventCommS.h \
- RtecDefaultEventDataS.h \
- RtecDefaultEventDataS_T.h \
- RtecDefaultEventDataS_T.i \
- RtecDefaultEventDataS_T.cpp \
- RtecDefaultEventDataS.i \
- RtecEventCommS_T.h \
- RtecEventCommS_T.i \
- RtecEventCommS_T.cpp \
- RtecEventCommS.i \
- RtecEventChannelAdminC.h \
- RtecEventChannelAdminC.i \
- RtecEventChannelAdminS.h \
- RtecEventChannelAdminS_T.h \
- RtecEventChannelAdminS_T.i \
- RtecEventChannelAdminS_T.cpp \
- RtecEventChannelAdminS.i \
- Event/Local_ESTypes.i \
- Event/Timer_Module.h \
- Event/RT_Task.h \
- Event/Timer_Module.i \
- Event/ReactorTask.h \
- Event/Fast_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor_T.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.h \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Select_Reactor_Base.i \
- $(ACE_ROOT)/ace/Select_Reactor_T.cpp \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
- $(ACE_ROOT)/ace/Select_Reactor_T.i \
- $(ACE_ROOT)/ace/Select_Reactor.i \
- Event/event_export.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_List_T.cpp \
- Event/Event_Manip.h \
- Event/Event_Manip.i \
- Event/Event_Channel.i Event/Memory_Pools.h \
- Event/Dispatching_Modules.h \
- Event/Event_Channel.h \
- Event/Dispatching_Modules.i Event/Memory_Pools.i
+ Event/Event_Manip.i
 
-.obj/ReactorTask.o .obj/ReactorTask.so .shobj/ReactorTask.o .shobj/ReactorTask.so: Event/ReactorTask.cpp \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
+.obj/Local_ESTypes.o .obj/Local_ESTypes.so .shobj/Local_ESTypes.o .shobj/Local_ESTypes.so: Event/Local_ESTypes.cpp Event/Local_ESTypes.h \
  $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/ACE.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/post.h \
@@ -18679,16 +18802,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- Scheduler_Factory.h \
- CosNamingC.h \
- $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
@@ -18827,14 +18945,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -18883,6 +18996,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -18948,44 +19063,28 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
+ Event_Service_Constants.h \
+ Time_Utilities.h \
+ TimeBaseC.h \
+ svc_utils_export.h \
+ TimeBaseC.i \
+ Time_Utilities.i \
+ CosNamingC.h \
  Naming/naming_export.h \
  CosNamingC.i \
  RtecSchedulerC.h \
  Sched/sched_export.h \
- TimeBaseC.h \
- svc_utils_export.h \
- TimeBaseC.i \
  RtecSchedulerC.i \
- Scheduler_Factory.i \
- Event/ReactorTask.h Event/Fast_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor_T.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.h \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Select_Reactor_Base.i \
- $(ACE_ROOT)/ace/Select_Reactor_T.cpp \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
- $(ACE_ROOT)/ace/Select_Reactor_T.i \
- $(ACE_ROOT)/ace/Select_Reactor.i \
- Event/event_export.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_List_T.cpp \
- Event/Local_ESTypes.h \
- Event_Service_Constants.h \
- Time_Utilities.h \
- Time_Utilities.i \
  RtecSchedulerS.h \
  TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
@@ -19002,7 +19101,7 @@ realclean: clean
  RtecSchedulerS_T.cpp \
  RtecSchedulerS.i \
  RtecEventCommC.h \
- CosEvent/event_export.h \
+ Event/event_export.h \
  RtecDefaultEventDataC.h \
  RtecDefaultEventDataC.i \
  RtecEventCommC.i \
@@ -19023,23 +19122,11 @@ realclean: clean
  RtecEventChannelAdminS_T.i \
  RtecEventChannelAdminS_T.cpp \
  RtecEventChannelAdminS.i \
- Event/Local_ESTypes.i Event/RT_Task.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- Event/event_export.h Event/RT_Task.i
+ Event/Local_ESTypes.i
 
-.obj/Timer_Module.o .obj/Timer_Module.so .shobj/Timer_Module.o .shobj/Timer_Module.so: Event/Timer_Module.cpp \
- $(ACE_ROOT)/ace/Functor.h \
+.obj/Memory_Pools.o .obj/Memory_Pools.so .shobj/Memory_Pools.o .shobj/Memory_Pools.so: Event/Memory_Pools.cpp Event/Memory_Pools.h \
  $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -19055,24 +19142,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- Scheduler_Factory.h \
- CosNamingC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
@@ -19086,6 +19155,19 @@ realclean: clean
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ Event/Event_Channel.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -19102,21 +19184,48 @@ realclean: clean
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(TAO_ROOT)/tao/Timeprobe.h \
+ $(ACE_ROOT)/ace/Timeprobe.h \
+ Scheduler_Factory.h \
+ CosNamingC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
@@ -19133,22 +19242,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -19198,14 +19291,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -19226,9 +19314,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Pair_T.h \
  $(ACE_ROOT)/ace/Pair_T.i \
  $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Active_Map_Manager.h \
  $(ACE_ROOT)/ace/Active_Map_Manager.i \
  $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
@@ -19254,6 +19339,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -19319,6 +19406,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -19334,25 +19425,6 @@ realclean: clean
  TimeBaseC.i \
  RtecSchedulerC.i \
  Scheduler_Factory.i \
- Event/ReactorTask.h Event/Fast_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor_T.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.h \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Select_Reactor_Base.i \
- $(ACE_ROOT)/ace/Select_Reactor_T.cpp \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
- $(ACE_ROOT)/ace/Select_Reactor_T.i \
- $(ACE_ROOT)/ace/Select_Reactor.i \
- Event/event_export.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_List_T.cpp \
  Event/Local_ESTypes.h \
  Event_Service_Constants.h \
  Time_Utilities.h \
@@ -19373,7 +19445,7 @@ realclean: clean
  RtecSchedulerS_T.cpp \
  RtecSchedulerS.i \
  RtecEventCommC.h \
- CosEvent/event_export.h \
+ Event/event_export.h \
  RtecDefaultEventDataC.h \
  RtecDefaultEventDataC.i \
  RtecEventCommC.i \
@@ -19394,7 +19466,9 @@ realclean: clean
  RtecEventChannelAdminS_T.i \
  RtecEventChannelAdminS_T.cpp \
  RtecEventChannelAdminS.i \
- Event/Local_ESTypes.i Event/RT_Task.h \
+ Event/Local_ESTypes.i \
+ Event/Timer_Module.h \
+ Event/RT_Task.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
  $(ACE_ROOT)/ace/Task_T.h \
@@ -19406,26 +19480,36 @@ realclean: clean
  $(ACE_ROOT)/ace/Stream_Modules.h \
  $(ACE_ROOT)/ace/Stream_Modules.i \
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
- Event/event_export.h Event/RT_Task.i Event/Timer_Module.h \
- Event/RT_Task.h \
+ Event/RT_Task.i \
  Event/Timer_Module.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h
+ Event/ReactorTask.h \
+ Event/Fast_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor_T.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.h \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.i \
+ $(ACE_ROOT)/ace/Select_Reactor_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Heap.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
+ $(ACE_ROOT)/ace/Select_Reactor_T.i \
+ $(ACE_ROOT)/ace/Select_Reactor.i \
+ $(ACE_ROOT)/ace/Timer_List.h \
+ $(ACE_ROOT)/ace/Timer_List_T.h \
+ $(ACE_ROOT)/ace/Timer_List_T.cpp \
+ Event/Event_Manip.h \
+ Event/Event_Manip.i \
+ Event/Event_Channel.i Event/Dispatching_Modules.h \
+ Event/Event_Channel.h \
+ Event/Dispatching_Modules.i Event/Memory_Pools.i
 
-.obj/EC_Gateway.o .obj/EC_Gateway.so .shobj/EC_Gateway.o .shobj/EC_Gateway.so: Event/EC_Gateway.cpp \
- Event/EC_Gateway.h \
+.obj/RT_Task.o .obj/RT_Task.so .shobj/RT_Task.o .shobj/RT_Task.so: Event/RT_Task.cpp \
+ $(ACE_ROOT)/ace/Sched_Params.h \
  $(ACE_ROOT)/ace/pre.h \
- RtecEventChannelAdminS.h \
- RtecEventCommS.h \
- TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/post.h \
@@ -19439,6 +19523,14 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Sched_Params.i \
+ Scheduler_Factory.h \
+ CosNamingC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -19497,24 +19589,11 @@ realclean: clean
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -19551,12 +19630,18 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/IORManipulation.h \
  $(TAO_ROOT)/tao/IORS.h \
  $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/IORC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
  $(TAO_ROOT)/tao/POAC.h \
@@ -19572,6 +19657,8 @@ realclean: clean
  $(TAO_ROOT)/tao/InterceptorC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/InterceptorC.i \
  $(TAO_ROOT)/tao/Interceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
@@ -19583,12 +19670,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -19637,6 +19721,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -19702,62 +19788,114 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
+ Naming/naming_export.h \
+ CosNamingC.i \
+ RtecSchedulerC.h \
+ Sched/sched_export.h \
+ TimeBaseC.h \
  svc_utils_export.h \
  TimeBaseC.i \
+ RtecSchedulerC.i \
+ Scheduler_Factory.i \
+ Event/RT_Task.h $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ Event/event_export.h Event/RT_Task.i Event/Debug_Macros.h \
+ Event/Event_Channel.h \
+ $(TAO_ROOT)/tao/Timeprobe.h \
+ $(ACE_ROOT)/ace/Timeprobe.h \
+ Event/Local_ESTypes.h \
+ Event_Service_Constants.h \
+ Time_Utilities.h \
+ Time_Utilities.i \
+ RtecSchedulerS.h \
+ TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
  TimeBaseS_T.h \
  TimeBaseS_T.i \
  TimeBaseS_T.cpp \
  TimeBaseS.i \
- RtecDefaultEventDataS.h \
+ RtecSchedulerS_T.h \
+ RtecSchedulerS_T.i \
+ RtecSchedulerS_T.cpp \
+ RtecSchedulerS.i \
+ RtecEventCommC.h \
+ Event/event_export.h \
  RtecDefaultEventDataC.h \
- CosEvent/event_export.h \
  RtecDefaultEventDataC.i \
+ RtecEventCommC.i \
+ RtecEventCommS.h \
+ RtecDefaultEventDataS.h \
  RtecDefaultEventDataS_T.h \
  RtecDefaultEventDataS_T.i \
  RtecDefaultEventDataS_T.cpp \
  RtecDefaultEventDataS.i \
- RtecEventCommC.h \
- RtecEventCommC.i \
  RtecEventCommS_T.h \
  RtecEventCommS_T.i \
  RtecEventCommS_T.cpp \
  RtecEventCommS.i \
- RtecSchedulerS.h \
- RtecSchedulerC.h \
- Sched/sched_export.h \
- RtecSchedulerC.i \
- RtecSchedulerS_T.h \
- RtecSchedulerS_T.i \
- RtecSchedulerS_T.cpp \
- RtecSchedulerS.i \
  RtecEventChannelAdminC.h \
  RtecEventChannelAdminC.i \
+ RtecEventChannelAdminS.h \
  RtecEventChannelAdminS_T.h \
  RtecEventChannelAdminS_T.i \
  RtecEventChannelAdminS_T.cpp \
  RtecEventChannelAdminS.i \
- Channel_Clients_T.h \
- Channel_Clients_T.i \
- Channel_Clients_T.cpp \
- Event/event_export.h \
- Event_Utilities.h \
- Event_Service_Constants.h \
- Time_Utilities.h \
- Time_Utilities.i \
- Event_Utilities.i
+ Event/Local_ESTypes.i \
+ Event/Timer_Module.h \
+ Event/RT_Task.h \
+ Event/Timer_Module.i \
+ Event/ReactorTask.h \
+ Event/Fast_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor_T.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.h \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.i \
+ $(ACE_ROOT)/ace/Select_Reactor_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Heap.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
+ $(ACE_ROOT)/ace/Select_Reactor_T.i \
+ $(ACE_ROOT)/ace/Select_Reactor.i \
+ $(ACE_ROOT)/ace/Timer_List.h \
+ $(ACE_ROOT)/ace/Timer_List_T.h \
+ $(ACE_ROOT)/ace/Timer_List_T.cpp \
+ Event/Event_Manip.h \
+ Event/Event_Manip.i \
+ Event/Event_Channel.i Event/Memory_Pools.h \
+ Event/Dispatching_Modules.h \
+ Event/Event_Channel.h \
+ Event/Dispatching_Modules.i Event/Memory_Pools.i
 
-.obj/EC_Gateway_UDP.o .obj/EC_Gateway_UDP.so .shobj/EC_Gateway_UDP.o .shobj/EC_Gateway_UDP.so: Event/EC_Gateway_UDP.cpp \
- Event/EC_Gateway_UDP.h \
+.obj/ReactorTask.o .obj/ReactorTask.so .shobj/ReactorTask.o .shobj/ReactorTask.so: Event/ReactorTask.cpp \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/SOCK_CODgram.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -19773,20 +19911,17 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/QoS_Session.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(TAO_ROOT)/tao/Timeprobe.h \
+ $(ACE_ROOT)/ace/Timeprobe.h \
+ Scheduler_Factory.h \
+ CosNamingC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -19822,27 +19957,15 @@ realclean: clean
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_CODgram.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
- RtecEventChannelAdminS.h \
- RtecEventCommS.h \
- TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
@@ -19854,24 +19977,11 @@ realclean: clean
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -19908,12 +20018,18 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/IORManipulation.h \
  $(TAO_ROOT)/tao/IORS.h \
  $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/IORC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
  $(TAO_ROOT)/tao/POAC.h \
@@ -19929,6 +20045,8 @@ realclean: clean
  $(TAO_ROOT)/tao/InterceptorC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/InterceptorC.i \
  $(TAO_ROOT)/tao/Interceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
@@ -19940,12 +20058,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -19994,6 +20109,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -20059,74 +20176,101 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
+ Naming/naming_export.h \
+ CosNamingC.i \
+ RtecSchedulerC.h \
+ Sched/sched_export.h \
+ TimeBaseC.h \
  svc_utils_export.h \
  TimeBaseC.i \
+ RtecSchedulerC.i \
+ Scheduler_Factory.i \
+ Event/ReactorTask.h Event/Fast_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor_T.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.h \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.i \
+ $(ACE_ROOT)/ace/Select_Reactor_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Heap.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
+ $(ACE_ROOT)/ace/Select_Reactor_T.i \
+ $(ACE_ROOT)/ace/Select_Reactor.i \
+ Event/event_export.h \
+ $(ACE_ROOT)/ace/Timer_List.h \
+ $(ACE_ROOT)/ace/Timer_List_T.h \
+ $(ACE_ROOT)/ace/Timer_List_T.cpp \
+ Event/Local_ESTypes.h \
+ Event_Service_Constants.h \
+ Time_Utilities.h \
+ Time_Utilities.i \
+ RtecSchedulerS.h \
+ TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
  TimeBaseS_T.h \
  TimeBaseS_T.i \
  TimeBaseS_T.cpp \
  TimeBaseS.i \
- RtecDefaultEventDataS.h \
+ RtecSchedulerS_T.h \
+ RtecSchedulerS_T.i \
+ RtecSchedulerS_T.cpp \
+ RtecSchedulerS.i \
+ RtecEventCommC.h \
  RtecDefaultEventDataC.h \
- CosEvent/event_export.h \
  RtecDefaultEventDataC.i \
+ RtecEventCommC.i \
+ RtecEventCommS.h \
+ RtecDefaultEventDataS.h \
  RtecDefaultEventDataS_T.h \
  RtecDefaultEventDataS_T.i \
  RtecDefaultEventDataS_T.cpp \
  RtecDefaultEventDataS.i \
- RtecEventCommC.h \
- RtecEventCommC.i \
  RtecEventCommS_T.h \
  RtecEventCommS_T.i \
  RtecEventCommS_T.cpp \
  RtecEventCommS.i \
- RtecSchedulerS.h \
- RtecSchedulerC.h \
- Sched/sched_export.h \
- RtecSchedulerC.i \
- RtecSchedulerS_T.h \
- RtecSchedulerS_T.i \
- RtecSchedulerS_T.cpp \
- RtecSchedulerS.i \
  RtecEventChannelAdminC.h \
  RtecEventChannelAdminC.i \
+ RtecEventChannelAdminS.h \
  RtecEventChannelAdminS_T.h \
  RtecEventChannelAdminS_T.i \
  RtecEventChannelAdminS_T.cpp \
  RtecEventChannelAdminS.i \
- RtecUDPAdminS.h \
- RtecUDPAdminC.h \
- Event/event_export.h \
- RtecUDPAdminC.i \
- RtecUDPAdminS_T.h \
- RtecUDPAdminS_T.i \
- RtecUDPAdminS_T.cpp \
- RtecUDPAdminS.i \
- Event/EC_Gateway_UDP.i \
- Event_Utilities.h \
- Event_Service_Constants.h \
- Time_Utilities.h \
- Time_Utilities.i \
- Event_Utilities.i
+ Event/Local_ESTypes.i Event/RT_Task.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ Event/event_export.h Event/RT_Task.i
 
-.obj/EC_UDP_Admin.o .obj/EC_UDP_Admin.so .shobj/EC_UDP_Admin.o .shobj/EC_UDP_Admin.so: Event/EC_UDP_Admin.cpp \
- Event/EC_UDP_Admin.h \
+.obj/Timer_Module.o .obj/Timer_Module.so .shobj/Timer_Module.o .shobj/Timer_Module.so: Event/Timer_Module.cpp \
+ $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/pre.h \
- RtecUDPAdminS.h \
- RtecEventCommS.h \
- TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -20142,6 +20286,16 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ Scheduler_Factory.h \
+ CosNamingC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
@@ -20199,31 +20353,13 @@ realclean: clean
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
  $(ACE_ROOT)/ace/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
@@ -20253,12 +20389,18 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/IORManipulation.h \
  $(TAO_ROOT)/tao/IORS.h \
  $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/IORC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
  $(TAO_ROOT)/tao/POAC.h \
@@ -20274,6 +20416,8 @@ realclean: clean
  $(TAO_ROOT)/tao/InterceptorC.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/InterceptorC.i \
  $(TAO_ROOT)/tao/Interceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
@@ -20285,12 +20429,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -20339,6 +20480,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -20404,39 +20547,101 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
+ Naming/naming_export.h \
+ CosNamingC.i \
+ RtecSchedulerC.h \
+ Sched/sched_export.h \
+ TimeBaseC.h \
  svc_utils_export.h \
  TimeBaseC.i \
+ RtecSchedulerC.i \
+ Scheduler_Factory.i \
+ Event/ReactorTask.h Event/Fast_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor_T.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.h \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.i \
+ $(ACE_ROOT)/ace/Select_Reactor_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Heap.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
+ $(ACE_ROOT)/ace/Select_Reactor_T.i \
+ $(ACE_ROOT)/ace/Select_Reactor.i \
+ Event/event_export.h \
+ $(ACE_ROOT)/ace/Timer_List.h \
+ $(ACE_ROOT)/ace/Timer_List_T.h \
+ $(ACE_ROOT)/ace/Timer_List_T.cpp \
+ Event/Local_ESTypes.h \
+ Event_Service_Constants.h \
+ Time_Utilities.h \
+ Time_Utilities.i \
+ RtecSchedulerS.h \
+ TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
  TimeBaseS_T.h \
  TimeBaseS_T.i \
  TimeBaseS_T.cpp \
  TimeBaseS.i \
- RtecDefaultEventDataS.h \
+ RtecSchedulerS_T.h \
+ RtecSchedulerS_T.i \
+ RtecSchedulerS_T.cpp \
+ RtecSchedulerS.i \
+ RtecEventCommC.h \
  RtecDefaultEventDataC.h \
- CosEvent/event_export.h \
  RtecDefaultEventDataC.i \
+ RtecEventCommC.i \
+ RtecEventCommS.h \
+ RtecDefaultEventDataS.h \
  RtecDefaultEventDataS_T.h \
  RtecDefaultEventDataS_T.i \
  RtecDefaultEventDataS_T.cpp \
  RtecDefaultEventDataS.i \
- RtecEventCommC.h \
- RtecEventCommC.i \
  RtecEventCommS_T.h \
  RtecEventCommS_T.i \
  RtecEventCommS_T.cpp \
  RtecEventCommS.i \
- RtecUDPAdminC.h \
- Event/event_export.h \
- RtecUDPAdminC.i \
- RtecUDPAdminS_T.h \
- RtecUDPAdminS_T.i \
- RtecUDPAdminS_T.cpp \
- RtecUDPAdminS.i
+ RtecEventChannelAdminC.h \
+ RtecEventChannelAdminC.i \
+ RtecEventChannelAdminS.h \
+ RtecEventChannelAdminS_T.h \
+ RtecEventChannelAdminS_T.i \
+ RtecEventChannelAdminS_T.cpp \
+ RtecEventChannelAdminS.i \
+ Event/Local_ESTypes.i Event/RT_Task.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ Event/event_export.h Event/RT_Task.i Event/Timer_Module.h \
+ Event/RT_Task.h \
+ Event/Timer_Module.i \
+ $(TAO_ROOT)/tao/Timeprobe.h \
+ $(ACE_ROOT)/ace/Timeprobe.h
 
 .obj/Module_Factory.o .obj/Module_Factory.so .shobj/Module_Factory.o .shobj/Module_Factory.so: Event/Module_Factory.cpp \
  Event/Dispatching_Modules.h \
@@ -20621,14 +20826,9 @@ realclean: clean
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -20677,6 +20877,8 @@ realclean: clean
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -20742,6 +20944,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -20776,7 +20982,6 @@ realclean: clean
  RtecSchedulerS_T.cpp \
  RtecSchedulerS.i \
  RtecEventCommC.h \
- CosEvent/event_export.h \
  RtecDefaultEventDataC.h \
  RtecDefaultEventDataC.i \
  RtecEventCommC.i \
diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile b/TAO/orbsvcs/tests/Event/Basic/Makefile
index de62cca11e5..0a8887466db 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Makefile
+++ b/TAO/orbsvcs/tests/Event/Basic/Makefile
@@ -242,12 +242,7 @@ endif
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -296,6 +291,8 @@ endif
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -361,6 +358,10 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -375,7 +376,7 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
@@ -402,8 +403,8 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
  $(ACE_ROOT)/ace/Stats.h \
- $(ACE_ROOT)/ace/Stats.i \
- ../lib/Driver.i ../lib/Consumer.h ../lib/Supplier.h \
+ $(ACE_ROOT)/ace/Stats.i ../lib/Driver.i \
+ ../lib/Consumer.h ../lib/Supplier.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
  $(ACE_ROOT)/ace/Task_T.h \
@@ -417,7 +418,6 @@ endif
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Defaults.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i \
@@ -597,12 +597,7 @@ endif
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -651,6 +646,8 @@ endif
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -716,6 +713,10 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -730,7 +731,7 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
@@ -757,8 +758,8 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
  $(ACE_ROOT)/ace/Stats.h \
- $(ACE_ROOT)/ace/Stats.i \
- ../lib/Driver.i ../lib/Consumer.h ../lib/Supplier.h \
+ $(ACE_ROOT)/ace/Stats.i ../lib/Driver.i \
+ ../lib/Consumer.h ../lib/Supplier.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
  $(ACE_ROOT)/ace/Task_T.h \
@@ -942,12 +943,7 @@ endif
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -996,6 +992,8 @@ endif
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -1061,6 +1059,10 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -1075,7 +1077,7 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
@@ -1102,8 +1104,8 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
  $(ACE_ROOT)/ace/Stats.h \
- $(ACE_ROOT)/ace/Stats.i \
- ../lib/Driver.i ../lib/Consumer.h ../lib/Supplier.h \
+ $(ACE_ROOT)/ace/Stats.i ../lib/Driver.i \
+ ../lib/Consumer.h ../lib/Supplier.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
  $(ACE_ROOT)/ace/Task_T.h \
@@ -1117,7 +1119,6 @@ endif
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Defaults.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i \
@@ -1313,12 +1314,7 @@ endif
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -1367,6 +1363,8 @@ endif
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -1432,6 +1430,10 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -1446,7 +1448,7 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
@@ -1473,13 +1475,11 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
  $(ACE_ROOT)/ace/Stats.h \
- $(ACE_ROOT)/ace/Stats.i \
- ../lib/Driver.i \
+ $(ACE_ROOT)/ace/Stats.i ../lib/Driver.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Gateway.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  ../lib/Consumer.h ../lib/Supplier.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1673,12 +1673,7 @@ endif
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -1727,6 +1722,8 @@ endif
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -1792,6 +1789,10 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -1806,7 +1807,7 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
@@ -1833,11 +1834,9 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
  $(ACE_ROOT)/ace/Stats.h \
- $(ACE_ROOT)/ace/Stats.i \
- ../lib/Driver.i \
+ $(ACE_ROOT)/ace/Stats.i ../lib/Driver.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS_T.i \
@@ -2051,12 +2050,7 @@ endif
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -2105,6 +2099,8 @@ endif
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -2170,6 +2166,10 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -2184,7 +2184,7 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
@@ -2221,7 +2221,6 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
@@ -2411,12 +2410,7 @@ endif
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -2465,6 +2459,8 @@ endif
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -2530,6 +2526,10 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -2544,7 +2544,7 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
@@ -2581,7 +2581,6 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
@@ -2771,12 +2770,7 @@ endif
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -2825,6 +2819,8 @@ endif
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -2890,6 +2886,10 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -2904,7 +2904,7 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
@@ -2941,7 +2941,6 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
@@ -3133,12 +3132,7 @@ endif
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -3187,6 +3181,8 @@ endif
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -3252,6 +3248,10 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -3266,7 +3266,7 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
@@ -3301,7 +3301,6 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
@@ -3513,14 +3512,9 @@ endif
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -3569,6 +3563,8 @@ endif
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(TAO_ROOT)/tao/Pluggable.i \
@@ -3613,13 +3609,17 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
@@ -3661,7 +3661,6 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
@@ -3851,12 +3850,7 @@ endif
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -3905,6 +3899,8 @@ endif
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -3970,6 +3966,10 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -3984,7 +3984,7 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
@@ -4021,7 +4021,6 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
@@ -4211,12 +4210,7 @@ endif
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -4265,6 +4259,8 @@ endif
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -4330,6 +4326,10 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -4344,7 +4344,7 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
@@ -4381,7 +4381,6 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
@@ -4571,12 +4570,7 @@ endif
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -4625,6 +4619,8 @@ endif
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -4690,6 +4686,10 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -4704,7 +4704,7 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
@@ -4741,7 +4741,6 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
@@ -4931,12 +4930,7 @@ endif
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -4985,6 +4979,8 @@ endif
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -5050,6 +5046,10 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -5064,7 +5064,7 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
@@ -5101,7 +5101,6 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
@@ -5292,12 +5291,7 @@ endif
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -5346,6 +5340,8 @@ endif
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -5411,6 +5407,10 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -5425,7 +5425,7 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
@@ -5462,7 +5462,6 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile b/TAO/orbsvcs/tests/Event/Performance/Makefile
index 9c22f9f1169..cd8b39e1148 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Makefile
+++ b/TAO/orbsvcs/tests/Event/Performance/Makefile
@@ -279,6 +279,8 @@ endif
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -362,7 +364,7 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
@@ -389,8 +391,8 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
  $(ACE_ROOT)/ace/Stats.h \
- $(ACE_ROOT)/ace/Stats.i \
- ../lib/Driver.i ../lib/Consumer.h ../lib/Supplier.h \
+ $(ACE_ROOT)/ace/Stats.i ../lib/Driver.i \
+ ../lib/Consumer.h ../lib/Supplier.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
  $(ACE_ROOT)/ace/Task_T.h \
@@ -404,7 +406,6 @@ endif
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Defaults.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i \
@@ -631,6 +632,8 @@ endif
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -714,7 +717,7 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
@@ -741,8 +744,8 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
  $(ACE_ROOT)/ace/Stats.h \
- $(ACE_ROOT)/ace/Stats.i \
- ../lib/Driver.i ../lib/Supplier.h \
+ $(ACE_ROOT)/ace/Stats.i ../lib/Driver.i \
+ ../lib/Supplier.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
  $(ACE_ROOT)/ace/Task_T.h \
@@ -756,7 +759,6 @@ endif
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Defaults.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i \
@@ -984,6 +986,8 @@ endif
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -1067,7 +1071,7 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
@@ -1094,8 +1098,8 @@ endif
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
  $(ACE_ROOT)/ace/Stats.h \
- $(ACE_ROOT)/ace/Stats.i \
- ../lib/Driver.i ../lib/Consumer.h ../lib/Supplier.h \
+ $(ACE_ROOT)/ace/Stats.i ../lib/Driver.i \
+ ../lib/Consumer.h ../lib/Supplier.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
  $(ACE_ROOT)/ace/Task_T.h \
@@ -1109,7 +1113,6 @@ endif
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Defaults.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i \
diff --git a/TAO/orbsvcs/tests/Event/lib/Makefile b/TAO/orbsvcs/tests/Event/lib/Makefile
index 89dd472cc7a..bb9f9ff0473 100644
--- a/TAO/orbsvcs/tests/Event/lib/Makefile
+++ b/TAO/orbsvcs/tests/Event/lib/Makefile
@@ -275,6 +275,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -358,7 +360,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
@@ -402,7 +404,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Default_Factory.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
@@ -636,6 +637,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -719,7 +722,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
@@ -970,6 +973,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -1053,7 +1058,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
@@ -1096,7 +1101,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i
 
 .obj/Counting_Consumer.o .obj/Counting_Consumer.so .shobj/Counting_Consumer.o .shobj/Counting_Consumer.so: Counting_Consumer.cpp Counting_Consumer.h \
@@ -1317,6 +1321,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -1400,7 +1406,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
@@ -1638,6 +1644,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
  $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -1721,7 +1729,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
@@ -1755,7 +1763,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY