ChangeLogTag:Tue Sep 29 11:08:08 1998 Carlos O'Ryan <coryan@cs.wustl.edu>

32 files changed, 923 insertions, 545 deletions

diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile b/TAO/orbsvcs/Concurrency_Service/Makefile
index 72d68e0bb1a..a15cfdf1e28 100644
--- a/TAO/orbsvcs/Concurrency_Service/Makefile
+++ b/TAO/orbsvcs/Concurrency_Service/Makefile
@@ -240,6 +240,7 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile b/TAO/orbsvcs/Dump_Schedule/Makefile
index b8d3e384441..cb264926e23 100644
--- a/TAO/orbsvcs/Dump_Schedule/Makefile
+++ b/TAO/orbsvcs/Dump_Schedule/Makefile
@@ -242,6 +242,7 @@ Dump_Schedule: $(addprefix $(VDIR),$(DUMP_OBJS))
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
diff --git a/TAO/orbsvcs/Event_Service/Makefile b/TAO/orbsvcs/Event_Service/Makefile
index f9ba317da26..99df4954e85 100644
--- a/TAO/orbsvcs/Event_Service/Makefile
+++ b/TAO/orbsvcs/Event_Service/Makefile
@@ -240,6 +240,7 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -325,10 +326,10 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/CORBA_Utils_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/CORBA_Utils_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/CORBA_Utils_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Task_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Task_Manager.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/ReactorTask.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Fast_Reactor.h \
  $(ACE_ROOT)/ace/Select_Reactor.h \
diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile b/TAO/orbsvcs/LifeCycle_Service/Makefile
index 700ca862426..c18f5587e81 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Makefile
+++ b/TAO/orbsvcs/LifeCycle_Service/Makefile
@@ -259,6 +259,7 @@ Life_Cycle_Service: $(addprefix $(VDIR),$(LIFE_CYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -525,6 +526,7 @@ Life_Cycle_Service: $(addprefix $(VDIR),$(LIFE_CYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -789,6 +791,7 @@ Life_Cycle_Service: $(addprefix $(VDIR),$(LIFE_CYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -1034,6 +1037,7 @@ Life_Cycle_Service: $(addprefix $(VDIR),$(LIFE_CYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
diff --git a/TAO/orbsvcs/Logging_Service/Makefile b/TAO/orbsvcs/Logging_Service/Makefile
index efe99bde7a8..5f1a8f3610d 100644
--- a/TAO/orbsvcs/Logging_Service/Makefile
+++ b/TAO/orbsvcs/Logging_Service/Makefile
@@ -244,6 +244,7 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -499,6 +500,7 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
diff --git a/TAO/orbsvcs/Naming_Service/Makefile b/TAO/orbsvcs/Naming_Service/Makefile
index ea0a00862ed..23d9a89a3b9 100644
--- a/TAO/orbsvcs/Naming_Service/Makefile
+++ b/TAO/orbsvcs/Naming_Service/Makefile
@@ -240,6 +240,7 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile b/TAO/orbsvcs/Scheduling_Service/Makefile
index 927a5293096..02f8424bdca 100644
--- a/TAO/orbsvcs/Scheduling_Service/Makefile
+++ b/TAO/orbsvcs/Scheduling_Service/Makefile
@@ -240,6 +240,7 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS))
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
diff --git a/TAO/orbsvcs/Trading_Service/Makefile b/TAO/orbsvcs/Trading_Service/Makefile
index bf9b7c53aa0..61d40fc8b56 100644
--- a/TAO/orbsvcs/Trading_Service/Makefile
+++ b/TAO/orbsvcs/Trading_Service/Makefile
@@ -240,6 +240,7 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
index 14350c18204..99e3d52215c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
@@ -110,7 +110,7 @@ ACE_ES_Dispatching_Base::shutdown (void)
 
 ACE_ES_Priority_Dispatching::ACE_ES_Priority_Dispatching (ACE_EventChannel *channel)
   : ACE_ES_Dispatching_Base (channel),
-    notification_strategy_ (this, channel->task_manager ()),
+    notification_strategy_ (this, channel->timer_module ()),
     highest_priority_ (0),
     shutdown_ (0),
     threads_per_queue_ (0)
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
index 8949f967f73..64a62411422 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
@@ -248,7 +248,7 @@ class TAO_ORBSVCS_Export ACE_ES_ReactorEx_NS : public ACE_Notification_Strategy
 {
 public:
   ACE_ES_ReactorEx_NS (ACE_Event_Handler *eh,
-		       ACE_Task_Manager *tm);
+		       TAO_EC_Timer_Module *tm);
   // Stores away <eh> for when this->open is called.
 
   int open (void);
@@ -271,8 +271,8 @@ private:
   ACE_Auto_Event event_;
   // Registered with the ReactorEx.
 
-  ACE_Task_Manager *task_manager_;
-  // To gain access into the Reactor tasks.
+  TAO_EC_Timer_Module *timer_module_;
+  // To schedule timers.
 };
 
 typedef ACE_ES_ReactorEx_NS ACE_ES_Notification_Strategy;
@@ -289,7 +289,7 @@ class TAO_ORBSVCS_Export ACE_ES_Reactor_NS : public ACE_Reactor_Notification_Str
 {
 public:
   ACE_ES_Reactor_NS (ACE_Event_Handler *eh,
-		     ACE_Task_Manager *tm);
+		     TAO_EC_Timer_Module *tm);
   // Calls ACE_Reactor_Notification_Strategy with the ORB's reactor
   // and signal mask.
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i
index 17c6be1cb0d..5ec70e28449 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i
@@ -202,45 +202,47 @@ ACE_ES_Dispatching_Base::dispatch_event (ACE_ES_Dispatch_Request *request,
 #if defined (ACE_WIN32)
 ACE_INLINE
 ACE_ES_ReactorEx_NS::ACE_ES_ReactorEx_NS (ACE_Event_Handler *eh,
-					  ACE_Task_Manager* tm)
+					  TAO_EC_Timer_Module* tm)
   : ACE_Notification_Strategy (eh, ACE_Event_Handler::NULL_MASK),
-    task_manager_ (tm)
+    timer_module_ (tm)
 {
 }
 
 ACE_INLINE int
 ACE_ES_ReactorEx_NS::open (void)
 {
-  return this->task_manager_->GetReactorTask (0)->
-    get_reactor ().register_handler (eh_, event_.handle ());
+  return this->timer_module_->register_handler (0,
+						eh_,
+						event_.handle ());
 }
 
 ACE_INLINE void
 ACE_ES_ReactorEx_NS::shutdown (void)
 {
-  this->task_manager_->GetReactorTask (0)->
-    get_reactor ().remove_handler (eh_, ACE_Event_Handler::DONT_CALL);
+  this->timer_module_->remove_handler (0, 
+				       eh_,
+				       ACE_Event_Handler::DONT_CALL);
 }
 
 ACE_INLINE int 
 ACE_ES_ReactorEx_NS::notify (void)
 {
-  return event_.signal ();
+  return this->event_.signal ();
 }
 
 ACE_INLINE int 
-ACE_ES_ReactorEx_NS::notify (ACE_Event_Handler *eh,
-			       ACE_Reactor_Mask mask)
+ACE_ES_ReactorEx_NS::notify (ACE_Event_Handler *,
+			     ACE_Reactor_Mask)
 {
-  return event_.signal ();
+  return this->event_.signal ();
 }
 
 #else /* !defined (ACE_WIN32) */
 // This class is only necessary on non-win32 platforms.
 ACE_INLINE
 ACE_ES_Reactor_NS::ACE_ES_Reactor_NS (ACE_Event_Handler *eh,
-				      ACE_Task_Manager *tm)
-  : ACE_Reactor_Notification_Strategy (&tm->GetReactorTask (0)->get_reactor (),
+				      TAO_EC_Timer_Module *tm)
+  : ACE_Reactor_Notification_Strategy (tm->reactor (0),
 				       eh, ACE_Event_Handler::READ_MASK)
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
index 23b8f7040f5..5dc8b9f64b6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
@@ -262,76 +262,9 @@ public:
 
 // ************************************************************
 
-// Since this class is *defined* in the cpp file, the INLINE
-// definitions must also be in the cpp file.   The should go here
-// before any use of these methods.
-
-ACE_INLINE int
-ACE_ES_Priority_Timer::schedule_timer (RtecScheduler::handle_t rt_info,
-                                       const ACE_ES_Timer_ACT *act,
-                                       RtecScheduler::OS_Priority preemption_priority,
-                                       const RtecScheduler::Time &delta,
-                                       const RtecScheduler::Time &interval)
-{
-  if (rt_info != 0)
-    {
-      // Add the timer to the task's dependency list.
-      RtecScheduler::handle_t timer_rtinfo =
-        this->task_manager_->GetReactorTask (preemption_priority)->rt_info ();
-
-      TAO_TRY
-        {
-          ACE_Scheduler_Factory::server()->add_dependency
-            (rt_info, timer_rtinfo, 1, RtecScheduler::ONE_WAY_CALL, TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-        }
-      TAO_CATCHANY
-        {
-          ACE_ERROR ((LM_ERROR, "add dependency failed"));
-        }
-      TAO_ENDTRY;
-    }
-
-  // @@ We're losing resolution here.
-  ACE_Time_Value tv_delta;
-  ORBSVCS_Time::TimeT_to_Time_Value (tv_delta, delta);
-
-  ACE_Time_Value tv_interval;
-  ORBSVCS_Time::TimeT_to_Time_Value (tv_interval, interval);
-
-  return this->task_manager_->GetReactorTask (preemption_priority)->
-    get_reactor ().schedule_timer (this,
-                                   (void *) act,
-                                   tv_delta, tv_interval);
-}
-
-ACE_INLINE int
-ACE_ES_Priority_Timer::cancel_timer (RtecScheduler::OS_Priority preemption_priority,
-                                     int id, ACE_ES_Timer_ACT *&act)
-{
-  const void *vp;
-
-  int result = this->task_manager_->
-    GetReactorTask (preemption_priority)->
-    get_reactor ().cancel_timer (id, &vp);
-
-  if (result == 0)
-    {
-      ACE_ERROR ((LM_ERROR, "ACE_ES_Priority_Timer::cancel_timer: "
-                  "Tried to cancel nonexistent timer.\n"));
-      act = 0;
-    }
-  else
-    act = (ACE_ES_Timer_ACT *) vp;
-
-  return result;
-}
-
-// ************************************************************
-
-ACE_ES_Event_Container::ACE_ES_Event_Container (void) :
-  //  ACE_ES_Event (),
-  ref_count_ (1)
+ACE_ES_Event_Container::ACE_ES_Event_Container (void)
+  : //  ACE_ES_Event (),
+    ref_count_ (1)
 {
 }
 
@@ -387,6 +320,18 @@ ACE_ES_Event_Container::operator delete (void *mem)
 }
 
 void
+dump_event (const RtecEventComm::Event &event)
+{
+  ACE_DEBUG ((LM_DEBUG, "source_ = %d "
+              "type_ = %d "
+              "time_ = %u.\n",
+              (void*)event.header.source,
+              event.header.type,
+              // The divide-by-1 is for ACE_U_LongLong support.
+              ORBSVCS_Time::to_hrtime (event.header.creation_time) / 1));
+}
+
+void
 ACE_ES_Event_Container::dump (void)
 {
   ::dump_event ((RtecEventComm::Event &) *this);
@@ -590,8 +535,8 @@ ACE_EventChannel::ACE_EventChannel (CORBA::Boolean activate_threads,
   consumer_module_ =
     this->module_factory_->create_consumer_module (this);
 
-  this->task_manager_ =
-    this->module_factory_->create_task_manager (this);
+  this->timer_module_ =
+    this->module_factory_->create_timer_module (this);
 
   this->dispatching_module_ =
     this->module_factory_->create_dispatching_module(this);
@@ -602,8 +547,6 @@ ACE_EventChannel::ACE_EventChannel (CORBA::Boolean activate_threads,
     this->module_factory_->create_subscription_module (this);
   this->supplier_module_ =
     this->module_factory_->create_supplier_module (this);
-  this->timer_ =
-    this->module_factory_->create_timer_module (this);
 
   consumer_module_->open (dispatching_module_);
   dispatching_module_->open (consumer_module_, correlation_module_);
@@ -631,16 +574,16 @@ ACE_EventChannel::~ACE_EventChannel (void)
     }
   TAO_ENDTRY;
 
-  this->dispatching_module_->shutdown ();
-  this->task_manager_->shutdown ();
+  this->cleanup_observers ();
 
+  this->timer_module_->shutdown ();
+  this->dispatching_module_->shutdown ();
 
-  this->module_factory_->destroy_timer_module (this->timer_);
+  this->module_factory_->destroy_timer_module (this->timer_module_);
   this->module_factory_->destroy_supplier_module (this->supplier_module_);
   this->module_factory_->destroy_subscription_module (this->subscription_module_);
   this->module_factory_->destroy_correlation_module (this->correlation_module_);
   this->module_factory_->destroy_dispatching_module(this->dispatching_module_);
-  this->module_factory_->destroy_task_manager (this->task_manager_);
   this->module_factory_->destroy_consumer_module (this->consumer_module_);
 
   if (this->own_factory_)
@@ -677,11 +620,11 @@ ACE_EventChannel::destroy (CORBA::Environment &)
     TAO_THROW (CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
 
   // Set a 100ns timer.
-  if (this->timer ()->schedule_timer (0, // no rt-info
-                                      act,
-                                      ACE_Scheduler_MIN_PREEMPTION_PRIORITY,
-                                      100, // 10 usec delta
-                                      0) == -1) // no interval
+  if (this->timer_module ()->schedule_timer (0, // no rt-info
+					     act,
+					     ACE_Scheduler_MIN_PREEMPTION_PRIORITY,
+					     100, // 10 usec delta
+					     0) == -1) // no interval
     {
       ACE_ERROR ((LM_ERROR, "%p queue_request failed.\n", "ACE_ES_Consumer_Module"));
       delete sc;
@@ -694,7 +637,7 @@ void
 ACE_EventChannel::activate (void)
 {
   this->dispatching_module_->activate (THREADS_PER_DISPATCH_QUEUE);
-  this->task_manager_->activate ();
+  this->timer_module_->activate ();
 }
 
 void
@@ -702,9 +645,8 @@ ACE_EventChannel::shutdown (void)
 {
   this->cleanup_observers ();
 
-  this->task_manager_->shutdown ();
+  this->timer_module_->shutdown ();
   this->dispatching_module_->shutdown ();
-
 }
 
 void
@@ -1288,7 +1230,8 @@ ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer,
     TAO_THROW (CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
 
   // Create a wrapper around the dispatch request.
-  Flush_Queue_ACT *act = new Flush_Queue_ACT (sc, channel_->dispatching_module_);
+  Flush_Queue_ACT *act =
+    new Flush_Queue_ACT (sc, channel_->dispatching_module_);
   if (act == 0)
     TAO_THROW (CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
 
@@ -1297,12 +1240,11 @@ ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer,
   // Set a 100ns timer.
   TimeBase::TimeT ns100;
   ORBSVCS_Time::hrtime_to_TimeT (ns100, 100);
-  if (channel_->timer ()->schedule_timer (0, // no rt_info
-                                          act,
-                                          // ::Preemption_Priority (consumer->qos ().rt_info_),
-                                          ACE_Scheduler_MIN_PREEMPTION_PRIORITY,
-                                          ns100,
-                                          ORBSVCS_Time::zero) == -1)
+  if (this->channel_->schedule_timer (0, // no rt_info
+				      act,
+				      ACE_Scheduler_MIN_PREEMPTION_PRIORITY,
+				      ns100,
+				      ORBSVCS_Time::zero) == -1)
     {
       ACE_ERROR ((LM_ERROR, "%p queue_request failed.\n", "ACE_ES_Consumer_Module"));
       delete sc;
@@ -1540,10 +1482,11 @@ ACE_ES_Correlation_Module::schedule_timeout (ACE_ES_Consumer_Rep_Timeout *consum
   // interval.low, interval.high));
 
   // Register the timer.
-  int id = channel_->timer ()->schedule_timer (consumer->dependency ()->rt_info,
-                                               consumer,
-                                               consumer->preemption_priority (),
-                                               delay, interval);
+  int id =
+    this->channel_->schedule_timer (consumer->dependency ()->rt_info,
+				    consumer,
+				    consumer->preemption_priority (),
+				    delay, interval);
 
   // Store the timer id for canceling.
   consumer->timer_id (id);
@@ -1561,9 +1504,9 @@ ACE_ES_Correlation_Module::cancel_timeout (ACE_ES_Consumer_Rep_Timeout *consumer
 {
   // Cancel the timer from the Priority Timer.
   ACE_ES_Timer_ACT *act;
-  channel_->timer ()->cancel_timer (consumer->preemption_priority (),
-                                    consumer->timer_id (),
-                                    act);
+  this->channel_->cancel_timer (consumer->preemption_priority (),
+				consumer->timer_id (),
+				act);
 
   ACE_ASSERT (consumer == act);
 
@@ -1592,10 +1535,11 @@ ACE_ES_Correlation_Module::reschedule_timeout (ACE_ES_Consumer_Rep_Timeout *cons
       consumer->preemption_priority (::IntervalToPriority (interval));
 
       // Register the timer.
-      int id = channel_->timer ()->schedule_timer (0, // Do not pass an RT_Info.
-                                                   consumer,
-                                                   consumer->preemption_priority (),
-                                                   delay, interval);
+      int id =
+	this->channel_->schedule_timer (0, // Do not pass an RT_Info.
+					consumer,
+					consumer->preemption_priority (),
+					delay, interval);
 
       // Store the timer id for canceling.
       consumer->timer_id (id);
@@ -3333,50 +3277,13 @@ ACE_ES_Supplier_Module::fill_qos (RtecEventChannelAdmin::SupplierQOS& s_qos)
 
 // ************************************************************
 
-ACE_ES_Priority_Timer::ACE_ES_Priority_Timer (ACE_Task_Manager* tm)
-  : task_manager_ (tm)
+TAO_EC_Timeout_Handler::TAO_EC_Timeout_Handler (void)
 {
 }
 
 int
-ACE_ES_Priority_Timer::connected (RtecScheduler::handle_t rt_info)
-{
-  RtecScheduler::OS_Priority thread_priority;
-  RtecScheduler::Preemption_Subpriority subpriority;
-  RtecScheduler::Preemption_Priority preemption_priority;
-
-  TAO_TRY
-    {
-      ACE_TIMEPROBE (TAO_EVENT_CHANNEL_CONNECTED_PRIORITY_REQUESTED);
-      ACE_Scheduler_Factory::server ()->priority
-        (rt_info, thread_priority,
-         subpriority, preemption_priority, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      ACE_TIMEPROBE (TAO_EVENT_CHANNEL_CONNECTED_PRIORITY_OBTAINED);
-#if 0
-      ACE_ERROR_RETURN ((LM_ERROR, "%p RtecScheduler::Scheduler::priority failed.\n",
-                         "ACE_ES_Priority_Timer::connected"), -1);
-#endif /* 0 */
-    }
-  TAO_CATCHANY
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "%p RtecScheduler::Scheduler::priority failed.\n",
-                         "ACE_ES_Priority_Timer::connected"), -1);
-    }
-  TAO_ENDTRY;
-
-  // Just make sure the ORB allocates resources for this priority.
-  if (this->task_manager_->GetReactorTask (preemption_priority) == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
-                       "ACE_ES_Priority_Timer::connected"), -1);
-
-  return 0;
-}
-
-int
-ACE_ES_Priority_Timer::handle_timeout (const ACE_Time_Value &,
-                                       const void *vp)
+TAO_EC_Timeout_Handler::handle_timeout (const ACE_Time_Value &,
+					const void *vp)
 {
   ACE_ES_Timer_ACT *act = (ACE_ES_Timer_ACT *) vp;
 
@@ -3426,31 +3333,6 @@ ACE_ES_Consumer_Name (const RtecEventChannelAdmin::ConsumerQOS &qos)
 
 // ************************************************************
 
-void
-dump_event (const RtecEventComm::Event &event)
-{
-  ACE_DEBUG ((LM_DEBUG, "source_ = %d "
-              "type_ = %d "
-              "time_ = %u.\n",
-              (void*)event.header.source,
-              event.header.type,
-              // The divide-by-1 is for ACE_U_LongLong support.
-              ORBSVCS_Time::to_hrtime (event.header.creation_time) / 1));
-}
-
-// ************************************************************
-
-#if defined(ACE_ES_LACKS_ORB)
-void
-dump_sequence (const ACE_CORBA_Sequence<ACE_ES_Event> &seq)
-{
-  for (CORBA::ULong index=0; index < seq.length (); index++)
-    ::dump_event (seq[index]);
-}
-#endif /* ACE_ES_LACKS_ORB */
-
-// ************************************************************
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Atomic_Op<ACE_ES_MUTEX, int>;
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
index ba39b863edc..c15b82bd532 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
@@ -34,9 +34,10 @@
 #include "ace/Map_Manager.h"
 
 #include "tao/Timeprobe.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
 #include "Local_ESTypes.h"
 #include "CORBA_Utils_T.h"
-#include "Task_Manager.h"
+#include "Timer_Module.h"
 #include "ReactorTask.h"
 
 //ACE_INLINE void operator += (ACE_CORBA_Sequence<RtecEventComm::Event_var> &dest,
@@ -148,6 +149,30 @@ private:
 
 // ************************************************************
 
+class ACE_ES_Timer_ACT;
+class ACE_EventChannel;
+
+class TAO_ORBSVCS_Export TAO_EC_Timeout_Handler : public ACE_Event_Handler
+{
+  // = TITLE
+  //   Event Service Timeout handler.
+  //
+  // = DESCRIPTION
+  //   Receives the timeouts from the Timer_Module and dispatches them
+  //   as Event Channel events.
+  //
+public:
+  TAO_EC_Timeout_Handler (void);
+  // Default construction.
+
+private:
+  virtual int handle_timeout (const ACE_Time_Value &tv,
+                              const void *act);
+  // Casts <act> to ACE_ES_Timer_ACT and calls execute.
+};
+
+// ************************************************************
+
 // Chesire cat.
 class ACE_ES_Priority_Timer;
 // Forward declarations.
@@ -166,8 +191,8 @@ class TAO_EC_Gateway;
 class TAO_Module_Factory;
 // Factory class for the modules in the EC.
 
-// ec..
 class TAO_ORBSVCS_Export ACE_EventChannel : public POA_RtecEventChannelAdmin::EventChannel
+//
 // = TITLE
 //   TAO's Real-time Event Channel.
 //
@@ -198,9 +223,6 @@ public:
   ACE_RTU_Manager *rtu_manager (void);
   // Returns a reference to the RTU manager.
 
-  ACE_ES_Priority_Timer *timer (void);
-  // Timer accessor.
-
   // = These should be private.
   ACE_ES_Consumer_Module *consumer_module_;
   ACE_ES_Dispatching_Module *dispatching_module_;
@@ -208,7 +230,7 @@ public:
   ACE_ES_Subscription_Module *subscription_module_;
   ACE_ES_Supplier_Module *supplier_module_;
 
-  ACE_ES_Priority_Timer *timer_;
+  TAO_EC_Timeout_Handler timer_;
 
   void report_connect (u_long);
   // Consumer or supplier connected.
@@ -237,8 +259,8 @@ public:
   // The consumer (or supplier) list has changed, thus the EC has to
   // inform any gateways it has.
 
-  ACE_Task_Manager* task_manager (void) const;
-  // Each Event Channel has its own Task_Manager to handle timers.
+  TAO_EC_Timer_Module* timer_module (void) const;
+  // The timer module controls the strategy to dispatch timers.
 
   // = The RtecEventChannelAdmin::EventChannel methods.
 
@@ -262,7 +284,24 @@ public:
 				CORBA::Environment &env);
   // The observer manipulators
 
- private:
+  // = Timer managment
+  int schedule_timer (RtecScheduler::handle_t rt_info,
+                      const ACE_ES_Timer_ACT *act,
+                      RtecScheduler::OS_Priority preemption_priority,
+                      const RtecScheduler::Time& delta,
+                      const RtecScheduler::Time& interval = ORBSVCS_Time::zero);
+  // Schedule a timer at the appropriate priority for <preemption_priority>.
+  // Returns the preemption priority used on success, -1 on failure.
+
+  int cancel_timer (RtecScheduler::OS_Priority preemption_priority,
+                    int id,
+		    ACE_ES_Timer_ACT *&act);
+  // Cancel the timer associated with the priority of
+  // <preemption_priority> and <id>.  <act> is filled in with the
+  // Timer_ACT used when scheduling the timer.  Returns 0 on success,
+  // -1 on failure.
+
+private:
   void cleanup_observers (void);
   // Remove all the observers, this simplifies the shutdown process.
 
@@ -318,10 +357,8 @@ private:
   Observer_Map observers_;
   // Keep the set of Gateways, i.e. connections to peer EC.
 
-  ACE_Task_Manager* task_manager_;
-  // @@ TODO: change that class and object name.
-  // This object handles the threads related to timers, is a bad name,
-  // but this is not the opportunity to change it.
+  TAO_EC_Timer_Module* timer_module_;
+  // The strategy to dispatch timers.
 
   int own_factory_;
   // If 1 then we created the factory, thus we have to destroy it.
@@ -333,50 +370,6 @@ private:
 
 // ************************************************************
 
-class ACE_ES_Timer_ACT;
-
-class TAO_ORBSVCS_Export ACE_ES_Priority_Timer : public ACE_Event_Handler
-// = TITLE
-//    Event Service Timer
-//
-// = DESCRIPTION
-//    Manages a thread per priority, each of which sits on its own
-//    ReactorEx dispatching the timers for its given priority.
-{
-public:
-  ACE_ES_Priority_Timer (ACE_Task_Manager* task_manager);
-  // Default construction.
-
-  int connected (RtecScheduler::handle_t rt_info);
-  // This allows the Priority Timer to prespawn threads.  Returns 0 on
-  // success, -1 on failure.
-
-  int schedule_timer (RtecScheduler::handle_t rt_info,
-                      const ACE_ES_Timer_ACT *act,
-                      RtecScheduler::OS_Priority preemption_priority,
-                      const RtecScheduler::Time& delta,
-                      const RtecScheduler::Time& interval = ORBSVCS_Time::zero);
-  // Schedule a timer at the appropriate priority for <preemption_priority>.
-  // Returns the preemption priority used on success, -1 on failure.
-
-  int cancel_timer (RtecScheduler::OS_Priority preemption_priority,
-                    int id, ACE_ES_Timer_ACT *&act);
-  // Cancel the timer associated with the priority of
-  // <preemption_priority> and <id>.  <act> is filled in with the
-  // Timer_ACT used when scheduling the timer.  Returns 0 on success,
-  // -1 on failure.
-
-private:
-  virtual int handle_timeout (const ACE_Time_Value &tv,
-                              const void *act);
-  // Casts <act> to ACE_ES_Timer_ACT and calls execute.
-
-  ACE_Task_Manager* task_manager_;
-  // The pointer to the manager for the timer threads.
-};
-
-// ************************************************************
-
 class TAO_ORBSVCS_Export ACE_ES_Dependency_Iterator
 // = TITLE
 //    ConsumerQOS Iterator
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
index 844831376e0..9b725a85c6d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
@@ -112,16 +112,10 @@ ACE_EventChannel::for_consumers (CORBA::Environment &env)
   return consumer_module_->get_ref (env);
 }
 
-ACE_INLINE ACE_ES_Priority_Timer *
-ACE_EventChannel::timer (void)
+ACE_INLINE TAO_EC_Timer_Module*
+ACE_EventChannel::timer_module (void) const
 {
-  return timer_;
-}
-
-ACE_INLINE ACE_Task_Manager*
-ACE_EventChannel::task_manager (void) const
-{
-  return this->task_manager_;
+  return this->timer_module_;
 }
 
 // ************************************************************
@@ -395,21 +389,11 @@ ACE_RTU_Manager::should_preempt (void)
     return 0;
   else
     {
-#if 0
-      // Expire any timers.  Am I evil for putting this here?
-      ACE_Time_Value tv;
-      if (this->task_manager_->GetReactorTask (0)->
-	    get_reactor ().handle_events (&tv) == -1)
-	ACE_ERROR ((LM_ERROR, "%p.\n",
-		    "ACE_RTU_Manager::should_preempt"));
-#else
       // This routine was dead-code, but I'll leave it here until I
       // find out what it is supposed to do.
       ACE_ERROR ((LM_WARNING,
 		  "EC (%t) RTU_Manager::should_preempt - obsolete\n"));
 		 
-#endif
-
       int should_preempt = should_preempt_;
       should_preempt_ = 0;
       return should_preempt;
@@ -689,3 +673,73 @@ ACE_ES_Conjunction_Group::add_events (Event_Set *outbox,
 }
 
 // ************************************************************
+
+ACE_INLINE int
+ACE_EventChannel::schedule_timer (RtecScheduler::handle_t rt_info,
+				  const ACE_ES_Timer_ACT *act,
+				  RtecScheduler::Preemption_Priority preemption_priority,
+				  const RtecScheduler::Time &delta,
+				  const RtecScheduler::Time &interval)
+{
+  if (rt_info != 0)
+    {
+      // Add the timer to the task's dependency list.
+      RtecScheduler::handle_t timer_rtinfo =
+        this->timer_module ()->rt_info (preemption_priority);
+
+      TAO_TRY
+        {
+          ACE_Scheduler_Factory::server()->add_dependency
+            (rt_info,
+	     timer_rtinfo,
+	     1,
+	     RtecScheduler::ONE_WAY_CALL,
+	     TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+        }
+      TAO_CATCHANY
+        {
+          ACE_ERROR ((LM_ERROR, "add dependency failed"));
+        }
+      TAO_ENDTRY;
+    }
+
+  // @@ We're losing resolution here.
+  ACE_Time_Value tv_delta;
+  ORBSVCS_Time::TimeT_to_Time_Value (tv_delta, delta);
+
+  ACE_Time_Value tv_interval;
+  ORBSVCS_Time::TimeT_to_Time_Value (tv_interval, interval);
+
+  return this->timer_module ()->schedule_timer (preemption_priority,
+						&this->timer_,
+						ACE_const_cast(ACE_ES_Timer_ACT*,act),
+						tv_delta, tv_interval);
+}
+
+ACE_INLINE int
+ACE_EventChannel::cancel_timer (RtecScheduler::OS_Priority preemption_priority,
+				int id,
+				ACE_ES_Timer_ACT *&act)
+{
+  const void *vp;
+
+  int result =
+    this->timer_module ()->cancel_timer (preemption_priority,
+					      id,
+					      vp);
+
+  if (result == 0)
+    {
+      ACE_ERROR ((LM_ERROR, "ACE_ES_Priority_Timer::cancel_timer: "
+                  "Tried to cancel nonexistent timer.\n"));
+      act = 0;
+    }
+  else
+    act = (ACE_ES_Timer_ACT *) vp;
+
+  return result;
+}
+
+// ************************************************************
+
diff --git a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp
index c6e1bfc744c..763b40f65c6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "orbsvcs/Event/Dispatching_Modules.h"
-#include "orbsvcs/Event/Task_Manager.h"
+#include "orbsvcs/Event/Timer_Module.h"
 #include "orbsvcs/Event/Event_Channel.h"
 #include "orbsvcs/Event/Module_Factory.h"
 
@@ -45,62 +45,132 @@ TAO_Default_Module_Factory::destroy_consumer_module (ACE_ES_Consumer_Module* x)
   delete x;
 }
 
-ACE_Task_Manager*
-TAO_Default_Module_Factory::create_task_manager (ACE_EventChannel*)
+ACE_ES_Correlation_Module*
+TAO_Default_Module_Factory::create_correlation_module (ACE_EventChannel* ec)
+{
+  return new ACE_ES_Correlation_Module (ec);
+}
+
+void
+TAO_Default_Module_Factory::destroy_correlation_module (ACE_ES_Correlation_Module* x)
+{
+  delete x;
+}
+
+ACE_ES_Subscription_Module*
+TAO_Default_Module_Factory::create_subscription_module (ACE_EventChannel* ec)
+{
+  return new ACE_ES_Subscription_Module (ec);
+}
+
+void
+TAO_Default_Module_Factory::destroy_subscription_module (ACE_ES_Subscription_Module* x)
 {
-  return new ACE_Task_Manager;
+  delete x;
+}
+
+ACE_ES_Supplier_Module*
+TAO_Default_Module_Factory::create_supplier_module (ACE_EventChannel* ec)
+{
+  return new ACE_ES_Supplier_Module (ec);
 }
 
 void
-TAO_Default_Module_Factory::destroy_task_manager (ACE_Task_Manager* x)
+TAO_Default_Module_Factory::destroy_supplier_module (ACE_ES_Supplier_Module* x)
+{
+  delete x;
+}
+
+TAO_EC_Timer_Module*
+TAO_Default_Module_Factory::create_timer_module (ACE_EventChannel* ec)
+{
+  return new TAO_EC_RPT_Timer_Module;
+}
+
+void
+TAO_Default_Module_Factory::destroy_timer_module (TAO_EC_Timer_Module* x)
+{
+  delete x;
+}
+
+// ****************************************************************
+
+TAO_Reactive_Module_Factory::TAO_Reactive_Module_Factory (void)
+{
+}
+
+TAO_Reactive_Module_Factory::~TAO_Reactive_Module_Factory (void)
+{
+}
+
+ACE_ES_Dispatching_Base*
+TAO_Reactive_Module_Factory::create_dispatching_module (ACE_EventChannel* ec)
+{
+  return new ACE_ES_EFD_Dispatching(ec);
+}
+
+void
+TAO_Reactive_Module_Factory::destroy_dispatching_module (ACE_ES_Dispatching_Base* x)
+{
+  delete x;
+}
+
+ACE_ES_Consumer_Module*
+TAO_Reactive_Module_Factory::create_consumer_module (ACE_EventChannel* ec)
+{
+  return new ACE_ES_Consumer_Module (ec);
+}
+
+void
+TAO_Reactive_Module_Factory::destroy_consumer_module (ACE_ES_Consumer_Module* x)
 {
   delete x;
 }
 
 ACE_ES_Correlation_Module*
-TAO_Default_Module_Factory::create_correlation_module (ACE_EventChannel* ec)
+TAO_Reactive_Module_Factory::create_correlation_module (ACE_EventChannel* ec)
 {
   return new ACE_ES_Correlation_Module (ec);
 }
 
 void
-TAO_Default_Module_Factory::destroy_correlation_module (ACE_ES_Correlation_Module* x)
+TAO_Reactive_Module_Factory::destroy_correlation_module (ACE_ES_Correlation_Module* x)
 {
   delete x;
 }
 
 ACE_ES_Subscription_Module*
-TAO_Default_Module_Factory::create_subscription_module (ACE_EventChannel* ec)
+TAO_Reactive_Module_Factory::create_subscription_module (ACE_EventChannel* ec)
 {
   return new ACE_ES_Subscription_Module (ec);
 }
 
 void
-TAO_Default_Module_Factory::destroy_subscription_module (ACE_ES_Subscription_Module* x)
+TAO_Reactive_Module_Factory::destroy_subscription_module (ACE_ES_Subscription_Module* x)
 {
   delete x;
 }
 
 ACE_ES_Supplier_Module*
-TAO_Default_Module_Factory::create_supplier_module (ACE_EventChannel* ec)
+TAO_Reactive_Module_Factory::create_supplier_module (ACE_EventChannel* ec)
 {
   return new ACE_ES_Supplier_Module (ec);
 }
 
 void
-TAO_Default_Module_Factory::destroy_supplier_module (ACE_ES_Supplier_Module* x)
+TAO_Reactive_Module_Factory::destroy_supplier_module (ACE_ES_Supplier_Module* x)
 {
   delete x;
 }
 
-ACE_ES_Priority_Timer*
-TAO_Default_Module_Factory::create_timer_module (ACE_EventChannel* ec)
+TAO_EC_Timer_Module*
+TAO_Reactive_Module_Factory::create_timer_module (ACE_EventChannel*)
 {
-  return new ACE_ES_Priority_Timer (ec->task_manager ());
+  return new TAO_EC_ST_Timer_Module (TAO_ORB_Core_instance ()->reactor ());
 }
 
 void
-TAO_Default_Module_Factory::destroy_timer_module (ACE_ES_Priority_Timer* x)
+TAO_Reactive_Module_Factory::destroy_timer_module (TAO_EC_Timer_Module* x)
 {
   delete x;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.h b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.h
index 8a835dc26c2..dd8198bc255 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.h
@@ -33,11 +33,11 @@ class ACE_EventChannel;
 
 class ACE_ES_Dispatching_Base;
 class ACE_ES_Consumer_Module;
-class ACE_Task_Manager;
 class ACE_ES_Correlation_Module;
 class ACE_ES_Subscription_Module;
 class ACE_ES_Supplier_Modulel;
 class ACE_ES_Priority_Timer;
+class TAO_EC_Timer_Module;
 
 class TAO_ORBSVCS_Export TAO_Module_Factory
 {
@@ -62,10 +62,6 @@ public:
     create_consumer_module (ACE_EventChannel*) = 0;
   virtual void destroy_consumer_module (ACE_ES_Consumer_Module*) = 0;
 
-  virtual ACE_Task_Manager*
-    create_task_manager (ACE_EventChannel*) = 0;
-  virtual void destroy_task_manager (ACE_Task_Manager*) = 0;
-
   virtual ACE_ES_Correlation_Module*
     create_correlation_module (ACE_EventChannel*) = 0;
   virtual void destroy_correlation_module (ACE_ES_Correlation_Module*) = 0;
@@ -78,9 +74,10 @@ public:
     create_supplier_module (ACE_EventChannel*) = 0;
   virtual void destroy_supplier_module (ACE_ES_Supplier_Module*) = 0;
 
-  virtual ACE_ES_Priority_Timer*
+  virtual TAO_EC_Timer_Module*
     create_timer_module (ACE_EventChannel*) = 0;
-  virtual void destroy_timer_module (ACE_ES_Priority_Timer*) = 0;
+  virtual void destroy_timer_module (TAO_EC_Timer_Module*) = 0;
+
 };
 
 // ****************************************************************
@@ -88,7 +85,7 @@ public:
 class TAO_ORBSVCS_Export TAO_Default_Module_Factory : public TAO_Module_Factory
 {
   // = TITLE
-  //   Factory class for the Event Channel "modules".
+  //   Default factory class for the Event Channel.
   //
   // = DESCRIPTION
   //   The Event Channel "modules" represent the different phases and
@@ -109,9 +106,49 @@ public:
     create_consumer_module (ACE_EventChannel*);
   virtual void destroy_consumer_module (ACE_ES_Consumer_Module*);
 
-  virtual ACE_Task_Manager*
-    create_task_manager (ACE_EventChannel*);
-  virtual void destroy_task_manager (ACE_Task_Manager*);
+  virtual ACE_ES_Correlation_Module*
+    create_correlation_module (ACE_EventChannel*);
+  virtual void destroy_correlation_module (ACE_ES_Correlation_Module*);
+
+  virtual ACE_ES_Subscription_Module*
+    create_subscription_module (ACE_EventChannel*);
+  virtual void destroy_subscription_module (ACE_ES_Subscription_Module*);
+
+  virtual ACE_ES_Supplier_Module*
+    create_supplier_module (ACE_EventChannel*);
+  virtual void destroy_supplier_module (ACE_ES_Supplier_Module*);
+
+  virtual TAO_EC_Timer_Module*
+    create_timer_module (ACE_EventChannel*);
+  virtual void destroy_timer_module (TAO_EC_Timer_Module*);
+
+};
+
+// ****************************************************************
+
+class TAO_ORBSVCS_Export TAO_Reactive_Module_Factory : public TAO_Module_Factory
+{
+  // = TITLE
+  //   Factory class for the Event Channel "modules".
+  //
+  // = DESCRIPTION
+  //   This class factors out modules that require no extra threads
+  //   for event or timer dispatching.
+  //   An Event Channel configured with this factory can exhibit high
+  //   priority inversion, but it should provide high-performance due
+  //   to the elimination of context switching.
+  // 
+public:
+  TAO_Reactive_Module_Factory (void);
+  virtual ~TAO_Reactive_Module_Factory (void);
+
+  virtual ACE_ES_Dispatching_Base*
+    create_dispatching_module (ACE_EventChannel*);
+  virtual void destroy_dispatching_module (ACE_ES_Dispatching_Base*);
+
+  virtual ACE_ES_Consumer_Module*
+    create_consumer_module (ACE_EventChannel*);
+  virtual void destroy_consumer_module (ACE_ES_Consumer_Module*);
 
   virtual ACE_ES_Correlation_Module*
     create_correlation_module (ACE_EventChannel*);
@@ -125,9 +162,10 @@ public:
     create_supplier_module (ACE_EventChannel*);
   virtual void destroy_supplier_module (ACE_ES_Supplier_Module*);
 
-  virtual ACE_ES_Priority_Timer*
+  virtual TAO_EC_Timer_Module*
     create_timer_module (ACE_EventChannel*);
-  virtual void destroy_timer_module (ACE_ES_Priority_Timer*);
+  virtual void destroy_timer_module (TAO_EC_Timer_Module*);
+
 };
 
 #endif /* ACE_EVENT_CHANNEL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Task_Manager.cpp b/TAO/orbsvcs/orbsvcs/Event/Task_Manager.cpp
deleted file mode 100644
index 97e119fb425..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/Task_Manager.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// $Id$
-
-#include "Task_Manager.h"
-#include "ReactorTask.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "Task_Manager.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Event, Task_Manager, "$Id$")
-
-ACE_Task_Manager::ACE_Task_Manager (void)
-  : shutdown_ (0)
-{
-  for (int i = 0; i < ACE_Scheduler_MAX_PRIORITIES; ++i)
-    this->reactorTasks[i] = 0;
-}
-
-ACE_Task_Manager::~ACE_Task_Manager (void)
-{
-  this->shutdown ();
-
-  for (int i = 0; i < ACE_Scheduler_MAX_PRIORITIES; ++i)
-    {
-      if (this->reactorTasks[i] != 0)
-	{
-	  delete this->reactorTasks[i];
-	  this->reactorTasks[i] = 0;
-	}
-    }
-}
-
-void ACE_Task_Manager::activate (void)
-{
-  for (int i = 0; i < ACE_Scheduler_MAX_PRIORITIES; ++i)
-    {
-      if (this->reactorTasks[i] != 0)
-	continue;
-
-      // Convert ACE_Scheduler_Rate (it's really a period, not a rate!)
-      // to a form we can easily work with.
-      ACE_Time_Value period_tv;
-      ORBSVCS_Time::TimeT_to_Time_Value (period_tv, ACE_Scheduler_Rates[i]);
-
-      RtecScheduler::Period period = period_tv.sec () * 10000000 +
-                                     period_tv.usec () * 10;
-
-      ACE_NEW (this->reactorTasks[i], ReactorTask);
-
-      if (!this->shutdown_)
-	{
-	  this->reactorTasks[i]->thr_mgr (this->ThrMgr ());
-	  if (this->reactorTasks[i]->open_reactor (period) == -1)
-	    {
-	      ACE_ERROR ((LM_ERROR, "%p\n",
-			  "EC (%t) Task_Manager - open reactor"));
-	    }
-	}
-    }
-}
-
-void
-ACE_Task_Manager::shutdown (void)
-{
-  if (this->shutdown_)
-    return;
-
-  this->shutdown_ = 1;
-  for (int i = 0; i < ACE_Scheduler_MAX_PRIORITIES; ++i)
-    {
-      if (this->reactorTasks[i] != 0)
-	this->reactorTasks[i]->shutdown_task ();
-    }
-
-  if (this->ThrMgr ()->wait () == -1)
-    ACE_ERROR ((LM_DEBUG, "%p\n", "EC (%t) Task_Manager wait"));
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/Task_Manager.h b/TAO/orbsvcs/orbsvcs/Event/Task_Manager.h
deleted file mode 100644
index 0a659969eed..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/Task_Manager.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-
-#if !defined(TASK_MANAGER_H)
-#define TASK_MANAGER_H
-
-#include "ace/ACE.h"
-#include "ace/Singleton.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "RT_Task.h"
-
-class ACE_ES_Reactor_Task;
-
-class TAO_ORBSVCS_Export ACE_Task_Manager 
-{
-  //
-  // = TITLE
-  //  Manager for the pool of ACE_ReactorTask.
-  //
-  // = DESCRIPTION
-  //   The EventChannel uses a pool of ACE_ReactorTask to handle the
-  //   dispatching of timeouts. In real-time multi-threaded enviroments
-  //   this maps to a different thread per priority.
-  //   This class offers a centralized access point to those tasks and
-  //   some related services.
-  //
-public:
-  ACE_Task_Manager (void);
-  // Create the Task_Manager.
-
-  ~ACE_Task_Manager (void);
-  // The dtor also shutdowns the Task_Manager.
-
-  void activate (void);
-  // Activate the threads, it waits until the threads are up and
-  // running.
-
-  void shutdown (void);
-  // Deactivate the threads, it waits until all the threads have
-  // terminated.
-
-  typedef ACE_ES_Reactor_Task ReactorTask;
-
-  ReactorTask* GetReactorTask(RtecScheduler::OS_Priority priority);
-  // Obtain the ReactorTask for the given priority.
-  // The Task must have been created already.
-
-  ACE_RT_Thread_Manager* ThrMgr();
-  // Returns a global ThreadManager for the Task pool.
-
-private:
-  int shutdown_;
-  // The reactors are shutdown, do not attempt to restart them.
-  
-  ReactorTask *reactorTasks[ACE_Scheduler_MAX_PRIORITIES];
-  // The set of ReactorTasks
-
-  ACE_RT_Thread_Manager thr_mgr;
-  // The thread manager.
-};
-
-#if defined (__ACE_INLINE__)
-#include "Task_Manager.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TASK_MANAGER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp
new file mode 100644
index 00000000000..f670dbf2a5c
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp
@@ -0,0 +1,183 @@
+// $Id$
+
+#include "orbsvcs/orbsvcs/Event/ReactorTask.h"
+#include "orbsvcs/orbsvcs/Event/Timer_Module.h"
+
+#if ! defined (__ACE_INLINE__)
+#include "Timer_Module.i"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(Event, Timer_Module, "$Id$")
+
+// ****************************************************************
+
+TAO_EC_Timer_Module::~TAO_EC_Timer_Module (void)
+{
+}
+
+// ****************************************************************
+
+TAO_EC_ST_Timer_Module::TAO_EC_ST_Timer_Module (ACE_Reactor* r)
+  :  reactor_ (r)
+{
+}
+
+TAO_EC_ST_Timer_Module::~TAO_EC_ST_Timer_Module (void)
+{
+}
+
+void
+TAO_EC_ST_Timer_Module::activate (void)
+{
+}
+
+void
+TAO_EC_ST_Timer_Module::shutdown (void)
+{
+}
+
+RtecScheduler::handle_t
+TAO_EC_ST_Timer_Module::rt_info (RtecScheduler::Preemption_Priority)
+{
+  // @@ TODO......
+  return 0;
+}
+
+int
+TAO_EC_ST_Timer_Module::schedule_timer (RtecScheduler::Preemption_Priority,
+                                        ACE_Event_Handler* eh,
+                                        void* act,
+                                        const ACE_Time_Value& delta,
+                                        const ACE_Time_Value& interval)
+{
+  return this->reactor_->schedule_timer (eh, act, delta, interval);
+}
+
+int
+TAO_EC_ST_Timer_Module::cancel_timer (RtecScheduler::Preemption_Priority,
+                                      int id,
+                                      const void*& act)
+{
+  return this->reactor_->cancel_timer (id, &act);
+}
+
+int
+TAO_EC_ST_Timer_Module::register_handler (RtecScheduler::Preemption_Priority,
+                                          ACE_Event_Handler* eh,
+                                          ACE_HANDLE handle)
+{
+  return this->reactor_->register_handler (eh, handle);
+}
+
+ACE_Reactor*
+TAO_EC_ST_Timer_Module::reactor (RtecScheduler::Preemption_Priority)
+{
+  return this->reactor_;
+}
+
+// ****************************************************************
+
+TAO_EC_RPT_Timer_Module::TAO_EC_RPT_Timer_Module (void)
+  : shutdown_ (0)
+{
+  for (int i = 0; i < ACE_Scheduler_MAX_PRIORITIES; ++i)
+    this->reactorTasks[i] = 0;
+}
+
+TAO_EC_RPT_Timer_Module::~TAO_EC_RPT_Timer_Module (void)
+{
+  this->shutdown ();
+
+  for (int i = 0; i < ACE_Scheduler_MAX_PRIORITIES; ++i)
+    {
+      if (this->reactorTasks[i] != 0)
+	{
+	  delete this->reactorTasks[i];
+	  this->reactorTasks[i] = 0;
+	}
+    }
+}
+
+void TAO_EC_RPT_Timer_Module::activate (void)
+{
+  for (int i = 0; i < ACE_Scheduler_MAX_PRIORITIES; ++i)
+    {
+      if (this->reactorTasks[i] != 0)
+	continue;
+
+      // Convert ACE_Scheduler_Rate (it's really a period, not a rate!)
+      // to a form we can easily work with.
+      ACE_Time_Value period_tv;
+      ORBSVCS_Time::TimeT_to_Time_Value (period_tv, ACE_Scheduler_Rates[i]);
+
+      RtecScheduler::Period period = period_tv.sec () * 10000000 +
+                                     period_tv.usec () * 10;
+
+      ACE_NEW (this->reactorTasks[i], ReactorTask);
+
+      if (!this->shutdown_)
+	{
+	  this->reactorTasks[i]->thr_mgr (this->ThrMgr ());
+	  if (this->reactorTasks[i]->open_reactor (period) == -1)
+	    {
+	      ACE_ERROR ((LM_ERROR, "%p\n",
+			  "EC (%t) Timer_Module - open reactor"));
+	    }
+	}
+    }
+}
+
+void
+TAO_EC_RPT_Timer_Module::shutdown (void)
+{
+  if (this->shutdown_)
+    return;
+
+  this->shutdown_ = 1;
+  for (int i = 0; i < ACE_Scheduler_MAX_PRIORITIES; ++i)
+    {
+      if (this->reactorTasks[i] != 0)
+	this->reactorTasks[i]->shutdown_task ();
+    }
+
+  if (this->ThrMgr ()->wait () == -1)
+    ACE_ERROR ((LM_DEBUG, "%p\n", "EC (%t) Timer_Module wait"));
+}
+
+RtecScheduler::handle_t
+TAO_EC_RPT_Timer_Module::rt_info (RtecScheduler::Preemption_Priority priority)
+{
+  return this->GetReactorTask (priority)->rt_info ();
+}
+
+int
+TAO_EC_RPT_Timer_Module::schedule_timer (RtecScheduler::Preemption_Priority priority,
+                                         ACE_Event_Handler* eh,
+                                         void* act,
+                                         const ACE_Time_Value& delta,
+                                         const ACE_Time_Value& interval)
+{
+  return this->GetReactorTask (priority)->get_reactor ().schedule_timer (eh, act, delta, interval);
+}
+
+int
+TAO_EC_RPT_Timer_Module::cancel_timer (RtecScheduler::Preemption_Priority priority,
+                                       int id,
+                                       const void*& act)
+{
+  return this->GetReactorTask (priority)->get_reactor ().cancel_timer (id, &act);
+}
+
+int
+TAO_EC_RPT_Timer_Module::register_handler (RtecScheduler::Preemption_Priority priority,
+                                           ACE_Event_Handler* eh,
+                                           ACE_HANDLE handle)
+{
+  return this->GetReactorTask (priority)->get_reactor ().register_handler (eh, handle);
+}
+
+ACE_Reactor*
+TAO_EC_RPT_Timer_Module::reactor (RtecScheduler::Preemption_Priority priority)
+{
+  return &this->GetReactorTask (priority)->get_reactor ();
+}
diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h
new file mode 100644
index 00000000000..6e0c39fc0e2
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h
@@ -0,0 +1,171 @@
+/* -*- C++ -*- */
+//
+// $Id$
+//
+
+#if !defined(TAO_EC_TIMER_MODULE_H)
+#define TAO_EC_TIMER_MODULE_H
+
+#include "ace/ACE.h"
+#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event/RT_Task.h"
+
+class TAO_ORBSVCS_Export TAO_EC_Timer_Module
+{
+  // = TITLE
+  //   The timer managment module.
+  //
+  // = DESCRIPTION
+  //   The Event Channel can use several strategies to dispatch
+  //   timers, for instance, it can use the ORB reactor or a pool of
+  //   reactors running at different priorities or a pool of
+  //   Thread_Timer_Queue_Adapters running at different priorities
+  //   also.
+  //   This class is the abstract base class to abstract this
+  //   strategies.
+  //
+public:
+  virtual ~TAO_EC_Timer_Module (void);
+  // The dtor
+
+  virtual void activate (void) = 0;
+  // Activate the threads, it waits until the threads are up and
+  // running.
+
+  virtual void shutdown (void) = 0;
+  // Deactivate the threads, it waits until all the threads have
+  // terminated.
+
+  virtual RtecScheduler::handle_t
+     rt_info (RtecScheduler::OS_Priority priority) = 0;
+  // The RT_Info handle for the "task" at <priority>
+
+  virtual int schedule_timer (RtecScheduler::Preemption_Priority priority,
+                              ACE_Event_Handler* eh,
+                              void* act,
+                              const ACE_Time_Value& delta,
+                              const ACE_Time_Value& interval) = 0;
+  // Add a timer at the given priority, returns the timer ID.
+
+  virtual int cancel_timer (RtecScheduler::Preemption_Priority priority,
+                            int id,
+                            const void*& act) = 0;
+  // Add a timer at the given priority.
+
+  virtual int register_handler (RtecScheduler::Preemption_Priority priority,
+				ACE_Event_Handler* eh,
+				ACE_HANDLE handle) = 0;
+  // Register a handler?????
+
+  virtual ACE_Reactor* reactor (RtecScheduler::Preemption_Priority priority) = 0;
+  // Obtain the reactor for the given priority.
+  // @@ This may prove tricky to implement with timer queues not based
+  // on reactors.
+};
+
+// ****************************************************************
+
+class TAO_ORBSVCS_Export TAO_EC_ST_Timer_Module : public TAO_EC_Timer_Module
+{
+  // = TITLE
+  //   A single threaded implementation for the timer module.
+  //
+  // = DESCRIPTION
+  //   This timer module uses a single Reactor to implement the timer,
+  //   usually the ORB reactor is used for this purposes.
+  //
+public:
+  TAO_EC_ST_Timer_Module (ACE_Reactor* reactor);
+  // The ctor.
+
+  virtual ~TAO_EC_ST_Timer_Module (void);
+  // The dtor
+
+  // = The TAO_EC_Timer_Module methods.
+  virtual void activate (void);
+  virtual void shutdown (void);
+  virtual RtecScheduler::handle_t
+     rt_info (RtecScheduler::Preemption_Priority priority);
+  virtual int schedule_timer (RtecScheduler::Preemption_Priority priority,
+                              ACE_Event_Handler* eh,
+                              void* act,
+                              const ACE_Time_Value& delta,
+                              const ACE_Time_Value& interval);
+  virtual int cancel_timer (RtecScheduler::Preemption_Priority priority,
+                            int id,
+                            const void*& act);
+  virtual int register_handler (RtecScheduler::Preemption_Priority priority,
+				ACE_Event_Handler* eh,
+				ACE_HANDLE handle);
+  virtual ACE_Reactor* reactor (RtecScheduler::Preemption_Priority priority);
+
+private:
+  ACE_Reactor* reactor_;
+  // The reactor.
+};
+
+// ****************************************************************
+
+class ACE_ES_Reactor_Task;
+
+class TAO_ORBSVCS_Export TAO_EC_RPT_Timer_Module : public TAO_EC_Timer_Module
+{
+  //
+  // = TITLE
+  //   A timer module using reactor-per-thread.
+  //
+  // = DESCRIPTION
+  //   This Timer Module uses a pool of ACE_ReactorTask to handle the
+  //   dispatching of timeouts. In real-time multi-threaded enviroments
+  //   each Reactor runs at a different priority.
+  //
+public:
+  TAO_EC_RPT_Timer_Module (void);
+  // Create the Timer Module
+
+  virtual ~TAO_EC_RPT_Timer_Module (void);
+  // The dtor also shutdowns the Task_Manager.
+
+  typedef ACE_ES_Reactor_Task ReactorTask;
+
+  ReactorTask* GetReactorTask(RtecScheduler::Preemption_Priority priority);
+  // Obtain the ReactorTask for the given priority.
+  // The Task must have been created already.
+
+  ACE_RT_Thread_Manager* ThrMgr();
+  // Returns a global ThreadManager for the Task pool.
+
+  // = The TAO_EC_Timer_Module methods.
+  virtual void activate (void);
+  virtual void shutdown (void);
+  virtual RtecScheduler::handle_t
+     rt_info (RtecScheduler::Preemption_Priority priority);
+  virtual int schedule_timer (RtecScheduler::Preemption_Priority priority,
+                              ACE_Event_Handler* eh,
+                              void* act,
+                              const ACE_Time_Value& delta,
+                              const ACE_Time_Value& interval);
+  virtual int cancel_timer (RtecScheduler::Preemption_Priority priority,
+                            int id,
+                            const void*& act);
+  virtual int register_handler (RtecScheduler::Preemption_Priority priority,
+				ACE_Event_Handler* eh,
+				ACE_HANDLE handle);
+  virtual ACE_Reactor* reactor (RtecScheduler::Preemption_Priority priority);
+  
+private:
+  int shutdown_;
+  // The reactors are shutdown, do not attempt to restart them.
+  
+  ReactorTask *reactorTasks[ACE_Scheduler_MAX_PRIORITIES];
+  // The set of ReactorTasks
+
+  ACE_RT_Thread_Manager thr_mgr;
+  // The thread manager.
+};
+
+#if defined (__ACE_INLINE__)
+#include "Timer_Module.i"
+#endif /* __ACE_INLINE__ */
+
+#endif /* TAO_EC_TIMER_MODULE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Task_Manager.i b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.i
index f2f392018f8..b2bf243de55 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Task_Manager.i
+++ b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.i
@@ -2,22 +2,23 @@
 // $Id$
 //
 
-ACE_INLINE ACE_Task_Manager::ReactorTask*
-ACE_Task_Manager::GetReactorTask(RtecScheduler::OS_Priority priority)
+ACE_INLINE TAO_EC_RPT_Timer_Module::ReactorTask*
+TAO_EC_RPT_Timer_Module::GetReactorTask(RtecScheduler::Preemption_Priority priority)
 {
   if (reactorTasks[priority] == 0)
     {
       this->activate ();
       //ACE_ERROR_RETURN ((LM_ERROR,
       //"%p no reactor task for priority %d.\n", 
-      //"ACE_Task_Manager::GetReactor",
+      //"TAO_EC_RPT_Timer_Module::GetReactor",
       //priority), 0);
    }
    
   return reactorTasks[priority];
 }
 
-ACE_INLINE ACE_RT_Thread_Manager* ACE_Task_Manager::ThrMgr()
+ACE_INLINE ACE_RT_Thread_Manager*
+TAO_EC_RPT_Timer_Module::ThrMgr()
 {
   return &thr_mgr;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile
index ebf2c2073c7..fbddc209e22 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile
+++ b/TAO/orbsvcs/orbsvcs/Makefile
@@ -67,7 +67,7 @@ FILES= $(IDL_FILES) \
 	Event/Memory_Pools \
 	Event/RT_Task \
 	Event/ReactorTask \
-	Event/Task_Manager \
+	Event/Timer_Module \
 	Event/EC_Gateway \
 	Event/EC_Gateway_UDP \
 	Event/EC_UDP_Admin \
@@ -363,6 +363,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -596,6 +597,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -829,6 +831,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -1064,6 +1067,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -1297,6 +1301,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -1529,6 +1534,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -1762,6 +1768,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -1997,6 +2004,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -2233,6 +2241,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -2472,6 +2481,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -2708,6 +2718,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -2944,6 +2955,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -3177,6 +3189,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -3412,6 +3425,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -3645,6 +3659,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -3878,6 +3893,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -4110,6 +4126,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -4344,6 +4361,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -4577,6 +4595,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -4809,6 +4828,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -5041,6 +5061,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -5275,6 +5296,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -5510,6 +5532,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -5750,6 +5773,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -5986,6 +6010,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -6222,6 +6247,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -6454,6 +6480,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -6689,6 +6716,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -6924,6 +6952,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -7169,6 +7198,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -7419,6 +7449,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -7672,6 +7703,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -7909,6 +7941,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -8142,6 +8175,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -8379,6 +8413,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -8616,6 +8651,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -8850,6 +8886,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -9116,6 +9153,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -9351,6 +9389,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -9423,9 +9462,10 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
  Event/Local_ESTypes.i Event/CORBA_Utils_T.h Event/CORBA_Utils_T.i \
- Event/CORBA_Utils_T.cpp Event/Task_Manager.h Event/RT_Task.h \
- Event/RT_Task.i Event/Task_Manager.i Event/ReactorTask.h \
- Event/Fast_Reactor.h \
+ Event/CORBA_Utils_T.cpp Event/Timer_Module.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/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 \
@@ -9443,7 +9483,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Timer_List.h \
  $(ACE_ROOT)/ace/Timer_List_T.h \
  $(ACE_ROOT)/ace/Timer_List_T.cpp \
- Event/Event_Channel.i Event/Dispatching_Modules.h \
+ Event/RT_Task.h Event/Event_Channel.i Event/Dispatching_Modules.h \
  Event/Dispatching_Modules.i Event/Memory_Pools.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 \
@@ -9644,6 +9684,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -9737,9 +9778,11 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
  Event/Local_ESTypes.i Event/RT_Task.h Event/RT_Task.i \
  Event/Event_Channel.h Event/CORBA_Utils_T.h Event/CORBA_Utils_T.i \
- Event/CORBA_Utils_T.cpp Event/Task_Manager.h Event/Task_Manager.i \
- Event/Event_Channel.i Event/Dispatching_Modules.i \
- Event/Memory_Pools.h Event/Memory_Pools.i Event/EC_Gateway.h \
+ Event/CORBA_Utils_T.cpp Event/Timer_Module.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.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 \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.cpp \
@@ -9941,6 +9984,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -10089,7 +10133,8 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
- Event/Local_ESTypes.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
@@ -10210,6 +10255,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -10243,16 +10289,17 @@ realclean: clean
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
+ Event/Local_ESTypes.h \
+ $(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/RtecSchedulerS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
@@ -10278,9 +10325,10 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
  Event/Local_ESTypes.i Event/CORBA_Utils_T.h Event/CORBA_Utils_T.i \
- Event/CORBA_Utils_T.cpp Event/Task_Manager.h Event/RT_Task.h \
- Event/RT_Task.i Event/Task_Manager.i Event/ReactorTask.h \
- Event/Fast_Reactor.h \
+ Event/CORBA_Utils_T.cpp Event/Timer_Module.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/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 \
@@ -10298,7 +10346,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Timer_List.h \
  $(ACE_ROOT)/ace/Timer_List_T.h \
  $(ACE_ROOT)/ace/Timer_List_T.cpp \
- Event/Event_Channel.i Event/Dispatching_Modules.h \
+ Event/RT_Task.h Event/Event_Channel.i Event/Dispatching_Modules.h \
  Event/Dispatching_Modules.i Event/Memory_Pools.i
 .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 \
@@ -10501,6 +10549,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -10574,8 +10623,9 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
  Event/Local_ESTypes.i Event/CORBA_Utils_T.h Event/CORBA_Utils_T.i \
- Event/CORBA_Utils_T.cpp Event/Task_Manager.h Event/Task_Manager.i \
- Event/ReactorTask.h Event/Fast_Reactor.h \
+ Event/CORBA_Utils_T.cpp Event/Timer_Module.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/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 \
@@ -10799,6 +10849,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -10886,7 +10937,14 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
  Event/Local_ESTypes.i Event/RT_Task.h Event/RT_Task.i
-.obj/Task_Manager.o .obj/Task_Manager.so .shobj/Task_Manager.o .shobj/Task_Manager.so: Event/Task_Manager.cpp Event/Task_Manager.h \
+.obj/Timer_Module.o .obj/Timer_Module.so .shobj/Timer_Module.o .shobj/Timer_Module.so: Event/Timer_Module.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/ReactorTask.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/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/Signal.h \
+ $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -10903,8 +10961,6 @@ realclean: clean
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(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 \
@@ -10918,15 +10974,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(ACE_ROOT)/ace/Message_Block.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/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
@@ -10937,19 +10989,40 @@ 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/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/Message_Block.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(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/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Reactor.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(ACE_ROOT)/ace/Timer_List.h \
+ $(ACE_ROOT)/ace/Timer_List_T.h \
+ $(ACE_ROOT)/ace/Timer_List_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
@@ -10976,15 +11049,6 @@ realclean: clean
  $(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/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/Time_Value.h \
@@ -11005,6 +11069,8 @@ realclean: clean
  $(ACE_ROOT)/ace/Service_Repository.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Message_Queue_T.h \
  $(ACE_ROOT)/ace/Message_Queue_T.i \
@@ -11031,6 +11097,9 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.i \
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Dynamic.i \
  $(ACE_ROOT)/ace/Connector.i \
  $(ACE_ROOT)/ace/Connector.cpp \
@@ -11086,6 +11155,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -11119,34 +11189,15 @@ realclean: clean
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- Event/RT_Task.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- Event/RT_Task.i Event/Task_Manager.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/Local_ESTypes.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
@@ -11171,7 +11222,11 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- Event/Local_ESTypes.i
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.i
 .obj/EC_Gateway.o .obj/EC_Gateway.so .shobj/EC_Gateway.o .shobj/EC_Gateway.so: Event/EC_Gateway.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Gateway.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
@@ -11374,6 +11429,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -11648,6 +11704,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -11920,6 +11977,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -12192,6 +12250,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -12262,11 +12321,13 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/CORBA_Utils_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/CORBA_Utils_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/CORBA_Utils_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Task_Manager.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Task_Manager.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Dispatching_Modules.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Module_Factory.h
@@ -12469,6 +12530,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -12727,6 +12789,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -12969,6 +13032,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -13211,6 +13275,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -13453,6 +13518,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -13692,6 +13758,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -13928,6 +13995,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -14167,6 +14235,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -14407,6 +14476,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -14648,6 +14718,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -14892,6 +14963,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -15133,6 +15205,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -15375,6 +15448,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -15620,6 +15694,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -15862,6 +15937,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -16104,6 +16180,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -16345,6 +16422,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -16585,6 +16663,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -16824,6 +16903,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -17065,6 +17145,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -17312,6 +17393,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -17556,6 +17638,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -17801,6 +17884,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -18041,6 +18125,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -18277,6 +18362,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -18516,6 +18602,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -18764,6 +18851,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -19027,6 +19115,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
diff --git a/TAO/orbsvcs/tests/Concurrency/Makefile b/TAO/orbsvcs/tests/Concurrency/Makefile
index 5ecf16153c8..adba452cf71 100644
--- a/TAO/orbsvcs/tests/Concurrency/Makefile
+++ b/TAO/orbsvcs/tests/Concurrency/Makefile
@@ -301,6 +301,7 @@ CC_client:	$(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -551,6 +552,7 @@ CC_client:	$(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -800,6 +802,7 @@ CC_client:	$(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -1049,6 +1052,7 @@ CC_client:	$(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -1282,6 +1286,7 @@ CC_client:	$(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -1516,6 +1521,7 @@ CC_client:	$(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -1750,6 +1756,7 @@ CC_client:	$(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -2001,6 +2008,7 @@ CC_client:	$(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
index 598b9521dae..82ed1c17b96 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
@@ -260,6 +260,7 @@ realclean:
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -341,10 +342,10 @@ realclean:
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/CORBA_Utils_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/CORBA_Utils_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/CORBA_Utils_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Task_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Task_Manager.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/ReactorTask.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Fast_Reactor.h \
  $(ACE_ROOT)/ace/Select_Reactor.h \
@@ -576,6 +577,7 @@ realclean:
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -657,10 +659,10 @@ realclean:
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/CORBA_Utils_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/CORBA_Utils_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/CORBA_Utils_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Task_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Task_Manager.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/ReactorTask.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Fast_Reactor.h \
  $(ACE_ROOT)/ace/Select_Reactor.h \
@@ -883,6 +885,7 @@ realclean:
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -1114,6 +1117,7 @@ realclean:
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -1345,6 +1349,7 @@ realclean:
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index fc2179c5e56..051c0be68a5 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -13,6 +13,7 @@
 #include "orbsvcs/Sched/Config_Scheduler.h"
 #include "orbsvcs/Runtime_Scheduler.h"
 #include "orbsvcs/Event/Event_Channel.h"
+#include "orbsvcs/Event/Module_Factory.h"
 #include "EC_Mcast.h"
 
 #if !defined (__ACE_INLINE__)
@@ -159,7 +160,10 @@ ECM_Driver::run (int argc, char* argv[])
 
       // Create the EventService implementation, but don't start its
       // internal threads.
-      ACE_EventChannel ec_impl (0);
+      TAO_Default_Module_Factory module_factory;
+      ACE_EventChannel ec_impl (0,
+                                ACE_DEFAULT_EVENT_CHANNEL_TYPE,
+                                &module_factory);
 
       // Register Event_Service with the Naming Service.
       RtecEventChannelAdmin::EventChannel_var ec =
@@ -171,20 +175,14 @@ ECM_Driver::run (int argc, char* argv[])
 
       ACE_DEBUG ((LM_DEBUG, "The (local) EC IOR is <%s>\n", str.in ()));
 
-      ACE_DEBUG ((LM_DEBUG, "waiting to start\n"));
-
-      ACE_Time_Value tv (15, 0);
-
       poa_manager->activate (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
-      ACE_DEBUG ((LM_DEBUG, "starting....\n"));
-
       RtecEventChannelAdmin::EventChannel_var local_ec =
         ec_impl._this (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
-      ACE_DEBUG ((LM_DEBUG, "located local EC\n"));
+      ACE_DEBUG ((LM_DEBUG, "EC_Mcast: local EC objref ready\n"));
 
       this->open_federations (local_ec.in (),
                               scheduler.in (),
@@ -214,16 +212,16 @@ ECM_Driver::run (int argc, char* argv[])
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: activate_federations done\n"));
 
-      ACE_DEBUG ((LM_DEBUG, "activate the  EC\n"));
+      ACE_DEBUG ((LM_DEBUG, "EC_Mcast: activate the  EC\n"));
 
       // Create the EC internal threads
       ec_impl.activate ();
 
-      ACE_DEBUG ((LM_DEBUG, "running the test\n"));
+      ACE_DEBUG ((LM_DEBUG, "EC_Mcast: running the test\n"));
       if (this->orb_->run () == -1)
         ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
 
-      ACE_DEBUG ((LM_DEBUG, "shutdown the EC\n"));
+      ACE_DEBUG ((LM_DEBUG, "EC_Mcast: shutdown the EC\n"));
       ec_impl.shutdown ();
 
       this->dump_results ();
@@ -236,9 +234,9 @@ ECM_Driver::run (int argc, char* argv[])
       this->close_federations (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
-      ACE_DEBUG ((LM_DEBUG, "shutdown grace period\n"));
+      ACE_DEBUG ((LM_DEBUG, "EC_Mcast: shutdown grace period\n"));
 
-      tv.set (5, 0);
+      ACE_Time_Value tv (5, 0);
       if (this->orb_->run (&tv) == -1)
         ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
     }
diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile b/TAO/orbsvcs/tests/EC_Mcast/Makefile
index 1cebe52dfee..30a74b07b7c 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/Makefile
+++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile
@@ -238,6 +238,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -323,10 +324,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/CORBA_Utils_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/CORBA_Utils_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/CORBA_Utils_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Task_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Task_Manager.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/ReactorTask.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Fast_Reactor.h \
  $(ACE_ROOT)/ace/Select_Reactor.h \
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile b/TAO/orbsvcs/tests/EC_Multiple/Makefile
index 3900c48a356..ba2a05d8868 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Makefile
+++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile
@@ -236,6 +236,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -321,10 +322,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/CORBA_Utils_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/CORBA_Utils_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/CORBA_Utils_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Task_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Task_Manager.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/ReactorTask.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Fast_Reactor.h \
  $(ACE_ROOT)/ace/Select_Reactor.h \
diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile b/TAO/orbsvcs/tests/EC_Throughput/Makefile
index d9f6b297e02..d349e411125 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/Makefile
+++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile
@@ -252,6 +252,7 @@ realclean:
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -333,10 +334,10 @@ realclean:
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/CORBA_Utils_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/CORBA_Utils_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/CORBA_Utils_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Task_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Task_Manager.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/ReactorTask.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Fast_Reactor.h \
  $(ACE_ROOT)/ace/Select_Reactor.h \
@@ -567,6 +568,7 @@ realclean:
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -648,10 +650,10 @@ realclean:
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/CORBA_Utils_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/CORBA_Utils_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/CORBA_Utils_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Task_Manager.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Task_Manager.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/ReactorTask.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Fast_Reactor.h \
  $(ACE_ROOT)/ace/Select_Reactor.h \
diff --git a/TAO/orbsvcs/tests/Event_Latency/Makefile b/TAO/orbsvcs/tests/Event_Latency/Makefile
index c64ff9e8d43..c7e644442a0 100644
--- a/TAO/orbsvcs/tests/Event_Latency/Makefile
+++ b/TAO/orbsvcs/tests/Event_Latency/Makefile
@@ -252,6 +252,7 @@ Event_Latency: $(addprefix $(VDIR),$(EVENT_LATENCY_OBJS) $(EVENT_LATENCY_CONFIG_
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
diff --git a/TAO/orbsvcs/tests/Logger/Makefile b/TAO/orbsvcs/tests/Logger/Makefile
index c946acf1b5a..2c950fd480e 100644
--- a/TAO/orbsvcs/tests/Logger/Makefile
+++ b/TAO/orbsvcs/tests/Logger/Makefile
@@ -243,6 +243,7 @@ Logging_Test:	$(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -496,6 +497,7 @@ Logging_Test:	$(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
diff --git a/TAO/orbsvcs/tests/Simple_Naming/Makefile b/TAO/orbsvcs/tests/Simple_Naming/Makefile
index 887d78ffcb4..ed06fde3295 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/Makefile
+++ b/TAO/orbsvcs/tests/Simple_Naming/Makefile
@@ -251,6 +251,7 @@ realclean:
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -483,6 +484,7 @@ realclean:
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -715,6 +717,7 @@ realclean:
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
diff --git a/TAO/orbsvcs/tests/Trading/Makefile b/TAO/orbsvcs/tests/Trading/Makefile
index 6492aa3f608..8ef32834ff4 100644
--- a/TAO/orbsvcs/tests/Trading/Makefile
+++ b/TAO/orbsvcs/tests/Trading/Makefile
@@ -259,6 +259,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -490,6 +491,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -721,6 +723,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -963,6 +966,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -1198,6 +1202,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -1442,6 +1447,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \
@@ -1687,6 +1693,7 @@ realclean: clean
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_Table.h \
+ $(TAO_ROOT)/tao/Object_Table.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/try_macros.h \